Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-23 07:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve regexes for ipv4 matching

Browse source 
Signed-off-by: jbzdarkid <jbzdarkid@gmail.com>
This commit is contained in:
Joseph Blackman 2021-03-17 03:09:13 -07:00 • committed by jbzdarkid
parent b51751e892
commit 89c80947df
2 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

58
test/test_automated_install.py
View file

@ -524,43 +524,37 @@ def test_IPv6_ULA_GUA_test(Pihole):
assert expected_stdout in detectPlatform.stdout
def test_validate_ip_valid(Pihole):
def test_validate_ip(Pihole):
'''
Given a valid IP address, valid_ip returns success
Tests valid_ip for various IP addresses
'''
output = Pihole.run('''
source /opt/pihole/basic-install.sh
valid_ip "192.168.1.1"
''')
def test_address(addr, success=True):
output = Pihole.run('''
source /opt/pihole/basic-install.sh
valid_ip "{addr}"
'''.format(addr=addr))
assert output.rc == 0
assert output.rc == 0 if success else 1
def test_validate_ip_invalid_octet(Pihole):
'''
Given an invalid IP address (large octet), valid_ip returns an error
'''
output = Pihole.run('''
source /opt/pihole/basic-install.sh
valid_ip "1092.168.1.1"
''')
assert output.rc == 1
def test_validate_ip_invalid_letters(Pihole):
'''
Given an invalid IP address (contains letters), valid_ip returns an error
'''
output = Pihole.run('''
source /opt/pihole/basic-install.sh
valid_ip "not an IP"
''')
assert output.rc == 1
test_address('192.168.1.1')
test_address('127.0.0.1')
test_address('255.255.255.255')
test_address('255.255.255.256', False)
test_address('255.255.256.255', False)
test_address('255.256.255.255', False)
test_address('256.255.255.255', False)
test_address('1092.168.1.1', False)
test_address('not an IP', False)
test_address('8.8.8.8:', False)
test_address('8.8.8.8:0')
test_address('8.8.8.8:1')
test_address('8.8.8.8:42')
test_address('8.8.8.8:888')
test_address('8.8.8.8:1337')
test_address('8.8.8.8:65535')
test_address('8.8.8.8:65536', False)
test_address('8.8.8.8:-1', False)
def test_os_check_fails(Pihole):