Merge pull request #30 from LulububuApps/bugfix/invalid-config-catch

Avoid crashes on invalid configurations
LulububuSoftwareGmbH · Oct 31, 2019 · cc4e1ea · cc4e1ea
2 parents 3151b78 + 8bf7ad3
commit cc4e1ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea/
 config.yml
 composer.lock
 vendor/

diff --git a/src/Config/Redirect.php b/src/Config/Redirect.php
@@ -90,7 +90,11 @@ public function prepare()
      */
     public function match($path)
     {
-        return preg_match("~^" . $this->computedWildcards . "$~i", $path);
+        try {
+            return preg_match("~^" . $this->computedWildcards . "$~i", $path);
+        } catch (\Exception $exception) {
+            return false;
+        }
     }
 
     /**

diff --git a/src/Redirector/Redirector.php b/src/Redirector/Redirector.php
@@ -37,8 +37,13 @@ public function handle(Request $request, Application $app)
         foreach ($this->config->getRedirects() as $redirect) {
 
             $redirect->prepare();
+            $match = $redirect->match($path);
 
-            if ($redirect->match($path)) {
+            if ($match === false) {
+                $app['logger.flash']->error('Error while parsing the boltredirector <a href="/bolt/file/edit/extensions_config/boltredirector.sahassar.yml">configuration</a>.');
+            }
+
+            if ($match) {
                 $result = $redirect->getResult($path);
                 $status = $redirect->getStatusCode();