Merge pull request #61 from jupyter-on-openshift/master

dhirschfeld · web-flow · commit 6cca4b870be8 · 2018-06-07T10:18:08.000+10:00
Don't force TLS bind if not using SSL.
diff --git a/ldapauthenticator/ldapauthenticator.py b/ldapauthenticator/ldapauthenticator.py
@@ -281,7 +281,7 @@ def getConnection(userdn, username, password):
                 server,
                 user=self.escape_userdn_if_needed(userdn),
                 password=password,
-                auto_bind=ldap3.AUTO_BIND_TLS_BEFORE_BIND,
+                auto_bind=self.use_ssl and ldap3.AUTO_BIND_TLS_BEFORE_BIND or ldap3.AUTO_BIND_NO_TLS,
             )
             return conn
         

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ def getConnection(userdn, username, password):`
`281`	`281`	`server,`
`282`	`282`	`user=self.escape_userdn_if_needed(userdn),`
`283`	`283`	`password=password,`
`284`		`- auto_bind=ldap3.AUTO_BIND_TLS_BEFORE_BIND,`
	`284`	`+ auto_bind=self.use_ssl and ldap3.AUTO_BIND_TLS_BEFORE_BIND or ldap3.AUTO_BIND_NO_TLS,`
`285`	`285`	`)`
`286`	`286`	`return conn`
`287`	`287`