From a60bb3e7afe96eab980bcebf42944fb46cede8fd Mon Sep 17 00:00:00 2001 From: AudricV <74829229+AudricV@users.noreply.github.com> Date: Mon, 3 Feb 2025 13:05:39 +0100 Subject: [PATCH] [YouTube] Change BotGuard endpoint to youtube.com's one This prevents non-abilities to fetch BotGuard challenge and send its result with the jnn-pa.googleapis.com domain (domain block like done on Pi-hole lists or DNS servers). That's what the official website uses to send the challenge execution result, however it uses InnerTube to fetch the challenge. Embeds still use the jnn-pa.googleapis.com domain. Also rename the makeJnnPaGoogleapisRequest method appropriately. --- .../org/schabi/newpipe/util/potoken/PoTokenWebView.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt b/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt index 89cad89b0..2589e12c3 100644 --- a/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt +++ b/app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt @@ -89,8 +89,8 @@ class PoTokenWebView private constructor( Log.d(TAG, "downloadAndRunBotguard() called") } - makeJnnPaGoogleapisRequest( - "https://jnn-pa.googleapis.com/\$rpc/google.internal.waa.v1.Waa/Create", + makeBotguardServiceRequest( + "https://www.youtube.com/api/jnn/v1/Create", "[ \"$REQUEST_KEY\" ]", ) { responseBody -> webView.evaluateJavascript( @@ -129,8 +129,8 @@ class PoTokenWebView private constructor( if (BuildConfig.DEBUG) { Log.d(TAG, "botguardResponse: $botguardResponse") } - makeJnnPaGoogleapisRequest( - "https://jnn-pa.googleapis.com/\$rpc/google.internal.waa.v1.Waa/GenerateIT", + makeBotguardServiceRequest( + "https://www.youtube.com/api/jnn/v1/GenerateIT", "[ \"$REQUEST_KEY\", \"$botguardResponse\" ]", ) { responseBody -> if (BuildConfig.DEBUG) { @@ -252,7 +252,7 @@ class PoTokenWebView private constructor( * successful. The request is performed in the background and a disposable is added to * [disposables]. */ - private fun makeJnnPaGoogleapisRequest( + private fun makeBotguardServiceRequest( url: String, data: String, handleResponseBody: (String) -> Unit,