Fix admin API for users when "avatar_url" is "null"

Signed-off-by: Manuel Stahl <manuel.stahl@awesome-technologies.de>
matrix-org · Feb 10, 2020 · 26de7a1 · 26de7a1
1 parent db0fee7
commit 26de7a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/synapse/rest/admin/users.py b/synapse/rest/admin/users.py
@@ -196,7 +196,7 @@ async def on_PUT(self, request, user_id):
                         user_id, threepid["medium"], threepid["address"], current_time
                     )
 
-            if "avatar_url" in body:
+            if "avatar_url" in body and type(body["avatar_url"]) == str:
                 await self.profile_handler.set_avatar_url(
                     target_user, requester, body["avatar_url"], True
                 )
@@ -271,7 +271,7 @@ async def on_PUT(self, request, user_id):
                         user_id, threepid["medium"], threepid["address"], current_time
                     )
 
-            if "avatar_url" in body:
+            if "avatar_url" in body and type(body["avatar_url"]) == str:
                 await self.profile_handler.set_avatar_url(
                     user_id, requester, body["avatar_url"], True
                 )

diff --git a/tests/rest/admin/test_user.py b/tests/rest/admin/test_user.py
@@ -412,6 +412,7 @@ def test_requester_is_admin(self):
                 "password": "abc123",
                 "admin": True,
                 "threepids": [{"medium": "email", "address": "bob@bob.bob"}],
+                "avatar_url": None,
             }
         )