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

It looks like this was a protocol violation 

https://www.w3.org/TR/activitypub/#block-activity-outbox
merge-requests/30/head
Bob Mottram 2023-06-01 20:21:42 +01:00
parent ebad3f4769
commit 7b515a45b4
1 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
daemon.py
View File

@ -4305,15 +4305,9 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
print('Adding block by ' + blocker_nickname + print('Adding block by ' + blocker_nickname +
' of ' + blocking_actor) ' of ' + blocking_actor)
if add_block(base_dir, blocker_nickname, add_block(base_dir, blocker_nickname,
domain, domain, blocking_nickname,
blocking_nickname, blocking_domain_full)
blocking_domain_full):
# send block activity
self._send_block(http_prefix,
blocker_nickname, domain_full,
blocking_nickname, blocking_domain_full,
curr_session, proxy_type)
remove_follower(base_dir, blocker_nickname, remove_follower(base_dir, blocker_nickname,
domain, domain,
blocking_nickname, blocking_nickname,
@ -16792,35 +16786,6 @@ class PubServer(BaseHTTPRequestHandler):
None, calling_domain, False) None, calling_domain, False)
self._write(msg) self._write(msg)
def _send_block(self, http_prefix: str,
blocker_nickname: str, blocker_domain_full: str,
blocking_nickname: str, blocking_domain_full: str,
curr_session, proxy_type: str) -> bool:
if blocker_domain_full == blocking_domain_full:
if blocker_nickname == blocking_nickname:
# don't block self
return False
block_actor = \
local_actor_url(http_prefix, blocker_nickname, blocker_domain_full)
to_url = 'https://www.w3.org/ns/activitystreams#Public'
cc_url = block_actor + '/followers'
blocked_url = \
http_prefix + '://' + blocking_domain_full + \
'/@' + blocking_nickname
block_json = {
"@context": "https://www.w3.org/ns/activitystreams",
'type': 'Block',
'actor': block_actor,
'object': blocked_url,
'to': [to_url],
'cc': [cc_url]
}
self._post_to_outbox(block_json, self.server.project_version,
blocker_nickname,
curr_session, proxy_type)
return True
def _get_referer_domain(self, ua_str: str) -> str: def _get_referer_domain(self, ua_str: str) -> str:
"""Returns the referer domain """Returns the referer domain
Which domain is the GET request coming from? Which domain is the GET request coming from?