@W-21933885: [MSDK Android] App Attestation Implementation #2868
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,10 @@ jobs: | |
| - name: Install Dependencies | ||
| env: | ||
| TEST_CREDENTIALS: ${{ secrets.TEST_CREDENTIALS }} | ||
| # On PR runs, only SalesforceReact consumes the bundled index.android.bundle, | ||
| # so skip the yarn install + react-native bundle step for every other lib to | ||
| # save ~3-5 min per matrix job. Nightly runs still produce the bundle. | ||
| SKIP_REACT_NATIVE_BUNDLE: ${{ (inputs.is_pr && inputs.lib != 'SalesforceReact') && '1' || '0' }} | ||
| run: | | ||
| ./install.sh | ||
| echo $TEST_CREDENTIALS > ./shared/test/test_credentials.json | ||
|
|
@@ -109,7 +113,6 @@ jobs: | |
|
|
||
| if $IS_PR ; then | ||
| LEVELS_TO_TEST=$PR_API_VERSION | ||
|
Contributor
Author
There was a problem hiding this comment. @brandonpage, a little later you'll see a fix in the |
||
| fi | ||
|
|
||
| # Build test-targets-for-shard arguments from config file | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -89,6 +89,7 @@ import com.salesforce.androidsdk.app.Features.FEATURE_BROWSER_LOGIN | |
| import com.salesforce.androidsdk.app.Features.FEATURE_NATIVE_LOGIN | ||
| import com.salesforce.androidsdk.app.SalesforceSDKManager.Theme.DARK | ||
| import com.salesforce.androidsdk.app.SalesforceSDKManager.Theme.SYSTEM_DEFAULT | ||
| import com.salesforce.androidsdk.auth.AppAttestationClient | ||
| import com.salesforce.androidsdk.auth.AuthenticatorService.KEY_INSTANCE_URL | ||
| import com.salesforce.androidsdk.auth.HttpAccess | ||
| import com.salesforce.androidsdk.auth.HttpAccess.DEFAULT | ||
|
|
@@ -226,6 +227,54 @@ open class SalesforceSDKManager protected constructor( | |
| */ | ||
| val loginActivityClass: Class<out Activity> = nativeLoginActivity ?: webViewLoginActivityClass | ||
|
|
||
| /** | ||
| * The client side implementation of the Salesforce App Attestation External | ||
| * Client App (ECA) Plugin or null when app attestation is disabled. | ||
| * | ||
| * This property is not intended for public use outside of Salesforce Mobile | ||
| * SDK | ||
| * | ||
| * TODO: Make this Kotlin-internal once it is no longer referenced by Java. ECJ20260420 | ||
| */ | ||
| @Volatile | ||
| var appAttestationClient: AppAttestationClient? = null | ||
|
Contributor
Author
There was a problem hiding this comment. A crux change is creating a new object to encapsulate all the things for the new Salesforce "Challenge" API, the Integrity Token Provider, the Token and providing that in the "Attestation" format the auth and token refresh endpoints now expect. That's here. Our tools had some great suggestion around making this property thread safe, so I added @volatile, the private setter and a dedicated lock object based on tool feedback. |
||
| @VisibleForTesting | ||
| internal set | ||
|
|
||
| /** Lock object for synchronized access to the app Attestation Client */ | ||
| private val appAttestationClientLock = Any() | ||
|
|
||
| /** | ||
| * Updates the Salesforce App Attestation ECA Plugin Client for the selected | ||
| * login server and matching Google Cloud Project ID. When using App | ||
| * Attestation, this value must match the linked Google Cloud Project ID | ||
| * for the app in Google Play Console's Play Integrity API and provided to | ||
| * the Salesforce App Attestation External Client App Plugin. | ||
| * | ||
| * @param apiHostName The Salesforce App Attestation External Client App | ||
| * (ECA) Plugin Challenge API Host Name. This usually matches the selected | ||
| * login server | ||
| * @param googleCloudProjectId The Google Cloud Project ID or null to | ||
| * disable Salesforce App Attestation | ||
| */ | ||
| fun updateAppAttestationClient( | ||
|
Contributor
Author
There was a problem hiding this comment. If one reads the description of this pull request, this is the entry point for an app to actually enable App Attestation. |
||
| apiHostName: String, | ||
| googleCloudProjectId: Long? = null | ||
| ) { | ||
| synchronized(appAttestationClientLock) { | ||
| appAttestationClient = googleCloudProjectId?.let { appAttestationGoogleCloudProjectId -> | ||
| AppAttestationClient( | ||
| context = appContext, | ||
| apiHostName = apiHostName, | ||
| deviceId = deviceId, | ||
| googleCloudProjectId = appAttestationGoogleCloudProjectId, | ||
| remoteAccessConsumerKey = getBootConfig(appContext).remoteAccessConsumerKey, | ||
| restClient = clientManager.peekUnauthenticatedRestClient() | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * ViewModel Factory the SDK will use in LoginActivity and composable functions. Setting this will allow for | ||
| * visual customization without overriding LoginActivity. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,255 @@ | ||
| /* | ||
| * Copyright (c) 2026-present, salesforce.com, inc. | ||
| * All rights reserved. | ||
| * Redistribution and use of this software in source and binary forms, with or | ||
| * without modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * - Redistributions of source code must retain the above copyright notice, this | ||
| * list of conditions and the following disclaimer. | ||
| * - Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * - Neither the name of salesforce.com, inc. nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this software without | ||
| * specific prior written permission of salesforce.com, inc. | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
| package com.salesforce.androidsdk.auth | ||
|
|
||
| import android.content.Context | ||
| import androidx.annotation.VisibleForTesting | ||
| import com.google.android.play.core.integrity.IntegrityManagerFactory.createStandard | ||
| import com.google.android.play.core.integrity.IntegrityServiceException | ||
| import com.google.android.play.core.integrity.StandardIntegrityManager | ||
| import com.google.android.play.core.integrity.StandardIntegrityManager.PrepareIntegrityTokenRequest | ||
| import com.google.android.play.core.integrity.StandardIntegrityManager.StandardIntegrityTokenProvider | ||
| import com.google.android.play.core.integrity.StandardIntegrityManager.StandardIntegrityTokenRequest | ||
| import com.google.android.play.core.integrity.model.StandardIntegrityErrorCode.INTEGRITY_TOKEN_PROVIDER_INVALID | ||
| import com.salesforce.androidsdk.rest.AppAttestationChallengeApiClient | ||
| import com.salesforce.androidsdk.rest.RestClient | ||
| import com.salesforce.androidsdk.util.SalesforceSDKLogger.w | ||
| import kotlinx.coroutines.runBlocking | ||
| import kotlinx.coroutines.tasks.await | ||
| import kotlinx.serialization.Serializable | ||
| import kotlinx.serialization.json.Json | ||
| import java.nio.charset.StandardCharsets.UTF_8 | ||
| import java.security.MessageDigest | ||
| import java.util.Base64 | ||
|
|
||
| /** | ||
| * App attestation features supporting the Salesforce App Attestation External | ||
| * Client App (ECA) Plugin, the Salesforce Challenge API, Google Play Integrity | ||
| * API and integration of app attestation with Salesforce Authentication. | ||
| * | ||
| * This method is not intended for public use outside of Salesforce Mobile SDK. | ||
| * | ||
| * TODO: Make this class internal once Java support is removed. ECJ20260421 | ||
| * | ||
| * @param apiHostName The Salesforce App Attestation Challenge API host | ||
| * @param deviceId The device id, usually provided by the Salesforce SDK Manager | ||
| * @param googleCloudProjectId The Google Cloud Project ID used with Google Play | ||
| * Integrity API | ||
| * @param integrityManager The Google Play App Integrity API Integrity Manager. | ||
| * This parameter is intended for testing purposes only. Defaults to a new | ||
| * instance | ||
| * @param remoteAccessConsumerKey The Salesforce Connected App (CA) or External | ||
| * Client App (ECA)remote access consumer key, usually provided by the boot | ||
| * config | ||
| * @param restClient The REST client, usually provided by the Salesforce SDK | ||
| * Manager's unauthenticated REST client | ||
| */ | ||
| class AppAttestationClient( | ||
|
Contributor
Author
There was a problem hiding this comment. This object is the heart 'n soul of App Attestation. |
||
| context: Context, | ||
| @property:VisibleForTesting | ||
| internal val apiHostName: String, | ||
| @property:VisibleForTesting | ||
| internal val deviceId: String, | ||
| @property:VisibleForTesting | ||
| internal val googleCloudProjectId: Long, | ||
| @property:VisibleForTesting | ||
| internal val integrityManager: StandardIntegrityManager = createStandard(context), | ||
| @property:VisibleForTesting | ||
| internal val remoteAccessConsumerKey: String, | ||
| @property:VisibleForTesting | ||
| internal val restClient: RestClient, | ||
| ) { | ||
|
|
||
|
|
||
| /** The Google Play Integrity API Token Provider */ | ||
| @VisibleForTesting | ||
| internal var integrityTokenProvider: StandardIntegrityTokenProvider? = null | ||
|
|
||
| init { | ||
| prepareIntegrityTokenProvider() | ||
|
Contributor
Author
There was a problem hiding this comment. This is the "warm up" for Google Play Integrity API, as we often call it in internal discussion and docs. |
||
| } | ||
|
|
||
| /** | ||
| * (Re-)prepares the Google Play Integrity Token Provider. Calling this | ||
| * prior to requesting the Integrity Token via | ||
| * [createAppAttestation] reduces the latency of the request. | ||
| */ | ||
| @VisibleForTesting | ||
| internal fun prepareIntegrityTokenProvider() = integrityManager.prepareIntegrityToken( | ||
| PrepareIntegrityTokenRequest.builder() | ||
| .setCloudProjectNumber(googleCloudProjectId) | ||
| .build() | ||
| ).addOnSuccessListener( | ||
| ::onPrepareIntegrityTokenProviderSuccess | ||
| ).addOnFailureListener( | ||
| ::onPrepareIntegrityTokenProviderFailure | ||
| ) | ||
|
|
||
| /** | ||
| * A success callback used by [prepareIntegrityTokenProvider]. | ||
| * @param tokenProvider The Google Play API Integrity Token Provider | ||
| */ | ||
| @VisibleForTesting | ||
| internal fun onPrepareIntegrityTokenProviderSuccess(tokenProvider: StandardIntegrityTokenProvider) { | ||
| integrityTokenProvider = tokenProvider | ||
| } | ||
|
|
||
| /** | ||
| * A failure callback for [prepareIntegrityTokenProvider]. | ||
| * @param exception The exception provided by Google Play Integrity API | ||
| */ | ||
| @VisibleForTesting | ||
| internal fun onPrepareIntegrityTokenProviderFailure(exception: Exception) { | ||
| w(javaClass.name, "Failed to prepare Google Play Integrity Token Provider: '${exception.message}'. App Attestation will be disabled.") | ||
| } | ||
|
|
||
| /** | ||
| * Creates a Salesforce App Attestation External Client App (ECA) Plugin | ||
| * "attestation". First a Salesforce Mobile App Attestation "Challenge" is | ||
| * requested for the device id. Then, a Google Play Integrity API Token is | ||
| * fetched using the "Challenge" as the Request Hash. The resulting token is | ||
| * encoded into a value usable as the "attestation" parameter in the | ||
| * Salesforce OAuth authorization request. | ||
| * | ||
| * This method is not intended for public use outside of Salesforce Mobile | ||
| * SDK. | ||
| * | ||
| * TODO: Make this Kotlin-internal once it is no longer referenced by Java. ECJ20260420 | ||
| * | ||
| * @param appAttestationChallenge The Salesforce Mobile App Attestation | ||
| * External Client App (ECA) Plug-In "Challenge" to use | ||
| * @param integrityTokenProvider The Google Play App Integrity API Integrity | ||
| * Token Provider. This parameter is intended for testing purposes only | ||
| * @return The "attestation" value usable in Salesforce OAuth authorization | ||
| * and token refresh requests or null if the value cannot be created | ||
| */ | ||
| suspend fun createAppAttestation( | ||
| appAttestationChallenge: String, | ||
| integrityTokenProvider: StandardIntegrityTokenProvider? = this.integrityTokenProvider, | ||
| ): String? { | ||
| // Guard to ensure the Google Play Integrity API Integrity Provider was asynchronously resolved or do so synchronously now. | ||
| val integrityTokenProviderResolved = integrityTokenProvider ?: prepareIntegrityTokenProvider().await() | ||
|
|
||
| // Fetch the Challenge from Salesforce Mobile App Attestation. | ||
| val salesforceAppAttestationChallengeHashByteArray = MessageDigest.getInstance("SHA-256") | ||
| .digest(appAttestationChallenge.toByteArray(UTF_8)) | ||
| val salesforceAppAttestationChallengeHashHexString = salesforceAppAttestationChallengeHashByteArray.joinToString("") { "%02x".format(it) } | ||
|
|
||
| // Request the Google Play Integrity Token. | ||
| val integrityTokenResponse = integrityTokenProviderResolved.request( | ||
| StandardIntegrityTokenRequest.builder() | ||
| .setRequestHash(salesforceAppAttestationChallengeHashHexString) | ||
| .build() | ||
| ) | ||
|
|
||
| /* | ||
| * Wait for the Google Play Integrity API response and return the | ||
| * Base64-encoded Salesforce OAuth authorization attestation parameter | ||
| * JSON. This may block the calling thread if the Google Play Integrity | ||
| * API introduces latency, though latency is expected to minimal as the | ||
| * API will have been prepared earlier in most scenarios. | ||
| */ | ||
| return runCatching { | ||
| integrityTokenResponse.await() | ||
|
|
||
| // When the Google Play Integrity API response is received, return the Base64-encoded Salesforce OAuth authorization attestation parameter JSON. | ||
| OAuthAuthorizationAttestation( | ||
| attestationId = deviceId, | ||
| attestationData = Base64.getEncoder().encodeToString( | ||
| integrityTokenResponse.getResult().token().encodeToByteArray() | ||
| ) | ||
| ).toBase64String() | ||
| }.getOrElse { e -> | ||
| // If the Google Play Integrity API failed due to the Integrity Token Provider being expired, re-prepare it once for an inline retry. | ||
| if ((e as? IntegrityServiceException)?.errorCode == INTEGRITY_TOKEN_PROVIDER_INVALID) { | ||
| createAppAttestation( | ||
| appAttestationChallenge = appAttestationChallenge, | ||
| integrityTokenProvider = null | ||
| ) | ||
| } else { | ||
| null | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * A blocking Java-callable wrapper for [createAppAttestation] | ||
| * | ||
| * This method is not intended for public use outside of Salesforce Mobile | ||
| * SDK. | ||
| * | ||
| * TODO: Remove method when no longer referenced by Java. ECJ20260420 | ||
| * @param appAttestationChallenge The Salesforce Mobile App Attestation | ||
| * External Client App (ECA) Plug-In "Challenge" to use | ||
| */ | ||
| fun createAppAttestationBlocking(appAttestationChallenge: String) = runBlocking { | ||
| createAppAttestation(appAttestationChallenge) | ||
| } | ||
|
|
||
| /** | ||
| * Fetches a new "Challenge" from the Salesforce App Attestation External | ||
| * Client App (ECA) Plug-In. | ||
| * | ||
| * This method is not intended for public use outside of Salesforce Mobile | ||
| * SDK. | ||
| * | ||
| * TODO: Make this Kotlin-internal once it is no longer referenced by Java. ECJ20260420 | ||
| * | ||
| * @return The Salesforce App Attestation ECA Plug-In's "Challenge" | ||
| */ | ||
| fun fetchMobileAppAttestationChallenge(): String { | ||
| // Create the Salesforce App Attestation Challenge API client and fetch a new challenge. | ||
| val appAttestationChallengeApiClient = AppAttestationChallengeApiClient( | ||
| apiHostName = apiHostName, | ||
| restClient = restClient | ||
| ) | ||
| return appAttestationChallengeApiClient.fetchChallenge( | ||
| attestationId = deviceId, | ||
| remoteConsumerKey = remoteAccessConsumerKey | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * A Salesforce OAuth 2.0 authorization "attestation" parameter. | ||
| * @param attestationId The attestation id used when creating the Salesforce | ||
| * Mobile App Attestation API Challenge. This is intended to be the | ||
| * Salesforce Mobile SDK device id | ||
| * @param attestationData The token provided by the Google Play Integrity API | ||
| */ | ||
| @Serializable | ||
| internal data class OAuthAuthorizationAttestation( | ||
| val attestationId: String, | ||
| val attestationData: String, | ||
| ) { | ||
|
|
||
| /** | ||
| * Returns a Base64-encoded JSON representation of this object | ||
| */ | ||
| fun toBase64String(): String? = Base64.getEncoder().encodeToString(Json.encodeToString(serializer(), this).encodeToByteArray()) | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is unrelated to the feature, but could be useful to consider. While spending a lot of time watching ~25m CI runs, I asked our tools where a quick win would be in trimming that time. The analysis found that we're re-running yarn from scratch for all the modules instead of just for
SalesforceReact. I believe this brought my run down to ~12m! I need to verify that over a few more runs, but if that's the case this could be a nice optimization. @brandonpage?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice find!