generated from ReVanced/revanced-patches-template
-
-
Notifications
You must be signed in to change notification settings - Fork 236
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(syncforreddit): add
change-oauth-client-id
patch (#2393)
- Loading branch information
Showing
9 changed files
with
134 additions
and
13 deletions.
There are no files selected for viewing
This file contains 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 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,9 @@ | ||
plugins { | ||
id("java") | ||
} | ||
|
||
java { | ||
toolchain { | ||
languageVersion.set(JavaLanguageVersion.of(11)) | ||
} | ||
} |
This file contains 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,7 @@ | ||
package android.os; | ||
|
||
public final class Environment { | ||
public static String getExternalStorageDirectory() { | ||
throw new UnsupportedOperationException("Stub"); | ||
} | ||
} |
This file contains 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 |
---|---|---|
@@ -1 +1,3 @@ | ||
include("dummy") | ||
|
||
rootProject.name = "revanced-patches" |
8 changes: 0 additions & 8 deletions
8
...main/kotlin/app/revanced/patches/syncforreddit/ads/annotations/DisableAdsCompatibility.kt
This file was deleted.
Oops, something went wrong.
7 changes: 2 additions & 5 deletions
7
src/main/kotlin/app/revanced/patches/syncforreddit/ads/patch/DisableAdsPatch.kt
This file contains 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
7 changes: 7 additions & 0 deletions
7
.../app/revanced/patches/syncforreddit/api/fingerprints/GetAuthorizationStringFingerprint.kt
This file contains 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,7 @@ | ||
package app.revanced.patches.syncforreddit.api.fingerprints | ||
|
||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint | ||
|
||
object GetAuthorizationStringFingerprint : MethodFingerprint( | ||
strings = listOf("authorize.compact?client_id") | ||
) |
7 changes: 7 additions & 0 deletions
7
...n/kotlin/app/revanced/patches/syncforreddit/api/fingerprints/GetBearerTokenFingerprint.kt
This file contains 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,7 @@ | ||
package app.revanced.patches.syncforreddit.api.fingerprints | ||
|
||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint | ||
|
||
object GetBearerTokenFingerprint : MethodFingerprint( | ||
strings = listOf("Basic") | ||
) |
96 changes: 96 additions & 0 deletions
96
src/main/kotlin/app/revanced/patches/syncforreddit/api/patch/ChangeOAuthClientIdPatch.kt
This file contains 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,96 @@ | ||
package app.revanced.patches.syncforreddit.api.patch | ||
|
||
import android.os.Environment | ||
import app.revanced.patcher.annotation.* | ||
import app.revanced.patcher.data.BytecodeContext | ||
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions | ||
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction | ||
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction | ||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.resolve | ||
import app.revanced.patcher.patch.* | ||
import app.revanced.patcher.patch.annotations.Patch | ||
import app.revanced.patches.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint | ||
import app.revanced.patches.syncforreddit.api.fingerprints.GetBearerTokenFingerprint | ||
import org.jf.dexlib2.iface.instruction.OneRegisterInstruction | ||
import org.jf.dexlib2.iface.instruction.ReferenceInstruction | ||
import org.jf.dexlib2.iface.reference.StringReference | ||
import java.io.File | ||
import java.util.* | ||
|
||
@Patch | ||
@Name("change-oauth-client-id") | ||
@Description("Changes the OAuth client ID.") | ||
@Compatibility([Package("com.laurencedawson.reddit_sync")]) | ||
@Version("0.0.1") | ||
class ChangeOAuthClientIdPatch : BytecodePatch( | ||
listOf(GetAuthorizationStringFingerprint) | ||
) { | ||
override fun execute(context: BytecodeContext): PatchResult { | ||
if (clientId == null) { | ||
// Test if on Android | ||
try { | ||
Class.forName("android.os.Environment") | ||
} catch (e: ClassNotFoundException) { | ||
return PatchResultError("No client ID provided") | ||
} | ||
|
||
File(Environment.getExternalStorageDirectory(), "reddit_client_id_revanced.txt").also { | ||
if (it.exists()) return@also | ||
|
||
val error = """ | ||
In order to use this patch, you need to provide a client ID. | ||
You can do this by creating a file at ${it.absolutePath} with the client ID as its content. | ||
Alternatively, you can provide the client ID using patch options. | ||
You can get your client ID from https://www.reddit.com/prefs/apps. | ||
The redirect URI has to be set to "http://redditsync/auth". | ||
""".trimIndent() | ||
|
||
return PatchResultError(error) | ||
}.let { clientId = it.readText() } | ||
} | ||
|
||
GetAuthorizationStringFingerprint.result?.also { result -> | ||
GetBearerTokenFingerprint.also { it.resolve(context, result.classDef) }.result?.mutableMethod?.apply { | ||
val auth = Base64.getEncoder().encodeToString("$clientId:".toByteArray(Charsets.UTF_8)) | ||
addInstructions( | ||
0, | ||
""" | ||
const-string v0, "Basic $auth" | ||
return-object v0 | ||
""" | ||
) | ||
} ?: return PatchResultError("Could not find required method to patch.") | ||
}?.let { | ||
val occurrenceIndex = it.scanResult.stringsScanResult!!.matches.first().index | ||
|
||
it.mutableMethod.apply { | ||
val authorizationStringInstruction = getInstruction<ReferenceInstruction>(occurrenceIndex) | ||
val targetRegister = (authorizationStringInstruction as OneRegisterInstruction).registerA | ||
val reference = authorizationStringInstruction.reference as StringReference | ||
|
||
val newAuthorizationUrl = reference.string.replace( | ||
"client_id=.*?&".toRegex(), | ||
"client_id=${clientId!!}&" | ||
) | ||
|
||
replaceInstruction( | ||
occurrenceIndex, | ||
"const-string v$targetRegister, \"$newAuthorizationUrl\"" | ||
) | ||
} | ||
} ?: return PatchResultError("Could not find required method to patch.") | ||
return PatchResultSuccess() | ||
} | ||
|
||
companion object : OptionsContainer() { | ||
var clientId by option( | ||
PatchOption.StringOption( | ||
"client-id", | ||
null, | ||
"OAuth client ID", | ||
"The client ID to use for OAuth." | ||
) | ||
) | ||
} | ||
} |