From 3d0c813a32528f92c4541f179b479c93d76c2e7f Mon Sep 17 00:00:00 2001 From: Izalia Mae Date: Fri, 17 Sep 2021 12:52:47 -0400 Subject: [PATCH] fix http_server.Request --- http_server/izzylib/http_server/request.py | 6 +++--- .../izzylib/http_urllib_client/signatures.py | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/http_server/izzylib/http_server/request.py b/http_server/izzylib/http_server/request.py index dde7d2a..90bb7db 100644 --- a/http_server/izzylib/http_server/request.py +++ b/http_server/izzylib/http_server/request.py @@ -7,10 +7,10 @@ from .misc import Headers class Request(sanic.request.Request): - def __init__(self, url_bytes, headers, version, method, transport, app): - super().__init__(url_bytes, headers, version, method, transport, app) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) - self.Headers = Headers(headers) + self.Headers = Headers(self.headers) self.address = self.headers.get('x-real-ip', self.forwarded.get('for', self.remote_addr)) self.data = Data(self) self.template = self.app.template diff --git a/http_urllib_client/izzylib/http_urllib_client/signatures.py b/http_urllib_client/izzylib/http_urllib_client/signatures.py index 452d0c0..e73c043 100644 --- a/http_urllib_client/izzylib/http_urllib_client/signatures.py +++ b/http_urllib_client/izzylib/http_urllib_client/signatures.py @@ -9,7 +9,7 @@ from base64 import b64decode, b64encode from datetime import datetime from functools import lru_cache from izzylib import DefaultDotDict, DotDict -from izzylib import izzylog as logging +from izzylib import izzylog from tldextract import extract from urllib.parse import urlparse @@ -191,7 +191,13 @@ async def verify_request(request, actor: dict=None): actor: A dictionary containing the activitypub actor and the link to the pubkey used for verification ''' - return verify_headers(request.Headers.to_dict(), request.method, request.path, actor, request.body) + return verify_headers( + request.Headers.to_dict(), + request.method, + request.path, + actor = actor, + body = request.body + )