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-05 23:20:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

resolve domain with dig and remove debug output

Browse source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09 2020-05-26 23:39:06 +02:00
parent 9ebfba7820
commit 81275623c9
1 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
test/test_automated_install.py
View file

@ -402,10 +402,9 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
by $LIGHTTPD_USER on a fresh build by $LIGHTTPD_USER on a fresh build
''' '''
# TODO: also add IP address from setupVars? # TODO: also add IP address from setupVars?
# TODO: pi.hole can not be resolved because of some error in FTL or resolved
piholeWebpage = [ piholeWebpage = [
"http://127.0.0.1/admin", "127.0.0.1",
"http://pi.hole/admin" "pi.hole"
] ]
# Whiptail dialog returns Cancel for user prompt # Whiptail dialog returns Cancel for user prompt
mock_command('whiptail', {'*': ('', '0')}, Pihole) mock_command('whiptail', {'*': ('', '0')}, Pihole)
@ -514,40 +513,8 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
echo "INSTALL_WEB_SERVER=${INSTALL_WEB_SERVER}" echo "INSTALL_WEB_SERVER=${INSTALL_WEB_SERVER}"
''') ''')
assert 0 == installWeb.rc assert 0 == installWeb.rc
b = Pihole.run('cat /etc/resolv.conf');
print(b.stdout)
b = Pihole.run('ls -la /etc/pihole');
print(b.stdout)
b = Pihole.run('ls -la /etc/sudoers.d');
print(b.stdout)
b = Pihole.run('command -v apt-get && apt-get install -qq --no-install-recommends e2fsprogs');
print(b.stdout)
b = Pihole.run('command -v dnf && dnf install -y e2fsprogs');
print(b.stdout)
b = Pihole.run('command -v yum && yum install -y e2fsprogs');
print(b.stdout)
b = Pihole.run('ls -la $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('lsattr $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('lsattr $(which pihole-FTL)/../');
print(b.stdout)
b = Pihole.run('chmod a+x $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('pihole-FTL version');
print(b.stdout)
b = Pihole.run('pihole-FTL tag');
print(b.stdout)
b = Pihole.run('pihole-FTL branch');
print(b.stdout)
b = Pihole.run('pihole-FTL test'); b = Pihole.run('pihole-FTL test');
print(b.stdout) print(b.stdout)
b = Pihole.run('ldd $(which pihole-FTL)');
print(b.stdout)
b = Pihole.run('LD_DEBUG=help pihole-FTL version');
print(b.stdout)
b = Pihole.run('file pihole-FTL');
print(b.stdout)
b = Pihole.run('cat /var/log/pihole.log'); b = Pihole.run('cat /var/log/pihole.log');
print(b.stdout) print(b.stdout)
b = Pihole.run('cat /etc/pihole/install.log'); b = Pihole.run('cat /etc/pihole/install.log');
@ -641,6 +608,9 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
# not work here because of the way docker uses this file # not work here because of the way docker uses this file
ns = Pihole.run("sed -i 's/nameserver.*/nameserver 127.0.0.1/' /etc/resolv.conf") ns = Pihole.run("sed -i 's/nameserver.*/nameserver 127.0.0.1/' /etc/resolv.conf")
pihole_is_ns = ns.rc == 0 pihole_is_ns = ns.rc == 0
def is_ip(address):
m = re.match(r"(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})", address)
return bool(m)
if installWebInterface is True: if installWebInterface is True:
# TODO: login into admin interface? # TODO: login into admin interface?
passwordcommand = 'grep "WEBPASSWORD" -c "/etc/pihole/setupVars.conf"' passwordcommand = 'grep "WEBPASSWORD" -c "/etc/pihole/setupVars.conf"'
@ -675,17 +645,18 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
'grep "HTTP/1.[01] [23].." > /dev/null') 'grep "HTTP/1.[01] [23].." > /dev/null')
pagecontent = 'curl --verbose -L "{}"' pagecontent = 'curl --verbose -L "{}"'
for page in piholeWebpage: for page in piholeWebpage:
# d = Pihole.run("echo {} | sed -e 's|http://||' -e 's|/.*||'".format(page)) testpage = "http://" + page + "/admin"
# print(d.stdout) resolvesuccess = True
dig = Pihole.run("dig @127.0.0.1 $(echo {} | sed -e 's|http://||' -e 's|/.*||')".format(page)) if is_ip(page) is False:
print(dig.stdout) dig = Pihole.run(r"dig A +short {} @127.0.0.1".format(page))
dig = Pihole.run("nslookup $(echo {} | sed -e 's|http://||' -e 's|/.*||') 127.0.0.1 | grep '^Address:' | head -n 2 | sed -e 's/Address: *//'".format(page)) testpage = "http://" + dig.stdout.strip() + "/admin"
print(dig.stdout) resolvesuccess = dig.rc == 0
if dig.rc == 0 or pihole_is_ns: if resolvesuccess or pihole_is_ns:
# check HTTP status of blockpage # check HTTP status of blockpage
actual_rc = Pihole.run(status.format(page)) actual_rc = Pihole.run(status.format(testpage))
assert exit_status_success == actual_rc.rc assert exit_status_success == actual_rc.rc
actual_output = Pihole.run(pagecontent.format(page)) # check for PHP error
actual_output = Pihole.run(pagecontent.format(testpage))
assert noPHPfopen.match(actual_output.stdout) is None assert noPHPfopen.match(actual_output.stdout) is None