summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMuthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com>2015-07-07 17:40:30 +0530
committerMuthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com>2015-07-08 15:36:54 +0530
commit81682d0f820a6209535267a45ee28b8f66ff7794 (patch)
treef5cda857c38fe8af6291eb58f937f62280232738 /synapse/config
parentOops: underride rule had an identifier with override in it. (diff)
downloadsynapse-81682d0f820a6209535267a45ee28b8f66ff7794.tar.xz
Integrate SAML2 basic authentication - uses pysaml2
Diffstat (limited to '')
-rw-r--r--synapse/config/homeserver.py6
-rw-r--r--synapse/config/saml2.py27
2 files changed, 30 insertions, 3 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index fe0ccb6eb7..5c655c5373 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -25,12 +25,12 @@ from .registration import RegistrationConfig
 from .metrics import MetricsConfig
 from .appservice import AppServiceConfig
 from .key import KeyConfig
-
+from .saml2 import SAML2Config
 
 class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
                        RatelimitConfig, ContentRepositoryConfig, CaptchaConfig,
-                       VoipConfig, RegistrationConfig,
-                       MetricsConfig, AppServiceConfig, KeyConfig,):
+                       VoipConfig, RegistrationConfig, MetricsConfig,
+                       AppServiceConfig, KeyConfig, SAML2Config, ):
     pass
 
 
diff --git a/synapse/config/saml2.py b/synapse/config/saml2.py
new file mode 100644
index 0000000000..4f3a724e27
--- /dev/null
+++ b/synapse/config/saml2.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright 2015 Ericsson
+#
+# 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 SAML2Config(Config):
+    def read_config(self, config):
+        self.saml2_config = config["saml2_config"]
+
+    def default_config(self, config_dir_path, server_name):
+        return """
+        saml2_config:
+            config_path: "%s/sp_conf.py"
+            idp_redirect_url: "http://%s/idp"
+        """%(config_dir_path, server_name)