diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index 6314f31f7a..6dc19305b7 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -18,4 +18,5 @@
CLIENT_PREFIX = "/_matrix/client/api/v1"
FEDERATION_PREFIX = "/_matrix/federation/v1"
WEB_CLIENT_PREFIX = "/_matrix/client"
-CONTENT_REPO_PREFIX = "/_matrix/content"
\ No newline at end of file
+CONTENT_REPO_PREFIX = "/_matrix/content"
+SERVER_KEY_PREFIX = "/_matrix/key/v1"
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 2f1b954902..a77f137b4e 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -26,8 +26,10 @@ from twisted.web.server import Site
from synapse.http.server import JsonResource, RootRedirect
from synapse.http.content_repository import ContentRepoResource
from synapse.http.client import TwistedHttpClient
+from synapse.http.server_key_resource import LocalKey
from synapse.api.urls import (
- CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX
+ CLIENT_PREFIX, FEDERATION_PREFIX, WEB_CLIENT_PREFIX, CONTENT_REPO_PREFIX,
+ SERVER_KEY_PREFIX,
)
from synapse.config.homeserver import HomeServerConfig
from synapse.crypto import context_factory
@@ -63,6 +65,9 @@ class SynapseHomeServer(HomeServer):
self, self.upload_dir, self.auth, self.content_addr
)
+ def build_resource_for_server_key(self):
+ return LocalKey(self)
+
def build_db_pool(self):
return adbapi.ConnectionPool(
"sqlite3", self.get_db_name(),
@@ -88,7 +93,8 @@ class SynapseHomeServer(HomeServer):
desired_tree = [
(CLIENT_PREFIX, self.get_resource_for_client()),
(FEDERATION_PREFIX, self.get_resource_for_federation()),
- (CONTENT_REPO_PREFIX, self.get_resource_for_content_repo())
+ (CONTENT_REPO_PREFIX, self.get_resource_for_content_repo()),
+ (SERVER_KEY_PREFIX, self.get_resource_for_server_key()),
]
if web_client:
logger.info("Adding the web client.")
diff --git a/synapse/crypto/resource/key.py b/synapse/crypto/resource/key.py
deleted file mode 100644
index 48d14b9f4a..0000000000
--- a/synapse/crypto/resource/key.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2014 OpenMarket 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 twisted.web.resource import Resource
-from twisted.web.server import NOT_DONE_YET
-from twisted.internet import defer
-from synapse.http.server import respond_with_json_bytes
-from synapse.crypto.keyclient import fetch_server_key
-from syutil.crypto.jsonsign import sign_json, verify_signed_json
-from syutil.base64util import encode_base64, decode_base64
-from syutil.jsonutil import encode_canonical_json
-from OpenSSL import crypto
-from nacl.signing import VerifyKey
-import logging
-
-
-logger = logging.getLogger(__name__)
-
-
-class LocalKey(Resource):
- """HTTP resource containing encoding the TLS X.509 certificate and NACL
- signature verification keys for this server::
-
- GET /key HTTP/1.1
-
- HTTP/1.1 200 OK
- Content-Type: application/json
- {
- "server_name": "this.server.example.com"
- "signature_verify_key": # base64 encoded NACL verification key.
- "tls_certificate": # base64 ASN.1 DER encoded X.509 tls cert.
- "signatures": {
- "this.server.example.com": # NACL signature for this server.
- }
- }
- """
-
- def __init__(self, key_server):
- self.key_server = key_server
- self.response_body = encode_canonical_json(
- self.response_json_object(key_server)
- )
- Resource.__init__(self)
-
- @staticmethod
- def response_json_object(key_server):
- verify_key_bytes = key_server.signing_key.verify_key.encode()
- x509_certificate_bytes = crypto.dump_certificate(
- crypto.FILETYPE_ASN1,
- key_server.tls_certificate
- )
- json_object = {
- u"server_name": key_server.server_name,
- u"signature_verify_key": encode_base64(verify_key_bytes),
- u"tls_certificate": encode_base64(x509_certificate_bytes)
- }
- signed_json = sign_json(
- json_object,
- key_server.server_name,
- key_server.signing_key
- )
- return signed_json
-
- def getChild(self, name, request):
- logger.info("getChild %s %s", name, request)
- if name == '':
- return self
- else:
- return RemoteKey(name, self.key_server)
-
- def render_GET(self, request):
- return respond_with_json_bytes(request, 200, self.response_body)
-
-
-class RemoteKey(Resource):
- """HTTP resource for retreiving the TLS certificate and NACL signature
- verification keys for a another server. Checks that the reported X.509 TLS
- certificate matches the one used in the HTTPS connection. Checks that the
- NACL signature for the remote server is valid. Returns JSON signed by both
- the remote server and by this server.
-
- GET /key/remote.server.example.com HTTP/1.1
-
- HTTP/1.1 200 OK
- Content-Type: application/json
- {
- "server_name": "remote.server.example.com"
- "signature_verify_key": # base64 encoded NACL verification key.
- "tls_certificate": # base64 ASN.1 DER encoded X.509 tls cert.
- "signatures": {
- "remote.server.example.com": # NACL signature for remote server.
- "this.server.example.com": # NACL signature for this server.
- }
- }
- """
-
- isLeaf = True
-
- def __init__(self, server_name, key_server):
- self.server_name = server_name
- self.key_server = key_server
- Resource.__init__(self)
-
- def render_GET(self, request):
- self._async_render_GET(request)
- return NOT_DONE_YET
-
- @defer.inlineCallbacks
- def _async_render_GET(self, request):
- try:
- server_keys, certificate = yield fetch_server_key(
- self.server_name,
- self.key_server.ssl_context_factory
- )
-
- resp_server_name = server_keys[u"server_name"]
- verify_key_b64 = server_keys[u"signature_verify_key"]
- tls_certificate_b64 = server_keys[u"tls_certificate"]
- verify_key = VerifyKey(decode_base64(verify_key_b64))
-
- if resp_server_name != self.server_name:
- raise ValueError("Wrong server name '%s' != '%s'" %
- (resp_server_name, self.server_name))
-
- x509_certificate_bytes = crypto.dump_certificate(
- crypto.FILETYPE_ASN1,
- certificate
- )
-
- if encode_base64(x509_certificate_bytes) != tls_certificate_b64:
- raise ValueError("TLS certificate doesn't match")
-
- verify_signed_json(server_keys, self.server_name, verify_key)
-
- signed_json = sign_json(
- server_keys,
- self.key_server.server_name,
- self.key_server.signing_key
- )
-
- json_bytes = encode_canonical_json(signed_json)
- respond_with_json_bytes(request, 200, json_bytes)
-
- except Exception as e:
- json_bytes = encode_canonical_json({
- u"error": {u"code": 502, u"message": e.message}
- })
- respond_with_json_bytes(request, 502, json_bytes)
diff --git a/synapse/http/server_key_resource.py b/synapse/http/server_key_resource.py
new file mode 100644
index 0000000000..8022f9a5ae
--- /dev/null
+++ b/synapse/http/server_key_resource.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+# Copyright 2014 OpenMarket 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 twisted.web.resource import Resource
+from twisted.web.server import NOT_DONE_YET
+from twisted.internet import defer
+from synapse.http.server import respond_with_json_bytes
+from synapse.crypto.keyclient import fetch_server_key
+from syutil.crypto.jsonsign import sign_json
+from syutil.base64util import encode_base64, decode_base64
+from syutil.jsonutil import encode_canonical_json
+from OpenSSL import crypto
+from nacl.signing import VerifyKey
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+class LocalKey(Resource):
+ """HTTP resource containing encoding the TLS X.509 certificate and NACL
+ signature verification keys for this server::
+
+ GET /key HTTP/1.1
+
+ HTTP/1.1 200 OK
+ Content-Type: application/json
+ {
+ "server_name": "this.server.example.com"
+ "verify_keys": {
+ "algorithm:version": # base64 encoded NACL verification key.
+ },
+ "tls_certificate": # base64 ASN.1 DER encoded X.509 tls cert.
+ "signatures": {
+ "this.server.example.com": {
+ "algorithm:version": # NACL signature for this server.
+ }
+ }
+ }
+ """
+
+ def __init__(self, hs):
+ self.hs = hs
+ self.response_body = encode_canonical_json(
+ self.response_json_object(hs.config)
+ )
+ Resource.__init__(self)
+
+ @staticmethod
+ def response_json_object(server_config):
+ verify_keys = {}
+ for key in server_config.signing_key:
+ verify_key_bytes = key.verify_key.encode()
+ key_id = "%s:%s" % (key.alg, key.version)
+ verify_keys[key_id] = encode_base64(verify_key_bytes)
+
+ x509_certificate_bytes = crypto.dump_certificate(
+ crypto.FILETYPE_ASN1,
+ server_config.tls_certificate
+ )
+ json_object = {
+ u"server_name": server_config.server_name,
+ u"verify_keys": verify_keys,
+ u"tls_certificate": encode_base64(x509_certificate_bytes)
+ }
+ for key in server_config.signing_key:
+ json_object = sign_json(
+ json_object,
+ server_config.server_name,
+ key,
+ )
+
+ return json_object
+
+ def render_GET(self, request):
+ return respond_with_json_bytes(request, 200, self.response_body)
+
+ def getChild(self, name, request):
+ if name == '':
+ return self
diff --git a/synapse/server.py b/synapse/server.py
index cdea49e6ab..529500d595 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -75,6 +75,7 @@ class BaseHomeServer(object):
'resource_for_federation',
'resource_for_web_client',
'resource_for_content_repo',
+ 'resource_for_server_key',
'event_sources',
'ratelimiter',
]
|
