mirror of
https://github.com/Ysurac/openmptcprouter-vps-admin.git
synced 2025-03-09 15:40:05 +00:00
Remove IPv6 IP check
This commit is contained in:
parent
7185adad0e
commit
ef57968ea4
2 changed files with 30 additions and 10 deletions
12
debian/changelog
vendored
12
debian/changelog
vendored
|
@ -1,3 +1,15 @@
|
||||||
|
omr-vps-admin (0.3+20230709) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Remove IPv6 VPN IP check
|
||||||
|
|
||||||
|
-- OpenMPTCProuter <contact@openmptcprouter.com> Sun, 09 Jul 2023 20:13:12 +0200
|
||||||
|
|
||||||
|
omr-vps-admin (0.3+20230217) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Fix Shadowsocks config on multiple IP
|
||||||
|
|
||||||
|
-- OpenMPTCProuter <contact@openmptcprouter.com> Fri, 17 Feb 2023 16:36:22 +0200
|
||||||
|
|
||||||
omr-vps-admin (0.3+20221001) unstable; urgency=medium
|
omr-vps-admin (0.3+20221001) unstable; urgency=medium
|
||||||
|
|
||||||
* Fix IPv6 firewall
|
* Fix IPv6 firewall
|
||||||
|
|
28
omr-admin.py
28
omr-admin.py
|
@ -433,14 +433,22 @@ def add_gre_tunnels():
|
||||||
contentss = g.read()
|
contentss = g.read()
|
||||||
contentss = re.sub(",\s*}", "}", contentss) # pylint: disable=W1401
|
contentss = re.sub(",\s*}", "}", contentss) # pylint: disable=W1401
|
||||||
datass = json.loads(contentss)
|
datass = json.loads(contentss)
|
||||||
ss_port = content['users'][0][user]['shadowsocks_port']
|
makechange = True
|
||||||
if 'port_key' in datass:
|
|
||||||
ss_key = datass['port_key'][str(ss_port)]
|
|
||||||
if 'port_conf' in datass:
|
if 'port_conf' in datass:
|
||||||
ss_key = datass['port_conf'][str(ss_port)]['key']
|
for sscport in datass['port_conf']:
|
||||||
if gre_intf not in user_gre_tunnels:
|
if 'local_address' in datass['port_conf'][sscport] and datass['port_conf'][sscport]['local_address'] == str(addr):
|
||||||
user_gre_tunnels[gre_intf] = {}
|
shadowsocks_port = sscport
|
||||||
user_gre_tunnels[gre_intf] = {'shadowsocks_port': str(add_ss_user('', ss_key, userid, str(addr))), 'local_ip': str(list(network)[1]), 'remote_ip': str(list(network)[2]), 'public_ip': str(addr)}
|
makechange = False
|
||||||
|
if makechange:
|
||||||
|
ss_port = content['users'][0][user]['shadowsocks_port']
|
||||||
|
if 'port_key' in datass:
|
||||||
|
ss_key = datass['port_key'][str(ss_port)]
|
||||||
|
if 'port_conf' in datass:
|
||||||
|
ss_key = datass['port_conf'][str(ss_port)]['key']
|
||||||
|
if gre_intf not in user_gre_tunnels:
|
||||||
|
user_gre_tunnels[gre_intf] = {}
|
||||||
|
shadowsocks_port = str(add_ss_user('', ss_key, userid, str(addr)))
|
||||||
|
user_gre_tunnels[gre_intf] = {'shadowsocks_port': shadowsocks_port, 'local_ip': str(list(network)[1]), 'remote_ip': str(list(network)[2]), 'public_ip': str(addr)}
|
||||||
#user_gre_tunnels[gre_intf] = {'local_ip': str(list(network)[1]), 'remote_ip': str(list(network)[2]), 'public_ip': str(addr)}
|
#user_gre_tunnels[gre_intf] = {'local_ip': str(list(network)[1]), 'remote_ip': str(list(network)[2]), 'public_ip': str(addr)}
|
||||||
modif_config_user(user, {'gre_tunnels': user_gre_tunnels})
|
modif_config_user(user, {'gre_tunnels': user_gre_tunnels})
|
||||||
nbip = nbip + 1
|
nbip = nbip + 1
|
||||||
|
@ -573,7 +581,7 @@ def v2ray_add_port(user, port, proto, name, destip, destport):
|
||||||
if inbounds['tag'] == tag:
|
if inbounds['tag'] == tag:
|
||||||
exist = 1
|
exist = 1
|
||||||
if exist == 0:
|
if exist == 0:
|
||||||
inbounds = {'tag': tag, 'port': int(port), 'protocol': 'dokodemo-door', 'settings': {'network': proto, 'port': int(destport), 'address': destip}}
|
inbounds = {'tag': tag, 'port': port, 'protocol': 'dokodemo-door', 'settings': {'network': proto, 'port': destport, 'address': destip}}
|
||||||
#inbounds = {'tag': user.username + '_redir_' + proto + '_' + str(port), 'port': str(port), 'protocol': 'dokodemo-door', 'settings': {'network': proto, 'port': str(destport), 'address': destip}}
|
#inbounds = {'tag': user.username + '_redir_' + proto + '_' + str(port), 'port': str(port), 'protocol': 'dokodemo-door', 'settings': {'network': proto, 'port': str(destport), 'address': destip}}
|
||||||
data['inbounds'].append(inbounds)
|
data['inbounds'].append(inbounds)
|
||||||
routing = {'type': 'field','inboundTag': [tag], 'outboundTag': 'OMRLan'}
|
routing = {'type': 'field','inboundTag': [tag], 'outboundTag': 'OMRLan'}
|
||||||
|
@ -2332,8 +2340,8 @@ def lan(*, lanconfig: Lanips, current_user: User = Depends(get_current_user)):
|
||||||
class VPNips(BaseModel):
|
class VPNips(BaseModel):
|
||||||
remoteip: str = Query(..., regex='^(10(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){3}|((172\.(1[6-9]|2[0-9]|3[01]))|192\.168)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){2})$')
|
remoteip: str = Query(..., regex='^(10(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){3}|((172\.(1[6-9]|2[0-9]|3[01]))|192\.168)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){2})$')
|
||||||
localip: str = Query(..., regex='^(10(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){3}|((172\.(1[6-9]|2[0-9]|3[01]))|192\.168)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){2})$')
|
localip: str = Query(..., regex='^(10(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){3}|((172\.(1[6-9]|2[0-9]|3[01]))|192\.168)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{1,2}|[0-9]{1,2})){2})$')
|
||||||
remoteip6: Optional[str] = Query(None, regex='(?:^|(?<=\s))(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(?=\s|$)')
|
remoteip6: Optional[str] = None
|
||||||
localip6: Optional[str] = Query(None, regex='(?:^|(?<=\s))(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(?=\s|$)')
|
localip6: Optional[str] = None
|
||||||
ula: Optional[str] = None
|
ula: Optional[str] = None
|
||||||
|
|
||||||
# Set user vpn IPs
|
# Set user vpn IPs
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue