MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #876: use proper http-signature release

This commit is contained in:
Agate 2020-05-07 15:26:05 +02:00 committed by Georg Krause
parent b91c48a6ce
commit 7f80a86bc5
No known key found for this signature in database
GPG Key ID: FD479B9A4D48E632
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/funkwhale_api/federation/factories.py
View File

@ -20,11 +20,10 @@ class SignatureAuthFactory(factory.Factory):
algorithm = "rsa-sha256" algorithm = "rsa-sha256"
key = factory.LazyFunction(lambda: keys.get_key_pair()[0]) key = factory.LazyFunction(lambda: keys.get_key_pair()[0])
key_id = factory.Faker("url") key_id = factory.Faker("url")
use_auth_header = False
headers = ["(request-target)", "user-agent", "host", "date", "accept"] headers = ["(request-target)", "user-agent", "host", "date", "accept"]
class Meta: class Meta:
model = requests_http_signature.HTTPSignatureAuth model = requests_http_signature.HTTPSignatureHeaderAuth
@registry.register(name="federation.SignedRequest") @registry.register(name="federation.SignedRequest")

5
api/funkwhale_api/federation/signing.py
View File

@ -46,7 +46,7 @@ def verify(request, public_key):
verify_date(date) verify_date(date)
try: try:
return requests_http_signature.HTTPSignatureAuth.verify( return requests_http_signature.HTTPSignatureAuth.verify(
request, key_resolver=lambda **kwargs: public_key, use_auth_header=False request, key_resolver=lambda **kwargs: public_key, scheme="Signature"
) )
except cryptography.exceptions.InvalidSignature: except cryptography.exceptions.InvalidSignature:
logger.warning( logger.warning(
@ -98,8 +98,7 @@ def verify_django(django_request, public_key):
def get_auth(private_key, private_key_id): def get_auth(private_key, private_key_id):
return requests_http_signature.HTTPSignatureAuth( return requests_http_signature.HTTPSignatureHeaderAuth(
use_auth_header=False,
headers=["(request-target)", "user-agent", "host", "date"], headers=["(request-target)", "user-agent", "host", "date"],
algorithm="rsa-sha256", algorithm="rsa-sha256",
key=private_key.encode("utf-8"), key=private_key.encode("utf-8"),

2
api/requirements/base.txt
View File

@ -47,7 +47,7 @@ gunicorn~=20.0.0
cryptography~=2.9.0 cryptography~=2.9.0
# requests-http-signature==0.0.3 # requests-http-signature==0.0.3
# clone until the branch is merged and released upstream # clone until the branch is merged and released upstream
git+https://github.com/EliotBerriot/requests-http-signature.git@signature-header-support https://github.com/pyauth/requests-http-signature/archive/c0c8fd7255b73001845062f355c2f702bb2903db.zip
django-cleanup~=5.0.0 django-cleanup~=5.0.0
requests~=2.24.0 requests~=2.24.0
pyOpenSSL~=19.1.0 pyOpenSSL~=19.1.0

1
changes/changelog.d/876.enhancement Normal file
View File

@ -0,0 +1 @@
Replaced forked http-signature dependency with official package (#876)