indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidy the checking of object nickname in received announces

main
bashrc 2026-04-13 19:10:47 +01:00
parent c4ec185d8a
commit 0bc7af49b2
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
inbox_receive.py
View File

@ -1934,10 +1934,14 @@ def receive_announce(recent_posts_cache: {},
object_nickname = get_nickname_from_actor(announce_url) object_nickname = get_nickname_from_actor(announce_url)
if object_nickname: if object_nickname:
if not valid_nickname(object_domain, object_nickname): if not valid_nickname(object_domain, object_nickname):
print('WARN: receive_announce invalid nickname ' + print('WARN: receive_announce object invalid nickname ' +
str(object_nickname) + '@' + str(object_domain) + ' ' + str(object_nickname) + '@' + str(object_domain) + ' ' +
str(announce_url)) str(announce_url))
return False return False
if is_blocked_nickname(base_dir, object_nickname):
if debug:
print('DEBUG: receive_announce object nickname is blocked')
return False
handle_dir = acct_handle_dir(base_dir, handle) handle_dir = acct_handle_dir(base_dir, handle)
if not os.path.isdir(handle_dir): if not os.path.isdir(handle_dir):
@ -1970,21 +1974,14 @@ def receive_announce(recent_posts_cache: {},
actor_nickname + '@' + actor_domain) actor_nickname + '@' + actor_domain)
return False return False
# also check the actor for the url being announced # also check the actor for the object url being announced
announced_actor_nickname = get_nickname_from_actor(announce_url) if object_nickname:
if not announced_actor_nickname: if is_blocked(base_dir, nickname, domain,
print('WARN: _receive_announce no announced_actor_nickname') object_nickname, object_domain,
return False None, block_federated):
announced_actor_domain, _ = get_domain_from_actor(announce_url) print('Receive announce object blocked for actor: ' +
if not announced_actor_domain: object_nickname + '@' + object_domain)
print('WARN: _receive_announce no announced_actor_domain') return False
return False
if is_blocked(base_dir, nickname, domain,
announced_actor_nickname, announced_actor_domain,
None, block_federated):
print('Receive announce object blocked for actor: ' +
announced_actor_nickname + '@' + announced_actor_domain)
return False
# is this post in the inbox or outbox of the account? # is this post in the inbox or outbox of the account?
post_filename = locate_post(base_dir, nickname, domain, announce_url) post_filename = locate_post(base_dir, nickname, domain, announce_url)