php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 14:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue #337: support strict parsing for URL manager.

Browse Source
This commit is contained in:
Qiang Xue
2013-05-23 10:47:45 -04:00
parent 79598ca8ca
commit c4595b8b5d
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/yii/web/UrlManager.php
View File

@@ -26,6 +26,12 @@ class UrlManager extends Component
* "/index.php?r=news/view&id=100". * "/index.php?r=news/view&id=100".
*/ */
public $enablePrettyUrl = false; public $enablePrettyUrl = false;
/**
* @var boolean whether to enable strict parsing. If strict parsing is enabled, the incoming
* requested URL must match at least one of the [[rules]] in order to be treated as a valid request.
* This property is used only when [[enablePrettyUrl]] is true.
*/
public $enableStrictParsing = false;
/** /**
* @var array the rules for creating and parsing URLs when [[enablePrettyUrl]] is true. * @var array the rules for creating and parsing URLs when [[enablePrettyUrl]] is true.
* This property is used only if [[enablePrettyUrl]] is true. Each element in the array * This property is used only if [[enablePrettyUrl]] is true. Each element in the array
@@ -139,6 +145,10 @@ class UrlManager extends Component
} }
} }
if ($this->enableStrictParsing) {
return false;
}
$suffix = (string)$this->suffix; $suffix = (string)$this->suffix;
if ($suffix !== '' && $suffix !== '/' && $pathInfo !== '') { if ($suffix !== '' && $suffix !== '/' && $pathInfo !== '') {
$n = strlen($this->suffix); $n = strlen($this->suffix);

22
tests/unit/framework/web/UrlManagerTest.php
View File

@@ -224,5 +224,27 @@ class UrlManagerTest extends \yiiunit\TestCase
$request->pathInfo = 'site/index'; $request->pathInfo = 'site/index';
$result = $manager->parseRequest($request); $result = $manager->parseRequest($request);
$this->assertFalse($result); $this->assertFalse($result);
// strict parsing
$manager = new UrlManager(array(
'enablePrettyUrl' => true,
'enableStrictParsing' => true,
'suffix' => '.html',
'cache' => null,
'rules' => array(
array(
'pattern' => 'post/<id>/<title>',
'route' => 'post/view',
),
),
));
// matching pathinfo
$request->pathInfo = 'post/123/this+is+sample.html';
$result = $manager->parseRequest($request);
$this->assertEquals(array('post/view', array('id' => '123', 'title' => 'this+is+sample')), $result);
// unmatching pathinfo
$request->pathInfo = 'site/index.html';
$result = $manager->parseRequest($request);
$this->assertFalse($result);
} }
} }