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

Merge branch 'main' of gitlab.com:bashrc2/epicyon

main
Bob Mottram 2022-03-14 22:20:35 +00:00
parent c869ccfad8 fd1db142a5
commit cbbc7a9fb8
50 changed files with 276 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
daemon.py
View File

@ -60,6 +60,7 @@ from donate import get_donation_url
from donate import set_donation_url from donate import set_donation_url
from donate import get_website from donate import get_website
from donate import set_website from donate import set_website
from person import add_alternate_domains
from person import add_actor_update_timestamp from person import add_actor_update_timestamp
from person import set_person_notes from person import set_person_notes
from person import get_default_person_context from person import get_default_person_context
@ -428,7 +429,7 @@ class PubServer(BaseHTTPRequestHandler):
def _convert_domains(self, calling_domain, referer_domain, def _convert_domains(self, calling_domain, referer_domain,
msg_str: str) -> str: msg_str: str) -> str:
"""Convert domains to onion or i2p """Convert domains to onion or i2p, depending upon who is asking
""" """
curr_http_prefix = self.server.http_prefix + '://' curr_http_prefix = self.server.http_prefix + '://'
if is_onion_request(calling_domain, referer_domain, if is_onion_request(calling_domain, referer_domain,
@ -8363,6 +8364,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(announce_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, False, individual_post_as_html(self.server.signing_priv_key_pem, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
self.server.max_recent_posts, self.server.max_recent_posts,
@ -8391,7 +8396,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
actor_absolute = self._get_instance_url(calling_domain) + actor actor_absolute = self._get_instance_url(calling_domain) + actor
actor_path_str = \ actor_path_str = \
@ -8894,6 +8899,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(liked_post_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -8924,7 +8933,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Liked post not found: ' + liked_post_filename) print('WARN: Liked post not found: ' + liked_post_filename)
# clear the icon from the cache so that it gets updated # clear the icon from the cache so that it gets updated
@ -9072,6 +9081,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(liked_post_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -9102,7 +9115,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Unliked post not found: ' + liked_post_filename) print('WARN: Unliked post not found: ' + liked_post_filename)
# clear the icon from the cache so that it gets updated # clear the icon from the cache so that it gets updated
@ -9279,6 +9292,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(reaction_post_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -9309,7 +9326,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Emoji reaction post not found: ' + print('WARN: Emoji reaction post not found: ' +
reaction_post_filename) reaction_post_filename)
@ -9476,6 +9493,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(reaction_post_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -9506,7 +9527,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Unreaction post not found: ' + print('WARN: Unreaction post not found: ' +
reaction_post_filename) reaction_post_filename)
@ -9723,6 +9744,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(bookmark_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -9753,7 +9778,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Bookmarked post not found: ' + bookmark_filename) print('WARN: Bookmarked post not found: ' + bookmark_filename)
# self._post_to_outbox(bookmark_json, # self._post_to_outbox(bookmark_json,
@ -9875,6 +9900,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(self.post_to_nickname): if self.server.account_timezone.get(self.post_to_nickname):
timezone = \ timezone = \
self.server.account_timezone.get(self.post_to_nickname) self.server.account_timezone.get(self.post_to_nickname)
mitm = False
if os.path.isfile(bookmark_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
False, False,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -9905,7 +9934,7 @@ class PubServer(BaseHTTPRequestHandler):
False, True, False, False, True, False,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Unbookmarked post not found: ' + print('WARN: Unbookmarked post not found: ' +
bookmark_filename) bookmark_filename)
@ -10100,6 +10129,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(nickname): if self.server.account_timezone.get(nickname):
timezone = \ timezone = \
self.server.account_timezone.get(nickname) self.server.account_timezone.get(nickname)
mitm = False
if os.path.isfile(mute_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
allow_downloads, allow_downloads,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -10131,7 +10164,7 @@ class PubServer(BaseHTTPRequestHandler):
use_cache_only, use_cache_only,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Muted post not found: ' + mute_filename) print('WARN: Muted post not found: ' + mute_filename)
@ -10217,6 +10250,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(nickname): if self.server.account_timezone.get(nickname):
timezone = \ timezone = \
self.server.account_timezone.get(nickname) self.server.account_timezone.get(nickname)
mitm = False
if os.path.isfile(mute_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(self.server.signing_priv_key_pem, individual_post_as_html(self.server.signing_priv_key_pem,
allow_downloads, allow_downloads,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -10248,7 +10285,7 @@ class PubServer(BaseHTTPRequestHandler):
use_cache_only, use_cache_only,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
else: else:
print('WARN: Unmuted post not found: ' + mute_filename) print('WARN: Unmuted post not found: ' + mute_filename)
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain:
@ -11008,6 +11045,10 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.account_timezone.get(nickname): if self.server.account_timezone.get(nickname):
timezone = \ timezone = \
self.server.account_timezone.get(nickname) self.server.account_timezone.get(nickname)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') +
'.mitm'):
mitm = True
msg = \ msg = \
html_individual_post(self.server.css_cache, html_individual_post(self.server.css_cache,
self.server.recent_posts_cache, self.server.recent_posts_cache,
@ -11034,7 +11075,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.signing_priv_key_pem, self.server.signing_priv_key_pem,
self.server.cw_lists, self.server.cw_lists,
self.server.lists_enabled, self.server.lists_enabled,
timezone) timezone, mitm)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
self._set_headers('text/html', msglen, self._set_headers('text/html', msglen,
@ -13428,6 +13469,7 @@ class PubServer(BaseHTTPRequestHandler):
actor_json = person_lookup(domain, path, base_dir) actor_json = person_lookup(domain, path, base_dir)
if not actor_json: if not actor_json:
return False return False
add_alternate_domains(actor_json, domain, onion_domain, i2p_domain)
if self._request_http(): if self._request_http():
curr_session = \ curr_session = \
self._establish_session("showPersonProfile", self._establish_session("showPersonProfile",

66
inbox.py
View File

@ -296,7 +296,8 @@ def _inbox_store_post_to_html_cache(recent_posts_cache: {},
signing_priv_key_pem: str, signing_priv_key_pem: str,
cw_lists: {}, cw_lists: {},
lists_enabled: str, lists_enabled: str,
timezone: str) -> None: timezone: str,
mitm: bool) -> None:
"""Converts the json post into html and stores it in a cache """Converts the json post into html and stores it in a cache
This enables the post to be quickly displayed later This enables the post to be quickly displayed later
""" """
@ -321,7 +322,7 @@ def _inbox_store_post_to_html_cache(recent_posts_cache: {},
peertube_instances, allow_local_network_access, peertube_instances, allow_local_network_access,
theme_name, system_language, max_like_count, theme_name, system_language, max_like_count,
not_dm, True, True, False, True, False, not_dm, True, True, False, True, False,
cw_lists, lists_enabled, timezone) cw_lists, lists_enabled, timezone, mitm)
def valid_inbox(base_dir: str, nickname: str, domain: str) -> bool: def valid_inbox(base_dir: str, nickname: str, domain: str) -> bool:
@ -1133,6 +1134,9 @@ def _receive_like(recent_posts_cache: {},
follower_approval_active(base_dir, handle_name, domain) follower_approval_active(base_dir, handle_name, domain)
not_dm = not is_dm(liked_post_json) not_dm = not is_dm(liked_post_json)
timezone = get_account_timezone(base_dir, handle_name, domain) timezone = get_account_timezone(base_dir, handle_name, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -1151,7 +1155,7 @@ def _receive_like(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
return True return True
@ -1247,6 +1251,9 @@ def _receive_undo_like(recent_posts_cache: {},
follower_approval_active(base_dir, handle_name, domain) follower_approval_active(base_dir, handle_name, domain)
not_dm = not is_dm(liked_post_json) not_dm = not is_dm(liked_post_json)
timezone = get_account_timezone(base_dir, handle_name, domain) timezone = get_account_timezone(base_dir, handle_name, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -1265,7 +1272,7 @@ def _receive_undo_like(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
return True return True
@ -1393,6 +1400,9 @@ def _receive_reaction(recent_posts_cache: {},
follower_approval_active(base_dir, handle_name, domain) follower_approval_active(base_dir, handle_name, domain)
not_dm = not is_dm(reaction_post_json) not_dm = not is_dm(reaction_post_json)
timezone = get_account_timezone(base_dir, handle_name, domain) timezone = get_account_timezone(base_dir, handle_name, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -1412,7 +1422,7 @@ def _receive_reaction(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
return True return True
@ -1527,6 +1537,9 @@ def _receive_undo_reaction(recent_posts_cache: {},
follower_approval_active(base_dir, handle_name, domain) follower_approval_active(base_dir, handle_name, domain)
not_dm = not is_dm(reaction_post_json) not_dm = not is_dm(reaction_post_json)
timezone = get_account_timezone(base_dir, handle_name, domain) timezone = get_account_timezone(base_dir, handle_name, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -1546,7 +1559,7 @@ def _receive_undo_reaction(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
return True return True
@ -1639,6 +1652,9 @@ def _receive_bookmark(recent_posts_cache: {},
follower_approval_active(base_dir, nickname, domain) follower_approval_active(base_dir, nickname, domain)
not_dm = not is_dm(bookmarked_post_json) not_dm = not is_dm(bookmarked_post_json)
timezone = get_account_timezone(base_dir, nickname, domain) timezone = get_account_timezone(base_dir, nickname, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -1657,7 +1673,7 @@ def _receive_bookmark(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
return True return True
@ -1754,6 +1770,9 @@ def _receive_undo_bookmark(recent_posts_cache: {},
follower_approval_active(base_dir, nickname, domain) follower_approval_active(base_dir, nickname, domain)
not_dm = not is_dm(bookmarked_post_json) not_dm = not is_dm(bookmarked_post_json)
timezone = get_account_timezone(base_dir, nickname, domain) timezone = get_account_timezone(base_dir, nickname, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -1772,7 +1791,7 @@ def _receive_undo_bookmark(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, lists_enabled, False, True, False, cw_lists, lists_enabled,
timezone) timezone, mitm)
return True return True
@ -1963,6 +1982,9 @@ def _receive_announce(recent_posts_cache: {},
if debug: if debug:
print('Generating html for announce ' + message_json['id']) print('Generating html for announce ' + message_json['id'])
timezone = get_account_timezone(base_dir, nickname, domain) timezone = get_account_timezone(base_dir, nickname, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
announce_html = \ announce_html = \
individual_post_as_html(signing_priv_key_pem, True, individual_post_as_html(signing_priv_key_pem, True,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
@ -1982,7 +2004,7 @@ def _receive_announce(recent_posts_cache: {},
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
if not announce_html: if not announce_html:
print('WARN: Unable to generate html for announce ' + print('WARN: Unable to generate html for announce ' +
str(message_json)) str(message_json))
@ -3110,6 +3132,9 @@ def _receive_question_vote(server, base_dir: str, nickname: str, domain: str,
follower_approval_active(base_dir, nickname, domain) follower_approval_active(base_dir, nickname, domain)
not_dm = not is_dm(question_json) not_dm = not is_dm(question_json)
timezone = get_account_timezone(base_dir, nickname, domain) timezone = get_account_timezone(base_dir, nickname, domain)
mitm = False
if os.path.isfile(question_post_filename.replace('.json', '') + '.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, False, individual_post_as_html(signing_priv_key_pem, False,
recent_posts_cache, max_recent_posts, recent_posts_cache, max_recent_posts,
translate, page_number, base_dir, translate, page_number, base_dir,
@ -3128,7 +3153,7 @@ def _receive_question_vote(server, base_dir: str, nickname: str, domain: str,
show_individual_post_icons, show_individual_post_icons,
manually_approve_followers, manually_approve_followers,
False, True, False, cw_lists, False, True, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, mitm)
# add id to inbox index # add id to inbox index
inbox_update_index('inbox', base_dir, handle, inbox_update_index('inbox', base_dir, handle,
@ -3297,7 +3322,8 @@ def _inbox_after_initial(server,
default_reply_interval_hrs: int, default_reply_interval_hrs: int,
cw_lists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
content_license_url: str, content_license_url: str,
languages_understood: []) -> bool: languages_understood: [],
mitm: bool) -> bool:
""" Anything which needs to be done after initial checks have passed """ Anything which needs to be done after initial checks have passed
""" """
# if this is a clearnet instance then replace any onion/i2p # if this is a clearnet instance then replace any onion/i2p
@ -3634,6 +3660,17 @@ def _inbox_after_initial(server,
# save the post to file # save the post to file
if save_json(post_json_object, destination_filename): if save_json(post_json_object, destination_filename):
if mitm:
# write a file to indicate that this post was delivered
# via a third party
destination_filename_mitm = \
destination_filename.replace('.json', '') + '.mitm'
try:
with open(destination_filename_mitm, 'w+') as mitm_file:
mitm_file.write('\n')
except OSError:
print('EX: unable to write ' + destination_filename_mitm)
_low_frequency_post_notification(base_dir, http_prefix, _low_frequency_post_notification(base_dir, http_prefix,
nickname, domain, port, nickname, domain, port,
handle, post_is_dm, json_obj) handle, post_is_dm, json_obj)
@ -3693,7 +3730,7 @@ def _inbox_after_initial(server,
signing_priv_key_pem, signing_priv_key_pem,
cw_lists, cw_lists,
lists_enabled, lists_enabled,
timezone) timezone, mitm)
if debug: if debug:
time_diff = \ time_diff = \
str(int((time.time() - html_cache_start_time) * str(int((time.time() - html_cache_start_time) *
@ -4728,6 +4765,9 @@ def run_inbox_queue(server,
destination = \ destination = \
queue_json['destination'].replace(inbox_handle, handle) queue_json['destination'].replace(inbox_handle, handle)
languages_understood = [] languages_understood = []
mitm = False
if queue_json.get('mitm'):
mitm = True
_inbox_after_initial(server, _inbox_after_initial(server,
recent_posts_cache, recent_posts_cache,
max_recent_posts, max_recent_posts,
@ -4759,7 +4799,7 @@ def run_inbox_queue(server,
default_reply_interval_hrs, default_reply_interval_hrs,
cw_lists, lists_enabled, cw_lists, lists_enabled,
content_license_url, content_license_url,
languages_understood) languages_understood, mitm)
if debug: if debug:
pprint(queue_json['post']) pprint(queue_json['post'])
print('Queue: Queue post accepted') print('Queue: Queue post accepted')

6
outbox.py
View File

@ -457,6 +457,10 @@ def post_message_to_outbox(session, translate: {},
timezone = \ timezone = \
get_account_timezone(base_dir, get_account_timezone(base_dir,
post_to_nickname, domain) post_to_nickname, domain)
mitm = False
if os.path.isfile(saved_filename.replace('.json', '') +
'.mitm'):
mitm = True
individual_post_as_html(signing_priv_key_pem, individual_post_as_html(signing_priv_key_pem,
False, recent_posts_cache, False, recent_posts_cache,
max_recent_posts, max_recent_posts,
@ -481,7 +485,7 @@ def post_message_to_outbox(session, translate: {},
manually_approve_followers, manually_approve_followers,
False, True, use_cache_only, False, True, use_cache_only,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, mitm)
if outbox_announce(recent_posts_cache, if outbox_announce(recent_posts_cache,
base_dir, message_json, debug): base_dir, message_json, debug):

26
person.py
View File

@ -38,6 +38,7 @@ from roles import set_role
from roles import set_rolesFromList from roles import set_rolesFromList
from roles import get_actor_roles_list from roles import get_actor_roles_list
from media import process_meta_data from media import process_meta_data
from utils import get_nickname_from_actor
from utils import remove_html from utils import remove_html
from utils import contains_invalid_chars from utils import contains_invalid_chars
from utils import replace_users_with_at from utils import replace_users_with_at
@ -861,6 +862,31 @@ def person_upgrade_actor(base_dir: str, person_json: {},
save_json(person_json, actor_cache_filename) save_json(person_json, actor_cache_filename)
def add_alternate_domains(actor_json: {}, domain: str,
onion_domain: str, i2p_domain: str) -> None:
"""Adds alternate onion and/or i2p domains to alsoKnownAs
"""
if not onion_domain and not i2p_domain:
return
if not actor_json.get('id'):
return
if domain not in actor_json['id']:
return
nickname = get_nickname_from_actor(actor_json['id'])
if not nickname:
return
if 'alsoKnownAs' not in actor_json:
actor_json['alsoKnownAs'] = []
if onion_domain:
onion_actor = 'http://' + onion_domain + '/users/' + nickname
if onion_actor not in actor_json['alsoKnownAs']:
actor_json['alsoKnownAs'].append(onion_actor)
if i2p_domain:
i2p_actor = 'http://' + i2p_domain + '/users/' + nickname
if i2p_actor not in actor_json['alsoKnownAs']:
actor_json['alsoKnownAs'].append(i2p_actor)
def person_lookup(domain: str, path: str, base_dir: str) -> {}: def person_lookup(domain: str, path: str, base_dir: str) -> {}:
"""Lookup the person for an given nickname """Lookup the person for an given nickname
""" """

43
posts.py
View File

@ -3779,6 +3779,11 @@ def _add_post_to_timeline(file_path: str, boxname: str,
# append a replies identifier, which will later be removed # append a replies identifier, which will later be removed
post_str += '<hasReplies>' post_str += '<hasReplies>'
mitm_filename = file_path.replace('.json', '.mitm')
if os.path.isfile(mitm_filename):
# append a mitm identifier, which will later be removed
post_str += '<postmitm>'
return _add_post_string_to_timeline(post_str, boxname, posts_in_box, return _add_post_string_to_timeline(post_str, boxname, posts_in_box,
box_actor) box_actor)
return False return False
@ -4078,6 +4083,13 @@ def _create_box_indexed(recent_posts_cache: {},
# remove the replies identifier # remove the replies identifier
post_str = post_str.replace('<hasReplies>', '') post_str = post_str.replace('<hasReplies>', '')
# Check if the post was delivered via a third party
mitm = False
if post_str.endswith('<postmitm>'):
mitm = True
# remove the mitm identifier
post_str = post_str.replace('<postmitm>', '')
pst = None pst = None
try: try:
pst = json.loads(post_str) pst = json.loads(post_str)
@ -4090,6 +4102,9 @@ def _create_box_indexed(recent_posts_cache: {},
# created by individual_post_as_html # created by individual_post_as_html
pst['hasReplies'] = has_replies pst['hasReplies'] = has_replies
# was the post delivered via a third party?
pst['mitm'] = mitm
if not authorized: if not authorized:
if not remove_post_interactions(pst, False): if not remove_post_interactions(pst, False):
continue continue
@ -4842,18 +4857,22 @@ def download_announce(session, base_dir: str, http_prefix: str,
return None return None
if not isinstance(announced_json, dict): if not isinstance(announced_json, dict):
print('WARN: announce json is not a dict - ' + print('WARN: announced post json is not a dict - ' +
post_json_object['object']) post_json_object['object'])
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if not announced_json.get('id'): if not announced_json.get('id'):
print('WARN: announced post does not have an id ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if not announced_json.get('type'): if not announced_json.get('type'):
print('WARN: announced post does not have a type ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
@ -4866,11 +4885,15 @@ def download_announce(session, base_dir: str, http_prefix: str,
if converted_json: if converted_json:
announced_json = converted_json announced_json = converted_json
if '/statuses/' not in announced_json['id']: if '/statuses/' not in announced_json['id']:
print('WARN: announced post id does not contain /statuses/ ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if not has_users_path(announced_json['id']): if not has_users_path(announced_json['id']):
print('WARN: announced post id does not contain /users/ ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
@ -4878,22 +4901,30 @@ def download_announce(session, base_dir: str, http_prefix: str,
if announced_json['type'] != 'Note' and \ if announced_json['type'] != 'Note' and \
announced_json['type'] != 'Page' and \ announced_json['type'] != 'Page' and \
announced_json['type'] != 'Article': announced_json['type'] != 'Article':
print('WARN: announced post is not Note/Page/Article ' +
str(announced_json))
# You can only announce Note or Article types # You can only announce Note or Article types
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if not announced_json.get('content'): if not announced_json.get('content'):
print('WARN: announced post does not have content ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if not announced_json.get('published'): if not announced_json.get('published'):
print('WARN: announced post does not have published ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if not valid_post_date(announced_json['published'], 90, debug): if not valid_post_date(announced_json['published'], 90, debug):
print('WARN: announced post is not recently published ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
@ -4906,18 +4937,24 @@ def download_announce(session, base_dir: str, http_prefix: str,
# Check the content of the announce # Check the content of the announce
content_str = announced_json['content'] content_str = announced_json['content']
if dangerous_markup(content_str, allow_local_network_access): if dangerous_markup(content_str, allow_local_network_access):
print('WARN: announced post contains dangerous markup ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if is_filtered(base_dir, nickname, domain, content_str): if is_filtered(base_dir, nickname, domain, content_str):
print('WARN: announced post has been filtered ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
return None return None
if invalid_ciphertext(content_str): if invalid_ciphertext(content_str):
print('WARN: announced post contains invalid ciphertext ' +
str(announced_json))
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)
@ -4943,6 +4980,8 @@ def download_announce(session, base_dir: str, http_prefix: str,
actor_nickname, actor_domain, actor_nickname, actor_domain,
actor_port, announced_json) actor_port, announced_json)
if announced_json['type'] != 'Create': if announced_json['type'] != 'Create':
print('WARN: announced post could not be wrapped in Create ' +
str(announced_json))
# Create wrap failed # Create wrap failed
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
@ -4963,6 +5002,8 @@ def download_announce(session, base_dir: str, http_prefix: str,
get_full_domain(attributed_domain, attributed_port) get_full_domain(attributed_domain, attributed_port)
if is_blocked(base_dir, nickname, domain, if is_blocked(base_dir, nickname, domain,
attributed_nickname, attributed_domain): attributed_nickname, attributed_domain):
print('WARN: announced post handle is blocked ' +
str(attributed_nickname) + '@' + attributed_domain)
_reject_announce(announce_filename, _reject_announce(announce_filename,
base_dir, nickname, domain, post_id, base_dir, nickname, domain, post_id,
recent_posts_cache) recent_posts_cache)

BIN
theme/blue/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
theme/debian/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
theme/default/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
theme/hacker/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
theme/henge/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
theme/indymediaclassic/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
theme/indymediamodern/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
theme/lcd/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
theme/light/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
theme/night/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
theme/pixel/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
theme/purple/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
theme/rc3/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
theme/solidaric/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
theme/starlight/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
theme/zen/icons/mitm.png 100644
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

3
translations/ar.json
View File

@ -517,5 +517,6 @@
"Repeated by": "يتكرر بواسطة", "Repeated by": "يتكرر بواسطة",
"Register": "يسجل", "Register": "يسجل",
"Web Bots Allowed": "مسموح روبوتات الويب", "Web Bots Allowed": "مسموح روبوتات الويب",
"Known Search Bots": "روبوتات بحث الويب المعروفة" "Known Search Bots": "روبوتات بحث الويب المعروفة",
"mitm": "يمكن قراءة الرسالة أو تعديلها من قبل طرف ثالث"
} }

3
translations/ca.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Repetit per", "Repeated by": "Repetit per",
"Register": "Registra't", "Register": "Registra't",
"Web Bots Allowed": "Bots web permesos", "Web Bots Allowed": "Bots web permesos",
"Known Search Bots": "Bots de cerca web coneguts" "Known Search Bots": "Bots de cerca web coneguts",
"mitm": "El missatge podria haver estat llegit o modificat per un tercer"
} }

3
translations/cy.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Ailadrodd gan", "Repeated by": "Ailadrodd gan",
"Register": "Cofrestrwch", "Register": "Cofrestrwch",
"Web Bots Allowed": "Web Bots a Ganiateir", "Web Bots Allowed": "Web Bots a Ganiateir",
"Known Search Bots": "Bots Chwilio Gwe Hysbys" "Known Search Bots": "Bots Chwilio Gwe Hysbys",
"mitm": "Gallai'r neges fod wedi cael ei darllen neu ei haddasu gan drydydd parti"
} }

3
translations/de.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Wiederholt von", "Repeated by": "Wiederholt von",
"Register": "Registrieren", "Register": "Registrieren",
"Web Bots Allowed": "Webbots erlaubt", "Web Bots Allowed": "Webbots erlaubt",
"Known Search Bots": "Bekannte Bots für die Websuche" "Known Search Bots": "Bekannte Bots für die Websuche",
"mitm": "Die Nachricht könnte von einem Dritten gelesen oder geändert worden sein"
} }

3
translations/en.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Repeated by", "Repeated by": "Repeated by",
"Register": "Register", "Register": "Register",
"Web Bots Allowed": "Web Search Bots Allowed", "Web Bots Allowed": "Web Search Bots Allowed",
"Known Search Bots": "Known Web Search Bots" "Known Search Bots": "Known Web Search Bots",
"mitm": "Message could have been read or modified by a third party"
} }

3
translations/es.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Repetido por", "Repeated by": "Repetido por",
"Register": "Registrarse", "Register": "Registrarse",
"Web Bots Allowed": "Bots web permitidos", "Web Bots Allowed": "Bots web permitidos",
"Known Search Bots": "Bots de búsqueda web conocidos" "Known Search Bots": "Bots de búsqueda web conocidos",
"mitm": "El mensaje podría haber sido leído o modificado por un tercero"
} }

3
translations/fr.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Répété par", "Repeated by": "Répété par",
"Register": "S'inscrire", "Register": "S'inscrire",
"Web Bots Allowed": "Robots Web autorisés", "Web Bots Allowed": "Robots Web autorisés",
"Known Search Bots": "Robots de recherche Web connus" "Known Search Bots": "Robots de recherche Web connus",
"mitm": "Le message a pu être lu ou modifié par un tiers"
} }

3
translations/ga.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Arís agus arís eile ag", "Repeated by": "Arís agus arís eile ag",
"Register": "Clár", "Register": "Clár",
"Web Bots Allowed": "Róbónna Gréasáin Ceadaithe", "Web Bots Allowed": "Róbónna Gréasáin Ceadaithe",
"Known Search Bots": "Róbónna Cuardach Gréasáin Aitheanta" "Known Search Bots": "Róbónna Cuardach Gréasáin Aitheanta",
"mitm": "D'fhéadfadh tríú páirtí an teachtaireacht a léamh nó a mhodhnú"
} }

3
translations/hi.json
View File

@ -517,5 +517,6 @@
"Repeated by": "द्वारा दोहराया गया", "Repeated by": "द्वारा दोहराया गया",
"Register": "रजिस्टर करें", "Register": "रजिस्टर करें",
"Web Bots Allowed": "वेब बॉट्स की अनुमति है", "Web Bots Allowed": "वेब बॉट्स की अनुमति है",
"Known Search Bots": "ज्ञात वेब खोज बॉट्स" "Known Search Bots": "ज्ञात वेब खोज बॉट्स",
"mitm": "संदेश किसी तीसरे पक्ष द्वारा पढ़ा या संशोधित किया जा सकता था"
} }

3
translations/it.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Ripetuto da", "Repeated by": "Ripetuto da",
"Register": "Registrati", "Register": "Registrati",
"Web Bots Allowed": "Web bot consentiti", "Web Bots Allowed": "Web bot consentiti",
"Known Search Bots": "Bot di ricerca Web noti" "Known Search Bots": "Bot di ricerca Web noti",
"mitm": "Il messaggio potrebbe essere stato letto o modificato da terzi"
} }

3
translations/ja.json
View File

@ -517,5 +517,6 @@
"Repeated by": "によって繰り返される", "Repeated by": "によって繰り返される",
"Register": "登録", "Register": "登録",
"Web Bots Allowed": "許可されたWebボット", "Web Bots Allowed": "許可されたWebボット",
"Known Search Bots": "既知のWeb検索ボット" "Known Search Bots": "既知のWeb検索ボット",
"mitm": "メッセージが第三者によって読み取られたり変更されたりした可能性があります"
} }

3
translations/ko.json
View File

@ -517,5 +517,6 @@
"Repeated by": "반복한 사람", "Repeated by": "반복한 사람",
"Register": "등록", "Register": "등록",
"Web Bots Allowed": "웹 봇 허용", "Web Bots Allowed": "웹 봇 허용",
"Known Search Bots": "알려진 웹 검색 봇" "Known Search Bots": "알려진 웹 검색 봇",
"mitm": "제3자가 메시지를 읽거나 수정했을 수 있습니다."
} }

3
translations/ku.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Ji hêla dubare kirin", "Repeated by": "Ji hêla dubare kirin",
"Register": "Fêhrist", "Register": "Fêhrist",
"Web Bots Allowed": "Web Bots Destûrdar in", "Web Bots Allowed": "Web Bots Destûrdar in",
"Known Search Bots": "Botên Lêgerîna Webê yên naskirî" "Known Search Bots": "Botên Lêgerîna Webê yên naskirî",
"mitm": "Peyam dikaribû ji hêla aliyek sêyemîn ve were xwendin an guhertin"
} }

3
translations/oc.json
View File

@ -513,5 +513,6 @@
"Repeated by": "Repeated by", "Repeated by": "Repeated by",
"Register": "Register", "Register": "Register",
"Web Bots Allowed": "Web Search Bots Allowed", "Web Bots Allowed": "Web Search Bots Allowed",
"Known Search Bots": "Known Web Search Bots" "Known Search Bots": "Known Web Search Bots",
"mitm": "Message could have been read or modified by a third party"
} }

3
translations/pl.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Powtórzone przez", "Repeated by": "Powtórzone przez",
"Register": "Zarejestrować", "Register": "Zarejestrować",
"Web Bots Allowed": "Dozwolone boty internetowe", "Web Bots Allowed": "Dozwolone boty internetowe",
"Known Search Bots": "Znane boty wyszukiwania w sieci" "Known Search Bots": "Znane boty wyszukiwania w sieci",
"mitm": "Wiadomość mogła zostać przeczytana lub zmodyfikowana przez osobę trzecią"
} }

3
translations/pt.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Repetido por", "Repeated by": "Repetido por",
"Register": "Registro", "Register": "Registro",
"Web Bots Allowed": "Webbots permitidos", "Web Bots Allowed": "Webbots permitidos",
"Known Search Bots": "Bots de pesquisa na Web conhecidos" "Known Search Bots": "Bots de pesquisa na Web conhecidos",
"mitm": "A mensagem pode ter sido lida ou modificada por terceiros"
} }

3
translations/ru.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Повторено", "Repeated by": "Повторено",
"Register": "регистр", "Register": "регистр",
"Web Bots Allowed": "Веб-боты разрешены", "Web Bots Allowed": "Веб-боты разрешены",
"Known Search Bots": "Известные боты веб-поиска" "Known Search Bots": "Известные боты веб-поиска",
"mitm": "Сообщение могло быть прочитано или изменено третьим лицом"
} }

3
translations/sw.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Imerudiwa na", "Repeated by": "Imerudiwa na",
"Register": "Sajili", "Register": "Sajili",
"Web Bots Allowed": "Mtandao wa Boti Unaruhusiwa", "Web Bots Allowed": "Mtandao wa Boti Unaruhusiwa",
"Known Search Bots": "Vijibu vya Utafutaji wa Wavuti vinavyojulikana" "Known Search Bots": "Vijibu vya Utafutaji wa Wavuti vinavyojulikana",
"mitm": "Ujumbe ungeweza kusomwa au kurekebishwa na mtu mwingine"
} }

3
translations/uk.json
View File

@ -517,5 +517,6 @@
"Repeated by": "Повторюється за", "Repeated by": "Повторюється за",
"Register": "Реєстрація", "Register": "Реєстрація",
"Web Bots Allowed": "Веб-боти дозволені", "Web Bots Allowed": "Веб-боти дозволені",
"Known Search Bots": "Відомі пошукові роботи в Інтернеті" "Known Search Bots": "Відомі пошукові роботи в Інтернеті",
"mitm": "Повідомлення могло бути прочитане або змінене третьою стороною"
} }

3
translations/zh.json
View File

@ -517,5 +517,6 @@
"Repeated by": "重复", "Repeated by": "重复",
"Register": "登记", "Register": "登记",
"Web Bots Allowed": "允许网络机器人", "Web Bots Allowed": "允许网络机器人",
"Known Search Bots": "已知的网络搜索机器人" "Known Search Bots": "已知的网络搜索机器人",
"mitm": "消息可能已被第三方阅读或修改"
} }

2
utils.py
View File

@ -1788,7 +1788,7 @@ def delete_post(base_dir: str, http_prefix: str,
# remove any attachment # remove any attachment
_remove_attachment(base_dir, http_prefix, domain, post_json_object) _remove_attachment(base_dir, http_prefix, domain, post_json_object)
extensions = ('votes', 'arrived', 'muted', 'tts', 'reject') extensions = ('votes', 'arrived', 'muted', 'tts', 'reject', 'mitm')
for ext in extensions: for ext in extensions:
ext_filename = post_filename + '.' + ext ext_filename = post_filename + '.' + ext
if os.path.isfile(ext_filename): if os.path.isfile(ext_filename):

5
webapp_confirm.py
View File

@ -66,6 +66,9 @@ def html_confirm_delete(css_cache: {},
delete_post_str = \ delete_post_str = \
html_header_with_external_style(css_filename, instance_title, None) html_header_with_external_style(css_filename, instance_title, None)
timezone = get_account_timezone(base_dir, nickname, domain) timezone = get_account_timezone(base_dir, nickname, domain)
mitm = False
if os.path.isfile(post_filename.replace('.json', '') + '.mitm'):
mitm = True
delete_post_str += \ delete_post_str += \
individual_post_as_html(signing_priv_key_pem, individual_post_as_html(signing_priv_key_pem,
True, recent_posts_cache, max_recent_posts, True, recent_posts_cache, max_recent_posts,
@ -81,7 +84,7 @@ def html_confirm_delete(css_cache: {},
peertube_instances, allow_local_network_access, peertube_instances, allow_local_network_access,
theme_name, system_language, max_like_count, theme_name, system_language, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
cw_lists, lists_enabled, timezone) cw_lists, lists_enabled, timezone, mitm)
delete_post_str += '<center>' delete_post_str += '<center>'
delete_post_str += \ delete_post_str += \
' <p class="followText">' + \ ' <p class="followText">' + \

2
webapp_create_post.py
View File

@ -286,7 +286,7 @@ def html_new_post(css_cache: {}, media_instance: bool, translate: {},
False, False, False, False, False, False,
False, False, False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
reply_str = '<input type="hidden" ' + \ reply_str = '<input type="hidden" ' + \
'name="replyTo" value="' + inReplyTo + '">\n' 'name="replyTo" value="' + inReplyTo + '">\n'

2
webapp_frontscreen.py
View File

@ -87,7 +87,7 @@ def _html_front_screen_posts(recent_posts_cache: {}, max_recent_posts: int,
False, False, False, False, False, False,
True, False, False, True, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
if post_str: if post_str:
profile_str += post_str + separator_str profile_str += post_str + separator_str
ctr += 1 ctr += 1

5
webapp_likers.py
View File

@ -78,6 +78,9 @@ def html_likers_of_post(base_dir: str, nickname: str,
# show the post which was liked # show the post which was liked
timezone = get_account_timezone(base_dir, nickname, domain) timezone = get_account_timezone(base_dir, nickname, domain)
mitm = False
if os.path.isfile(filename.replace('.json', '') + '.mitm'):
mitm = True
html_str += \ html_str += \
individual_post_as_html(signing_priv_key_pem, individual_post_as_html(signing_priv_key_pem,
True, recent_posts_cache, True, recent_posts_cache,
@ -102,7 +105,7 @@ def html_likers_of_post(base_dir: str, nickname: str,
False, False, False, False, False, False,
False, False, False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, mitm)
# show likers beneath the post # show likers beneath the post
obj = post_json_object obj = post_json_object

52
webapp_post.py
View File

@ -1026,8 +1026,8 @@ def _get_post_title_announce_html(base_dir: str,
page_number: int, page_number: int,
message_id_str: str, message_id_str: str,
container_class_icons: str, container_class_icons: str,
container_class: str) -> (str, str, container_class: str,
str, str): mitm: bool) -> (str, str, str, str):
"""Returns the announce title of a post containing names of participants """Returns the announce title of a post containing names of participants
x announces y x announces y
""" """
@ -1081,6 +1081,10 @@ def _get_post_title_announce_html(base_dir: str,
title_str += \ title_str += \
_announce_with_display_name_html(translate, post_json_object, _announce_with_display_name_html(translate, post_json_object,
announce_display_name) announce_display_name)
if mitm:
title_str += _mitm_warning_html(translate)
# show avatar of person replied to # show avatar of person replied to
announce_actor = attributed_to announce_actor = attributed_to
announce_avatar_url = \ announce_avatar_url = \
@ -1141,6 +1145,16 @@ def _reply_to_unknown_html(translate: {},
'" class="announceOrReply">@unknown</a>\n' '" class="announceOrReply">@unknown</a>\n'
def _mitm_warning_html(translate: {}) -> str:
"""Returns the html title for a reply to an unknown handle
"""
mitm_warning_str = translate['mitm']
return ' <img loading="lazy" title="' + \
mitm_warning_str + '" alt="' + \
mitm_warning_str + '" src="/icons' + \
'/mitm.png" class="announceOrReply"/>\n'
def _reply_with_unknown_path_html(translate: {}, def _reply_with_unknown_path_html(translate: {},
post_json_object: {}, post_json_object: {},
post_domain: str) -> str: post_domain: str) -> str:
@ -1196,7 +1210,8 @@ def _get_post_title_reply_html(base_dir: str,
page_number: int, page_number: int,
message_id_str: str, message_id_str: str,
container_class_icons: str, container_class_icons: str,
container_class: str) -> (str, str, str, str): container_class: str,
mitm: bool) -> (str, str, str, str):
"""Returns the reply title of a post containing names of participants """Returns the reply title of a post containing names of participants
x replies to y x replies to y
""" """
@ -1264,6 +1279,9 @@ def _get_post_title_reply_html(base_dir: str,
title_str += _get_reply_html(translate, in_reply_to, reply_display_name) title_str += _get_reply_html(translate, in_reply_to, reply_display_name)
if mitm:
title_str += _mitm_warning_html(translate)
_log_post_timing(enable_timing_log, post_start_time, '13.7') _log_post_timing(enable_timing_log, post_start_time, '13.7')
# show avatar of person replied to # show avatar of person replied to
@ -1309,7 +1327,8 @@ def _get_post_title_html(base_dir: str,
page_number: int, page_number: int,
message_id_str: str, message_id_str: str,
container_class_icons: str, container_class_icons: str,
container_class: str) -> (str, str, str, str): container_class: str,
mitm: bool) -> (str, str, str, str):
"""Returns the title of a post containing names of participants """Returns the title of a post containing names of participants
x replies to y, x announces y, etc x replies to y, x announces y, etc
""" """
@ -1337,7 +1356,7 @@ def _get_post_title_html(base_dir: str,
page_number, page_number,
message_id_str, message_id_str,
container_class_icons, container_class_icons,
container_class) container_class, mitm)
return _get_post_title_reply_html(base_dir, return _get_post_title_reply_html(base_dir,
http_prefix, http_prefix,
@ -1356,7 +1375,7 @@ def _get_post_title_html(base_dir: str,
page_number, page_number,
message_id_str, message_id_str,
container_class_icons, container_class_icons,
container_class) container_class, mitm)
def _get_footer_with_icons(show_icons: bool, def _get_footer_with_icons(show_icons: bool,
@ -1416,7 +1435,8 @@ def individual_post_as_html(signing_priv_key_pem: str,
use_cache_only: bool, use_cache_only: bool,
cw_lists: {}, cw_lists: {},
lists_enabled: str, lists_enabled: str,
timezone: str) -> str: timezone: str,
mitm: bool) -> str:
""" Shows a single post as html """ Shows a single post as html
""" """
if not post_json_object: if not post_json_object:
@ -1845,7 +1865,7 @@ def individual_post_as_html(signing_priv_key_pem: str,
page_number, page_number,
message_id_str, message_id_str,
container_class_icons, container_class_icons,
container_class) container_class, mitm)
title_str += title_str2 title_str += title_str2
_log_post_timing(enable_timing_log, post_start_time, '14') _log_post_timing(enable_timing_log, post_start_time, '14')
@ -2094,7 +2114,7 @@ def html_individual_post(css_cache: {},
theme_name: str, system_language: str, theme_name: str, system_language: str,
max_like_count: int, signing_priv_key_pem: str, max_like_count: int, signing_priv_key_pem: str,
cw_lists: {}, lists_enabled: str, cw_lists: {}, lists_enabled: str,
timezone: str) -> str: timezone: str, mitm: bool) -> str:
"""Show an individual post as html """Show an individual post as html
""" """
original_post_json = post_json_object original_post_json = post_json_object
@ -2160,7 +2180,7 @@ def html_individual_post(css_cache: {},
allow_local_network_access, theme_name, allow_local_network_access, theme_name,
system_language, max_like_count, system_language, max_like_count,
False, authorized, False, False, False, False, False, authorized, False, False, False, False,
cw_lists, lists_enabled, timezone) cw_lists, lists_enabled, timezone, mitm)
message_id = remove_id_ending(post_json_object['id']) message_id = remove_id_ending(post_json_object['id'])
# show the previous posts # show the previous posts
@ -2173,6 +2193,10 @@ def html_individual_post(css_cache: {},
break break
post_json_object = load_json(post_filename) post_json_object = load_json(post_filename)
if post_json_object: if post_json_object:
mitm = False
if os.path.isfile(post_filename.replace('.json', '') +
'.mitm'):
mitm = True
post_str = \ post_str = \
individual_post_as_html(signing_priv_key_pem, individual_post_as_html(signing_priv_key_pem,
True, recent_posts_cache, True, recent_posts_cache,
@ -2196,7 +2220,7 @@ def html_individual_post(css_cache: {},
False, authorized, False, authorized,
False, False, False, False, False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) + post_str timezone, mitm) + post_str
# show the following posts # show the following posts
post_filename = locate_post(base_dir, nickname, domain, message_id) post_filename = locate_post(base_dir, nickname, domain, message_id)
@ -2234,7 +2258,7 @@ def html_individual_post(css_cache: {},
False, authorized, False, authorized,
False, False, False, False, False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
css_filename = base_dir + '/epicyon-profile.css' css_filename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'): if os.path.isfile(base_dir + '/epicyon.css'):
css_filename = base_dir + '/epicyon.css' css_filename = base_dir + '/epicyon.css'
@ -2288,7 +2312,7 @@ def html_post_replies(css_cache: {},
False, False, False, False, False, False, False, False,
False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
css_filename = base_dir + '/epicyon-profile.css' css_filename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'): if os.path.isfile(base_dir + '/epicyon.css'):
@ -2341,7 +2365,7 @@ def html_emoji_reaction_picker(css_cache: {},
theme_name, system_language, theme_name, system_language,
max_like_count, max_like_count,
False, False, False, False, False, False, False, False, False, False, False, False,
cw_lists, lists_enabled, timezone) cw_lists, lists_enabled, timezone, False)
reactions_filename = base_dir + '/emoji/reactions.json' reactions_filename = base_dir + '/emoji/reactions.json'
if not os.path.isfile(reactions_filename): if not os.path.isfile(reactions_filename):

4
webapp_profile.py
View File

@ -368,7 +368,7 @@ def html_profile_after_search(css_cache: {},
False, False, False, False, False, False,
False, False, False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
i += 1 i += 1
if i >= 8: if i >= 8:
break break
@ -1125,7 +1125,7 @@ def _html_profile_posts(recent_posts_cache: {}, max_recent_posts: int,
False, False, False, False, False, False,
True, False, False, True, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
if post_str: if post_str:
profile_str += post_str + separator_str profile_str += post_str + separator_str
ctr += 1 ctr += 1

4
webapp_search.py
View File

@ -699,7 +699,7 @@ def html_history_search(css_cache: {}, translate: {}, base_dir: str,
show_individual_post_icons, show_individual_post_icons,
False, False, False, False, False, False, False, False,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, False)
if post_str: if post_str:
history_search_form += separator_str + post_str history_search_form += separator_str + post_str
index += 1 index += 1
@ -885,7 +885,7 @@ def html_hashtag_search(css_cache: {},
manually_approves_followers, manually_approves_followers,
show_public_only, show_public_only,
store_to_sache, False, cw_lists, store_to_sache, False, cw_lists,
lists_enabled, timezone) lists_enabled, timezone, False)
if post_str: if post_str:
hashtag_search_form += separator_str + post_str hashtag_search_form += separator_str + post_str
index += 1 index += 1

5
webapp_timeline.py
View File

@ -906,6 +906,9 @@ def html_timeline(css_cache: {}, default_timeline: str,
timeline_start_time, timeline_start_time,
box_name, '11') box_name, '11')
mitm = False
if item.get('mitm'):
mitm = True
# read the post from disk # read the post from disk
curr_tl_str = \ curr_tl_str = \
individual_post_as_html(signing_priv_key_pem, individual_post_as_html(signing_priv_key_pem,
@ -932,7 +935,7 @@ def html_timeline(css_cache: {}, default_timeline: str,
manually_approve_followers, manually_approve_followers,
False, True, use_cache_only, False, True, use_cache_only,
cw_lists, lists_enabled, cw_lists, lists_enabled,
timezone) timezone, mitm)
_log_timeline_timing(enable_timing_log, _log_timeline_timing(enable_timing_log,
timeline_start_time, box_name, '12') timeline_start_time, box_name, '12')