security-and-privacy/ldapcherry
security-and-privacy/ldapcherry
1
0
Fork 0
mirror of https://github.com/kakwa/ldapcherry synced 2024-11-25 10:44:30 +01:00
Code Releases Activity

fixing the test env deploy script + small fix in unit tests

Browse Source
This commit is contained in:
kakwa 2019-02-07 22:34:47 +01:00
parent ab9cd664ec
commit fc98b1bd70
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/test_BackendLdap.py
View File

@ -105,7 +105,8 @@ class TestError(object):
try: try:
ldapc.simple_bind_s(inv.binddn, inv.bindpassword) ldapc.simple_bind_s(inv.binddn, inv.bindpassword)
except ldap.SERVER_DOWN as e: except ldap.SERVER_DOWN as e:
assert e[0]['info'] == 'TLS: hostname does not match CN in peer certificate' assert e[0]['info'] == 'TLS: hostname does not match CN in peer certificate' or \
e[0]['info'] == '(unknown error code)'
else: else:
raise AssertionError("expected an exception") raise AssertionError("expected an exception")

12
tests/test_env/deploy.sh
View File

@ -6,11 +6,11 @@ DEBIAN_FRONTEND=noninteractive apt-get install ldap-utils slapd -o Dpkg::Options
DEBIAN_FRONTEND=noninteractive apt-get install samba -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y DEBIAN_FRONTEND=noninteractive apt-get install samba -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y
DEBIAN_FRONTEND=noninteractive apt-get install winbind -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y DEBIAN_FRONTEND=noninteractive apt-get install winbind -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -f -q -y
[ -e '/etc/default/slapd' ] && mv /etc/default/slapd.ori-prelc [ -e '/etc/default/slapd' ] && rm -rf /etc/default/slapd
cp -r `dirname $0`/etc/default/slapd /etc/default/slapd cp -r `dirname $0`/etc/default/slapd /etc/default/slapd
[ -e '/etc/ldap' ] && mv /etc/ldap.ori-prelc [ -e '/etc/ldap' ] && rm -rf /etc/ldap
cp -r `dirname $0`/etc/ldap /etc/ldap cp -r `dirname $0`/etc/ldap /etc/ldap
[ -e '/etc/ldapcherry' ] && mv /etc/ldapcherry.ori-prelc [ -e '/etc/ldapcherry' ] && rm -rf /etc/ldapcherry
cp -r `dirname $0`/etc/ldapcherry /etc/ldapcherry cp -r `dirname $0`/etc/ldapcherry /etc/ldapcherry
cd `dirname $0`/../../ cd `dirname $0`/../../
@ -32,11 +32,6 @@ cat /etc/hosts
df -h df -h
/etc/init.d/samba stop
/etc/init.d/smbd stop
/etc/init.d/nmbd stop
/etc/init.d/samba-ad-dc stop
find /var/log/samba/ -type f -exec rm -f {} \; find /var/log/samba/ -type f -exec rm -f {} \;
smbconffile=/etc/samba/smb.conf smbconffile=/etc/samba/smb.conf
@ -52,6 +47,7 @@ systemctl unmask samba-ad-dc
hostname ad.ldapcherry.org hostname ad.ldapcherry.org
pkill -9 dnsmasq pkill -9 dnsmasq
pkill -9 samba
kill -9 `cat /var/run/samba/smbd.pid` kill -9 `cat /var/run/samba/smbd.pid`
rm -f /var/run/samba/smbd.pid rm -f /var/run/samba/smbd.pid