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

Various fixes

Browse source
This commit is contained in:
Ycarus 2020-01-10 20:50:06 +01:00
parent 196557de16
commit fe726e1c3f
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
omr-admin.py
View file

@ -672,8 +672,8 @@ def shadowsocks(*,params: ShadowsocksConfigparams,current_user: User = Depends(g
os.system("systemctl restart shadowsocks-libev-manager@manager.service") os.system("systemctl restart shadowsocks-libev-manager@manager.service")
for x in range (1,os.cpu_count()): for x in range (1,os.cpu_count()):
os.system("systemctl restart shadowsocks-libev-manager@manager" + str(x) + ".service") os.system("systemctl restart shadowsocks-libev-manager@manager" + str(x) + ".service")
shorewall_add_port(str(port),'tcp','shadowsocks') shorewall_add_port(current_user.username,str(port),'tcp','shadowsocks')
shorewall_add_port(str(port),'udp','shadowsocks') shorewall_add_port(current_user.username,str(port),'udp','shadowsocks')
set_lastchange() set_lastchange()
return {'result': 'done','reason': 'changes applied','route': 'shadowsocks'} return {'result': 'done','reason': 'changes applied','route': 'shadowsocks'}
else: else:
@ -853,16 +853,19 @@ def glorytun(*, glorytunconfig: GlorytunConfig,current_user: User = Depends(get_
if current_user.permission == "ro": if current_user.permission == "ro":
set_lastchange(10) set_lastchange(10)
return {'result': 'permission','reason': 'Read only user','route': 'glorytun'} return {'result': 'permission','reason': 'Read only user','route': 'glorytun'}
userid = current_user.userid
if userid == None:
userid = 0
key = glorytunconfig.key key = glorytunconfig.key
port = glorytunconfig.port port = glorytunconfig.port
chacha = glorytunconfig.chacha chacha = glorytunconfig.chacha
initial_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-tcp/tun0', 'rb'))).hexdigest() initial_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-tcp/tun' + str(userid), 'rb'))).hexdigest()
with open('/etc/glorytun-tcp/tun0.key','w') as outfile: with open('/etc/glorytun-tcp/tun' + str(userid) + '.key','w') as outfile:
outfile.write(key) outfile.write(key)
with open('/etc/glorytun-udp/tun0.key','w') as outfile: with open('/etc/glorytun-udp/tun' + str(userid) + '.key','w') as outfile:
outfile.write(key) outfile.write(key)
fd, tmpfile = mkstemp() fd, tmpfile = mkstemp()
with open('/etc/glorytun-tcp/tun0','r') as f, open(tmpfile,'a+') as n: with open('/etc/glorytun-tcp/tun' + str(userid),'r') as f, open(tmpfile,'a+') as n:
for line in f: for line in f:
if 'PORT=' in line: if 'PORT=' in line:
n.write('PORT=' + str(port) + '\n') n.write('PORT=' + str(port) + '\n')
@ -874,13 +877,13 @@ def glorytun(*, glorytunconfig: GlorytunConfig,current_user: User = Depends(get_
else: else:
n.write(line) n.write(line)
os.close(fd) os.close(fd)
move(tmpfile,'/etc/glorytun-tcp/tun0') move(tmpfile,'/etc/glorytun-tcp/tun' + str(userid))
final_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-tcp/tun0', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-tcp/tun' + str(userid), 'rb'))).hexdigest()
if not initial_md5 == final_md5: if not initial_md5 == final_md5:
os.system("systemctl -q restart glorytun-tcp@tun0") os.system("systemctl -q restart glorytun-tcp@tun" + str(userid))
initial_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-udp/tun0', 'rb'))).hexdigest() initial_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-udp/tun' + str(userid), 'rb'))).hexdigest()
fd, tmpfile = mkstemp() fd, tmpfile = mkstemp()
with open('/etc/glorytun-udp/tun0','r') as f, open(tmpfile,'a+') as n: with open('/etc/glorytun-udp/tun' + str(userid),'r') as f, open(tmpfile,'a+') as n:
for line in f: for line in f:
if 'BIND_PORT=' in line: if 'BIND_PORT=' in line:
n.write('BIND_PORT=' + str(port) + '\n') n.write('BIND_PORT=' + str(port) + '\n')
@ -892,11 +895,11 @@ def glorytun(*, glorytunconfig: GlorytunConfig,current_user: User = Depends(get_
else: else:
n.write(line) n.write(line)
os.close(fd) os.close(fd)
move(tmpfile,'/etc/glorytun-udp/tun0') move(tmpfile,'/etc/glorytun-udp/tun' + str(userid))
final_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-udp/tun0', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/glorytun-udp/tun' + str(userid), 'rb'))).hexdigest()
if not initial_md5 == final_md5: if not initial_md5 == final_md5:
os.system("systemctl -q restart glorytun-udp@tun0") os.system("systemctl -q restart glorytun-udp@tun" + str(userid))
shorewall_add_port(str(port),'tcp','glorytun') shorewall_add_port(current_user.username,str(port),'tcp','glorytun')
set_lastchange() set_lastchange()
return {'result': 'done'} return {'result': 'done'}
@ -920,7 +923,7 @@ def dsvpn(*,params: DSVPN,current_user: User = Depends(get_current_user)):
final_md5 = hashlib.md5(file_as_bytes(open('/etc/dsvpn/dsvpn.key', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/dsvpn/dsvpn.key', 'rb'))).hexdigest()
if not initial_md5 == final_md5: if not initial_md5 == final_md5:
os.system("systemctl -q restart dsvpn-server") os.system("systemctl -q restart dsvpn-server")
shorewall_add_port(str(port),'tcp','dsvpn') shorewall_add_port(current_user.username,str(port),'tcp','dsvpn')
set_lastchange() set_lastchange()
return {'result': 'done'} return {'result': 'done'}