fix(relay/change-client-id): patch client id instead of developer key

ReVanced · Jun 27, 2023 · a326663 · a326663
1 parent a62f9d7
commit a326663
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 10 deletions.
diff --git a/...evanced/patches/reddit/customclients/boostforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...evanced/patches/reddit/customclients/boostforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -7,6 +7,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint

diff --git a/...nced/patches/reddit/customclients/infinityforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...nced/patches/reddit/customclients/infinityforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -8,6 +8,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 import app.revanced.patches.reddit.customclients.infinityforreddit.api.fingerprints.GetHTTPBasicAuthHeaderFingerprint

diff --git a/...tches/reddit/customclients/relayforreddit/api/fingerprints/AbstractClientIdFingerprint.kt b/...tches/reddit/customclients/relayforreddit/api/fingerprints/AbstractClientIdFingerprint.kt
@@ -0,0 +1,7 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+abstract class AbstractClientIdFingerprint(additionalSearchString: String) : MethodFingerprint(
+    strings = listOfNotNull("dj-xCIZQYiLbEg", additionalSearchString),
+)
diff --git a/...ed/patches/reddit/customclients/relayforreddit/api/fingerprints/GetClientIdFingerprint.kt b/...ed/patches/reddit/customclients/relayforreddit/api/fingerprints/GetClientIdFingerprint.kt
diff --git a/...reddit/customclients/relayforreddit/api/fingerprints/GetLoggedInBearerTokenFingerprint.kt b/...reddit/customclients/relayforreddit/api/fingerprints/GetLoggedInBearerTokenFingerprint.kt
@@ -0,0 +1,4 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object GetLoggedInBearerTokenFingerprint :
+    AbstractClientIdFingerprint("authorization_code")
diff --git a/...eddit/customclients/relayforreddit/api/fingerprints/GetLoggedOutBearerTokenFingerprint.kt b/...eddit/customclients/relayforreddit/api/fingerprints/GetLoggedOutBearerTokenFingerprint.kt
@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object GetLoggedOutBearerTokenFingerprint : AbstractClientIdFingerprint("https://oauth.reddit.com/grants/installed_client")
diff --git a/...atches/reddit/customclients/relayforreddit/api/fingerprints/GetRefreshTokenFingerprint.kt b/...atches/reddit/customclients/relayforreddit/api/fingerprints/GetRefreshTokenFingerprint.kt
@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object GetRefreshTokenFingerprint : AbstractClientIdFingerprint("refresh_token")
diff --git a/.../reddit/customclients/relayforreddit/api/fingerprints/LoginActivityClientIdFingerprint.kt b/.../reddit/customclients/relayforreddit/api/fingerprints/LoginActivityClientIdFingerprint.kt
@@ -0,0 +1,3 @@
+package app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints
+
+object LoginActivityClientIdFingerprint : AbstractClientIdFingerprint("&duration=permanent")
diff --git a/...evanced/patches/reddit/customclients/relayforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...evanced/patches/reddit/customclients/relayforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -1,23 +1,48 @@
 package app.revanced.patches.reddit.customclients.relayforreddit.api.patch
 
 import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Package
 import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
-import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetClientIdFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedInBearerTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetLoggedOutBearerTokenFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.LoginActivityClientIdFingerprint
+import app.revanced.patches.reddit.customclients.relayforreddit.api.fingerprints.GetRefreshTokenFingerprint
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @ChangeOAuthClientIdPatchAnnotation
 @Compatibility([Package("free.reddit.news"), Package("reddit.news")])
 class ChangeOAuthClientIdPatch : AbstractChangeOAuthClientIdPatch(
-    "dbrady://relay", Options, listOf(GetClientIdFingerprint)
+    "dbrady://relay",
+    Options,
+    listOf(
+        LoginActivityClientIdFingerprint,
+        GetLoggedInBearerTokenFingerprint,
+        GetLoggedOutBearerTokenFingerprint,
+        GetRefreshTokenFingerprint
+    )
 ) {
     override fun List<MethodFingerprintResult>.patch(context: BytecodeContext): PatchResult {
-        first().mutableMethod.replaceInstruction(0, "const-string v0, \"$clientId\"")
+        forEach {
+            val clientIdIndex = it.scanResult.stringsScanResult!!.matches.first().index
+            it.mutableMethod.apply {
+                val clientIdRegister = getInstruction<OneRegisterInstruction>(clientIdIndex).registerA
+
+                it.mutableMethod.replaceInstruction(
+                    clientIdIndex,
+                    "const-string v$clientIdRegister, \"$clientId\""
+                )
+            }
+        }
 
         return PatchResultSuccess()
     }

diff --git a/...revanced/patches/reddit/customclients/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt b/...revanced/patches/reddit/customclients/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt
@@ -11,6 +11,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprintResult
 import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.reddit.customclients.AbstractChangeOAuthClientIdPatch
 import app.revanced.patches.reddit.customclients.ChangeOAuthClientIdPatchAnnotation
 import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint