diff options
author | David Robertson <davidr@element.io> | 2021-08-20 16:31:02 +0100 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2021-08-20 16:33:52 +0100 |
commit | 7862d704fdececf5a3a10466e2e7aee81fdf10f4 (patch) | |
tree | fd62d3b5ff4d7e01a945902a288163263502fafa | |
parent | Validate device_keys for C-S /keys/query requests (#10593) (diff) | |
download | synapse-7862d704fdececf5a3a10466e2e7aee81fdf10f4.tar.xz |
Follow-up: format changelog, add licence (#10593)
Merged before approval; these comments from @clokep on that PR.
-rw-r--r-- | changelog.d/10593.bugfix | 2 | ||||
-rw-r--r-- | tests/rest/client/v2_alpha/test_keys.py | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/changelog.d/10593.bugfix b/changelog.d/10593.bugfix index 492e58a7a8..af910bfa4d 100644 --- a/changelog.d/10593.bugfix +++ b/changelog.d/10593.bugfix @@ -1 +1 @@ -Reject Client-Server /keys/query requests which provide device_ids incorrectly. \ No newline at end of file +Reject Client-Server `/keys/query` requests which provide `device_ids` incorrectly. diff --git a/tests/rest/client/v2_alpha/test_keys.py b/tests/rest/client/v2_alpha/test_keys.py index 80a4e728ff..d7fa635eae 100644 --- a/tests/rest/client/v2_alpha/test_keys.py +++ b/tests/rest/client/v2_alpha/test_keys.py @@ -1,3 +1,17 @@ +# Copyright 2021 The Matrix.org Foundation C.I.C. +# +# 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 http import HTTPStatus from synapse.api.errors import Codes |