be-gay-do-crimes
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #934 from AudricV/fix-yt-throttling-decryption-function-regex 

[YouTube] Fix throttling decryption function regex
This commit is contained in:
Stypox 2022-09-25 13:26:08 +02:00 committed by GitHub
parent 7244be7627 8067c43837
commit 5c710da160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeThrottlingDecrypter.java
View File

@ -38,7 +38,15 @@ public final class YoutubeThrottlingDecrypter {
private static final Pattern N_PARAM_PATTERN = Pattern.compile("[&?]n=([^&]+)"); private static final Pattern N_PARAM_PATTERN = Pattern.compile("[&?]n=([^&]+)");
private static final Pattern DECRYPT_FUNCTION_NAME_PATTERN = Pattern.compile( private static final Pattern DECRYPT_FUNCTION_NAME_PATTERN = Pattern.compile(
"\\.get\\(\"n\"\\)\\)&&\\(b=([a-zA-Z0-9$]+)(?:\\[(\\d+)])?\\([a-zA-Z0-9]\\)"); // CHECKSTYLE:OFF
"\\.get\\(\"n\"\\)\\)&&\\([a-zA-Z0-9$_]=([a-zA-Z0-9$_]+)(?:\\[(\\d+)])?\\([a-zA-Z0-9$_]\\)");
// CHECKSTYLE:ON
// Escape the curly end brace to allow compatibility with Android's regex engine
// See https://stackoverflow.com/q/45074813
@SuppressWarnings("RegExpRedundantEscape")
private static final String DECRYPT_FUNCTION_BODY_REGEX =
"=\\s*function([\\S\\s]*?\\}\\s*return [\\w$]+?\\.join\\(\"\"\\)\\s*\\};)";
private static final Map<String, String> N_PARAMS_CACHE = new HashMap<>(); private static final Map<String, String> N_PARAMS_CACHE = new HashMap<>();
private static String decryptFunction; private static String decryptFunction;
@ -128,11 +136,9 @@ public final class YoutubeThrottlingDecrypter {
@Nonnull @Nonnull
private static String parseWithRegex(final String playerJsCode, final String functionName) private static String parseWithRegex(final String playerJsCode, final String functionName)
throws Parser.RegexException { throws Parser.RegexException {
// Escape the curly end brace to allow compatibility with Android's regex engine // Quote the function name, as it may contain special regex characters such as dollar
// See https://stackoverflow.com/q/45074813 final Pattern functionPattern = Pattern.compile(
//noinspection RegExpRedundantEscape Pattern.quote(functionName) + DECRYPT_FUNCTION_BODY_REGEX, Pattern.DOTALL);
final Pattern functionPattern = Pattern.compile(functionName + "=function(.*?\\};)\n",
Pattern.DOTALL);
return validateFunction("function " return validateFunction("function "
+ functionName + functionName
+ Parser.matchGroup1(functionPattern, playerJsCode)); + Parser.matchGroup1(functionPattern, playerJsCode));