Merge pull request #4168 from matrix-org/babolivier/federation-client-content-type

Add a Content-Type header on POST requests to the federation client script
This commit is contained in:
Brendan Abolivier 2018-11-09 11:00:55 +00:00 committed by GitHub
commit 0f3f0a64bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -154,10 +154,15 @@ def request_json(method, origin_name, origin_key, destination, path, content):
s = requests.Session() s = requests.Session()
s.mount("matrix://", MatrixConnectionAdapter()) s.mount("matrix://", MatrixConnectionAdapter())
headers = {"Host": destination, "Authorization": authorization_headers[0]}
if method == "POST":
headers["Content-Type"] = "application/json"
result = s.request( result = s.request(
method=method, method=method,
url=dest, url=dest,
headers={"Host": destination, "Authorization": authorization_headers[0]}, headers=headers,
verify=False, verify=False,
data=content, data=content,
) )
@ -203,7 +208,7 @@ def main():
parser.add_argument( parser.add_argument(
"-X", "-X",
"--method", "--method",
help="HTTP method to use for the request. Defaults to GET if --data is" help="HTTP method to use for the request. Defaults to GET if --body is"
"unspecified, POST if it is.", "unspecified, POST if it is.",
) )