From f27344a396a82244c33329dea7ae4ca1e411b5ba Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Mon, 23 Sep 2019 17:48:13 +0200
Subject: [PATCH] stuff for tests with MySqlConnector for dotnet

---
 .gitlab-ci.yml      |  7 +------
 Dockerfile          | 14 ++++++++++----
 VERSION             |  2 +-
 ldap.conf-tmpl      | 22 ++++++----------------
 load_pam_plugin.cnf |  6 +++---
 5 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7fc6eb..2e87ce6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ stages:
 
 variables:
         IMAGE_NAME: registry.gitlab.com/wolutator/mariadb-with-ldap-pam
-        HUB_IMAGE_NAME: wollud1969/mariadb-with-ldap-pam
 
 build:
         stage: build
@@ -15,11 +14,7 @@ build:
                 - docker
         script:
                 - VERSION=`cat VERSION`
-                - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
+                - docker build --tag $IMAGE_NAME:$VERSION .
                 - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-                - docker push $IMAGE_NAME:latest
                 - docker push $IMAGE_NAME:$VERSION
-                - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
-                - docker push $HUB_IMAGE_NAME:latest
-                - docker push $HUB_IMAGE_NAME:$VERSION
 
diff --git a/Dockerfile b/Dockerfile
index 19cf4fd..c4fab38 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,10 @@ LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
 LABEL ImageName="registry.gitlab.com/wolutator/mariadb-with-ldap-pam"
 LABEL AlternativeImageName="wollud1969/mariadb-with-ldap-pam"
 
-ENV LDAPBASE "DC=hottis,DC=de"
-ENV LDAPURI "ldap://ldap.hottis.de:389"
-ENV LDAPBINDDB ""
-ENV LDAPBINDPW ""
+ENV LDAPBASE "dc=example,dc=org"
+ENV LDAPURI "ldap://ldapserver:389"
+ENV LDAPBINDDN "cn=admin,dc=example,dc=org"
+ENV LDAPBINDPW "admin"
 
 RUN \
   apt-get update && \
@@ -19,6 +19,12 @@ COPY pam.conf-tail /etc
 COPY ldap.conf-tmpl /etc
 COPY load_pam_plugin.cnf /etc/mysql/conf.d
 
+RUN mkdir /etc/mysql/conf.d/ssl
+
+COPY test/ca.pem /etc/mysql/conf.d/ssl/
+COPY test/server-cert.pem /etc/mysql/conf.d/ssl/
+COPY test/server-key.pem /etc/mysql/conf.d/ssl/
+
 RUN \
   cd /usr/local/bin && \
   tail -n +2 docker-entrypoint.sh > docker-entrypoint.sh-tail && \
diff --git a/VERSION b/VERSION
index 174ad37..2daf35f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2-10.4
+TEST-0.2-10.4
diff --git a/ldap.conf-tmpl b/ldap.conf-tmpl
index 376e2ff..a865011 100644
--- a/ldap.conf-tmpl
+++ b/ldap.conf-tmpl
@@ -1,18 +1,8 @@
-base %LDAPBASE%
-uri %LDAPURI%
-binddn %LDAPBINDDN%
-bindpw %LDAPBINDPW%
+base dc=example,dc=org
+uri ldap://ldapserver
+binddn cn=admin,dc=example,dc=org
+bindpw admin
 ldap_version 3
 referrals off
-pam_login_attribute samaccountname
-pam_member_attribute member
-nss_map_objectclass posixAccount user
-nss_map_objectclass shadowAccount user
-nss_map_attribute uid sAMAccountName
-nss_map_attribute homeDirectory unixHomeDirectory
-nss_map_attribute shadowLastChange pwdLastSet
-nss_map_objectclass posixGroup group
-nss_map_attribute uniqueMember member
-pam_login_attribute sAMAccountName
-pam_filter objectclass=User
-pam_password ad
+pam_login_attribute cn
+pam_filter objectclass=Person
diff --git a/load_pam_plugin.cnf b/load_pam_plugin.cnf
index 36cc368..76f44a9 100644
--- a/load_pam_plugin.cnf
+++ b/load_pam_plugin.cnf
@@ -5,9 +5,9 @@ pam_use_cleartext_plugin = ON
 # create these stuff and enable the following configuration
 # otherwise the pam_use_cleartext_plugin won't work which
 # is required for dotnet connections
-# ssl_cert = /etc/mysql/conf.d/ssl/server-cert.pem
-# ssl_key = /etc/mysql/conf.d/ssl/server-key.pem
-# ssl_ca = /etc/mysql/conf.d/ssl/ca.pem
+ssl_cert = /etc/mysql/conf.d/ssl/server-cert.pem
+ssl_key = /etc/mysql/conf.d/ssl/server-key.pem
+ssl_ca = /etc/mysql/conf.d/ssl/ca.pem