From b876ac5893dddf4a6b6b4b8152ce0ea5c2d2f482 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 25 May 2020 08:27:55 -0600 Subject: [PATCH 1/2] Clarify which server names to sign requests with Fixes https://github.com/matrix-org/matrix-doc/issues/2512 --- changelogs/server_server/newsfragments/2570.clarification | 1 + specification/server_server_api.rst | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 changelogs/server_server/newsfragments/2570.clarification diff --git a/changelogs/server_server/newsfragments/2570.clarification b/changelogs/server_server/newsfragments/2570.clarification new file mode 100644 index 00000000..3fac40bf --- /dev/null +++ b/changelogs/server_server/newsfragments/2570.clarification @@ -0,0 +1 @@ +Clarify the server names to use when signing requests. diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index b0a2bc1a..ca147665 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -291,6 +291,11 @@ Step 1 sign JSON: } } +The server names in the JSON above are the server names involved. Delegation from +the `server name resolution section <#resolving-server-names>`_ above do not affect +these - the server names from before delegation would take place are used. This +same condition applies throughout the request signing process. + Step 2 add Authorization header: .. code:: From 47c531adff5cea38dd4621a943257e6052a4997a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 26 May 2020 12:46:50 -0600 Subject: [PATCH 2/2] Clarify exactly which servers Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> --- specification/server_server_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst index ca147665..3d591ca8 100644 --- a/specification/server_server_api.rst +++ b/specification/server_server_api.rst @@ -291,7 +291,7 @@ Step 1 sign JSON: } } -The server names in the JSON above are the server names involved. Delegation from +The server names in the JSON above are the server names for each homeserver involved. Delegation from the `server name resolution section <#resolving-server-names>`_ above do not affect these - the server names from before delegation would take place are used. This same condition applies throughout the request signing process.