security-and-privacy/ldapcherry
security-and-privacy/ldapcherry
1
0
Fork 0
mirror of https://github.com/kakwa/ldapcherry synced 2024-11-24 10:14:31 +01:00
Code Releases Activity

read credentials from environment variables

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.rst
View File

@ -1,6 +1,11 @@
Dev Dev
*** ***
Version 1.1.2
*************
* [feat] read credentials from environment variables
Version 1.1.1 Version 1.1.1
************* *************

2
Dockerfile
View File

@ -5,6 +5,8 @@ ADD . /usr/src/app
ENV DATAROOTDIR /usr/share ENV DATAROOTDIR /usr/share
ENV SYSCONFDIR /etc ENV SYSCONFDIR /etc
ENV AD_LOGIN administrator
ENV PASSWORD password
RUN apk add --no-cache libldap && \ RUN apk add --no-cache libldap && \
apk add --no-cache --virtual build-dependencies build-base yaml-dev openldap-dev && \ apk add --no-cache --virtual build-dependencies build-base yaml-dev openldap-dev && \

4
ldapcherry/backend/backendAD.py
View File

@ -103,10 +103,10 @@ class Backend(ldapcherry.backend.backendLdap.Backend):
self.backend_name = name self.backend_name = name
self.backend_display_name = self.get_param('display_name') self.backend_display_name = self.get_param('display_name')
self.domain = self.get_param('domain') 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) basedn = 'dc=' + re.sub(r'\.', ',DC=', self.domain)
self.binddn = self.get_param('login') + '@' + 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.ca = self.get_param('ca', False)
self.checkcert = self.get_param('checkcert', 'on') self.checkcert = self.get_param('checkcert', 'on')
self.starttls = self.get_param('starttls', 'off') self.starttls = self.get_param('starttls', 'off')

2
ldapcherry/backend/backendLdap.py
View File

@ -59,7 +59,7 @@ class Backend(ldapcherry.backend.Backend):
self.backend_name = name self.backend_name = name
self.backend_display_name = self.get_param('display_name') self.backend_display_name = self.get_param('display_name')
self.binddn = self.get_param('binddn') 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.ca = self.get_param('ca', False)
self.checkcert = self.get_param('checkcert', 'on') self.checkcert = self.get_param('checkcert', 'on')
self.starttls = self.get_param('starttls', 'off') self.starttls = self.get_param('starttls', 'off')

2
ldapcherry/version.py
View File

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