jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support link scope ipv6 address

pull/104/head
Sheng 2019-09-19 10:55:34 +08:00
parent 4f9b5e2029
commit 7f6db649bf
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_utils.py
View File

@ -35,6 +35,10 @@ class TestUitls(unittest.TestCase):
self.assertFalse(is_valid_ip_address(b'abc'))
self.assertTrue(is_valid_ip_address('::1'))
self.assertTrue(is_valid_ip_address(b'::1'))
self.assertTrue(is_valid_ip_address('fe80::1111:2222:3333:4444'))
self.assertTrue(is_valid_ip_address(b'fe80::1111:2222:3333:4444'))
self.assertTrue(is_valid_ip_address('fe80::1111:2222:3333:4444%eth0'))
self.assertTrue(is_valid_ip_address(b'fe80::1111:2222:3333:4444%eth0'))
def test_is_valid_port(self):
self.assertTrue(is_valid_port(80))

5
webssh/utils.py
View File

@ -36,7 +36,10 @@ def to_int(string):
def to_ip_address(ipstr):
return ipaddress.ip_address(to_str(ipstr))
ip = to_str(ipstr)
if ip.startswith('fe80::'):
ip = ip.split('%')[0]
return ipaddress.ip_address(ip)
def is_valid_ip_address(ipstr):