michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

apf part 05: ignore self-deletes from users that do not exist here

Browse source
This commit is contained in:
freamon 2024-11-18 17:28:41 +00:00
parent e57ca1428e
commit 20f17000f5
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/activitypub/routes.py
View file

@ -430,6 +430,18 @@ def shared_inbox():
log_incoming_ap(request_json['id'], APLOG_PT_VIEW, APLOG_IGNORED, request_json if store_ap_json else None, 'PeerTube View or CacheFile activity') log_incoming_ap(request_json['id'], APLOG_PT_VIEW, APLOG_IGNORED, request_json if store_ap_json else None, 'PeerTube View or CacheFile activity')
return '' return ''
# Ignore delete requests from uses that do not already exist here
if request_json['type'] == 'Delete':
if (request_json['id'].endswith('#delete') or # Mastodon / PieFed
('object' in request_json and isinstance(request_json['object'], str) and request_json['actor'] == request_json['object'])): # Lemmy
actor = User.query.filter_by(ap_profile_id=request_json['actor'].lower()).first()
if not actor:
log_incoming_ap(request_json['id'], APLOG_DELETE, APLOG_IGNORED, request_json if store_ap_json else None, 'Does not exist here')
return '', 400
else:
actor.ap_fetched_at = utcnow() # use stored pubkey, don't try to re-fetch for next step (signature verification)
db.session.commit()
if request.method == 'POST': if request.method == 'POST':
# save all incoming data to aid in debugging and development. Set result to 'success' if things go well # save all incoming data to aid in debugging and development. Set result to 'success' if things go well
activity_log = ActivityPubLog(direction='in', result='failure') activity_log = ActivityPubLog(direction='in', result='failure')
@ -1308,9 +1320,6 @@ def process_delete_request(request_json, activitypublog_id, ip_address):
else: else:
activity_log.result = 'ignored' activity_log.result = 'ignored'
activity_log.exception_message = 'Only remote users can be deleted remotely' activity_log.exception_message = 'Only remote users can be deleted remotely'
else:
activity_log.result = 'ignored'
activity_log.exception_message = 'Does not exist here'
db.session.commit() db.session.commit()