Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If redirect ends at an https link assume it is valid (we cannot check it) (#491)

This commit is contained in:
Tim Wilkinson 2022-08-29 11:31:03 -04:00 committed by GitHub
parent d463923b29
commit 0cd4fd3edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/usr/local/bin/olsrd-config
View File

@ -179,9 +179,15 @@ if validate then
valid_services[#valid_services + 1] = service
elseif proto == "http" then
-- http so looks like a link. http check it
local status = io.popen("/usr/bin/curl --retry 0 --connect-timeout 2 --speed-time 5 --speed-limit 1000 --silent --output /dev/null --location --write-out '%{http_code}' " .. "http://" .. hostname .. ":" .. port .. path):read("*a")
local status, effective_url = io.popen("/usr/bin/curl --retry 0 --connect-timeout 2 --speed-time 5 --speed-limit 1000 --silent --output /dev/null --location --write-out '%{http_code} %{url_effective}' " .. "http://" .. hostname .. ":" .. port .. path):read("*a"):match("^(%d+) (.*)")
if status == "200" then
valid_services[#valid_services + 1] = service
elseif status == "301" or status == "302" or status == "308" then
-- Ended at a redirect rather than an actual page.
if effective_url:match("^https:") then
-- We cannot validate https: links so we just assume they're okay
valid_services[#valid_services + 1] = service
end
end
else
-- valid port, but we dont know the protocol (we cannot trust the one defined in the services file because the UI wont set