Merge pull request #1985 from jim-parry/fix/filter-match

Fix filter processing. Fixes #1907

Author: jim-parry

system/Filters/Filters.php

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * CodeIgniter
  *
@@ -317,9 +316,7 @@ public function enableFilter(string $name, string $when = 'before')
 	 */
 	public function getArguments(string $key = null)
 	{
-		return is_null($key)
-			? $this->arguments
-			: $this->arguments[$key];
+		return is_null($key) ? $this->arguments : $this->arguments[$key];
 	}
 
 	//--------------------------------------------------------------------
@@ -334,80 +331,44 @@ protected function processGlobals(string $uri = null)
 			return;
 		}
 
-		// Before
-		if (isset($this->config->globals['before']))
+		$uri = strtolower(trim($uri, '/ '));
+
+		// Add any global filters, unless they are excluded for this URI
+		$sets = [
+			'before',
+			'after',
+		];
+		foreach ($sets as $set)
 		{
-			// Take any 'except' routes into consideration
-			foreach ($this->config->globals['before'] as $alias => $rules)
+			if (isset($this->config->globals[$set]))
 			{
-				if (! is_array($rules) || ! array_key_exists('except', $rules))
-				{
-					continue;
-				}
-
-				$rules = $rules['except'];
-
-				if (is_string($rules))
+				// look at each alias in the group
+				foreach ($this->config->globals[$set] as $alias => $rules)
 				{
-					$rules = [$rules];
-				}
-
-				foreach ($rules as $path)
-				{
-					// Prep it for regex
-					$path = strtolower(str_replace('/*', '*', $path));
-					$path = trim(str_replace('*', '.+', $path), '/ ');
-
-					// Path doesn't match the URI? continue on...
-					if (preg_match('#' . $path . '#', $uri, $match) !== 1)
+					$keep = true;
+					if (is_array($rules))
 					{
-						continue;
+						// see if it should be excluded
+						if (isset($rules['except']))
+						{
+							// grab the exclusion rules
+							$check = $rules['except'];
+							if ($this->pathApplies($uri, $check))
+							{
+								$keep = false;
+							}
+						}
 					}
-
-					unset($this->config->globals['before'][$alias]);
-					break;
-				}
-			}
-
-			$this->filters['before'] = array_merge($this->filters['before'], $this->config->globals['before']);
-		}
-
-		// After
-		if (isset($this->config->globals['after']))
-		{
-			// Take any 'except' routes into consideration
-			foreach ($this->config->globals['after'] as $alias => $rules)
-			{
-				if (! is_array($rules) || ! array_key_exists('except', $rules))
-				{
-					continue;
-				}
-
-				$rules = $rules['except'];
-
-				if (is_string($rules))
-				{
-					$rules = [$rules];
-				}
-
-				foreach ($rules as $path)
-				{
-					// Prep it for regex
-					$path = strtolower(str_replace('/*', '*', $path));
-					$path = trim(str_replace('*', '.+', $path), '/ ');
-
-					// Path doesn't match the URI? continue on...
-					if (preg_match('#' . $path . '#', $uri, $match) !== 1)
+					else
 					{
-						continue;
+						$alias = $rules; // simple name of filter to apply
+					}
+					if ($keep)
+					{
+						$this->filters[$set][] = $alias;
 					}
-
-					unset($this->config->globals['after'][$alias]);
-					break;
 				}
 			}
-
-			$this->filters['after'] = array_merge($this->filters['after'], $this->config->globals['after']);
 		}
 	}
 
@@ -441,53 +402,64 @@ protected function processFilters(string $uri = null)
 
 		$uri = strtolower(trim($uri, '/ '));
 
-		$matches = [];
-
+		// Add any filters that apply to this URI
 		foreach ($this->config->filters as $alias => $settings)
 		{
-			// Before
+			// Look for inclusion rules
 			if (isset($settings['before']))
 			{
-				foreach ($settings['before'] as $path)
+				$path = $settings['before'];
+				if ($this->pathApplies($uri, $path))
 				{
-					// Prep it for regex
-					$path = strtolower(str_replace('/*', '*', $path));
-					$path = trim(str_replace('*', '.+', $path), '/ ');
-
-					if (preg_match('#' . $path . '#', $uri) !== 1)
-					{
-						continue;
-					}
-
-					$matches[] = $alias;
+					$this->filters['before'][] = $alias;
 				}
-
-				$this->filters['before'] = array_merge($this->filters['before'], $matches);
-				$matches                 = [];
 			}
-
-			// After
 			if (isset($settings['after']))
 			{
-				foreach ($settings['after'] as $path)
+				$path = $settings['after'];
+				if ($this->pathApplies($uri, $path))
 				{
-					// Prep it for regex
-					$path = strtolower(str_replace('/*', '*', $path));
-					$path = trim(str_replace('*', '.+', $path), '/ ');
+					$this->filters['after'][] = $alias;
+				}
+			}
+		}
+	}
 
-					if (preg_match('#' . $path . '#', $uri) !== 1)
-					{
-						continue;
-					}
+	/**
+	 * Check paths for match for URI
+	 *
+	 * @param  string $uri   URI to test against
+	 * @param  mixed  $paths The path patterns to test
+	 * @return boolean		True if any of the paths apply to the URI
+	 */
+	private function pathApplies(string $uri, $paths)
+	{
+		// empty path matches all
+		if (empty($paths))
+		{
+			return true;
+		}
 
-					$matches[] = $alias;
-				}
+		// make sure the paths are iterable
+		if (is_string($paths))
+		{
+			$paths = [$paths];
+		}
 
-				$this->filters['after'] = array_merge($this->filters['after'], $matches);
-				$matches                = [];
+		// treat each paths as pseudo-regex
+		foreach ($paths as $path)
+		{
+			// need to escape path separators
+			$path = str_replace('/', '\/', trim($path, '/ '));
+			// need to make pseudo wildcard real
+			$path = strtolower(str_replace('*', '.*', $path));
+			// Does this rule apply here?
+			if (preg_match('#' . $path . '#', $uri, $match) === 1)
+			{
+				return true;
 			}
 		}
+		return false;
 	}
 
-	//--------------------------------------------------------------------
 }