Skip to content

Commit 393429d

Browse files
authored
Fix undiscovered linter errors (#17166)
Linter errors are showing up in #17147 that are unrelated to that PR. The errors do not currently show up on develop. This PR aims to resolve the linter errors separately from #17147.
1 parent 34a8652 commit 393429d

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

changelog.d/17166.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes linter errors found in PR #17147.

synapse/handlers/profile.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121
import logging
2222
import random
23-
from typing import TYPE_CHECKING, Optional, Union
23+
from typing import TYPE_CHECKING, List, Optional, Union
2424

2525
from synapse.api.errors import (
2626
AuthError,
@@ -64,8 +64,10 @@ def __init__(self, hs: "HomeServer"):
6464
self.user_directory_handler = hs.get_user_directory_handler()
6565
self.request_ratelimiter = hs.get_request_ratelimiter()
6666

67-
self.max_avatar_size = hs.config.server.max_avatar_size
68-
self.allowed_avatar_mimetypes = hs.config.server.allowed_avatar_mimetypes
67+
self.max_avatar_size: Optional[int] = hs.config.server.max_avatar_size
68+
self.allowed_avatar_mimetypes: Optional[List[str]] = (
69+
hs.config.server.allowed_avatar_mimetypes
70+
)
6971

7072
self._is_mine_server_name = hs.is_mine_server_name
7173

@@ -337,6 +339,12 @@ async def check_avatar_size_and_mime_type(self, mxc: str) -> bool:
337339
return False
338340

339341
if self.max_avatar_size:
342+
if media_info.media_length is None:
343+
logger.warning(
344+
"Forbidding avatar change to %s: unknown media size",
345+
mxc,
346+
)
347+
return False
340348
# Ensure avatar does not exceed max allowed avatar size
341349
if media_info.media_length > self.max_avatar_size:
342350
logger.warning(

0 commit comments

Comments
 (0)