Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Printf debugging for MSISDN validation #11882

Merged
merged 5 commits into from
Feb 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions synapse/handlers/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ async def get_joined_members(self, requester: Requester, room_id: str) -> dict:
# If this is an AS, double check that they are allowed to see the members.
# This can either be because the AS user is in the room or because there
# is a user in the room that the AS is "interested in"
if False and requester.app_service and user_id not in users_with_profile:
for uid in users_with_profile:
if False and requester.app_service and user_id not in users_with_profile: # type: ignore[unreachable]
for uid in users_with_profile: # type: ignore[unreachable]
if requester.app_service.is_interested_in_user(uid):
break
else:
Expand Down
3 changes: 3 additions & 0 deletions synapse/rest/client/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
next_link = body.get("next_link") # Optional param

msisdn = phone_number_to_msisdn(country, phone_number)
logger.info("Request #%s to verify ownership of %s", send_attempt, msisdn)

if not check_3pid_allowed(self.hs, "msisdn", msisdn):
raise SynapseError(
Expand Down Expand Up @@ -494,6 +495,7 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
await self.hs.get_clock().sleep(random.randint(1, 10) / 10)
return 200, {"sid": random_string(16)}

logger.info("MSISDN %s is already in use by %s", msisdn, existing_user_id)
raise SynapseError(400, "MSISDN is already in use", Codes.THREEPID_IN_USE)

if not self.hs.config.registration.account_threepid_delegate_msisdn:
Expand All @@ -518,6 +520,7 @@ async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
threepid_send_requests.labels(type="msisdn", reason="add_threepid").observe(
send_attempt
)
logger.info("MSISDN %s: got response from identity server: %s", msisdn, ret)

return 200, ret

Expand Down