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 https://github.com/Ysurac/openmptcprouter/issues/229

Browse source
This commit is contained in:
Ycarus 2018-11-29 21:43:02 +00:00
parent 077df8bf08
commit 08eb4c77e3
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
omr-admin.py
View file

@ -11,6 +11,7 @@ import uuid
import configparser import configparser
import subprocess import subprocess
import os import os
import re
from tempfile import mkstemp from tempfile import mkstemp
from shutil import move from shutil import move
from pprint import pprint from pprint import pprint
@ -94,7 +95,9 @@ def status():
@jwt_required @jwt_required
def config(): def config():
with open('/etc/shadowsocks-libev/config.json') as f: with open('/etc/shadowsocks-libev/config.json') as f:
data = json.load(f) content = f.read()
content = re.sub(",\s*}","}",content)
data = json.loads(content)
shadowsocks_key = data["key"] shadowsocks_key = data["key"]
shadowsocks_port = data["server_port"] shadowsocks_port = data["server_port"]
shadowsocks_method = data["method"] shadowsocks_method = data["method"]
@ -151,8 +154,10 @@ def config():
@jwt_required @jwt_required
def shadowsocks(): def shadowsocks():
with open('/etc/shadowsocks-libev/config.json') as f: with open('/etc/shadowsocks-libev/config.json') as f:
data = json.load(f) content = f.read()
key = data["key"] content = re.sub(",\s*}","}",content)
data = json.loads(content)
#key = data["key"]
timeout = data["timeout"] timeout = data["timeout"]
verbose = data["verbose"] verbose = data["verbose"]
prefer_ipv6 = data["prefer_ipv6"] prefer_ipv6 = data["prefer_ipv6"]
@ -164,6 +169,9 @@ def shadowsocks():
no_delay = params.get('no_delay', None) no_delay = params.get('no_delay', None)
mptcp = params.get('mptcp', None) mptcp = params.get('mptcp', None)
obfs = params.get('obfs', None) obfs = params.get('obfs', None)
key = params.get('key', None)
if not key:
key = data["key"]
if not port or not method or not fast_open or not reuse_port or not no_delay or not mptcp: if not port or not method or not fast_open or not reuse_port or not no_delay or not mptcp:
return jsonify({'result': 'error','reason': 'Invalid parameters'}) return jsonify({'result': 'error','reason': 'Invalid parameters'})
if obfs: if obfs:
@ -229,13 +237,23 @@ def mptcp():
# Set VPN config # Set VPN config
#@app.route('/vpn', methods=['POST']) @app.route('/vpn', methods=['POST'])
#@jwt_required @jwt_required
#def vpn(): def vpn():
# params = request.get_json() params = request.get_json()
# type = params.get('type', None) vpn_type = params.get('type', None)
# mtu = params.get('mtu', None) key = params.get('key', None)
# return jsonify({'result': 'done'}) if not key:
return jsonify({'result': 'error','reason': 'Invalid parameters'})
if vpn_type == "glorytun":
with open('/etc/glorytun-tcp/tun0.key','w') as outfile:
outfile.write(key)
with open('/etc/glorytun-udp/tun0.key','w') as outfile:
outfile.write(key)
if vpn_type == "openvpn":
with open('/etc/openvpn/server/static.key','w') as outfile:
outfile.write(base64.b64decode(key))
return jsonify({'result': 'done'})
if __name__ == '__main__': if __name__ == '__main__':