adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't 404 extensions that could be handled by routing.

Browse source 
Fixes an error in #2750 where routed extensions would always return
404's for plugin requests. When a file extenion could be handled by
router, AssetDispatcher cannot 404 the request.

Refs #3305
This commit is contained in:
mark_story 2014-04-13 06:48:51 -04:00
parent 4b1d2b06c9
commit 749f2b99d9
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Cake/Routing/Filter/AssetDispatcher.php
View file

@ -55,10 +55,17 @@ class AssetDispatcher extends DispatcherFilter {
return null;
}
$pathSegments = explode('.', $url);
$ext = array_pop($pathSegments);
$isFile = file_exists($assetFile);
if (in_array($ext, Router::extensions()) && !$isFile) {
return null;
}
$response = $event->data['response'];
$event->stopPropagation();
if (!file_exists($assetFile)) {
if (!$isFile) {
$response->statusCode(404);
$response->send();
return $response;
@ -69,8 +76,6 @@ class AssetDispatcher extends DispatcherFilter {
return $response;
}
$pathSegments = explode('.', $url);
$ext = array_pop($pathSegments);
$this->_deliverAsset($response, $assetFile, $ext);
return $response;
}

32
lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
View file

@ -83,6 +83,38 @@ class AssetDispatcherTest extends CakeTestCase {
$this->assertFalse($event->isStopped());
}
/**
* AssetDispatcher should not 404 extensions that could be handled
* by Routing.
*
* @return void
*/
public function testNoHandleRoutedExtension() {
$filter = new AssetDispatcher();
$response = $this->getMock('CakeResponse', array('_sendHeader'));
Configure::write('Asset.filter', array(
'js' => '',
'css' => ''
));
App::build(array(
'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
), App::RESET);
Router::parseExtensions('json');
Router::connect('/test_plugin/api/v1/:action', array('controller' => 'api'));
CakePlugin::load('TestPlugin');
$request = new CakeRequest('test_plugin/api/v1/forwarding.json');
$event = new CakeEvent('DispatcherTest', $this, compact('request', 'response'));
$this->assertNull($filter->beforeDispatch($event));
$this->assertFalse($event->isStopped(), 'Events for routed extensions should not be stopped');
$request = new CakeRequest('test_plugin/api/v1/forwarding.png');
$event = new CakeEvent('DispatcherTest', $this, compact('request', 'response'));
$this->assertSame($response, $filter->beforeDispatch($event));
$this->assertTrue($event->isStopped());
}
/**
* Tests that $response->checkNotModified() is called and bypasses
* file dispatching