read credentials from environment variables

This commit is contained in:
Kevin Li 2019-05-23 12:41:41 +08:00
parent fe8539e2e6
commit 7af125550c
5 changed files with 14 additions and 7 deletions

View File

@ -1,6 +1,11 @@
Dev
***
Version 1.1.2
*************
* [feat] read credentials from environment variables
Version 1.1.1
*************
@ -72,7 +77,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
@ -117,7 +122,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
@ -131,7 +136,7 @@ Version 0.2.2
Version 0.2.1
*************
* [fix ] fix doc
* [fix ] fix doc
Version 0.2.0
*************

View File

@ -5,6 +5,8 @@ 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 && \

View File

@ -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 = self.get_param('login')
self.login = os.getenv("AD_LOGIN", self.get_param('login'))
basedn = 'dc=' + re.sub(r'\.', ',DC=', self.domain)
self.binddn = self.get_param('login') + '@' + self.domain
self.bindpassword = self.get_param('password')
self.bindpassword = os.getenv("PASSWORD", 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')

View File

@ -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 = self.get_param('password')
self.bindpassword = os.getenv("PASSWORD", 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')

View File

@ -5,4 +5,4 @@
# ldapCherry
# Copyright (c) 2014 Carpentier Pierre-Francois
version = '1.1.1'
version = '1.1.2'