Correctly handle response.raise_for_status() and guard search from bubbling parse errors (#322)

pull/324/head
Michael Manfre 2022-12-30 03:02:33 -05:00 zatwierdzone przez GitHub
rodzic 0250f2800b
commit 75c17c0766
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 12 dodań i 9 usunięć

Wyświetl plik

@ -41,15 +41,18 @@ class SearchService:
username__iexact=username, username__iexact=username,
) )
except Identity.DoesNotExist: except Identity.DoesNotExist:
identity = None
if self.identity is not None: if self.identity is not None:
# Allow authenticated users to fetch remote try:
identity = Identity.by_username_and_domain( # Allow authenticated users to fetch remote
username, domain_instance or domain, fetch=True identity = Identity.by_username_and_domain(
) username, domain_instance or domain, fetch=True
if identity and identity.state == IdentityStates.outdated: )
async_to_sync(identity.fetch_actor)() if identity and identity.state == IdentityStates.outdated:
else: async_to_sync(identity.fetch_actor)()
identity = None except ValueError:
pass
if identity: if identity:
results.add(identity) results.add(identity)

Wyświetl plik

@ -640,7 +640,7 @@ class Identity(StatorModel):
headers={"Accept": "application/json"}, headers={"Accept": "application/json"},
) )
response.raise_for_status() response.raise_for_status()
except httpx.RequestError as ex: except httpx.HTTPError as ex:
response = getattr(ex, "response", None) response = getattr(ex, "response", None)
if ( if (
response response