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

Snake case

merge-requests/30/head
Bob Mottram 2021-12-29 22:45:26 +00:00
parent 086c760ace
commit a38af5e492
3 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
acceptreject.py
View File

@ -103,8 +103,8 @@ def _accept_follow(base_dir: str, domain: str, message_json: {},
if not nickname: if not nickname:
print('WARN: no nickname found in ' + this_actor) print('WARN: no nickname found in ' + this_actor)
return return
acceptedDomain, acceptedPort = get_domain_from_actor(this_actor) accepted_domain, accepted_port = get_domain_from_actor(this_actor)
if not acceptedDomain: if not accepted_domain:
if debug: if debug:
print('DEBUG: domain not found in ' + this_actor) print('DEBUG: domain not found in ' + this_actor)
return return
@ -112,20 +112,20 @@ def _accept_follow(base_dir: str, domain: str, message_json: {},
if debug: if debug:
print('DEBUG: nickname not found in ' + this_actor) print('DEBUG: nickname not found in ' + this_actor)
return return
if acceptedPort: if accepted_port:
if '/' + acceptedDomain + ':' + str(acceptedPort) + \ if '/' + accepted_domain + ':' + str(accepted_port) + \
'/users/' + nickname not in this_actor: '/users/' + nickname not in this_actor:
if debug: if debug:
print('Port: ' + str(acceptedPort)) print('Port: ' + str(accepted_port))
print('Expected: /' + acceptedDomain + ':' + print('Expected: /' + accepted_domain + ':' +
str(acceptedPort) + '/users/' + nickname) str(accepted_port) + '/users/' + nickname)
print('Actual: ' + this_actor) print('Actual: ' + this_actor)
print('DEBUG: unrecognized actor ' + this_actor) print('DEBUG: unrecognized actor ' + this_actor)
return return
else: else:
if not '/' + acceptedDomain + '/users/' + nickname in this_actor: if not '/' + accepted_domain + '/users/' + nickname in this_actor:
if debug: if debug:
print('Expected: /' + acceptedDomain + '/users/' + nickname) print('Expected: /' + accepted_domain + '/users/' + nickname)
print('Actual: ' + this_actor) print('Actual: ' + this_actor)
print('DEBUG: unrecognized actor ' + this_actor) print('DEBUG: unrecognized actor ' + this_actor)
return return
@ -144,9 +144,9 @@ def _accept_follow(base_dir: str, domain: str, message_json: {},
followed_actor) followed_actor)
return return
accepted_domain_full = acceptedDomain accepted_domain_full = accepted_domain
if acceptedPort: if accepted_port:
accepted_domain_full = acceptedDomain + ':' + str(acceptedPort) accepted_domain_full = accepted_domain + ':' + str(accepted_port)
# has this person already been unfollowed? # has this person already been unfollowed?
unfollowed_filename = \ unfollowed_filename = \
@ -179,13 +179,13 @@ def _accept_follow(base_dir: str, domain: str, message_json: {},
else: else:
if debug: if debug:
print('DEBUG: Unable to create follow - ' + print('DEBUG: Unable to create follow - ' +
nickname + '@' + acceptedDomain + ' -> ' + nickname + '@' + accepted_domain + ' -> ' +
followed_nickname + '@' + followed_domain) followed_nickname + '@' + followed_domain)
def receive_accept_reject(session, base_dir: str, def receive_accept_reject(session, base_dir: str,
http_prefix: str, domain: str, port: int, http_prefix: str, domain: str, port: int,
send_threads: [], postLog: [], send_threads: [], post_log: [],
cached_webfingers: {}, cached_webfingers: {},
person_cache: {}, message_json: {}, person_cache: {}, message_json: {},
federation_list: [], federation_list: [],

232
announce.py
View File

@ -104,107 +104,109 @@ def outbox_announce(recent_posts_cache: {},
return False return False
def announced_by_person(isAnnounced: bool, postActor: str, def announced_by_person(is_announced: bool, post_actor: str,
nickname: str, domain_full: str) -> bool: nickname: str, domain_full: str) -> bool:
"""Returns True if the given post is announced by the given person """Returns True if the given post is announced by the given person
""" """
if not postActor: if not post_actor:
return False return False
if isAnnounced and \ if is_announced and \
postActor.endswith(domain_full + '/users/' + nickname): post_actor.endswith(domain_full + '/users/' + nickname):
return True return True
return False return False
def create_announce(session, base_dir: str, federation_list: [], def create_announce(session, base_dir: str, federation_list: [],
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
toUrl: str, ccUrl: str, http_prefix: str, to_url: str, ccUrl: str, http_prefix: str,
objectUrl: str, saveToFile: bool, object_url: str, saveToFile: bool,
client_to_server: bool, client_to_server: bool,
send_threads: [], postLog: [], send_threads: [], postLog: [],
person_cache: {}, cached_webfingers: {}, person_cache: {}, cached_webfingers: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
"""Creates an announce message """Creates an announce message
Typically toUrl will be https://www.w3.org/ns/activitystreams#Public Typically to_url will be https://www.w3.org/ns/activitystreams#Public
and ccUrl might be a specific person favorited or repeated and the and ccUrl might be a specific person favorited or repeated and the
followers url objectUrl is typically the url of the message, followers url object_url is typically the url of the message,
corresponding to url or atomUri in createPostBase corresponding to url or atomUri in createPostBase
""" """
if not url_permitted(objectUrl, federation_list): if not url_permitted(object_url, federation_list):
return None return None
domain = remove_domain_port(domain) domain = remove_domain_port(domain)
fullDomain = get_full_domain(domain, port) full_domain = get_full_domain(domain, port)
statusNumber, published = get_status_number() status_number, published = get_status_number()
newAnnounceId = http_prefix + '://' + fullDomain + \ new_announce_id = http_prefix + '://' + full_domain + \
'/users/' + nickname + '/statuses/' + statusNumber '/users/' + nickname + '/statuses/' + status_number
atomUriStr = local_actor_url(http_prefix, nickname, fullDomain) + \ atom_uri_str = local_actor_url(http_prefix, nickname, full_domain) + \
'/statuses/' + statusNumber '/statuses/' + status_number
newAnnounce = { new_announce = {
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
'actor': local_actor_url(http_prefix, nickname, fullDomain), 'actor': local_actor_url(http_prefix, nickname, full_domain),
'atomUri': atomUriStr, 'atomUri': atom_uri_str,
'cc': [], 'cc': [],
'id': newAnnounceId + '/activity', 'id': new_announce_id + '/activity',
'object': objectUrl, 'object': object_url,
'published': published, 'published': published,
'to': [toUrl], 'to': [to_url],
'type': 'Announce' 'type': 'Announce'
} }
if ccUrl: if ccUrl:
if len(ccUrl) > 0: if len(ccUrl) > 0:
newAnnounce['cc'] = [ccUrl] new_announce['cc'] = [ccUrl]
if saveToFile: if saveToFile:
outboxDir = create_outbox_dir(nickname, domain, base_dir) outbox_dir = create_outbox_dir(nickname, domain, base_dir)
filename = outboxDir + '/' + newAnnounceId.replace('/', '#') + '.json' filename = \
save_json(newAnnounce, filename) outbox_dir + '/' + new_announce_id.replace('/', '#') + '.json'
save_json(new_announce, filename)
announceNickname = None announce_nickname = None
announceDomain = None announce_domain = None
announcePort = None announce_port = None
group_account = False group_account = False
if has_users_path(objectUrl): if has_users_path(object_url):
announceNickname = get_nickname_from_actor(objectUrl) announce_nickname = get_nickname_from_actor(object_url)
announceDomain, announcePort = get_domain_from_actor(objectUrl) announce_domain, announce_port = get_domain_from_actor(object_url)
if '/' + str(announceNickname) + '/' in objectUrl: if '/' + str(announce_nickname) + '/' in object_url:
announceActor = \ announce_actor = \
objectUrl.split('/' + announceNickname + '/')[0] + \ object_url.split('/' + announce_nickname + '/')[0] + \
'/' + announceNickname '/' + announce_nickname
if has_group_type(base_dir, announceActor, person_cache): if has_group_type(base_dir, announce_actor, person_cache):
group_account = True group_account = True
if announceNickname and announceDomain: if announce_nickname and announce_domain:
send_signed_json(newAnnounce, session, base_dir, send_signed_json(new_announce, session, base_dir,
nickname, domain, port, nickname, domain, port,
announceNickname, announceDomain, announcePort, None, announce_nickname, announce_domain,
announce_port, None,
http_prefix, True, client_to_server, federation_list, http_prefix, True, client_to_server, federation_list,
send_threads, postLog, cached_webfingers, send_threads, postLog, cached_webfingers,
person_cache, person_cache,
debug, project_version, None, group_account, debug, project_version, None, group_account,
signing_priv_key_pem, 639633) signing_priv_key_pem, 639633)
return newAnnounce return new_announce
def announce_public(session, base_dir: str, federation_list: [], def announce_public(session, base_dir: str, federation_list: [],
nickname: str, domain: str, port: int, http_prefix: str, nickname: str, domain: str, port: int, http_prefix: str,
objectUrl: str, client_to_server: bool, object_url: str, client_to_server: bool,
send_threads: [], postLog: [], send_threads: [], postLog: [],
person_cache: {}, cached_webfingers: {}, person_cache: {}, cached_webfingers: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
"""Makes a public announcement """Makes a public announcement
""" """
fromDomain = get_full_domain(domain, port) from_domain = get_full_domain(domain, port)
toUrl = 'https://www.w3.org/ns/activitystreams#Public' to_url = 'https://www.w3.org/ns/activitystreams#Public'
ccUrl = local_actor_url(http_prefix, nickname, fromDomain) + '/followers' ccUrl = local_actor_url(http_prefix, nickname, from_domain) + '/followers'
return create_announce(session, base_dir, federation_list, return create_announce(session, base_dir, federation_list,
nickname, domain, port, nickname, domain, port,
toUrl, ccUrl, http_prefix, to_url, ccUrl, http_prefix,
objectUrl, True, client_to_server, object_url, True, client_to_server,
send_threads, postLog, send_threads, postLog,
person_cache, cached_webfingers, person_cache, cached_webfingers,
debug, project_version, debug, project_version,
@ -213,8 +215,8 @@ def announce_public(session, base_dir: str, federation_list: [],
def send_announce_via_server(base_dir: str, session, def send_announce_via_server(base_dir: str, session,
fromNickname: str, password: str, fromNickname: str, password: str,
fromDomain: str, fromPort: int, from_domain: str, fromPort: int,
http_prefix: str, repeatObjectUrl: str, http_prefix: str, repeat_object_url: str,
cached_webfingers: {}, person_cache: {}, cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
@ -224,90 +226,89 @@ def send_announce_via_server(base_dir: str, session,
print('WARN: No session for send_announce_via_server') print('WARN: No session for send_announce_via_server')
return 6 return 6
fromDomainFull = get_full_domain(fromDomain, fromPort) from_domain_full = get_full_domain(from_domain, fromPort)
toUrl = 'https://www.w3.org/ns/activitystreams#Public' to_url = 'https://www.w3.org/ns/activitystreams#Public'
actorStr = local_actor_url(http_prefix, fromNickname, fromDomainFull) actor_str = local_actor_url(http_prefix, fromNickname, from_domain_full)
ccUrl = actorStr + '/followers' cc_url = actor_str + '/followers'
statusNumber, published = get_status_number() status_number, published = get_status_number()
newAnnounceId = actorStr + '/statuses/' + statusNumber new_announce_id = actor_str + '/statuses/' + status_number
newAnnounceJson = { new_announce_json = {
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
'actor': actorStr, 'actor': actor_str,
'atomUri': newAnnounceId, 'atomUri': new_announce_id,
'cc': [ccUrl], 'cc': [cc_url],
'id': newAnnounceId + '/activity', 'id': new_announce_id + '/activity',
'object': repeatObjectUrl, 'object': repeat_object_url,
'published': published, 'published': published,
'to': [toUrl], 'to': [to_url],
'type': 'Announce' 'type': 'Announce'
} }
handle = http_prefix + '://' + fromDomainFull + '/@' + fromNickname handle = http_prefix + '://' + from_domain_full + '/@' + fromNickname
# lookup the inbox for the To handle # lookup the inbox for the To handle
wfRequest = webfinger_handle(session, handle, http_prefix, wf_request = webfinger_handle(session, handle, http_prefix,
cached_webfingers, cached_webfingers,
fromDomain, project_version, debug, False, from_domain, project_version, debug, False,
signing_priv_key_pem) signing_priv_key_pem)
if not wfRequest: if not wf_request:
if debug: if debug:
print('DEBUG: announce webfinger failed for ' + handle) print('DEBUG: announce webfinger failed for ' + handle)
return 1 return 1
if not isinstance(wfRequest, dict): if not isinstance(wf_request, dict):
print('WARN: announce webfinger for ' + handle + print('WARN: announce webfinger for ' + handle +
' did not return a dict. ' + str(wfRequest)) ' did not return a dict. ' + str(wf_request))
return 1 return 1
postToBox = 'outbox' post_to_box = 'outbox'
# get the actor inbox for the To handle # get the actor inbox for the To handle
originDomain = fromDomain origin_domain = from_domain
(inboxUrl, pubKeyId, pubKey, fromPersonId, (inbox_url, _, _, from_person_id,
sharedInbox, avatarUrl, _, _, _, _) = get_person_box(signing_priv_key_pem,
displayName, _) = get_person_box(signing_priv_key_pem, origin_domain,
originDomain, base_dir, session, wf_request,
base_dir, session, wfRequest,
person_cache, person_cache,
project_version, http_prefix, project_version, http_prefix,
fromNickname, fromDomain, fromNickname, from_domain,
postToBox, 73528) post_to_box, 73528)
if not inboxUrl: if not inbox_url:
if debug: if debug:
print('DEBUG: announce no ' + postToBox + print('DEBUG: announce no ' + post_to_box +
' was found for ' + handle) ' was found for ' + handle)
return 3 return 3
if not fromPersonId: if not from_person_id:
if debug: if debug:
print('DEBUG: announce no actor was found for ' + handle) print('DEBUG: announce no actor was found for ' + handle)
return 4 return 4
authHeader = create_basic_auth_header(fromNickname, password) auth_header = create_basic_auth_header(fromNickname, password)
headers = { headers = {
'host': fromDomain, 'host': from_domain,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': auth_header
} }
postResult = post_json(http_prefix, fromDomainFull, post_result = post_json(http_prefix, from_domain_full,
session, newAnnounceJson, [], inboxUrl, session, new_announce_json, [], inbox_url,
headers, 3, True) headers, 3, True)
if not postResult: if not post_result:
print('WARN: announce not posted') print('WARN: announce not posted')
if debug: if debug:
print('DEBUG: c2s POST announce success') print('DEBUG: c2s POST announce success')
return newAnnounceJson return new_announce_json
def send_undo_announce_via_server(base_dir: str, session, def send_undo_announce_via_server(base_dir: str, session,
undoPostJsonObject: {}, undo_post_json_object: {},
nickname: str, password: str, nickname: str, password: str,
domain: str, port: int, domain: str, port: int,
http_prefix: str, repeatObjectUrl: str, http_prefix: str, repeat_object_url: str,
cached_webfingers: {}, person_cache: {}, cached_webfingers: {}, person_cache: {},
debug: bool, project_version: str, debug: bool, project_version: str,
signing_priv_key_pem: str) -> {}: signing_priv_key_pem: str) -> {}:
@ -322,70 +323,69 @@ def send_undo_announce_via_server(base_dir: str, session,
actor = local_actor_url(http_prefix, nickname, domain_full) actor = local_actor_url(http_prefix, nickname, domain_full)
handle = replace_users_with_at(actor) handle = replace_users_with_at(actor)
statusNumber, published = get_status_number() status_number, _ = get_status_number()
unAnnounceJson = { unannounce_json = {
'@context': 'https://www.w3.org/ns/activitystreams', '@context': 'https://www.w3.org/ns/activitystreams',
'id': actor + '/statuses/' + str(statusNumber) + '/undo', 'id': actor + '/statuses/' + str(status_number) + '/undo',
'type': 'Undo', 'type': 'Undo',
'actor': actor, 'actor': actor,
'object': undoPostJsonObject['object'] 'object': undo_post_json_object['object']
} }
# lookup the inbox for the To handle # lookup the inbox for the To handle
wfRequest = webfinger_handle(session, handle, http_prefix, wf_request = webfinger_handle(session, handle, http_prefix,
cached_webfingers, cached_webfingers,
domain, project_version, debug, False, domain, project_version, debug, False,
signing_priv_key_pem) signing_priv_key_pem)
if not wfRequest: if not wf_request:
if debug: if debug:
print('DEBUG: undo announce webfinger failed for ' + handle) print('DEBUG: undo announce webfinger failed for ' + handle)
return 1 return 1
if not isinstance(wfRequest, dict): if not isinstance(wf_request, dict):
print('WARN: undo announce webfinger for ' + handle + print('WARN: undo announce webfinger for ' + handle +
' did not return a dict. ' + str(wfRequest)) ' did not return a dict. ' + str(wf_request))
return 1 return 1
postToBox = 'outbox' post_to_box = 'outbox'
# get the actor inbox for the To handle # get the actor inbox for the To handle
originDomain = domain origin_domain = domain
(inboxUrl, pubKeyId, pubKey, fromPersonId, (inbox_url, _, _, from_person_id,
sharedInbox, avatarUrl, _, _, _, _) = get_person_box(signing_priv_key_pem,
displayName, _) = get_person_box(signing_priv_key_pem, origin_domain,
originDomain, base_dir, session, wf_request,
base_dir, session, wfRequest,
person_cache, person_cache,
project_version, http_prefix, project_version, http_prefix,
nickname, domain, nickname, domain,
postToBox, 73528) post_to_box, 73528)
if not inboxUrl: if not inbox_url:
if debug: if debug:
print('DEBUG: undo announce no ' + postToBox + print('DEBUG: undo announce no ' + post_to_box +
' was found for ' + handle) ' was found for ' + handle)
return 3 return 3
if not fromPersonId: if not from_person_id:
if debug: if debug:
print('DEBUG: undo announce no actor was found for ' + handle) print('DEBUG: undo announce no actor was found for ' + handle)
return 4 return 4
authHeader = create_basic_auth_header(nickname, password) auth_header = create_basic_auth_header(nickname, password)
headers = { headers = {
'host': domain, 'host': domain,
'Content-type': 'application/json', 'Content-type': 'application/json',
'Authorization': authHeader 'Authorization': auth_header
} }
postResult = post_json(http_prefix, domain_full, post_result = post_json(http_prefix, domain_full,
session, unAnnounceJson, [], inboxUrl, session, unannounce_json, [], inbox_url,
headers, 3, True) headers, 3, True)
if not postResult: if not post_result:
print('WARN: undo announce not posted') print('WARN: undo announce not posted')
if debug: if debug:
print('DEBUG: c2s POST undo announce success') print('DEBUG: c2s POST undo announce success')
return unAnnounceJson return unannounce_json
def outbox_undo_announce(recent_posts_cache: {}, def outbox_undo_announce(recent_posts_cache: {},
@ -409,13 +409,13 @@ def outbox_undo_announce(recent_posts_cache: {},
if debug: if debug:
print('DEBUG: c2s undo announce request arrived in outbox') print('DEBUG: c2s undo announce request arrived in outbox')
messageId = remove_id_ending(message_json['object']['object']) message_id = remove_id_ending(message_json['object']['object'])
domain = remove_domain_port(domain) domain = remove_domain_port(domain)
post_filename = locate_post(base_dir, nickname, domain, messageId) post_filename = locate_post(base_dir, nickname, domain, message_id)
if not post_filename: if not post_filename:
if debug: if debug:
print('DEBUG: c2s undo announce post not found in inbox or outbox') print('DEBUG: c2s undo announce post not found in inbox or outbox')
print(messageId) print(message_id)
return True return True
undo_announce_collection_entry(recent_posts_cache, base_dir, post_filename, undo_announce_collection_entry(recent_posts_cache, base_dir, post_filename,
message_json['actor'], domain, debug) message_json['actor'], domain, debug)

4
epicyon.py
View File

@ -2997,8 +2997,8 @@ if args.testdata:
federation_list, False, False) federation_list, False, False)
add_follower_of_person(base_dir, nickname, domain, 'drokk', domain_full, add_follower_of_person(base_dir, nickname, domain, 'drokk', domain_full,
federation_list, False, False) federation_list, False, False)
add_follower_of_person(base_dir, nickname, domain, 'maxboardroom', domain_full, add_follower_of_person(base_dir, nickname, domain, 'maxboardroom',
federation_list, False, False) domain_full, federation_list, False, False)
set_config_param(base_dir, 'admin', nickname) set_config_param(base_dir, 'admin', nickname)
# set a lower bound to the maximum mentions # set a lower bound to the maximum mentions