mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 03:51:59 +00:00
Add a version 2 of the key server api
This commit is contained in:
parent
be7ead6946
commit
d488463fa3
@ -22,5 +22,6 @@ STATIC_PREFIX = "/_matrix/static"
|
|||||||
WEB_CLIENT_PREFIX = "/_matrix/client"
|
WEB_CLIENT_PREFIX = "/_matrix/client"
|
||||||
CONTENT_REPO_PREFIX = "/_matrix/content"
|
CONTENT_REPO_PREFIX = "/_matrix/content"
|
||||||
SERVER_KEY_PREFIX = "/_matrix/key/v1"
|
SERVER_KEY_PREFIX = "/_matrix/key/v1"
|
||||||
|
SERVER_KEY_V2_PREFIX = "/_matrix/key/v2"
|
||||||
MEDIA_PREFIX = "/_matrix/media/v1"
|
MEDIA_PREFIX = "/_matrix/media/v1"
|
||||||
APP_SERVICE_PREFIX = "/_matrix/appservice/v1"
|
APP_SERVICE_PREFIX = "/_matrix/appservice/v1"
|
||||||
|
@ -35,10 +35,12 @@ from synapse.http.server import JsonResource, RootRedirect
|
|||||||
from synapse.rest.media.v0.content_repository import ContentRepoResource
|
from synapse.rest.media.v0.content_repository import ContentRepoResource
|
||||||
from synapse.rest.media.v1.media_repository import MediaRepositoryResource
|
from synapse.rest.media.v1.media_repository import MediaRepositoryResource
|
||||||
from synapse.rest.key.v1.server_key_resource import LocalKey
|
from synapse.rest.key.v1.server_key_resource import LocalKey
|
||||||
|
from synapse.rest.key.v2 import KeyApiV2Resource
|
||||||
from synapse.http.matrixfederationclient import MatrixFederationHttpClient
|
from synapse.http.matrixfederationclient import MatrixFederationHttpClient
|
||||||
from synapse.api.urls import (
|
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, MEDIA_PREFIX, CLIENT_V2_ALPHA_PREFIX, STATIC_PREFIX
|
SERVER_KEY_PREFIX, MEDIA_PREFIX, CLIENT_V2_ALPHA_PREFIX, STATIC_PREFIX,
|
||||||
|
SERVER_KEY_V2_PREFIX,
|
||||||
)
|
)
|
||||||
from synapse.config.homeserver import HomeServerConfig
|
from synapse.config.homeserver import HomeServerConfig
|
||||||
from synapse.crypto import context_factory
|
from synapse.crypto import context_factory
|
||||||
@ -96,6 +98,9 @@ class SynapseHomeServer(HomeServer):
|
|||||||
def build_resource_for_server_key(self):
|
def build_resource_for_server_key(self):
|
||||||
return LocalKey(self)
|
return LocalKey(self)
|
||||||
|
|
||||||
|
def build_resource_for_server_key_v2(self):
|
||||||
|
return KeyApiV2Resource(self)
|
||||||
|
|
||||||
def build_resource_for_metrics(self):
|
def build_resource_for_metrics(self):
|
||||||
if self.get_config().enable_metrics:
|
if self.get_config().enable_metrics:
|
||||||
return MetricsResource(self)
|
return MetricsResource(self)
|
||||||
@ -135,6 +140,7 @@ class SynapseHomeServer(HomeServer):
|
|||||||
(FEDERATION_PREFIX, self.get_resource_for_federation()),
|
(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()),
|
(SERVER_KEY_PREFIX, self.get_resource_for_server_key()),
|
||||||
|
(SERVER_KEY_V2_PREFIX, self.get_resource_for_server_key_v2()),
|
||||||
(MEDIA_PREFIX, self.get_resource_for_media_repository()),
|
(MEDIA_PREFIX, self.get_resource_for_media_repository()),
|
||||||
(STATIC_PREFIX, self.get_resource_for_static_content()),
|
(STATIC_PREFIX, self.get_resource_for_static_content()),
|
||||||
]
|
]
|
||||||
|
@ -23,6 +23,9 @@ class ServerConfig(Config):
|
|||||||
super(ServerConfig, self).__init__(args)
|
super(ServerConfig, self).__init__(args)
|
||||||
self.server_name = args.server_name
|
self.server_name = args.server_name
|
||||||
self.signing_key = self.read_signing_key(args.signing_key_path)
|
self.signing_key = self.read_signing_key(args.signing_key_path)
|
||||||
|
self.old_signing_keys = self.read_old_signing_keys(
|
||||||
|
args.old_signing_key_path
|
||||||
|
)
|
||||||
self.bind_port = args.bind_port
|
self.bind_port = args.bind_port
|
||||||
self.bind_host = args.bind_host
|
self.bind_host = args.bind_host
|
||||||
self.unsecure_port = args.unsecure_port
|
self.unsecure_port = args.unsecure_port
|
||||||
@ -31,6 +34,7 @@ class ServerConfig(Config):
|
|||||||
self.web_client = args.web_client
|
self.web_client = args.web_client
|
||||||
self.manhole = args.manhole
|
self.manhole = args.manhole
|
||||||
self.soft_file_limit = args.soft_file_limit
|
self.soft_file_limit = args.soft_file_limit
|
||||||
|
self.key_refresh_interval = args.key_refresh_interval
|
||||||
|
|
||||||
if not args.content_addr:
|
if not args.content_addr:
|
||||||
host = args.server_name
|
host = args.server_name
|
||||||
@ -55,6 +59,14 @@ class ServerConfig(Config):
|
|||||||
)
|
)
|
||||||
server_group.add_argument("--signing-key-path",
|
server_group.add_argument("--signing-key-path",
|
||||||
help="The signing key to sign messages with")
|
help="The signing key to sign messages with")
|
||||||
|
server_group.add_argument("--old-signing-key-path",
|
||||||
|
help="The old signing keys")
|
||||||
|
server_group.add_argument("--key-refresh-interval",
|
||||||
|
default=24 * 60 * 60 * 1000, # 1 Day
|
||||||
|
help="How long a key response is valid for."
|
||||||
|
" Used to set the exipiry in /key/v2/."
|
||||||
|
" Controls how frequently servers will"
|
||||||
|
" query what keys are still valid")
|
||||||
server_group.add_argument("-p", "--bind-port", metavar="PORT",
|
server_group.add_argument("-p", "--bind-port", metavar="PORT",
|
||||||
type=int, help="https port to listen on",
|
type=int, help="https port to listen on",
|
||||||
default=8448)
|
default=8448)
|
||||||
@ -96,6 +108,19 @@ class ServerConfig(Config):
|
|||||||
" Try running again with --generate-config"
|
" Try running again with --generate-config"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def read_old_signing_keys(self, old_signing_key_path):
|
||||||
|
old_signing_keys = self.read_file(
|
||||||
|
old_signing_key_path, "old_signing_key"
|
||||||
|
)
|
||||||
|
try:
|
||||||
|
return syutil.crypto.signing_key.read_old_signing_keys(
|
||||||
|
old_signing_keys.splitlines(True)
|
||||||
|
)
|
||||||
|
except Exception:
|
||||||
|
raise ConfigError(
|
||||||
|
"Error reading old signing keys."
|
||||||
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def generate_config(cls, args, config_dir_path):
|
def generate_config(cls, args, config_dir_path):
|
||||||
super(ServerConfig, cls).generate_config(args, config_dir_path)
|
super(ServerConfig, cls).generate_config(args, config_dir_path)
|
||||||
@ -110,7 +135,7 @@ class ServerConfig(Config):
|
|||||||
with open(args.signing_key_path, "w") as signing_key_file:
|
with open(args.signing_key_path, "w") as signing_key_file:
|
||||||
syutil.crypto.signing_key.write_signing_keys(
|
syutil.crypto.signing_key.write_signing_keys(
|
||||||
signing_key_file,
|
signing_key_file,
|
||||||
(syutil.crypto.signing_key.generate_singing_key("auto"),),
|
(syutil.crypto.signing_key.generate_signing_key("auto"),),
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
signing_keys = cls.read_file(args.signing_key_path, "signing_key")
|
signing_keys = cls.read_file(args.signing_key_path, "signing_key")
|
||||||
@ -126,3 +151,10 @@ class ServerConfig(Config):
|
|||||||
signing_key_file,
|
signing_key_file,
|
||||||
(key,),
|
(key,),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if not args.old_signing_key_path:
|
||||||
|
args.old_signing_key_path = base_key_name + ".old.signing.keys"
|
||||||
|
|
||||||
|
if not os.path.exists(args.old_signing_key_path):
|
||||||
|
with open(args.old_signing_key_path, "w") as old_signing_key_file:
|
||||||
|
pass
|
||||||
|
19
synapse/rest/key/v2/__init__.py
Normal file
19
synapse/rest/key/v2/__init__.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright 2015 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 .local_key_resource import LocalKey
|
||||||
|
|
||||||
|
class KeyApiV2Resource(LocalKey):
|
||||||
|
pass
|
118
synapse/rest/key/v2/local_key_resource.py
Normal file
118
synapse/rest/key/v2/local_key_resource.py
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Copyright 2014, 2015 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 synapse.http.server import respond_with_json_bytes
|
||||||
|
from syutil.crypto.jsonsign import sign_json
|
||||||
|
from syutil.base64util import encode_base64
|
||||||
|
from syutil.jsonutil import encode_canonical_json
|
||||||
|
from OpenSSL import crypto
|
||||||
|
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 /_matrix/key/v2/ HTTP/1.1
|
||||||
|
|
||||||
|
HTTP/1.1 200 OK
|
||||||
|
Content-Type: application/json
|
||||||
|
{
|
||||||
|
"expires": # integer posix timestamp when this result expires.
|
||||||
|
"server_name": "this.server.example.com"
|
||||||
|
"verify_keys": {
|
||||||
|
"algorithm:version": # base64 encoded NACL verification key.
|
||||||
|
},
|
||||||
|
"old_verify_keys": {
|
||||||
|
"algorithm:version": {
|
||||||
|
"expired": # integer posix timestamp when the key expired.
|
||||||
|
"key": # 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.version_string = hs.version_string
|
||||||
|
self.config = hs.config
|
||||||
|
self.clock = hs.clock
|
||||||
|
self.update_response_body(self.clock.time_msec())
|
||||||
|
Resource.__init__(self)
|
||||||
|
|
||||||
|
def update_response_body(self, time_now_msec):
|
||||||
|
refresh_interval = self.config.key_refresh_interval
|
||||||
|
self.expires = int(time_now_msec + refresh_interval)
|
||||||
|
self.response_body = encode_canonical_json(self.response_json_object())
|
||||||
|
|
||||||
|
|
||||||
|
def response_json_object(self):
|
||||||
|
verify_keys = {}
|
||||||
|
for key in self.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)
|
||||||
|
|
||||||
|
old_verify_keys = {}
|
||||||
|
for key in self.config.old_signing_keys:
|
||||||
|
key_id = "%s:%s" % (key.alg, key.version)
|
||||||
|
verify_key_bytes = key.encode()
|
||||||
|
old_verify_keys[key_id] = {
|
||||||
|
u"key": encode_base64(verify_key_bytes),
|
||||||
|
u"expired": key.expired,
|
||||||
|
}
|
||||||
|
|
||||||
|
x509_certificate_bytes = crypto.dump_certificate(
|
||||||
|
crypto.FILETYPE_ASN1,
|
||||||
|
self.config.tls_certificate
|
||||||
|
)
|
||||||
|
json_object = {
|
||||||
|
u"expires": self.expires,
|
||||||
|
u"server_name": self.config.server_name,
|
||||||
|
u"verify_keys": verify_keys,
|
||||||
|
u"old_verify_keys": old_verify_keys,
|
||||||
|
u"tls_certificate": encode_base64(x509_certificate_bytes)
|
||||||
|
}
|
||||||
|
for key in self.config.signing_key:
|
||||||
|
json_object = sign_json(
|
||||||
|
json_object,
|
||||||
|
self.config.server_name,
|
||||||
|
key,
|
||||||
|
)
|
||||||
|
return json_object
|
||||||
|
|
||||||
|
def render_GET(self, request):
|
||||||
|
time_now = self.clock.time_msec()
|
||||||
|
# Update the expiry time if less than half the interval remains.
|
||||||
|
if time_now + self.config.key_refresh_interval / 2 > self.expires:
|
||||||
|
self.update_response_body()
|
||||||
|
return respond_with_json_bytes(
|
||||||
|
request, 200, self.response_body,
|
||||||
|
version_string=self.version_string
|
||||||
|
)
|
||||||
|
|
||||||
|
def getChild(self, name, request):
|
||||||
|
if name == '':
|
||||||
|
return self
|
@ -78,6 +78,7 @@ class BaseHomeServer(object):
|
|||||||
'resource_for_web_client',
|
'resource_for_web_client',
|
||||||
'resource_for_content_repo',
|
'resource_for_content_repo',
|
||||||
'resource_for_server_key',
|
'resource_for_server_key',
|
||||||
|
'resource_for_server_key_v2',
|
||||||
'resource_for_media_repository',
|
'resource_for_media_repository',
|
||||||
'resource_for_metrics',
|
'resource_for_metrics',
|
||||||
'event_sources',
|
'event_sources',
|
||||||
|
Loading…
Reference in New Issue
Block a user