Merge pull request #121 from asilelik/master

Allow wildcard in path
jaytaph · Apr 7, 2021 · 15e5a87 · 15e5a87
2 parents 3ddfa80 + 032a73a
commit 15e5a87
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/Tests/Util/PathLimitProcessorTest.php b/Tests/Util/PathLimitProcessorTest.php
@@ -186,6 +186,37 @@ function itMatchesAstrixAsAnyMethod()
         $this->assertEquals(array('*'), $result->getMethods());
     }
 
+    /** @test */
+    function itMatchesAstrixAsAnyPath()
+    {
+        $plp = new PathLimitProcessor(array(
+            'api' => array(
+                'path' => '*',
+                'methods' => array('GET'),
+                'limit' => 100,
+                'period' => 60
+            )
+        ));
+
+        $result = $plp->getRateLimit(Request::create('/api'));
+
+        $this->assertEquals(100, $result->getLimit());
+        $this->assertEquals(60, $result->getPeriod());
+        $this->assertEquals(array('GET'), $result->getMethods());
+
+        $result = $plp->getRateLimit(Request::create('/api/users'));
+
+        $this->assertEquals(100, $result->getLimit());
+        $this->assertEquals(60, $result->getPeriod());
+        $this->assertEquals(array('GET'), $result->getMethods());
+
+        $result = $plp->getRateLimit(Request::create('/api/users/emails'));
+
+        $this->assertEquals(100, $result->getLimit());
+        $this->assertEquals(60, $result->getPeriod());
+        $this->assertEquals(array('GET'), $result->getMethods());
+    }
+
     /** @test */
     function itMatchesWhenAccessSubPaths()
     {

diff --git a/Util/PathLimitProcessor.php b/Util/PathLimitProcessor.php
@@ -77,6 +77,10 @@ private function methodMatched(array $expectedMethods, $method)
 
     private function pathMatched($expectedPath, $path)
     {
+        if ($expectedPath === '*') {
+            return true;
+        }
+
         $expectedParts = explode('/', $expectedPath);
         $actualParts = explode('/', $path);