Fixup testing host

Author: williamdes

docker/docker-compose.test.yml

@@ -4,6 +4,7 @@ services:
     openldap:
         build: .
         command: ldap
+        hostname: ldap.server.intranet
         restart: on-failure:5
         mem_limit: 256M
         mem_reservation: 100M

docker/tests/run.sh

@@ -4,8 +4,10 @@
 # @author William Desportes <williamdes@wdes.fr>
 ##
 
+LDAP_URI="ldap://ldap.server.intranet"
+
 seedFile() {
-    ldapadd -H ldap://openldap -D "cn=admin,dc=example,dc=org" -w admin < "/tests/data/$1.ldiff"
+    ldapadd -H ${LDAP_URI} -D "cn=admin,dc=example,dc=org" -w admin < "/tests/data/$1.ldiff"
 }
 
 seedEmail() {
@@ -20,9 +22,9 @@ seedOrg() {
 
 set -eu
 
-ldapwhoami -H ldap://openldap -D cn=admin,dc=example,dc=org -w "admin"
-ldapwhoami -H ldap://openldap -D cn=config -w "config"
-ldapwhoami -H ldap://openldap -D cn=monitor -w "monitor"
+ldapwhoami -H ${LDAP_URI} -D cn=admin,dc=example,dc=org -w "admin"
+ldapwhoami -H ${LDAP_URI} -D cn=config -w "config"
+ldapwhoami -H ${LDAP_URI} -D cn=monitor -w "monitor"
 
 seedOrg org
 seedOrg org-email3
@@ -36,74 +38,74 @@ seedEmail email5
 seedEmail email6
 
 echo 'Print results'
-ldapsearch -LLL -H ldap://openldap -D "cn=admin,dc=example,dc=org" -w admin -b "ou=people,dc=example,dc=org" '*'
+ldapsearch -LLL -H ${LDAP_URI} -D "cn=admin,dc=example,dc=org" -w admin -b "ou=people,dc=example,dc=org" '*'
 
 echo 'Print config'
-ldapsearch -LLL -H ldap://openldap -D "cn=config" -w config -b "cn=config" 'cn=config'
+ldapsearch -LLL -H ${LDAP_URI} -D "cn=config" -w config -b "cn=config" 'cn=config'
 
 echo 'Print supported SASL Mechanisms'
 saslauthd -v
-ldapsearch -LLL -x -H ldap://openldap -b "" -s base supportedSASLMechanisms
+ldapsearch -LLL -x -H ${LDAP_URI} -b "" -s base supportedSASLMechanisms
 
 echo 'Login as email 1'
-ldapwhoami -H ldap://openldap -D "cn=John Pondu,ou=people,dc=example,dc=org" -w 'JohnPassWord!645987zefdm'
+ldapwhoami -H ${LDAP_URI} -D "cn=John Pondu,ou=people,dc=example,dc=org" -w 'JohnPassWord!645987zefdm'
 echo 'Login as email 1 bad password'
-ldapwhoami -H ldap://openldap -D "cn=Pondu John,ou=people,dc=example,dc=org" -w 'JohnPassWord!s645987zefdm' && ret=$? || ret=$?
+ldapwhoami -H ${LDAP_URI} -D "cn=Pondu John,ou=people,dc=example,dc=org" -w 'JohnPassWord!s645987zefdm' && ret=$? || ret=$?
 if [ $ret -ne 49 ]; then
     echo "Login should not work as the CN is wrong ($ret)"
     exit 1
 fi
 
 echo 'Login as email 1 no password'
-ldapwhoami -H ldap://openldap -D "cn=John Pondu,ou=people,dc=example,dc=org" && ret=$? || ret=$?
+ldapwhoami -H ${LDAP_URI} -D "cn=John Pondu,ou=people,dc=example,dc=org" && ret=$? || ret=$?
 if [ $ret -ne 53 ]; then
     echo "Login should not work as the password is missing ($ret)"
     exit 1
 fi
 
 echo 'Login as email 1 bad password'
-ldapwhoami -H ldap://openldap -D "cn=John Pondu,ou=people,dc=example,dc=org" -w 'JohnPassWord!s645987zefdm' && ret=$? || ret=$?
+ldapwhoami -H ${LDAP_URI} -D "cn=John Pondu,ou=people,dc=example,dc=org" -w 'JohnPassWord!s645987zefdm' && ret=$? || ret=$?
 if [ $ret -ne 49 ]; then
     echo "Login should not work as the password is wrong ($ret)"
     exit 1
 fi
 
 echo 'Login as email 2'
-ldapwhoami -H ldap://openldap -D "cn=Cyrielle Pondu,ou=people,dc=example,dc=org" -w 'PassCyrielle!ILoveDogs'
+ldapwhoami -H ${LDAP_URI} -D "cn=Cyrielle Pondu,ou=people,dc=example,dc=org" -w 'PassCyrielle!ILoveDogs'
 
 echo 'Login as email 3'
-ldapwhoami -H ldap://openldap -D "mail=alice@warz.eu,o=warz.eu,ou=people,dc=example,dc=org" -w 'oHHGf7YyJSihb6ifSwNWZPtEGzijjp8'
+ldapwhoami -H ${LDAP_URI} -D "mail=alice@warz.eu,o=warz.eu,ou=people,dc=example,dc=org" -w 'oHHGf7YyJSihb6ifSwNWZPtEGzijjp8'
 
 # -a slapd will make it use slapd.conf in the plugin config folder
 #echo "oHHGf7YyJSihb6ifSwNWZPtEGzijjp8" | saslpasswd2 -a slapd -n -p -c -u warz.eu edwin@warz.eu
 
 echo 'Login as email 4'
 echo -e "\tUsing SASL auth"
-ldapwhoami -Q -H ldap://openldap -U edwin@warz.eu -w 'oHHGf7YyJSihb6ifSwNWZPtEGzijjp8'
+ldapwhoami -Q -H ${LDAP_URI} -U edwin@warz.eu -w 'oHHGf7YyJSihb6ifSwNWZPtEGzijjp8'
 echo -e "\tUsing simple auth"
-ldapwhoami -H ldap://openldap -D "mail=edwin@warz.eu,o=warz.eu,ou=people,dc=example,dc=org" -w 'oHHGf7YyJSihb6ifSwNWZPtEGzijjp8'
+ldapwhoami -H ${LDAP_URI} -D "mail=edwin@warz.eu,o=warz.eu,ou=people,dc=example,dc=org" -w 'oHHGf7YyJSihb6ifSwNWZPtEGzijjp8'
 
 echo 'Login as email 5'
 echo -e "\tUsing secure STARTTLS auth"
-ldapwhoami -ZZ -H ldap://openldap -D "mail=elana@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'bandedetsylish'
+ldapwhoami -ZZ -H ${LDAP_URI} -D "mail=elana@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'bandedetsylish'
 echo -e "\tUsing secure SSL auth"
 ldapwhoami -H ldaps://openldap -D "mail=elana@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'bandedetsylish'
 echo -e "\tUsing simple auth"
-ldapwhoami -H ldap://openldap -D "mail=elana@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'bandedetsylish'
+ldapwhoami -H ${LDAP_URI} -D "mail=elana@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'bandedetsylish'
 echo -e "\tUsing SASL auth"
-ldapwhoami -Q -H ldap://openldap -U elana@caldin.eu -w 'bandedetsylish' && ret=$? || ret=$?
+ldapwhoami -Q -H ${LDAP_URI} -U elana@caldin.eu -w 'bandedetsylish' && ret=$? || ret=$?
 if [ $ret -ne 49 ]; then
     echo "Login can not work because the password is not usable for SASL and SRP secret is not set ($ret)"
     exit 1
 fi
 
 echo 'Login as email 6'
 echo -e "\tUsing SASL auth"
-ldapwhoami -Q -H ldap://openldap -U elon@caldin.eu -w 'HVxmD6ejZ9nUX6MSnQUvqKui5YYG56P' && ret=$? || ret=$?
+ldapwhoami -Q -H ${LDAP_URI} -U elon@caldin.eu -w 'HVxmD6ejZ9nUX6MSnQUvqKui5YYG56P' && ret=$? || ret=$?
 if [ $ret -ne 49 ]; then
     echo "Login should not work for clear text passwords in the DB ($ret)"
     exit 1
 fi
 
 echo -e "\tUsing simple auth"
-ldapwhoami -H ldap://openldap -D "mail=elon@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'HVxmD6ejZ9nUX6MSnQUvqKui5YYG56P'
+ldapwhoami -H ${LDAP_URI} -D "mail=elon@caldin.eu,o=caldin.eu,ou=people,dc=example,dc=org" -w 'HVxmD6ejZ9nUX6MSnQUvqKui5YYG56P'