FreakU
/
takahe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle servers that return wrong webfinger payload (#415)

This commit is contained in:
Michael Manfre 2023-01-14 16:19:47 -05:00 committed by GitHub
parent f69c7304c1
commit 1f44e93518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
users/models/identity.py
View File

@ -683,14 +683,18 @@ class Identity(StatorModel):
"JSON parse error fetching webfinger", "JSON parse error fetching webfinger",
response.content, response.content,
) )
if data["subject"].startswith("acct:"): try:
data["subject"] = data["subject"][5:] if data["subject"].startswith("acct:"):
for link in data["links"]: data["subject"] = data["subject"][5:]
if ( for link in data["links"]:
link.get("type") == "application/activity+json" if (
and link.get("rel") == "self" link.get("type") == "application/activity+json"
): and link.get("rel") == "self"
return link["href"], data["subject"] ):
return link["href"], data["subject"]
except KeyError:
# Server returning wrong payload structure
pass
return None, None return None, None
async def fetch_actor(self) -> bool: async def fetch_actor(self) -> bool: