Ensure timeout in requests

This commit is contained in:
Eliot Berriot 2018-04-08 13:33:36 +02:00
commit 206ae296b6
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
4 changed files with 5 additions and 1 deletions

View file

@ -73,6 +73,7 @@ def deliver(activity, on_behalf_of, to=[]):
auth=auth,
json=activity,
url=recipient_actor.inbox_url,
timeout=5,
headers={
'Content-Type': 'application/activity+json'
}

View file

@ -31,6 +31,7 @@ def remove_tags(text):
def get_actor_data(actor_url):
response = session.get_session().get(
actor_url,
timeout=5,
headers={
'Accept': 'application/activity+json',
}
@ -42,6 +43,7 @@ def get_actor_data(actor_url):
raise ValueError(
'Invalid actor payload: {}'.format(response.text))
def get_actor(actor_url):
data = get_actor_data(actor_url)
serializer = serializers.ActorSerializer(data=data)

View file

@ -47,7 +47,7 @@ def get_resource(resource_string):
username, hostname = clean_acct(resource, ensure_local=False)
url = 'https://{}/.well-known/webfinger?resource={}'.format(
hostname, resource_string)
response = session.get_session().get(url)
response = session.get_session().get(url, timeout=5)
response.raise_for_status()
serializer = serializers.ActorWebfingerSerializer(data=response.json())
serializer.is_valid(raise_exception=True)