merge

Author: Bertrand Gouny

Makefile

@@ -1,5 +1,5 @@
 NAME = osixia/phpldapadmin
-VERSION = 0.3.0
+VERSION = 0.4.0
 
 .PHONY: all build test tag_latest release
 
@@ -9,7 +9,7 @@ build:
 	docker.io build -t $(NAME):$(VERSION) --rm .
 
 test:
-	env NAME=$(NAME) VERSION=$(VERSION) ./test.sh
+	env NAME=$(NAME) VERSION=$(VERSION) ./test.sh debug
 
 tag_latest:
 	docker.io tag $(NAME):$(VERSION) $(NAME):latest

service/phpldapadmin/phpldapadmin.sh

@@ -1,18 +1,46 @@
 #!/bin/sh
 
 # -e Exit immediately if a command exits with a non-zero status
-# -u Treat unset variables as an error when substituting
-set -eu
+set -e
 
 status () {
   echo "---> ${@}" >&2
 }
 
-set -x
-: LDAP_HOST=${LDAP_HOST}
-: LDAP_BASE_DN=${LDAP_BASE_DN}
-: LDAP_LOGIN_DN=${LDAP_LOGIN_DN}
-: LDAP_SERVER_NAME=${LDAP_SERVER_NAME}
+getBaseDn () {
+  IFS="."
+  export IFS
+
+  domain=$1
+  init=1
+
+  for s in $domain; do
+    dc="dc=$s"
+    if [ "$init" -eq 1 ]; then
+      baseDn=$dc
+      init=0
+    else
+      baseDn="$baseDn,$dc" 
+    fi
+  done
+}
+
+# a ldap container is linked to this phpLDAPadmin container
+if [ -n "${LDAP_NAME}" ]; then
+  LDAP_HOST=${LDAP_PORT_389_TCP_ADDR}
+  
+  # Get base dn from ldap domain
+  getBaseDn ${LDAP_ENV_LDAP_DOMAIN}
+
+  LDAP_BASE_DN=$baseDn
+  LDAP_LOGIN_DN="cn=admin,$baseDn"
+  LDAP_SERVER_NAME=${LDAP_ENV_LDAP_ORGANISATION}
+else
+  LDAP_HOST=${LDAP_HOST}
+  LDAP_BASE_DN=${LDAP_BASE_DN}
+  LDAP_LOGIN_DN=${LDAP_LOGIN_DN}
+  LDAP_SERVER_NAME=${LDAP_SERVER_NAME}
+fi
 
 if [ ! -e /etc/phpldapadmin/docker_bootstrapped ]; then
   status "configuring LDAP for first run"

test.sh

@@ -9,6 +9,6 @@
 
 run_test tools/build-container.sh "Successfully built"
 run_test simple.sh "Use the menu to the left to navigate"
+run_test link.sh "Logged in as:"
 
 . test/tools/end.sh
-

test/link.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+#start a openldap container
+openldap="osixia-phpldapadmin-openldap"
+
+echo "docker.io run --name $openldap -d osixia/openldap"
+docker.io run --name $openldap -d osixia/openldap 
+sleep 10
+
+dir=$(dirname $0)
+
+runOptions="--link osixia-phpldapadmin-openldap:ldap"
+. $dir/tools/run-container.sh
+
+echo "curl -c $testDir/cookie.txt $IP"
+curl -c $testDir/cookie.txt $IP
+
+echo "curl http://$IP/cmd.php -L -b $testDir/cookie.txt  -H 'Accept-Encoding: gzip,deflate,sdch' -H 'Accept-Language: fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4' -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.153 Safari/537.36' -H 'Content-Type: application/x-www-form-urlencoded' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' -H 'Cache-Control: max-age=0'  -H 'Connection: keep-alive' --data 'cmd=login&server_id=1&nodecode%5Blogin_pass%5D=1&login=cn%3Dadmin%2Cdc%3Dexample%2Cdc%3Dcom&login_pass=toor&submit=Authenticate' --compressed"
+
+curl http://$IP/cmd.php -L -b $testDir/cookie.txt  -H 'Accept-Encoding: gzip,deflate,sdch' -H 'Accept-Language: fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4' -H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.153 Safari/537.36' -H 'Content-Type: application/x-www-form-urlencoded' -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' -H 'Cache-Control: max-age=0'  -H 'Connection: keep-alive' --data 'cmd=login&server_id=1&nodecode%5Blogin_pass%5D=1&login=cn%3Dadmin%2Cdc%3Dexample%2Cdc%3Dcom&login_pass=toor&submit=Authenticate' --compressed
+
+docker.io stop $openldap
+docker.io rm $openldap
+
+$dir/tools/delete-container.sh

test/tools/end.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+
+rm -rf $testDir
 ./test/tools/delete-container.sh 
 ./test/tools/delete-image.sh > /dev/null 2>&1
 

test/tools/prepare.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+mkdir -p $testDir
+
 dir=$(dirname $0)
 $dir/delete-container.sh
 $dir/delete-image.sh

test/tools/run-container.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-echo "docker.io run --name $testContainer $runOptions -d $testImage"
-ID=`docker.io run --name $testContainer $runOptions -d $testImage`
+echo "docker.io run --name $testContainer $runOptions -d $testImage $runCommand"
+ID=`docker.io run --name $testContainer $runOptions -d $testImage $runCommand`
 sleep 10
 
 echo " --> Obtaining IP"