forked from forks/microblog.pub
Improve the request verification checking
This commit is contained in:
parent
dc9df98084
commit
67643482c8
2 changed files with 12 additions and 9 deletions
11
app.py
11
app.py
|
@ -178,6 +178,7 @@ def login_required(f):
|
|||
return f(*args, **kwargs)
|
||||
return decorated_function
|
||||
|
||||
|
||||
def _api_required():
|
||||
if session.get('logged_in'):
|
||||
return
|
||||
|
@ -189,6 +190,8 @@ def _api_required():
|
|||
|
||||
# Will raise a BadSignature on bad auth
|
||||
payload = JWT.loads(token)
|
||||
|
||||
|
||||
def api_required(f):
|
||||
@wraps(f)
|
||||
def decorated_function(*args, **kwargs):
|
||||
|
@ -672,12 +675,16 @@ def inbox():
|
|||
))
|
||||
|
||||
data = request.get_json(force=True)
|
||||
# FIXME(tsileo): ensure verify_request() == True
|
||||
print(data)
|
||||
try:
|
||||
print(verify_request(ACTOR_SERVICE))
|
||||
except Exception:
|
||||
print('failed to verify request')
|
||||
print('failed to verify request, trying to verify the payload by fetching the remote')
|
||||
try:
|
||||
data = OBJECT_SERVICE.get(data['id'])
|
||||
except Exception:
|
||||
print(f'failed to fetch remote id at {data["id"]}')
|
||||
abort(422)
|
||||
|
||||
activity = activitypub.parse_activity(data)
|
||||
print(activity)
|
||||
|
|
|
@ -77,11 +77,7 @@ class HTTPSigAuth(AuthBase):
|
|||
sig = base64.b64encode(signer.sign(digest))
|
||||
sig = sig.decode('utf-8')
|
||||
headers = {
|
||||
'Signature': 'keyId="{keyid}",algorithm="rsa-sha256",headers="{headers}",signature="{signature}"'.format(
|
||||
keyid=self.keyid,
|
||||
signature=sig,
|
||||
headers=sigheaders,
|
||||
),
|
||||
'Signature': f'keyId="{self.keyid}",algorithm="rsa-sha256",headers="{sigheaders}",signature="{sig}"'
|
||||
}
|
||||
r.headers.update(headers)
|
||||
return r
|
||||
|
|
Loading…
Reference in a new issue