askiiart/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'little-boxes'

Browse source
This commit is contained in:
Thomas Sileo 2018-06-20 23:44:58 +02:00
commit dab94f0f98
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app.py
View file

@ -55,13 +55,13 @@ from config import custom_cache_purge_hook
from little_boxes import activitypub as ap from little_boxes import activitypub as ap
from little_boxes.activitypub import ActivityType from little_boxes.activitypub import ActivityType
from little_boxes.activitypub import clean_activity from little_boxes.activitypub import clean_activity
from little_boxes.activitypub import get_backend
from little_boxes.content_helper import parse_markdown from little_boxes.content_helper import parse_markdown
from little_boxes.errors import ActivityNotFoundError from little_boxes.errors import ActivityNotFoundError
from little_boxes.errors import Error from little_boxes.errors import Error
from little_boxes.errors import NotFromOutboxError from little_boxes.errors import NotFromOutboxError
from little_boxes.httpsig import HTTPSigAuth from little_boxes.httpsig import HTTPSigAuth
from little_boxes.httpsig import verify_request
# from little_boxes.httpsig import verify_request
from little_boxes.webfinger import get_actor_url from little_boxes.webfinger import get_actor_url
from little_boxes.webfinger import get_remote_follow_template from little_boxes.webfinger import get_remote_follow_template
from utils.key import get_secret_key from utils.key import get_secret_key
@ -1121,15 +1121,17 @@ def inbox():
data = request.get_json(force=True) data = request.get_json(force=True)
logger.debug(f"req_headers={request.headers}") logger.debug(f"req_headers={request.headers}")
logger.debug(f"raw_data={data}") logger.debug(f"raw_data={data}")
"""try: try:
if not verify_request(ACTOR_SERVICE): if not verify_request(
request.method, request.path, request.headers, request.data
):
raise Exception("failed to verify request") raise Exception("failed to verify request")
except Exception: except Exception:
logger.exception( logger.exception(
"failed to verify request, trying to verify the payload by fetching the remote" "failed to verify request, trying to verify the payload by fetching the remote"
) )
try: try:
data = OBJECT_SERVICE.get(data["id"]) data = get_backend().fetch_iri(data["id"])
except Exception: except Exception:
logger.exception(f'failed to fetch remote id at {data["id"]}') logger.exception(f'failed to fetch remote id at {data["id"]}')
return Response( return Response(
@ -1141,7 +1143,6 @@ def inbox():
} }
), ),
) )
"""
activity = ap.parse_activity(data) activity = ap.parse_activity(data)
logger.debug(f"inbox activity={activity}/{data}") logger.debug(f"inbox activity={activity}/{data}")
INBOX.post(activity) INBOX.post(activity)