mptcp/openmptcprouter-vps-admin
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps-admin.git synced 2025-02-15 03:51:52 +00:00
Code Issues Releases Wiki Activity

Fix when Shadowsocks-libev is not installed

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-08-01 08:51:12 +02:00
parent 9e86294e41
commit 7de2dfe7cc
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
omr-vps-admin (0.12+20240801) unstable; urgency=medium
* Fix when Shadowsocks-libev is not installed
-- OpenMPTCProuter <contact@openmptcprouter.com> Thu, 01 Aug 2024 08:50:17 +0200
omr-vps-admin (0.12+20240725) unstable; urgency=medium omr-vps-admin (0.12+20240725) unstable; urgency=medium
* Add server workers * Add server workers

22
omr-admin.py
View file

@ -1488,22 +1488,24 @@ async def config(userid: Optional[int] = Query(None), serial: Optional[str] = Qu
if 'proxy' in omr_config_data['users'][0][username]: if 'proxy' in omr_config_data['users'][0][username]:
proxy = omr_config_data['users'][0][username]['proxy'] proxy = omr_config_data['users'][0][username]['proxy']
with open('/etc/shadowsocks-libev/manager.json') as f: if os.path.isfile('/etc/shadowsocks-libev/manager.js'):
content = f.read() with open('/etc/shadowsocks-libev/manager.json') as f:
content = re.sub(",\s*}", "}", content) # pylint: disable=W1401 content = f.read()
try: content = re.sub(",\s*}", "}", content) # pylint: disable=W1401
data = json.loads(content) try:
except ValueError as e: data = json.loads(content)
data = {'port_key': '', 'server_port': 65101, 'method': 'chacha20'} except ValueError as e:
data = {'server_port': 65101, 'method': 'chacha20'}
else:
data = {'server_port': 65101, 'method': 'chacha20'}
#shadowsocks_port = data["server_port"] #shadowsocks_port = data["server_port"]
shadowsocks_port = current_user.shadowsocks_port shadowsocks_port = current_user.shadowsocks_port
shadowsocks_key = ''
if shadowsocks_port is not None: if shadowsocks_port is not None:
if 'port_key' in data: if 'port_key' in data:
shadowsocks_key = data["port_key"][str(shadowsocks_port)] shadowsocks_key = data["port_key"][str(shadowsocks_port)]
else: elif 'port_conf' in data:
shadowsocks_key = data["port_conf"][str(shadowsocks_port)]["key"] shadowsocks_key = data["port_conf"][str(shadowsocks_port)]["key"]
else:
shadowsocks_key = ''
shadowsocks_method = data["method"] shadowsocks_method = data["method"]
if 'fast_open' in data: if 'fast_open' in data:
shadowsocks_fast_open = data["fast_open"] shadowsocks_fast_open = data["fast_open"]