mirror of
https://github.com/revanced/revanced-patches
synced 2024-12-11 19:47:45 +01:00
feat(youtube): spoof-signature-verification
patch (#1745)
Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
parent
c33514f85e
commit
4306f25d3f
@ -0,0 +1,21 @@
|
|||||||
|
package app.revanced.patches.youtube.misc.fix.playback.annotation
|
||||||
|
|
||||||
|
import app.revanced.patcher.annotation.Compatibility
|
||||||
|
import app.revanced.patcher.annotation.Package
|
||||||
|
|
||||||
|
@Compatibility(
|
||||||
|
[Package(
|
||||||
|
"com.google.android.youtube", arrayOf(
|
||||||
|
"17.49.37",
|
||||||
|
"18.03.36",
|
||||||
|
"18.03.42",
|
||||||
|
"18.04.35",
|
||||||
|
"18.04.41",
|
||||||
|
"18.05.32",
|
||||||
|
"18.05.35",
|
||||||
|
"18.05.40"
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
)
|
||||||
|
@Target(AnnotationTarget.CLASS)
|
||||||
|
internal annotation class ProtobufSpoofCompatibility
|
@ -0,0 +1,31 @@
|
|||||||
|
package app.revanced.patches.youtube.misc.fix.playback.fingerprints
|
||||||
|
|
||||||
|
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||||
|
import org.jf.dexlib2.Opcode
|
||||||
|
|
||||||
|
object ProtobufParameterBuilderFingerprint : MethodFingerprint(
|
||||||
|
opcodes = listOf(
|
||||||
|
Opcode.MOVE_RESULT,
|
||||||
|
Opcode.CONST_16,
|
||||||
|
Opcode.MOVE_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT,
|
||||||
|
Opcode.MOVE_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_OBJECT_FROM16,
|
||||||
|
Opcode.MOVE_FROM16,
|
||||||
|
Opcode.MOVE_FROM16,
|
||||||
|
Opcode.MOVE_FROM16,
|
||||||
|
Opcode.INVOKE_VIRTUAL_RANGE, // target reference
|
||||||
|
// Opcode.MOVE_RESULT_OBJECT,
|
||||||
|
// Opcode.IPUT_OBJECT
|
||||||
|
),
|
||||||
|
strings = listOf(
|
||||||
|
"Prefetch request are disabled.",
|
||||||
|
"Unexpected empty videoId.",
|
||||||
|
)
|
||||||
|
)
|
@ -0,0 +1,53 @@
|
|||||||
|
package app.revanced.patches.youtube.misc.fix.playback.patch
|
||||||
|
|
||||||
|
import app.revanced.extensions.toErrorResult
|
||||||
|
import app.revanced.patcher.annotation.Description
|
||||||
|
import app.revanced.patcher.annotation.Name
|
||||||
|
import app.revanced.patcher.annotation.Version
|
||||||
|
import app.revanced.patcher.data.BytecodeContext
|
||||||
|
import app.revanced.patcher.data.toMethodWalker
|
||||||
|
import app.revanced.patcher.extensions.addInstructions
|
||||||
|
import app.revanced.patcher.extensions.instruction
|
||||||
|
import app.revanced.patcher.patch.BytecodePatch
|
||||||
|
import app.revanced.patcher.patch.PatchResult
|
||||||
|
import app.revanced.patcher.patch.PatchResultSuccess
|
||||||
|
import app.revanced.patcher.patch.annotations.Patch
|
||||||
|
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
|
||||||
|
import app.revanced.patcher.util.smali.ExternalLabel
|
||||||
|
import app.revanced.patches.youtube.misc.fix.playback.annotation.ProtobufSpoofCompatibility
|
||||||
|
import app.revanced.patches.youtube.misc.fix.playback.fingerprints.ProtobufParameterBuilderFingerprint
|
||||||
|
|
||||||
|
@Patch
|
||||||
|
@Name("spoof-signature-verification")
|
||||||
|
@Description("Spoofs the client to prevent playback issues.")
|
||||||
|
@ProtobufSpoofCompatibility
|
||||||
|
@Version("0.0.1")
|
||||||
|
class SpoofSignatureVerificationPatch : BytecodePatch(
|
||||||
|
listOf(ProtobufParameterBuilderFingerprint)
|
||||||
|
) {
|
||||||
|
override fun execute(context: BytecodeContext): PatchResult {
|
||||||
|
ProtobufParameterBuilderFingerprint.result?.let {
|
||||||
|
val setParamMethod = context
|
||||||
|
.toMethodWalker(it.method)
|
||||||
|
.nextMethod(it.scanResult.patternScanResult!!.endIndex, true).getMethod() as MutableMethod
|
||||||
|
|
||||||
|
setParamMethod.apply {
|
||||||
|
val protobufParameterRegister = 3
|
||||||
|
val parameterValue = "8AEByAMTuAQP" /* Protobuf Parameter of shorts */
|
||||||
|
|
||||||
|
addInstructions(
|
||||||
|
0,
|
||||||
|
"""
|
||||||
|
invoke-virtual { p$protobufParameterRegister }, Ljava/lang/String;->length()I
|
||||||
|
move-result v0
|
||||||
|
const/16 v1, 0x10
|
||||||
|
if-ge v0, v1, :not_spoof # bypass on feed
|
||||||
|
const-string p$protobufParameterRegister, "$parameterValue"
|
||||||
|
""",
|
||||||
|
listOf(ExternalLabel("not_spoof", instruction(0))))
|
||||||
|
}
|
||||||
|
} ?: return ProtobufParameterBuilderFingerprint.toErrorResult()
|
||||||
|
|
||||||
|
return PatchResultSuccess()
|
||||||
|
}
|
||||||
|
}
|
@ -12,6 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
|
|||||||
import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
|
import app.revanced.patches.shared.fingerprints.WatchWhileActivityFingerprint
|
||||||
import app.revanced.patches.youtube.layout.buttons.cast.patch.HideCastButtonPatch
|
import app.revanced.patches.youtube.layout.buttons.cast.patch.HideCastButtonPatch
|
||||||
import app.revanced.patches.youtube.misc.fix.spoof.patch.ClientSpoofPatch
|
import app.revanced.patches.youtube.misc.fix.spoof.patch.ClientSpoofPatch
|
||||||
|
import app.revanced.patches.youtube.misc.fix.playback.patch.SpoofSignatureVerificationPatch
|
||||||
import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
|
import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
|
||||||
import app.revanced.patches.youtube.misc.microg.fingerprints.*
|
import app.revanced.patches.youtube.misc.microg.fingerprints.*
|
||||||
import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
|
import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
|
||||||
@ -24,7 +25,8 @@ import app.revanced.util.microg.MicroGBytecodeHelper
|
|||||||
[
|
[
|
||||||
MicroGResourcePatch::class,
|
MicroGResourcePatch::class,
|
||||||
HideCastButtonPatch::class,
|
HideCastButtonPatch::class,
|
||||||
ClientSpoofPatch::class
|
ClientSpoofPatch::class,
|
||||||
|
SpoofSignatureVerificationPatch::class
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
@Name("microg-support")
|
@Name("microg-support")
|
||||||
|
Loading…
Reference in New Issue
Block a user