Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-26 06:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure we also check the last port

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2023-11-28 22:59:49 +01:00
parent 974fea592d
commit 6016131280
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
advanced/Scripts/api.sh
View file

@ -26,16 +26,18 @@ TestAPIAvailability() {
port="${ports%%,*}" port="${ports%%,*}"
# Iterate over comma separated list of ports # Iterate over comma separated list of ports
while [ "${port}" != "${ports}" ]; do while [ -n "${ports}" ]; do
# if the port ends with an "s", it is a secure connection # if the port ends with an "s", it is a secure connection
if [ "${port#"${port%?}"}" = "s" ]; then if [ "${port#"${port%?}"}" = "s" ]; then
# remove the "s" from the port # remove the "s" from the port
API_PROT="https" API_PROT="https"
API_PORT="${port%?}" API_PORT="${port%?}"
elif [ "${port#"${port%?}"}" = "r" ]; then elif [ "${port#"${port%?}"}" = "r" ]; then
# Ignore this port # Ignore this port, the client may not be able to follow the
# redirected target when FTL is not used as local resolver
API_PORT="0" API_PORT="0"
else else
# otherwise it is an insecure (plain HTTP) connection
API_PROT="http" API_PROT="http"
API_PORT="${port}" API_PORT="${port}"
fi fi
@ -50,8 +52,9 @@ TestAPIAvailability() {
API_URL="${API_PROT}://localhost:${API_PORT}/api" API_URL="${API_PROT}://localhost:${API_PORT}/api"
availabilityResonse=$(curl -skS -o /dev/null -w "%{http_code}" "${API_URL}/auth") availabilityResonse=$(curl -skS -o /dev/null -w "%{http_code}" "${API_URL}/auth")
# test if http status code was 200 (OK), 308 (redirect, we follow) 401 (authentication required) # Test if http status code was 200 (OK), 308 (redirect, we follow) 401 (authentication required)
if [ ! "${availabilityResonse}" = 200 ] && [ ! "${availabilityResonse}" = 308 ] && [ ! "${availabilityResonse}" = 401 ]; then if [ ! "${availabilityResonse}" = 200 ] && [ ! "${availabilityResonse}" = 308 ] && [ ! "${availabilityResonse}" = 401 ]; then
# API is not available at this port/protocol combination
API_PORT="0" API_PORT="0"
else else
# API is available at this port/protocol combination # API is available at this port/protocol combination
@ -59,9 +62,9 @@ TestAPIAvailability() {
fi fi
fi fi
# remove the first port from the list # If the loop has not been broken, remove the first port from the list
# and get the next port
ports="${ports#*,}" ports="${ports#*,}"
# get the next port
port="${ports%%,*}" port="${ports%%,*}"
done done
@ -192,3 +195,6 @@ secretRead() {
# restore original terminal settings # restore original terminal settings
stty "${stty_orig}" stty "${stty_orig}"
} }
TestAPIAvailability