Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrity API #5304

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Integrity API #5304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc6fd57
Integrity API
SeniorZhai Nov 29, 2023
ac129ee
Merge branch 'master' into feature/integrity_api
crossle Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ dependencies {

implementation "com.google.mlkit:barcode-scanning:${mlkitBarcodeVersion}"
implementation "com.google.android.play:app-update-ktx:${playVersion}"
implementation "com.google.android.gms:play-services-safetynet:${googlePlayServicesVersion}"
implementation 'com.google.android.play:integrity:1.4.0'
implementation "com.google.android.gms:play-services-maps:19.0.0"
implementation "com.google.android.gms:play-services-location:21.3.0"
implementation "com.google.android.gms:play-services-cronet:${googlePlayServicesVersion}"
Expand Down
36 changes: 26 additions & 10 deletions app/src/main/java/one/mixin/android/ui/home/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import androidx.lifecycle.lifecycleScope
import androidx.room.util.readVersion
import com.google.android.gms.common.ConnectionResult
import com.google.android.gms.common.GoogleApiAvailability
import com.google.android.gms.safetynet.SafetyNet
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
import com.google.android.play.core.appupdate.AppUpdateManagerFactory
Expand All @@ -32,6 +31,10 @@ import com.google.android.play.core.install.InstallStateUpdatedListener
import com.google.android.play.core.install.model.AppUpdateType
import com.google.android.play.core.install.model.InstallStatus
import com.google.android.play.core.install.model.UpdateAvailability
import com.google.android.play.core.integrity.IntegrityManagerFactory
import com.google.android.play.core.integrity.IntegrityTokenRequest
import com.google.android.play.core.integrity.IntegrityTokenResponse
import com.google.firebase.FirebaseApp
import com.google.firebase.crashlytics.FirebaseCrashlytics
import com.uber.autodispose.autoDispose
import dagger.hilt.android.AndroidEntryPoint
Expand Down Expand Up @@ -70,7 +73,6 @@ import one.mixin.android.RxBus
import one.mixin.android.api.request.SessionRequest
import one.mixin.android.api.service.ConversationService
import one.mixin.android.api.service.UserService
import one.mixin.android.crypto.Base64
import one.mixin.android.crypto.PrivacyPreference.getIsLoaded
import one.mixin.android.crypto.PrivacyPreference.getIsSyncSession
import one.mixin.android.databinding.ActivityMainBinding
Expand Down Expand Up @@ -615,8 +617,7 @@ class MainActivity : BlazeBaseActivity() {
.subscribe(
{ resp ->
resp.data?.let {
val nonce = Base64.decode(it.nonce)
validateSafetyNet(nonce)
validateIntegrity(it.nonce)
}
},
{
Expand All @@ -625,17 +626,32 @@ class MainActivity : BlazeBaseActivity() {
}
}

private fun validateSafetyNet(nonce: ByteArray) {
val client = SafetyNet.getClient(this)
val task = client.attest(nonce, BuildConfig.SAFETYNET_API_KEY)
task.addOnSuccessListener { safetyResp ->
accountRepo.updateSession(SessionRequest(deviceCheckToken = safetyResp.jwsResult))
private fun validateIntegrity(nonce: String) {
val integrityManager = IntegrityManagerFactory.create(this)
val projectNumber = FirebaseApp.getInstance().options.gcmSenderId!!
.toLong()
integrityManager.requestIntegrityToken(
IntegrityTokenRequest.builder()
.setCloudProjectNumber(projectNumber)
.setNonce(nonce)
.build()
)
val integrityTokenResponse = integrityManager.requestIntegrityToken(
IntegrityTokenRequest.builder()
.setCloudProjectNumber(projectNumber)
.setNonce(nonce)
.build()
)
integrityTokenResponse.addOnSuccessListener { response: IntegrityTokenResponse ->
// Todo replace api?
accountRepo.updateSession(SessionRequest(deviceCheckToken = response.token()))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.autoDispose(stopScope)
.subscribe({}, {})
}
task.addOnFailureListener { e ->

integrityTokenResponse.addOnFailureListener { e: Exception ->
reportException(e)
}
}
Expand Down
Loading