diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add basic validation of callback name

Browse Source
This commit is contained in:
Toni Uebernickel 2012-03-20 11:05:22 +01:00
parent 266f76d963
commit 601b87ca01
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/HttpFoundation/JsonResponse.php
View File

@ -56,6 +56,14 @@ class JsonResponse extends Response
*/
public function setCallback($callback = null)
{
if ($callback) {
// taken from http://www.geekality.net/2011/08/03/valid-javascript-identifier/
$pattern = '/^[$_\p{L}][$_\p{L}\p{Mn}\p{Mc}\p{Nd}\p{Pc}\x{200C}\x{200D}]*+$/u';
if (!preg_match($pattern, $callback)) {
throw new \InvalidArgumentException('The callback name is not valid.');
}
}
$this->callback = $callback;
return $this->update();

8
tests/Symfony/Tests/Component/HttpFoundation/JsonResponseTest.php
View File

@ -104,4 +104,12 @@ class JsonResponseTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('callback({"foo":"bar"});', $response->getContent());
$this->assertEquals('text/javascript', $response->headers->get('Content-Type'));
}
public function testSetCallbackInvalidIdentifier()
{
$response = new JsonResponse('foo');
$this->setExpectedException('InvalidArgumentException');
$response->setCallback('+invalid');
}
}