From 21c8438587436452ed1c1c3a7fac0da9bfd19b70 Mon Sep 17 00:00:00 2001
From: Christian Connert <christian@swarm-analytics.com>
Date: Tue, 9 Jul 2019 15:19:14 +0200
Subject: [PATCH] Revert "read credentials from environment variables"

This reverts commit 7af125550c054fb300c1868f22da70cd13235dae.
---
 ChangeLog.rst                     | 11 +++--------
 Dockerfile                        |  2 --
 ldapcherry/backend/backendAD.py   |  4 ++--
 ldapcherry/backend/backendLdap.py |  2 +-
 ldapcherry/version.py             |  2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ChangeLog.rst b/ChangeLog.rst
index 91575c3..883f28a 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,11 +1,6 @@
 Dev
 ***
 
-Version 1.1.2
-*************
-
-* [feat] read credentials from environment variables
-
 Version 1.1.1
 *************
 
@@ -77,7 +72,7 @@ Version 0.3.5
 Version 0.3.4
 *************
 
-* [impr] focus on first field for all forms
+* [impr] focus on first field for all forms 
 * [impr] add icon in navbar to return on /
 
 Version 0.3.3
@@ -122,7 +117,7 @@ Version 0.2.3
 *************
 
 * [fix ] notifications missing in case of multiple notification waiting to be displayed
-* [fix ] password handling for Active Directory backend
+* [fix ] password handling for Active Directory backend 
 * [fix ] default attribute value handling
 * [fix ] corrections on exemple configuration
 * [impr] explicite mandatory attributes for Active Directory backend
@@ -136,7 +131,7 @@ Version 0.2.2
 Version 0.2.1
 *************
 
-* [fix ] fix doc
+* [fix ] fix doc 
 
 Version 0.2.0
 *************
diff --git a/Dockerfile b/Dockerfile
index 1aa78ad..0ee9be5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,6 @@ ADD . /usr/src/app
 
 ENV DATAROOTDIR /usr/share
 ENV SYSCONFDIR /etc
-ENV AD_LOGIN administrator
-ENV PASSWORD password
 
 RUN apk add --no-cache libldap && \
     apk add --no-cache --virtual build-dependencies build-base yaml-dev openldap-dev && \
diff --git a/ldapcherry/backend/backendAD.py b/ldapcherry/backend/backendAD.py
index d53eb64..e5db15f 100644
--- a/ldapcherry/backend/backendAD.py
+++ b/ldapcherry/backend/backendAD.py
@@ -103,10 +103,10 @@ class Backend(ldapcherry.backend.backendLdap.Backend):
         self.backend_name = name
         self.backend_display_name = self.get_param('display_name')
         self.domain = self.get_param('domain')
-        self.login = os.getenv("AD_LOGIN", self.get_param('login'))
+        self.login = self.get_param('login')
         basedn = 'dc=' + re.sub(r'\.', ',DC=', self.domain)
         self.binddn = self.get_param('login') + '@' + self.domain
-        self.bindpassword = os.getenv("PASSWORD", self.get_param('password'))
+        self.bindpassword = self.get_param('password')
         self.ca = self.get_param('ca', False)
         self.checkcert = self.get_param('checkcert', 'on')
         self.starttls = self.get_param('starttls', 'off')
diff --git a/ldapcherry/backend/backendLdap.py b/ldapcherry/backend/backendLdap.py
index 7440304..3febdc0 100644
--- a/ldapcherry/backend/backendLdap.py
+++ b/ldapcherry/backend/backendLdap.py
@@ -59,7 +59,7 @@ class Backend(ldapcherry.backend.Backend):
         self.backend_name = name
         self.backend_display_name = self.get_param('display_name')
         self.binddn = self.get_param('binddn')
-        self.bindpassword = os.getenv("PASSWORD", self.get_param('password'))
+        self.bindpassword = self.get_param('password')
         self.ca = self.get_param('ca', False)
         self.checkcert = self.get_param('checkcert', 'on')
         self.starttls = self.get_param('starttls', 'off')
diff --git a/ldapcherry/version.py b/ldapcherry/version.py
index 45fdd7b..4ce55d1 100644
--- a/ldapcherry/version.py
+++ b/ldapcherry/version.py
@@ -5,4 +5,4 @@
 # ldapCherry
 # Copyright (c) 2014 Carpentier Pierre-Francois
 
-version = '1.1.2'
+version = '1.1.1'