[Webview, Child Accounts] Always Google Play Services to show the reauthentication page.

chrome/android/java/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProvider.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.superviseduser;
 
 import android.annotation.TargetApi;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.os.UserManager;
 
 import org.chromium.base.Callback;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.library_loader.LibraryLoader;
@@ skipping 16 matching lines @@
 public class SupervisedUserContentProvider extends WebRestrictionsContentProvider {
     private static final String SUPERVISED_USER_CONTENT_PROVIDER_ENABLED =
             "SupervisedUserContentProviderEnabled";
     private long mNativeSupervisedUserContentProvider;
     private boolean mChromeAlreadyStarted;
     private static Object sEnabledLock = new Object();
     private static Object sContentProviderLock = new Object();
 
     private static final String TAG = "SupervisedUserContent";
 
+    private static final Object ACCOUNTS_GOOGLE_COM = "accounts.google.com";
+    private static final Object GOOGLE_PLAY_SERVICES_UI_PACKAGE = "com.google.android.gms.ui";
+
     // Three value "boolean" caching enabled state, null if not yet known.
     private static Boolean sEnabled;
 
     @VisibleForTesting
     void startForcedSigninProcessor(Context appContext, Runnable onComplete) {
         ForcedSigninProcessor.start(appContext, onComplete);
     }
 
     @VisibleForTesting
     void listenForChildAccountStatusChange(Callback<Boolean> callback) {
@@ skipping 94 matching lines @@
             };
             onQueryFinished(new WebRestrictionsResult(false, errorInt, errorString));
         }
 
         void onQueryFailedNoErrorData() {
             onQueryFinished(new WebRestrictionsResult(false, null, null));
         }
     }
 
     @Override
-    protected WebRestrictionsResult shouldProceed(final String url) {
+    protected WebRestrictionsResult shouldProceed(String callingPackage, final String url) {
         // This will be called on multiple threads (but never the UI thread),
         // see http://developer.android.com/guide/components/processes-and-threads.html#ThreadSafe.
         // The reply comes back on a different thread (possibly the UI thread) some time later.
         // As such it needs to correctly match the replies to the calls. It does this by creating a
         // reply object for each query, and passing this through the callback structure. The reply
         // object also handles waiting for the reply.
         long startTimeMs = SystemClock.elapsedRealtime();
-        final SupervisedUserQueryReply queryReply = new SupervisedUserQueryReply();
+        if (requestIsWhitelisted(callingPackage, url)) {
+            return new WebRestrictionsResult(true, null, null);
+        }
+
         final long contentProvider = getSupervisedUserContentProvider();
         if (contentProvider == 0) {
             return new WebRestrictionsResult(
                     false, new int[] {FilteringBehaviorReason.NOT_SIGNED_IN}, null);
         }
+
+        final SupervisedUserQueryReply queryReply = new SupervisedUserQueryReply();
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 nativeShouldProceed(contentProvider, queryReply, url);
             }
         });
         try {
             // This will block until an onQueryComplete call on a different thread adds
             // something to the queue.
             WebRestrictionsResult result = queryReply.getResult();
             String histogramName = mChromeAlreadyStarted
                     ? "SupervisedUserContentProvider.ChromeStartedRequestTime"
                     : "SupervisedUserContentProvider.ChromeNotStartedRequestTime";
             RecordHistogram.recordTimesHistogram(histogramName,
                     SystemClock.elapsedRealtime() - startTimeMs, TimeUnit.MILLISECONDS);
             RecordHistogram.recordBooleanHistogram(
                     "SupervisedUserContentProvider.RequestTimedOut", result == null);
             if (result == null) return new WebRestrictionsResult(false, null, null);
             return result;
         } catch (InterruptedException e) {
             return new WebRestrictionsResult(false, null, null);
         }
     }
 
+    private boolean requestIsWhitelisted(String callingPackage, String url) {
+        // Always allow Google Play Services to show the reauthentication page (which is necessary
+        // to fix account issues).
+        return callingPackage != null && callingPackage.equals(GOOGLE_PLAY_SERVICES_UI_PACKAGE)

[dgn, 2017/02/23 12:19:49]

nit: TextUtils.equals() to avoid having to check for null?

[Bernhard Bauer, 2017/02/23 16:36:21]

Good idea! Done.

+                && Uri.parse(url).getHost().equals(ACCOUNTS_GOOGLE_COM);
+    }
+
     @Override
     protected boolean canInsert() {
         // Chrome always allows insertion requests.
         return true;
     }
 
     static class SupervisedUserInsertReply extends SupervisedUserReply<Boolean> {
         @CalledByNative("SupervisedUserInsertReply")
         void onInsertRequestSendComplete(boolean result) {
             onQueryFinished(result);
@@ skipping 119 matching lines @@
 
     native void nativeShouldProceed(long nativeSupervisedUserContentProvider,
             SupervisedUserQueryReply queryReply, String url);
 
     native void nativeRequestInsert(long nativeSupervisedUserContentProvider,
             SupervisedUserInsertReply insertReply, String url);
 
     private native void nativeSetFilterForTesting(long nativeSupervisedUserContentProvider);
 
 }