Improve forwarded activity processing

main
Thomas Sileo 2022-07-10 12:53:45 +02:00
parent 52cfc52fd5
commit 376fef76bf
1 changed files with 9 additions and 3 deletions

View File

@ -806,9 +806,15 @@ async def save_to_inbox(
if httpsig_info.signed_by_ap_actor_id != actor.ap_id: if httpsig_info.signed_by_ap_actor_id != actor.ap_id:
logger.info(f"Processing a forwarded activity {httpsig_info=}/{actor.ap_id}") logger.info(f"Processing a forwarded activity {httpsig_info=}/{actor.ap_id}")
if not (await ldsig.verify_signature(db_session, raw_object)): if not (await ldsig.verify_signature(db_session, raw_object)):
logger.warning("Failed to verify LD sig") logger.warning(
# FIXME(ts): fetch the remote object f"Failed to verify LD sig, fetching remote object {raw_object_id}"
raise fastapi.HTTPException(status_code=401, detail="Invalid LD sig") )
# Try to fetch the remote object since we failed to verify the LD sig
try:
raw_object = await ap.fetch(raw_object_id)
except Exception:
raise fastapi.HTTPException(status_code=401, detail="Invalid LD sig")
if ( if (
await db_session.scalar( await db_session.scalar(