Fixed connectivity emulation bug.

The bug was recently introduced by lighttpd's global redirection directive.
The global redirection ignored special domains used for emulation.
This commit is contained in:
Matias Barcenas 2017-12-24 15:05:20 -06:00
parent 3e1a30805b
commit cf23366f87
1 changed files with 2 additions and 10 deletions

View File

@ -480,13 +480,6 @@ index-file.names = (
\"index.html\", \"index.html\",
\"index.php\" \"index.php\"
) )
# Redirect all traffic to the captive portal.
\$HTTP[\"host\"] != \"captive.gateway.lan\" {
url.redirect = (
\"^/(.*)\" => \"http://captive.gateway.lan/\",
)
}
" > "$FLUXIONWorkspacePath/lighttpd.conf" " > "$FLUXIONWorkspacePath/lighttpd.conf"
# Configure lighttpd's SSL only if we've got a certificate and its key. # Configure lighttpd's SSL only if we've got a certificate and its key.
@ -516,9 +509,8 @@ index-file.names = (
" >> "$FLUXIONWorkspacePath/lighttpd.conf" " >> "$FLUXIONWorkspacePath/lighttpd.conf"
else else
echo "\ echo "\
# Android requires an explicit redirection code on certain domains. # Redirect all traffic to the captive portal when not emulating a connection.
# Domains: www.google.com, clients[0-9].google.com, connectivitycheck.gstatic.com, connectivitycheck.android.com, android.clients.google.com, alt[0-9]-mtalk.google.com, mtalk.google.com \$HTTP[\"host\"] != \"captive.gateway.lan\" {
\$HTTP[\"host\"] =~ \"((www|(android\.)?clients[0-9]*|(alt[0-9]*-)?mtalk)\.google|connectivitycheck\.(android|gstatic))\.com\" {
url.redirect = ( url.redirect = (
\"^/(.*)\" => \"http://captive.gateway.lan/\", \"^/(.*)\" => \"http://captive.gateway.lan/\",
) )