Put SAML callback URI under /_synapse/client. (#9289)

3 files changed, 0 insertions, 104 deletions

diff --git a/synapse/rest/saml2/__init__.py b/synapse/rest/saml2/__init__.py
deleted file mode 100644
index 68da37ca6a..0000000000
--- a/synapse/rest/saml2/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2018 New Vector Ltd
-#
-# 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.
-import logging
-
-from twisted.web.resource import Resource
-
-from synapse.rest.saml2.metadata_resource import SAML2MetadataResource
-from synapse.rest.saml2.response_resource import SAML2ResponseResource
-
-logger = logging.getLogger(__name__)
-
-
-class SAML2Resource(Resource):
-    def __init__(self, hs):
-        Resource.__init__(self)
-        self.putChild(b"metadata.xml", SAML2MetadataResource(hs))
-        self.putChild(b"authn_response", SAML2ResponseResource(hs))
diff --git a/synapse/rest/saml2/metadata_resource.py b/synapse/rest/saml2/metadata_resource.py
deleted file mode 100644
index 1e8526e22e..0000000000
--- a/synapse/rest/saml2/metadata_resource.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2018 New Vector Ltd
-#
-# 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.
-
-
-import saml2.metadata
-
-from twisted.web.resource import Resource
-
-
-class SAML2MetadataResource(Resource):
-    """A Twisted web resource which renders the SAML metadata"""
-
-    isLeaf = 1
-
-    def __init__(self, hs):
-        Resource.__init__(self)
-        self.sp_config = hs.config.saml2_sp_config
-
-    def render_GET(self, request):
-        metadata_xml = saml2.metadata.create_metadata_string(
-            configfile=None, config=self.sp_config
-        )
-        request.setHeader(b"Content-Type", b"text/xml; charset=utf-8")
-        return metadata_xml
diff --git a/synapse/rest/saml2/response_resource.py b/synapse/rest/saml2/response_resource.py
deleted file mode 100644
index f6668fb5e3..0000000000
--- a/synapse/rest/saml2/response_resource.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright 2018 New Vector Ltd
-#
-# 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 synapse.http.server import DirectServeHtmlResource
-
-
-class SAML2ResponseResource(DirectServeHtmlResource):
-    """A Twisted web resource which handles the SAML response"""
-
-    isLeaf = 1
-
-    def __init__(self, hs):
-        super().__init__()
-        self._saml_handler = hs.get_saml_handler()
-
-    async def _async_render_GET(self, request):
-        # We're not expecting any GET request on that resource if everything goes right,
-        # but some IdPs sometimes end up responding with a 302 redirect on this endpoint.
-        # In this case, just tell the user that something went wrong and they should
-        # try to authenticate again.
-        self._saml_handler._render_error(
-            request, "unexpected_get", "Unexpected GET request on /saml2/authn_response"
-        )
-
-    async def _async_render_POST(self, request):
-        await self._saml_handler.handle_saml_response(request)