mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-09-12 01:03:09 +00:00
Merge branch 'Fix_urgent' into 'master'
Fix: Fucking LDIF lines can span over multiple lines See merge request federez/re2o!184
This commit is contained in:
commit
d1c4fba0c0
1 changed files with 20 additions and 6 deletions
|
@ -23,21 +23,35 @@ from django.conf import settings
|
||||||
from users.models import User, ListRight
|
from users.models import User, ListRight
|
||||||
|
|
||||||
|
|
||||||
|
def split_lines(lines):
|
||||||
|
"""
|
||||||
|
Split LDIF lines. They can span over multiple system lines if the
|
||||||
|
following system lines begins with a space.
|
||||||
|
"""
|
||||||
|
ret = []
|
||||||
|
for line in lines.split(b'\n'):
|
||||||
|
if line.startswith(b' ') and len(ret) > 1:
|
||||||
|
ret[-1] += line[len(b' '):]
|
||||||
|
else:
|
||||||
|
ret.append(line)
|
||||||
|
return ret
|
||||||
|
|
||||||
|
|
||||||
def flush_ldap(binddn, bindpass, server, usersdn, groupsdn):
|
def flush_ldap(binddn, bindpass, server, usersdn, groupsdn):
|
||||||
"""
|
"""
|
||||||
Perform the python (and more understandable) equivalent of the following commands:
|
Perform the python (and more understandable) equivalent of the following commands:
|
||||||
|
|
||||||
ldapsearch -A -s one -D $binddn -w $bindpass -H $server -b $usersdn dn \
|
ldapsearch -LLL -s one -D $binddn -w $bindpass -H $server -b $usersdn dn \
|
||||||
| grep "dn: " | sed -e 's/dn: //g' \
|
| grep "dn: " | sed -e 's/dn: //g' \
|
||||||
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
||||||
ldapsearch -A -s one -D $binddn -w $bindpass -H $server -b $usersdn dn \
|
ldapsearch -LLL -s one -D $binddn -w $bindpass -H $server -b $usersdn dn \
|
||||||
| grep "dn:: " | sed -e 's/dn:: //g' \
|
| grep "dn:: " | sed -e 's/dn:: //g' \
|
||||||
| while read x; do echo "$x" | base64 -d; echo ""; done \
|
| while read x; do echo "$x" | base64 -d; echo ""; done \
|
||||||
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
||||||
ldapsearch -A -s one -D $binddn -w $bindpass -H $server -b $groupsdn dn \
|
ldapsearch -LLL -s one -D $binddn -w $bindpass -H $server -b $groupsdn dn \
|
||||||
| grep "dn: " | sed -e 's/dn: //g' \
|
| grep "dn: " | sed -e 's/dn: //g' \
|
||||||
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
||||||
ldapsearch -A -s one -D $binddn -w $bindpass -H $server -b $groupsdn dn \
|
ldapsearch -LLL -s one -D $binddn -w $bindpass -H $server -b $groupsdn dn \
|
||||||
| grep "dn:: " | sed -e 's/dn:: //g' \
|
| grep "dn:: " | sed -e 's/dn:: //g' \
|
||||||
| while read x; do echo "$x" | base64 -d; echo ""; done \
|
| while read x; do echo "$x" | base64 -d; echo ""; done \
|
||||||
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
| ldapdelete -v -D $binddn -w $bindpass -H $server --
|
||||||
|
@ -48,7 +62,7 @@ def flush_ldap(binddn, bindpass, server, usersdn, groupsdn):
|
||||||
for lookup in (usersdn, groupsdn):
|
for lookup in (usersdn, groupsdn):
|
||||||
search_cmd = [
|
search_cmd = [
|
||||||
'ldapsearch',
|
'ldapsearch',
|
||||||
'-A',
|
'-LLL',
|
||||||
'-s', 'one',
|
'-s', 'one',
|
||||||
'-D', binddn,
|
'-D', binddn,
|
||||||
'-w', bindpass,
|
'-w', bindpass,
|
||||||
|
@ -56,7 +70,7 @@ def flush_ldap(binddn, bindpass, server, usersdn, groupsdn):
|
||||||
'-b', lookup,
|
'-b', lookup,
|
||||||
'dn'
|
'dn'
|
||||||
]
|
]
|
||||||
for line in subprocess.check_output(search_cmd).split(b'\n'):
|
for line in split_lines(subprocess.check_output(search_cmd)):
|
||||||
if line.startswith(b'dn: '):
|
if line.startswith(b'dn: '):
|
||||||
to_remove.append(line[len(b'dn: '):])
|
to_remove.append(line[len(b'dn: '):])
|
||||||
elif line.startswith(b'dn:: '):
|
elif line.startswith(b'dn:: '):
|
||||||
|
|
Loading…
Reference in a new issue