diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py
index 77446970cb..ee73f0233d 100644
--- a/synapse/rest/admin/users.py
+++ b/synapse/rest/admin/users.py
@@ -1,16 +1,22 @@
-# Copyright 2019 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
+# This file is licensed under the Affero General Public License (AGPL) version 3.
+#
+# Copyright (C) 2023 New Vector, Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# See the GNU Affero General Public License for more details:
+# <https://www.gnu.org/licenses/agpl-3.0.html>.
+#
+# Originally licensed under the Apache License, Version 2.0:
+# <http://www.apache.org/licenses/LICENSE-2.0>.
+#
+# [This file includes modifications made by New Vector Limited]
#
-# 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.
import hashlib
import hmac
import logging
@@ -101,7 +107,7 @@ class UsersRestServletV2(RestServlet):
)
user_id = parse_string(request, "user_id")
- name = parse_string(request, "name")
+ name = parse_string(request, "name", encoding="utf-8")
guests = parse_boolean(request, "guests", default=True)
if self._msc3861_enabled and guests:
@@ -406,15 +412,6 @@ class UserRestServletV2(RestServlet):
target_user.to_string(), False, requester, by_admin=True
)
elif not deactivate and user["deactivated"]:
- if (
- "password" not in body
- and self.auth_handler.can_change_password()
- ):
- raise SynapseError(
- HTTPStatus.BAD_REQUEST,
- "Must provide a password to re-activate an account.",
- )
-
await self.deactivate_account_handler.activate_account(
target_user.to_string()
)
|
