Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Captive portal: better detect empty responses" am: c217f7a9f3

Browse Source 
am: af8e749820

Change-Id: I0b2cd45fb92e2f8accb53ef4e050d2b6e7f7fd1c
This commit is contained in:
Hugo Benichi
2017-02-16 07:08:27 +00:00
committed by android-build-merger
parent 38f5001c10 af8e749820
commit 7973ff4c13
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -809,19 +809,26 @@ public class NetworkMonitor extends StateMachine {
// portal. If it is considered a captive portal, a different sign-in URL // portal. If it is considered a captive portal, a different sign-in URL
// is needed (i.e. can't browse a 204). This could be the result of an HTTP // is needed (i.e. can't browse a 204). This could be the result of an HTTP
// proxy server. // proxy server.
if (httpResponseCode == 200) {
if (probeType == ValidationProbeEvent.PROBE_PAC) {
validationLog("PAC fetch 200 response interpreted as 204 response.");
httpResponseCode = 204;
} else if (urlConnection.getContentLengthLong() == 0) {
// Consider 200 response with "Content-length=0" to not be a captive portal. // Consider 200 response with "Content-length=0" to not be a captive portal.
// There's no point in considering this a captive portal as the user cannot // There's no point in considering this a captive portal as the user cannot
// sign-in to an empty page. Probably the result of a broken transparent proxy. // sign-in to an empty page. Probably the result of a broken transparent proxy.
// See http://b/9972012. // See http://b/9972012.
if (httpResponseCode == 200 && urlConnection.getContentLength() == 0) { validationLog(
"200 response with Content-length=0 interpreted as 204 response.");
httpResponseCode = 204;
} else if (urlConnection.getContentLengthLong() == -1) {
// When no Content-length (default value == -1), attempt to read a byte from the
// response. Do not use available() as it is unreliable. See http://b/33498325.
if (urlConnection.getInputStream().read() == -1) {
validationLog("Empty 200 response interpreted as 204 response."); validationLog("Empty 200 response interpreted as 204 response.");
httpResponseCode = 204; httpResponseCode = 204;
} }
}
if (httpResponseCode == 200 && probeType == ValidationProbeEvent.PROBE_PAC) {
validationLog("PAC fetch 200 response interpreted as 204 response.");
httpResponseCode = 204;
} }
} catch (IOException e) { } catch (IOException e) {
validationLog("Probably not a portal: exception " + e); validationLog("Probably not a portal: exception " + e);