Use different API key for SafetyNet checks

mar-v-in · mar-v-in · commit af28974d979d · 2022-01-25T18:31:32.000+01:00
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetPreferencesFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/ui/SafetyNetPreferencesFragment.kt
@@ -42,7 +42,7 @@ class SafetyNetPreferencesFragment : PreferenceFragmentCompat() {
             runAttest.setIcon(R.drawable.ic_circle_pending)
             runAttest.setSummary(R.string.pref_test_summary_running)
             val handler = Handler(Looper.myLooper()!!)
-            SafetyNetClientServiceImpl(context, "com.scottyab.safetynet.sample", lifecycle).attestWithApiKey(object : ISafetyNetCallbacks.Default() {
+            SafetyNetClientServiceImpl(context, context.packageName, lifecycle).attestWithApiKey(object : ISafetyNetCallbacks.Default() {
                 override fun onAttestationData(status: Status?, attestationData: AttestationData?) {
                     handler.post {
                         if (status?.isSuccess == true) {
@@ -95,15 +95,15 @@ class SafetyNetPreferencesFragment : PreferenceFragmentCompat() {
                         }
                     }
                 }
-            }, Random.nextBytes(32), "AIzaSyAfcNLBpWkqrt50mluU6GswUmtysmLn9cY")
+            }, Random.nextBytes(32), "AIzaSyCcJO6IZiA5Or_AXw3LFdaTCmpnfL4pJ-Q")
             true
         }
         runReCaptcha.setOnPreferenceClickListener {
             val context = context ?: return@setOnPreferenceClickListener false
             runReCaptcha.setIcon(R.drawable.ic_circle_pending)
             runReCaptcha.setSummary(R.string.pref_test_summary_running)
             val handler = Handler(Looper.myLooper()!!)
-            SafetyNetClientServiceImpl(context, "com.blogspot.android_er.recaptcha", lifecycle).verifyWithRecaptcha(object : ISafetyNetCallbacks.Default() {
+            SafetyNetClientServiceImpl(context, context.packageName, lifecycle).verifyWithRecaptcha(object : ISafetyNetCallbacks.Default() {
                 override fun onRecaptchaResult(status: Status?, recaptchaResultData: RecaptchaResultData?) {
                     handler.post {
                         if (status?.isSuccess == true) {
@@ -115,7 +115,7 @@ class SafetyNetPreferencesFragment : PreferenceFragmentCompat() {
                         }
                     }
                 }
-            }, "6LdMKyUUAAAAAN0ndw7byI03_qpbpjxKY-mTQnLw")
+            }, "6Lc4TzgeAAAAAJnW7Jbo6UtQ0xGuTKjHAeyhINuq")
             true
         }
     }
diff --git a/play-services-safetynet-core/src/main/java/org/microg/gms/safetynet/Attestation.java b/play-services-safetynet-core/src/main/java/org/microg/gms/safetynet/Attestation.java
@@ -100,9 +100,6 @@ private ByteString getPackageFileDigest() {
         try {
             return ByteString.of(getPackageFileDigest(context, packageName));
         } catch (Exception e) {
-            if (packageName.equals("com.scottyab.safetynet.sample")) {
-                return ByteString.decodeHex("66a3b8ff8c9444ec14eee94fa006548c4c7b542d54c27f3b06635e459e77c9a0");
-            }
             Log.w(TAG, e);
             return null;
         }
@@ -130,9 +127,6 @@ private List<ByteString> getPackageSignatures() {
             }
             return res;
         } catch (Exception e) {
-            if (packageName.equals("com.scottyab.safetynet.sample")) {
-                return Collections.singletonList(ByteString.decodeHex("31936c0e1cfc54024c985c4f3eca37f1946f644eabed5232cd4ab2a646a41bc1"));
-            }
             Log.w(TAG, e);
             return null;
         }
diff --git a/play-services-safetynet-core/src/main/kotlin/org/microg/gms/safetynet/SafetyNetClientService.kt b/play-services-safetynet-core/src/main/kotlin/org/microg/gms/safetynet/SafetyNetClientService.kt
@@ -148,22 +148,14 @@ class SafetyNetClientServiceImpl(private val context: Context, private val packa
         val packageFileDigest = try {
             Base64.encodeToString(Attestation.getPackageFileDigest(context, packageName), Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING)
         } catch (e: Exception) {
-            if (packageName == "com.blogspot.android_er.recaptcha") {
-                "kXkOWm-DT-q__5MnrdyCRLowptdd2PjNA1RAnyQ1A-4"
-            } else {
-                callbacks.onRecaptchaResult(Status(SafetyNetStatusCodes.ERROR, e.localizedMessage), null)
-                return
-            }
+            callbacks.onRecaptchaResult(Status(SafetyNetStatusCodes.ERROR, e.localizedMessage), null)
+            return
         }
         val packageSignatures = try {
             Attestation.getPackageSignatures(context, packageName).map { Base64.encodeToString(it, Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING) }
         } catch (e: Exception) {
-            if (packageName == "com.blogspot.android_er.recaptcha") {
-                listOf("xgEpqm72luj7TLUt7kMxIyN-orV6v03_T_yCkR4A93Y")
-            } else {
-                callbacks.onRecaptchaResult(Status(SafetyNetStatusCodes.ERROR, e.localizedMessage), null)
-                return
-            }
+            callbacks.onRecaptchaResult(Status(SafetyNetStatusCodes.ERROR, e.localizedMessage), null)
+            return
         }
         params.appendUrlEncodedParam("k", siteKey)
                 .appendUrlEncodedParam("di", androidId.toString())

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class SafetyNetPreferencesFragment : PreferenceFragmentCompat() {`
`42`	`42`	`runAttest.setIcon(R.drawable.ic_circle_pending)`
`43`	`43`	`runAttest.setSummary(R.string.pref_test_summary_running)`
`44`	`44`	`val handler = Handler(Looper.myLooper()!!)`
`45`		`- SafetyNetClientServiceImpl(context, "com.scottyab.safetynet.sample", lifecycle).attestWithApiKey(object : ISafetyNetCallbacks.Default() {`
	`45`	`+ SafetyNetClientServiceImpl(context, context.packageName, lifecycle).attestWithApiKey(object : ISafetyNetCallbacks.Default() {`
`46`	`46`	`override fun onAttestationData(status: Status?, attestationData: AttestationData?) {`
`47`	`47`	`handler.post {`
`48`	`48`	`if (status?.isSuccess == true) {`
`@@ -95,15 +95,15 @@ class SafetyNetPreferencesFragment : PreferenceFragmentCompat() {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`	`}`
`98`		`- }, Random.nextBytes(32), "AIzaSyAfcNLBpWkqrt50mluU6GswUmtysmLn9cY")`
	`98`	`+ }, Random.nextBytes(32), "AIzaSyCcJO6IZiA5Or_AXw3LFdaTCmpnfL4pJ-Q")`
`99`	`99`	`true`
`100`	`100`	`}`
`101`	`101`	`runReCaptcha.setOnPreferenceClickListener {`
`102`	`102`	`val context = context ?: return@setOnPreferenceClickListener false`
`103`	`103`	`runReCaptcha.setIcon(R.drawable.ic_circle_pending)`
`104`	`104`	`runReCaptcha.setSummary(R.string.pref_test_summary_running)`
`105`	`105`	`val handler = Handler(Looper.myLooper()!!)`
`106`		`- SafetyNetClientServiceImpl(context, "com.blogspot.android_er.recaptcha", lifecycle).verifyWithRecaptcha(object : ISafetyNetCallbacks.Default() {`
	`106`	`+ SafetyNetClientServiceImpl(context, context.packageName, lifecycle).verifyWithRecaptcha(object : ISafetyNetCallbacks.Default() {`
`107`	`107`	`override fun onRecaptchaResult(status: Status?, recaptchaResultData: RecaptchaResultData?) {`
`108`	`108`	`handler.post {`
`109`	`109`	`if (status?.isSuccess == true) {`
`@@ -115,7 +115,7 @@ class SafetyNetPreferencesFragment : PreferenceFragmentCompat() {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`}`
`118`		`- }, "6LdMKyUUAAAAAN0ndw7byI03_qpbpjxKY-mTQnLw")`
	`118`	`+ }, "6Lc4TzgeAAAAAJnW7Jbo6UtQ0xGuTKjHAeyhINuq")`
`119`	`119`	`true`
`120`	`120`	`}`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,6 @@ private ByteString getPackageFileDigest() {`
`100`	`100`	`try {`
`101`	`101`	`return ByteString.of(getPackageFileDigest(context, packageName));`
`102`	`102`	`} catch (Exception e) {`
`103`		`- if (packageName.equals("com.scottyab.safetynet.sample")) {`
`104`		`- return ByteString.decodeHex("66a3b8ff8c9444ec14eee94fa006548c4c7b542d54c27f3b06635e459e77c9a0");`
`105`		`- }`
`106`	`103`	`Log.w(TAG, e);`
`107`	`104`	`return null;`
`108`	`105`	`}`
`@@ -130,9 +127,6 @@ private List<ByteString> getPackageSignatures() {`
`130`	`127`	`}`
`131`	`128`	`return res;`
`132`	`129`	`} catch (Exception e) {`
`133`		`- if (packageName.equals("com.scottyab.safetynet.sample")) {`
`134`		`- return Collections.singletonList(ByteString.decodeHex("31936c0e1cfc54024c985c4f3eca37f1946f644eabed5232cd4ab2a646a41bc1"));`
`135`		`- }`
`136`	`130`	`Log.w(TAG, e);`
`137`	`131`	`return null;`
`138`	`132`	`}`