yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-03 23:59:15 +02:00
Code Issues Releases Wiki Activity

Linting

Browse source
This commit is contained in:
Eliot Berriot 2019-01-10 11:10:39 +01:00
parent d63f8f2e33
commit 4811f35eb5
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
4 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/funkwhale_api/federation/authentication.py
View file

@ -2,7 +2,7 @@ import cryptography
import logging
from django.contrib.auth.models import AnonymousUser
from rest_framework import authentication, exceptions
from rest_framework import authentication, exceptions as rest_exceptions
from funkwhale_api.moderation import models as moderation_models
from . import actors, exceptions, keys, signing, utils
@ -20,12 +20,12 @@ class SignatureAuthentication(authentication.BaseAuthentication):
except KeyError:
return
except ValueError as e:
raise exceptions.AuthenticationFailed(str(e))
raise rest_exceptions.AuthenticationFailed(str(e))
try:
actor_url = key_id.split("#")[0]
except (TypeError, IndexError, AttributeError):
raise exceptions.AuthenticationFailed("Invalid key id")
raise rest_exceptions.AuthenticationFailed("Invalid key id")
policies = (
moderation_models.InstancePolicy.objects.active()
@ -41,15 +41,15 @@ class SignatureAuthentication(authentication.BaseAuthentication):
logger.info(
"Discarding HTTP request from blocked actor/domain %s", actor_url
)
raise exceptions.AuthenticationFailed(str(e))
raise rest_exceptions.AuthenticationFailed(str(e))
if not actor.public_key:
raise exceptions.AuthenticationFailed("No public key found")
raise rest_exceptions.AuthenticationFailed("No public key found")
try:
signing.verify_django(request, actor.public_key.encode("utf-8"))
except cryptography.exceptions.InvalidSignature:
raise exceptions.AuthenticationFailed("Invalid signature")
raise rest_exceptions.AuthenticationFailed("Invalid signature")
return actor