[fix/ISSUE-75] Fix bug when deciphering N param with $ in challenge name

azihassan · May 14, 2024 · 8c006d9 · 8c006d9
1 parent a528ddc
commit 8c006d9
Show file tree

Hide file tree

Showing 3 changed files with 13,499 additions and 9 deletions.
diff --git a/source/helpers.d b/source/helpers.d
@@ -69,21 +69,21 @@ string matchOrFail(string pattern, bool escape = false)(string source)
 {
     trace("Matching ", pattern);
     auto regex = ctRegex!(escape ? pattern.escaper.to!string : pattern);
-    return source.matchFirst(regex).matchOrFail();
+    return source.matchFirst(regex).matchOrFail(pattern);
 }
 
 string matchOrFail(string source, string pattern)
 {
     trace("Matching ", pattern);
     auto regex = regex(pattern);
-    return source.matchFirst(regex).matchOrFail();
+    return source.matchFirst(regex).matchOrFail(pattern);
 }
 
-string matchOrFail(Captures!string match)
+string matchOrFail(Captures!string match, string pattern = "")
 {
     if(match.empty)
     {
-        throw new Exception("Failed to match regular expression");
+        throw new Exception("Failed to match regular expression " ~ pattern);
     }
     return match[1];
 }

diff --git a/source/parsers.d b/source/parsers.d
@@ -7,7 +7,7 @@ import std.conv : to;
 import std.array : replace;
 import std.file : readText;
 import std.string : indexOf, format, lastIndexOf, split, strip, toStringz, startsWith;
-import std.regex : ctRegex, matchFirst;
+import std.regex : ctRegex, matchFirst, escaper;
 import std.algorithm : canFind, filter, reverse, map;
 import std.format : formattedRead;
 
@@ -556,12 +556,12 @@ struct ThrottlingAlgorithm
 
     string findChallengeName()
     {
-        return javascript.matchOrFail!(`\|\|([a-zA-Z]{3})\(""\)`, false);
+        return javascript.matchOrFail!(`\|\|(.{3})\(""\)`, false);
     }
 
     string findChallengeImplementation()
     {
-        string challengeName = findChallengeName();
+        string challengeName = findChallengeName().escaper().to!string;
         logger.displayVerbose("challenge name : ", challengeName);
         return javascript.matchOrFail(challengeName ~ `=function\(a\)\{((.|\s)+?)return b\.join\(""\)\};`).strip();
     }
@@ -597,8 +597,9 @@ struct ThrottlingAlgorithm
         }
         catch(Exception e)
         {
-            logger.display(e.message.idup.formatError());
-            logger.display("Failed to solve N parameter, downloads might be rate limited".formatError());
+            logger.display(e.message.idup.formatWarning());
+            logger.display("Failed to solve N parameter, downloads might be rate limited".formatWarning());
+            logger.displayVerbose(e.info.to!string.formatWarning());
             return n;
         }
     }
@@ -627,3 +628,15 @@ unittest
 
     assert(expected == actual, expected ~ " != " ~ actual);
 }
+
+unittest
+{
+    writeln("Should solve challenge with unusual characters in it");
+    auto algorithm = ThrottlingAlgorithm("tests/a960a0cb.js".readText(), new StdoutLogger());
+    assert(algorithm.findChallengeName() == "$la", algorithm.findChallengeName() ~ " != $la");
+
+    string expected = "CJ6mFweU_U3YMQ";
+    string actual = algorithm.solve("lTCmja7irJFW2HwaD");
+
+    assert(expected == actual, expected ~ " != " ~ actual);
+}