kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
Merge branch 'revert-0edf32ed' into 'develop'
Revert "Merge branch '876-http-signature' into 'develop'" Closes #1338 See merge request funkwhale/funkwhale!1276environments/review-docs-devel-1399dq/deployments/6607
commit
a7953a50ca
|
@ -20,10 +20,11 @@ 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.HTTPSignatureHeaderAuth
|
model = requests_http_signature.HTTPSignatureAuth
|
||||||
|
|
||||||
|
|
||||||
@registry.register(name="federation.SignedRequest")
|
@registry.register(name="federation.SignedRequest")
|
||||||
|
|
|
@ -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, scheme="Signature"
|
request, key_resolver=lambda **kwargs: public_key, use_auth_header=False
|
||||||
)
|
)
|
||||||
except cryptography.exceptions.InvalidSignature:
|
except cryptography.exceptions.InvalidSignature:
|
||||||
logger.warning(
|
logger.warning(
|
||||||
|
@ -98,7 +98,8 @@ 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.HTTPSignatureHeaderAuth(
|
return requests_http_signature.HTTPSignatureAuth(
|
||||||
|
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"),
|
||||||
|
|
|
@ -45,7 +45,9 @@ uvicorn[standard]~=0.12.0
|
||||||
gunicorn~=20.0.0
|
gunicorn~=20.0.0
|
||||||
|
|
||||||
cryptography~=2.9.0
|
cryptography~=2.9.0
|
||||||
requests-http-signature==0.2.0
|
# requests-http-signature==0.0.3
|
||||||
|
# clone until the branch is merged and released upstream
|
||||||
|
git+https://github.com/agateblue/requests-http-signature.git@signature-header-support
|
||||||
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
|
||||||
|
|
Ładowanie…
Reference in New Issue