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

Detect post delivery via a third party

merge-requests/30/head
Bob Mottram 2022-03-11 17:44:53 +00:00
parent 00c2c4b7b2
commit cf9da94bba
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
daemon.py
View File

@ -424,6 +424,21 @@ def save_domain_qrcode(base_dir: str, http_prefix: str,
class PubServer(BaseHTTPRequestHandler): class PubServer(BaseHTTPRequestHandler):
protocol_version = 'HTTP/1.1' protocol_version = 'HTTP/1.1'
def _detect_mitm(self) -> bool:
"""Detect if a request contains a MiTM
"""
mitm_domains = ['cloudflare']
check_headers = (
'Server', 'Report-To', 'Report-to', 'report-to',
'Expect-CT', 'Expect-Ct', 'expect-ct'
)
for interloper in mitm_domains:
for header_name in check_headers:
if self.headers.get(header_name):
if interloper in self.headers[header_name]:
return True
return False
def _get_instance_url(self, calling_domain: str) -> str: def _get_instance_url(self, calling_domain: str) -> str:
"""Returns the URL for this instance """Returns the URL for this instance
""" """
@ -1711,6 +1726,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.blocked_cache_last_updated, self.server.blocked_cache_last_updated,
self.server.blocked_cache_update_secs) self.server.blocked_cache_update_secs)
mitm = self._detect_mitm()
queue_filename = \ queue_filename = \
save_post_to_inbox_queue(self.server.base_dir, save_post_to_inbox_queue(self.server.base_dir,
self.server.http_prefix, self.server.http_prefix,
@ -1722,7 +1739,8 @@ class PubServer(BaseHTTPRequestHandler):
self.path, self.path,
self.server.debug, self.server.debug,
self.server.blocked_cache, self.server.blocked_cache,
self.server.system_language) self.server.system_language,
mitm)
if queue_filename: if queue_filename:
# add json to the queue # add json to the queue
if queue_filename not in self.server.inbox_queue: if queue_filename not in self.server.inbox_queue:

6
inbox.py
View File

@ -459,7 +459,8 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str,
message_bytes: str, message_bytes: str,
http_headers: {}, http_headers: {},
post_path: str, debug: bool, post_path: str, debug: bool,
blocked_cache: [], system_language: str) -> str: blocked_cache: [], system_language: str,
mitm: bool) -> str:
"""Saves the given json to the inbox queue for the person """Saves the given json to the inbox queue for the person
key_id specifies the actor sending the post key_id specifies the actor sending the post
""" """
@ -592,7 +593,8 @@ def save_post_to_inbox_queue(base_dir: str, http_prefix: str,
'original': original_post_json_object, 'original': original_post_json_object,
'digest': digest, 'digest': digest,
'filename': filename, 'filename': filename,
'destination': destination 'destination': destination,
'mitm': mitm
} }
if debug: if debug: