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

Some fixes

Browse source
This commit is contained in:
Ycarus 2020-01-21 19:30:29 +01:00
parent 42b5748785
commit 9ddbe1f416
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
omr-admin.py
View file

@ -1099,13 +1099,16 @@ def vpnips(*,vpnconfig: VPNips,current_user: User = Depends(get_current_user)):
userid = current_user.userid userid = current_user.userid
if userid == None: if userid == None:
userid = 0 userid = 0
initial_md5 = hashlib.md5(file_as_bytes(open('/etc/openmptcprouter-vps-admin/omr6in4/user' + str(userid), 'rb'))).hexdigest() if os.path.isfile('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid)):
with open('/etc/openvpn/tun0.conf','r') as f: initial_md5 = hashlib.md5(file_as_bytes(open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid), 'rb'))).hexdigest()
else:
initial_md5 = ''
with open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid),'w+') as n:
n.write('LOCALIP=' + localip + "\n") n.write('LOCALIP=' + localip + "\n")
n.write('REMOTEIP=' + remoteip + "\n") n.write('REMOTEIP=' + remoteip + "\n")
n.write('LOCALIP6=fe80::a0' + hex(userid) + ':1/64' + "\n") n.write('LOCALIP6=fe80::a0' + hex(userid)[2:] + ':1/126' + "\n")
n.write('REMOTEIP6=fe80::a0' + hex(userid) + ':2/64' + "\n") n.write('REMOTEIP6=fe80::a0' + hex(userid)[2:] + ':2/126' + "\n")
final_md5 = hashlib.md5(file_as_bytes(open('/etc/openmptcprouter-vps-admin/omr6in4/user' + str(userid), 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/openmptcprouter-vps-admin/omr-6in4/user' + str(userid), 'rb'))).hexdigest()
if not initial_md5 == final_md5: if not initial_md5 == final_md5:
os.system("systemctl -q restart omr6in4@user" + str(userid)) os.system("systemctl -q restart omr6in4@user" + str(userid))
set_lastchange() set_lastchange()
@ -1114,12 +1117,12 @@ def vpnips(*,vpnconfig: VPNips,current_user: User = Depends(get_current_user)):
fd, tmpfile = mkstemp() fd, tmpfile = mkstemp()
with open('/etc/shorewall/params.vpn','r') as f, open(tmpfile,'a+') as n: with open('/etc/shorewall/params.vpn','r') as f, open(tmpfile,'a+') as n:
for line in f: for line in f:
if 'OMR_ADDR_USER' + str(userid) +'=' in line and not userid == 0: if not ('OMR_ADDR_USER' + str(userid) +'=' in line and not userid == 0) and not ('OMR_ADDR=' in line and userid == 0):
n.write('OMR_ADDR_USER' + str(userid) + '=' + remoteip + '\n')
elif 'OMR_ADDR=' in line and userid == 0:
n.write('OMR_ADDR=' + remoteip + '\n')
else:
n.write(line) n.write(line)
if not userid == 0:
n.write('OMR_ADDR_USER' + str(userid) + '=' + remoteip + '\n')
elif userid == 0:
n.write('OMR_ADDR=' + remoteip + '\n')
os.close(fd) os.close(fd)
move(tmpfile,'/etc/shorewall/params.vpn') move(tmpfile,'/etc/shorewall/params.vpn')
final_md5 = hashlib.md5(file_as_bytes(open('/etc/shorewall/params.vpn', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/shorewall/params.vpn', 'rb'))).hexdigest()
@ -1131,12 +1134,13 @@ def vpnips(*,vpnconfig: VPNips,current_user: User = Depends(get_current_user)):
fd, tmpfile = mkstemp() fd, tmpfile = mkstemp()
with open('/etc/shorewall6/params.vpn','r') as f, open(tmpfile,'a+') as n: with open('/etc/shorewall6/params.vpn','r') as f, open(tmpfile,'a+') as n:
for line in f: for line in f:
if 'OMR_ADDR_USER' + str(userid) +'=' in line and not userid == 0: if not ('OMR_ADDR_USER' + str(userid) +'=' in line and not userid == 0) and not ('OMR_ADDR=' in line and userid == 0):
n.write('OMR_ADDR_USER' + str(userid) + '=' + remoteip + '\n')
elif 'OMR_ADDR=' in line and userid == 0:
n.write('OMR_ADDR=' + remoteip + '\n')
else:
n.write(line) n.write(line)
if not userid == 0:
n.write('OMR_ADDR_USER' + str(userid) + '=fe80::a0' + hex(userid)[2:] + ':2/126' + '\n')
elif userid == 0:
n.write('OMR_ADDR=fe80::a0' + hex(userid)[2:] + ':2/126' + '\n')
os.close(fd) os.close(fd)
move(tmpfile,'/etc/shorewall6/params.vpn') move(tmpfile,'/etc/shorewall6/params.vpn')
final_md5 = hashlib.md5(file_as_bytes(open('/etc/shorewall6/params.vpn', 'rb'))).hexdigest() final_md5 = hashlib.md5(file_as_bytes(open('/etc/shorewall6/params.vpn', 'rb'))).hexdigest()