From 3d95405e5fe4ef1b795dbfd63a3532cac65b8cd4 Mon Sep 17 00:00:00 2001
From: Christoph Witzany <christoph@web.crofting.com>
Date: Tue, 5 Apr 2016 17:26:37 +0200
Subject: Introduce LDAP authentication

---
 synapse/config/homeserver.py |  3 ++-
 synapse/config/ldap.py       | 48 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 synapse/config/ldap.py

(limited to 'synapse/config')

diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index acf74c8761..9a80ac39ec 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -30,13 +30,14 @@ from .saml2 import SAML2Config
 from .cas import CasConfig
 from .password import PasswordConfig
 from .jwt import JWTConfig
+from .ldap import LDAPConfig
 
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
                        RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
                        VoipConfig, RegistrationConfig, MetricsConfig, ApiConfig,
                        AppServiceConfig, KeyConfig, SAML2Config, CasConfig,
-                       JWTConfig, PasswordConfig,):
+                       JWTConfig, LDAPConfig, PasswordConfig,):
     pass
 
 
diff --git a/synapse/config/ldap.py b/synapse/config/ldap.py
new file mode 100644
index 0000000000..86528139e2
--- /dev/null
+++ b/synapse/config/ldap.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Niklas Riekenbrauck
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from ._base import Config
+
+
+class LDAPConfig(Config):
+    def read_config(self, config):
+        ldap_config = config.get("ldap_config", None)
+        if ldap_config:
+            self.ldap_enabled = ldap_config.get("enabled", False)
+            self.ldap_server = ldap_config["server"]
+            self.ldap_port = ldap_config["port"]
+            self.ldap_search_base = ldap_config["search_base"]
+            self.ldap_search_property = ldap_config["search_property"]
+            self.ldap_email_property = ldap_config["email_property"]
+            self.ldap_full_name_property = ldap_config["full_name_property"]
+        else:
+            self.ldap_enabled = False
+            self.ldap_server = None
+            self.ldap_port = None
+            self.ldap_search_base = None
+            self.ldap_search_property = None
+            self.ldap_email_property = None
+            self.ldap_full_name_property = None
+
+    def default_config(self, **kwargs):
+        return """\
+        # ldap_config:
+        #    server: "ldap://localhost"
+        #    port: 389
+        #    search_base: "ou=Users,dc=example,dc=com"
+        #    search_property: "cn"
+        #    email_property: "email"
+        #    full_name_property: "givenName"
+        """
-- 
cgit 1.5.1


From 92767dd70313c81c12b91bf35ed44044969b4ef6 Mon Sep 17 00:00:00 2001
From: Christoph Witzany <christoph@web.crofting.com>
Date: Wed, 6 Apr 2016 16:57:54 +0200
Subject: add tls property

---
 synapse/config/ldap.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'synapse/config')

diff --git a/synapse/config/ldap.py b/synapse/config/ldap.py
index 86528139e2..9c14593a99 100644
--- a/synapse/config/ldap.py
+++ b/synapse/config/ldap.py
@@ -23,6 +23,7 @@ class LDAPConfig(Config):
             self.ldap_enabled = ldap_config.get("enabled", False)
             self.ldap_server = ldap_config["server"]
             self.ldap_port = ldap_config["port"]
+            self.ldap_tls = ldap_config.get("tls", False)
             self.ldap_search_base = ldap_config["search_base"]
             self.ldap_search_property = ldap_config["search_property"]
             self.ldap_email_property = ldap_config["email_property"]
@@ -31,6 +32,7 @@ class LDAPConfig(Config):
             self.ldap_enabled = False
             self.ldap_server = None
             self.ldap_port = None
+            self.ldap_tls = False
             self.ldap_search_base = None
             self.ldap_search_property = None
             self.ldap_email_property = None
@@ -39,10 +41,12 @@ class LDAPConfig(Config):
     def default_config(self, **kwargs):
         return """\
         # ldap_config:
-        #    server: "ldap://localhost"
-        #    port: 389
-        #    search_base: "ou=Users,dc=example,dc=com"
-        #    search_property: "cn"
-        #    email_property: "email"
-        #    full_name_property: "givenName"
+        #   enabled: true
+        #   server: "ldap://localhost"
+        #   port: 389
+        #   tls: false
+        #   search_base: "ou=Users,dc=example,dc=com"
+        #   search_property: "cn"
+        #   email_property: "email"
+        #   full_name_property: "givenName"
         """
-- 
cgit 1.5.1