tyler.durden/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-07-30 09:04:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use shell parameter expansion to split http_code and payload for api.sh (#6230)

Browse Source
This commit is contained in:
Dan Schaper 2025-05-14 08:31:13 -07:00 committed by GitHub
commit c1a5b902fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
advanced/Scripts/api.sh
View File

@ -47,14 +47,15 @@ TestAPIAvailability() {
API_URL="${API_URL%\"}" API_URL="${API_URL%\"}"
API_URL="${API_URL#\"}" API_URL="${API_URL#\"}"
# Test if the API is available at this URL # Test if the API is available at this URL, include delimiter for ease in splitting payload
authResponse=$(curl --connect-timeout 2 -skS -w "%{http_code}" "${API_URL}auth") authResponse=$(curl --connect-timeout 2 -skS -w ">>%{http_code}" "${API_URL}auth")
# authStatus are the last 3 characters # authStatus is the response http_code, eg. 200, 401.
# not using ${authResponse#"${authResponse%???}"}" here because it's extremely slow on big responses # Shell parameter expansion, remove everything up to and including the >> delim
authStatus=$(printf "%s" "${authResponse}" | tail -c 3) authStatus=${authResponse#*>>}
# data is everything from response without the last 3 characters # data is everything from response
authData=$(printf %s "${authResponse%???}") # Shell parameter expansion, remove the >> delim and everything after
authData=${authResponse%>>*}
# Test if http status code was 200 (OK) or 401 (authentication required) # Test if http status code was 200 (OK) or 401 (authentication required)
if [ "${authStatus}" = 200 ]; then if [ "${authStatus}" = 200 ]; then