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

Follow reject supports sending to onion or i2p domains

merge-requests/30/head
Bob Mottram 2022-03-12 11:04:37 +00:00
parent bf43d9cb34
commit 02444ecdef
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -8587,6 +8587,10 @@ class PubServer(BaseHTTPRequestHandler):
get_full_domain(handle_domain, handle_port) get_full_domain(handle_domain, handle_port)
if '@' in following_handle: if '@' in following_handle:
manual_deny_follow_request_thread(curr_session, manual_deny_follow_request_thread(curr_session,
self.server.session_onion,
self.server.session_i2p,
self.server.onion_domain,
self.server.i2p_domain,
base_dir, http_prefix, base_dir, http_prefix,
follower_nickname, follower_nickname,
domain, port, domain, port,

25
epicyon.py
View File

@ -1275,13 +1275,13 @@ if args.approve:
if args.secure_mode: if args.secure_mode:
signing_priv_key_pem = get_instance_actor_key(base_dir, domain) signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
onion_domain = get_config_param(base_dir, 'onionDomain') onion_domain = get_config_param(base_dir, 'onionDomain')
if args.onionDomain: if args.onion:
onion_domain = args.onionDomain onion_domain = args.onion
if onion_domain: if onion_domain:
session_onion = create_session('tor') session_onion = create_session('tor')
i2p_domain = get_config_param(base_dir, 'i2pDomain') i2p_domain = get_config_param(base_dir, 'i2pDomain')
if args.i2pDomain: if args.i2p_domain:
i2p_domain = args.i2pDomain i2p_domain = args.i2p_domain
if i2p_domain: if i2p_domain:
session_i2p = create_session('i2p') session_i2p = create_session('i2p')
manual_approve_follow_request(session, session_onion, session_i2p, manual_approve_follow_request(session, session_onion, session_i2p,
@ -1303,6 +1303,8 @@ if args.deny:
if '@' not in args.deny: if '@' not in args.deny:
print('syntax: --deny nick@domain') print('syntax: --deny nick@domain')
sys.exit() sys.exit()
session_onion = None
session_i2p = None
session = create_session(proxy_type) session = create_session(proxy_type)
send_threads = [] send_threads = []
postLog = [] postLog = []
@ -1313,8 +1315,19 @@ if args.deny:
signing_priv_key_pem = None signing_priv_key_pem = None
if args.secure_mode: if args.secure_mode:
signing_priv_key_pem = get_instance_actor_key(base_dir, domain) signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
manual_deny_follow_request(session, base_dir, onion_domain = get_config_param(base_dir, 'onionDomain')
http_prefix, if args.onion:
onion_domain = args.onion
if onion_domain:
session_onion = create_session('tor')
i2p_domain = get_config_param(base_dir, 'i2pDomain')
if args.i2p_domain:
i2p_domain = args.i2p_domain
if i2p_domain:
session_i2p = create_session('i2p')
manual_deny_follow_request(session, session_onion, session_i2p,
onion_domain, i2p_domain,
base_dir, http_prefix,
args.nickname, domain, port, args.nickname, domain, port,
args.deny, args.deny,
federation_list, federation_list,

19
manualapprove.py
View File

@ -19,8 +19,9 @@ from utils import acct_dir
from threads import thread_with_trace from threads import thread_with_trace
def manual_deny_follow_request(session, base_dir: str, def manual_deny_follow_request(session, session_onion, session_i2p,
http_prefix: str, onion_domain: str, i2p_domain: str,
base_dir: str, http_prefix: str,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
deny_handle: str, deny_handle: str,
federation_list: [], federation_list: [],
@ -59,7 +60,9 @@ def manual_deny_follow_request(session, base_dir: str,
if ':' in deny_domain: if ':' in deny_domain:
deny_port = get_port_from_domain(deny_domain) deny_port = get_port_from_domain(deny_domain)
deny_domain = remove_domain_port(deny_domain) deny_domain = remove_domain_port(deny_domain)
followed_account_rejects(session, base_dir, http_prefix, followed_account_rejects(session, session_onion, session_i2p,
onion_domain, i2p_domain,
base_dir, http_prefix,
nickname, domain, port, nickname, domain, port,
deny_nickname, deny_domain, deny_port, deny_nickname, deny_domain, deny_port,
federation_list, federation_list,
@ -71,8 +74,9 @@ def manual_deny_follow_request(session, base_dir: str,
print('Follow request from ' + deny_handle + ' was denied.') print('Follow request from ' + deny_handle + ' was denied.')
def manual_deny_follow_request_thread(session, base_dir: str, def manual_deny_follow_request_thread(session, session_onion, session_i2p,
http_prefix: str, onion_domain: str, i2p_domain: str,
base_dir: str, http_prefix: str,
nickname: str, domain: str, port: int, nickname: str, domain: str, port: int,
deny_handle: str, deny_handle: str,
federation_list: [], federation_list: [],
@ -86,8 +90,9 @@ def manual_deny_follow_request_thread(session, base_dir: str,
""" """
thr = \ thr = \
thread_with_trace(target=manual_deny_follow_request, thread_with_trace(target=manual_deny_follow_request,
args=(session, base_dir, args=(session, session_onion, session_i2p,
http_prefix, onion_domain, i2p_domain,
base_dir, http_prefix,
nickname, domain, port, nickname, domain, port,
deny_handle, deny_handle,
federation_list, federation_list,