From ce94cf124fd4c8d0371d6a8f81f81ff6614b8402 Mon Sep 17 00:00:00 2001 From: primetheus <865381+primetheus@users.noreply.github.com> Date: Sun, 17 Sep 2023 20:27:33 -0400 Subject: [PATCH] add default LDAPS port --- githubapp/ldap.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/githubapp/ldap.py b/githubapp/ldap.py index 1e68dbc..07fea41 100644 --- a/githubapp/ldap.py +++ b/githubapp/ldap.py @@ -15,10 +15,6 @@ class LDAPClient: def __init__(self): # Read settings from the config file and store them as constants self.LDAP_SERVER_HOST = os.environ["LDAP_SERVER_HOST"] - if "LDAP_SERVER_PORT" in os.environ: - self.LDAP_SERVER_PORT = os.environ["LDAP_SERVER_PORT"] - else - self.LDAP_SERVER_PORT = 389 self.LDAP_BASE_DN = os.environ["LDAP_BASE_DN"] self.LDAP_USER_BASE_DN = os.environ["LDAP_USER_BASE_DN"] self.LDAP_USER_ATTRIBUTE = os.environ["LDAP_USER_ATTRIBUTE"] @@ -76,6 +72,13 @@ def __init__(self): ) else: self.tls = None + if "LDAP_SERVER_PORT" in os.environ: + self.LDAP_SERVER_PORT = os.environ["LDAP_SERVER_PORT"] + else + if self.LDAP_USE_SSL: + self.LDAP_SERVER_PORT = 636 + else: + self.LDAP_SERVER_PORT = 389 self.srv = Server( host=self.LDAP_SERVER_HOST,