0xb00b5/firegex-traffic-viewer
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Threading python partialy fixed

Browse Source
This commit is contained in:
DomySh
2022-06-18 20:29:52 +02:00
parent 621f8e4129
commit 2332a4f5f7
5 changed files with 250 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
backend/proxy/__init__.py
View File

@@ -1,8 +1,8 @@
from signal import SIGUSR1
from signal import SIGUSR1, SIGUSR2
from secrets import token_urlsafe
from kthread import KThread
import re, os
from ctypes import CDLL, c_char_p, c_int, c_ushort
from threading import Thread
from ctypes import CDLL, POINTER, c_char_p, c_int, c_ushort, CFUNCTYPE, c_void_p, byref
#c++ -o proxy proxy.cpp
@@ -42,46 +42,44 @@ class Proxy:
if not os.path.exists(config_file_path):
self.config_file_path = config_file_path
self.lib = CDLL(os.path.join(os.path.dirname(os.path.abspath(__file__)),"./proxy.so"))
self.lib.proxy_start.restype = c_int
#char* local_host_p, unsigned short local_port, char* forward_host_p, unsigned short forward_port, char* config_file_p
self.lib.proxy_start.argtypes = [c_char_p, c_ushort, c_char_p, c_ushort, c_char_p]
self.lib.start_proxy.restype = c_int
#char* local_host_p, unsigned short local_port, char* forward_host_p, unsigned short forward_port, char* config_file_p, void (*incrementCallback_p)(const char *)
self.lib.start_proxy.argtypes = [c_char_p, c_ushort, c_char_p, c_ushort, c_char_p, POINTER(c_int), c_void_p]
def start(self, in_pause=False):
if self.process is None:
filter_map = self.compile_filters()
filters_codes = list(filter_map.keys()) if not in_pause else []
self.filter_map = self.compile_filters()
filters_codes = list(self.filter_map.keys()) if not in_pause else []
self.__write_config(filters_codes)
self.process = Thread(
target=self.lib.proxy_start,
@CFUNCTYPE(None, c_char_p)
def callback_wrap(regex):
filter = self.filter_map[regex.decode()]
filter.blocked+=1
print(self.filter_map)
if self.callback_blocked_update:
self.callback_blocked_update(self.filter_map[regex.decode()])
status_code = c_int(1)
self.process = KThread(
target=self.lib.start_proxy,
args=(self.public_host.encode(), self.public_port,
self.internal_host.encode(), self.internal_port,
self.config_file_path.encode()
self.config_file_path.encode(),
byref(status_code), callback_wrap
),
)
#for stdout_line in iter(self.process.stdout.readline, ""):
# if stdout_line.startswith("BLOCKED"):
# regex_id = stdout_line.split()[1]
# filter_map[regex_id].blocked+=1
# if self.callback_blocked_update: self.callback_blocked_update(filter_map[regex_id])
#self.process.stdout.close()
)
self.process.start()
return self.process.wait()
self.process.join()
self.__delete_config()
return status_code.value
def stop(self):
if self.process:
self.process.terminate()
try:
self.process.wait(timeout=3)
return True
except Exception:
self.process.kill()
return False
finally:
self.process = None
if self.process.is_alive():
os.kill(self.process.native_id,SIGUSR2)
self.process = None
return True
def restart(self, in_pause=False):
@@ -93,7 +91,10 @@ class Proxy:
with open(self.config_file_path,'w') as config_file:
for line in filters_codes:
config_file.write(line + '\n')
def __delete_config(self):
os.remove(self.config_file_path)
def reload(self):
if self.isactive():
filter_map = self.compile_filters()
@@ -102,7 +103,9 @@ class Proxy:
self.trigger_reload_config()
def isactive(self):
return True if self.process else False
if self.process and not self.process.is_alive():
self.process = None
return not self.process is None
def trigger_reload_config(self):
os.kill(self.process.native_id, SIGUSR1)