Merge pull request #2570 from matrix-org/travis/clarification/s2s-auth

Clarify which server names to sign requests with
4 years ago · 65c6435093
parent 04a26dafd0 47c531adff
commit 65c6435093
2 changed files with 6 additions and 0 deletions
--- a/changelogs/server_server/newsfragments/2570.clarification
+++ b/changelogs/server_server/newsfragments/2570.clarification
@ -0,0 +1 @@
+Clarify the server names to use when signing requests.
--- 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 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.
+
 Step 2 add Authorization header:

 .. code::
				`@ -0,0 +1 @@`
				`Clarify the server names to use when signing requests.`