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-04 22:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix stickler and codefactor warnings

Browse source 
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
This commit is contained in:
pvogt09 2020-03-23 13:43:16 +01:00
parent dc9f139c92
commit f7e80e9ce7
1 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
test/test_automated_install.py
View file

@ -140,7 +140,7 @@ 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 # TODO: pi.hole can not be resolved because of some error in FTL or resolved
piholeWebpage = ["http://127.0.0.1/admin", "http://pi.hole/admin"] piholeWebpage = ["http://127.0.0.1/admin", "http://pi.hole/admin"]
# Whiptail dialog returns Cancel for user prompt # Whiptail dialog returns Cancel for user prompt
mock_command('whiptail', {'*': ('', '0')}, Pihole) mock_command('whiptail', {'*': ('', '0')}, Pihole)
@ -154,26 +154,40 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
LIGHTTPD_USER="lighttpd" LIGHTTPD_USER="lighttpd"
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"
fi fi
mkdir -p /var/run/lighttpd mkdir -p "{run}"
chown ${{LIGHTTPD_USER}}:${{LIGHTTPD_GROUP}} /var/run/lighttpd chown {usergroup} "{run}"
mkdir -p /var/cache/lighttpd/compress mkdir -p "{compress}"
chown ${{LIGHTTPD_USER}}:${{LIGHTTPD_GROUP}} /var/cache/lighttpd chown {usergroup} "{cache}"
chown ${{LIGHTTPD_USER}}:${{LIGHTTPD_GROUP}} /var/cache/lighttpd/compress chown {usergroup} "{compress}"
mkdir -p /var/cache/lighttpd/uploads mkdir -p "{uploads}"
chown ${{LIGHTTPD_USER}}:${{LIGHTTPD_GROUP}} /var/cache/lighttpd/uploads chown {usergroup} "{uploads}"
# TODO: changing these permissions might be wrong # TODO: changing these permissions might be wrong
chmod 0777 /var chmod 0777 /var
chmod 0777 /var/cache chmod 0777 /var/cache
chmod 0777 /var/cache/lighttpd chmod 0777 "{cache}"
find "/var/run/lighttpd" -type d -exec chmod 0777 {{}} \;; find "{run}" -type d -exec chmod 0777 {chmodarg} \;;
find "/var/run/lighttpd" -type f -exec chmod 0666 {{}} \;; find "{run}" -type f -exec chmod 0666 {chmodarg} \;;
find "/var/cache/lighttpd/compress" -type d -exec chmod 0777 {{}} \;; find "{compress}" -type d -exec chmod 0777 {chmodarg} \;;
find "/var/cache/lighttpd/compress" -type f -exec chmod 0666 {{}} \;; find "{compress}" -type f -exec chmod 0666 {chmodarg} \;;
find "/var/cache/lighttpd/uploads" -type d -exec chmod 0777 {{}} \;; find "{uploads}" -type d -exec chmod 0777 {chmodarg} \;;
find "/var/cache/lighttpd/uploads" -type f -exec chmod 0666 {{}} \;; find "{uploads}" -type f -exec chmod 0666 {chmodarg} \;;
/usr/sbin/lighttpd -tt -f '/etc/lighttpd/lighttpd.conf' /usr/sbin/lighttpd -tt -f '{config}'
/usr/sbin/lighttpd -f '/etc/lighttpd/lighttpd.conf' /usr/sbin/lighttpd -f '{config}'
echo \"''') echo \"'''.format(
'{}',
usergroup='${{LIGHTTPD_USER}}:${{LIGHTTPD_GROUP}}',
chmodarg='{{}}',
config='/etc/lighttpd/lighttpd.conf',
run='/var/run/lighttpd',
cache='/var/cache/lighttpd',
uploads='/var/cache/lighttpd/uploads',
compress='/var/cache/lighttpd/compress'
)
)
FTLcommand = dedent('''\"
/etc/init.d/pihole-FTL restart
echo \"'''
)
mock_command_2( mock_command_2(
'systemctl', 'systemctl',
{ {
@ -193,14 +207,12 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
'', '',
'0' '0'
), ),
'restart pihole-FTL': (dedent('''\" 'restart pihole-FTL': (
/etc/init.d/pihole-FTL restart FTLcommand,
echo \"'''),
'0' '0'
), ),
'start pihole-FTL': (dedent('''\" 'start pihole-FTL': (
/etc/init.d/pihole-FTL start FTLcommand,
echo \"'''),
'0' '0'
), ),
'*': ( '*': (
@ -290,27 +302,28 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
check_admin = test_cmd.format('x', webroot + '/admin', webuser) check_admin = test_cmd.format('x', webroot + '/admin', webuser)
actual_rc = Pihole.run(check_admin).rc actual_rc = Pihole.run(check_admin).rc
assert exit_status_success == actual_rc assert exit_status_success == actual_rc
def get_directories_recursive(dir): def get_directories_recursive(dir):
if dir is None: if dir is None:
return dir return dir
webinterface = Pihole.run('ls -d {}'.format(dir + '/*/')) ls = Pihole.run('ls -d {}'.format(dir + '/*/'))
directories = list(filter(bool, webinterface.stdout.splitlines())) directories = list(filter(bool, ls.stdout.splitlines()))
dirs = directories dirs = directories
for dir in directories: for directory in directories:
dir_rec = get_directories_recursive(dir) dir_rec = get_directories_recursive(directory)
if type(dir_rec) == str: if isinstance(dir_rec, str):
dirs.extend([dir_rec]) dirs.extend([dir_rec])
else: else:
dirs.extend(dir_rec) dirs.extend(dir_rec)
return dirs return dirs
directories = get_directories_recursive(webroot + '/admin/*/') directories = get_directories_recursive(webroot + '/admin/*/')
for dir in directories: for directory in directories:
check_pihole = test_cmd.format('r', dir, webuser) check_pihole = test_cmd.format('r', directory, webuser)
actual_rc = Pihole.run(check_pihole).rc actual_rc = Pihole.run(check_pihole).rc
check_pihole = test_cmd.format('x', dir, webuser) check_pihole = test_cmd.format('x', directory, webuser)
actual_rc = Pihole.run(check_pihole).rc actual_rc = Pihole.run(check_pihole).rc
filelist = Pihole.run( findfiles = 'find "{}" -maxdepth 1 -type f -exec echo {{}} \\;;'
'find "{}" -maxdepth 1 -type f -exec echo {{}} \;;'.format(dir)) filelist = Pihole.run(findfiles.format(directory))
files = list(filter(bool, filelist.stdout.splitlines())) files = list(filter(bool, filelist.stdout.splitlines()))
for file in files: for file in files:
check_pihole = test_cmd.format('r', file, webuser) check_pihole = test_cmd.format('r', file, webuser)
@ -319,10 +332,8 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
# check web interface files # check web interface files
if installWebInterface is True: if installWebInterface is True:
# TODO: login into admin interface? # TODO: login into admin interface?
passwd = Pihole.run( passwordcommand = 'grep "WEBPASSWORD" -c "/etc/pihole/setupVars.conf"'
''' passwd = Pihole.run(passwordcommand)
grep "WEBPASSWORD" -c "/etc/pihole/setupVars.conf"
''')
webpassword = passwd.stdout.strip() webpassword = passwd.stdout.strip()
print (webpassword) print (webpassword)
check_pihole = test_cmd.format('r', webroot + '/pihole', webuser) check_pihole = test_cmd.format('r', webroot + '/pihole', webuser)
@ -344,18 +355,18 @@ def test_installPihole_fresh_install_readableBlockpage(Pihole, test_webpage):
# check webpage for unreadable files # check webpage for unreadable files
noPHPfopen = re.compile( noPHPfopen = re.compile(
(r"PHP Error(%d+):\s+fopen([^)]+):\s+" + (r"PHP Error(%d+):\s+fopen([^)]+):\s+" +
r"failed to open stream: " + r"failed to open stream: " +
r"Permission denied in"), r"Permission denied in"),
re.I) re.I)
status = ('curl -s --head "{}" | ' +
'head -n 1 | ' +
'grep "HTTP/1.[01] [23].." > /dev/null')
pagecontent = 'curl --verbose -L "{}"'
for page in piholeWebpage: for page in piholeWebpage:
# check HTTP status of blockpage # check HTTP status of blockpage
actual_rc = Pihole.run( actual_rc = Pihole.run(status.format(page))
'''
curl -s --head "{}" | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
'''.format(page))
assert exit_status_success == actual_rc.rc assert exit_status_success == actual_rc.rc
actual_output = Pihole.run( actual_output = Pihole.run(pagecontent.format(page))
'curl --verbose -L "{}"'.format(page))
assert noPHPfopen.match(actual_output.stdout) is None assert noPHPfopen.match(actual_output.stdout) is None