Commit ce70d4a9 authored by Adam Langley's avatar Adam Langley Committed by Commit Bot

webauthn: allow GMSCore to trigger caBLEv2.

GMSCore is expected to start triggering caBLEv2, rather than doing
caBLEv1, for accounts.google.com logins. This change allows it to send
Intents to start Chrome to perform the caBLEv2 interaction.

BUG=1002262

Change-Id: I557f89d3bb191b738fe50e6a2377573a334fdb20
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552623Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Adam Langley <agl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829949}
parent e4b4bc16
...@@ -599,9 +599,10 @@ ...@@ -599,9 +599,10 @@
</intent-filter> # DIFF-ANCHOR: 9c5197e9 </intent-filter> # DIFF-ANCHOR: 9c5197e9
</activity> # DIFF-ANCHOR: aea75380 </activity> # DIFF-ANCHOR: aea75380
<activity # DIFF-ANCHOR: a1fac31f <activity # DIFF-ANCHOR: a1fac31f
android:exported="false" android:exported="true"
android:label="@string/cablev2_activity_title" android:label="@string/cablev2_activity_title"
android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity" android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity"
android:permission="com.google.android.gms.auth.cryptauth.permission.CABLEV2_SERVER_LINK"
android:theme="@style/Theme.Chromium.Activity.Fullscreen"> android:theme="@style/Theme.Chromium.Activity.Fullscreen">
<intent-filter> # DIFF-ANCHOR: 5873407a <intent-filter> # DIFF-ANCHOR: 5873407a
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/> <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
......
...@@ -572,9 +572,10 @@ ...@@ -572,9 +572,10 @@
</intent-filter> # DIFF-ANCHOR: 9c5197e9 </intent-filter> # DIFF-ANCHOR: 9c5197e9
</activity> # DIFF-ANCHOR: aea75380 </activity> # DIFF-ANCHOR: aea75380
<activity # DIFF-ANCHOR: a1fac31f <activity # DIFF-ANCHOR: a1fac31f
android:exported="false" android:exported="true"
android:label="@string/cablev2_activity_title" android:label="@string/cablev2_activity_title"
android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity" android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity"
android:permission="com.google.android.gms.auth.cryptauth.permission.CABLEV2_SERVER_LINK"
android:theme="@style/Theme.Chromium.Activity.Fullscreen"> android:theme="@style/Theme.Chromium.Activity.Fullscreen">
<intent-filter> # DIFF-ANCHOR: 5873407a <intent-filter> # DIFF-ANCHOR: 5873407a
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/> <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED"/>
......
...@@ -853,12 +853,11 @@ by a child template that "extends" this file. ...@@ -853,12 +853,11 @@ by a child template that "extends" this file.
<activity android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity" <activity android:name="org.chromium.chrome.browser.webauth.authenticator.CableAuthenticatorActivity"
android:theme="@style/Theme.Chromium.Activity.Fullscreen" android:theme="@style/Theme.Chromium.Activity.Fullscreen"
android:label="@string/cablev2_activity_title" android:label="@string/cablev2_activity_title"
android:exported="false"> android:permission="com.google.android.gms.auth.cryptauth.permission.CABLEV2_SERVER_LINK"
<!-- This has an intent filter but is not exported. This works android:exported="true">
because the intent is sent by the Android system, not another <!-- This activity can be started by GMSCore, and is thus exported
application. We want to limit this activity to only be invoked by with a permission set, or can be started by the Android system in
Chromium or the OS because otherwise applications could fool the case that a USB device is attached. -->
Chromium into communicating with a fake USB device. -->
<intent-filter> <intent-filter>
<action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" /> <action android:name="android.hardware.usb.action.USB_ACCESSORY_ATTACHED" />
</intent-filter> </intent-filter>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment