| {{ loop.index }} |
- {{ trace.name }} |
- {{ trace.path }} |
+ {{ trace.name }} |
+ {{ trace.path }} |
{% if trace.level == 1 %}
Path almost matches, but
diff --git a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
index db6c64d54e..131d66e2c6 100644
--- a/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+++ b/src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
@@ -58,7 +58,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase
protected function assertMatchesXpath($html, $expression, $count = 1)
{
- $dom = new \DomDocument('UTF-8');
+ $dom = new \DOMDocument('UTF-8');
try {
// Wrap in node so we can load HTML with multiple tags at
// the top level
diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
index f8d94e5feb..1017b32862 100644
--- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
+++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php
@@ -43,6 +43,8 @@ class ContextListener implements ListenerInterface
private $registered;
private $trustResolver;
+ private static $unserializeExceptionCode = 0x37313bc;
+
public function __construct(TokenStorageInterface $tokenStorage, array $userProviders, $contextKey, LoggerInterface $logger = null, EventDispatcherInterface $dispatcher = null, AuthenticationTrustResolverInterface $trustResolver = null)
{
if (empty($contextKey)) {
@@ -82,7 +84,7 @@ class ContextListener implements ListenerInterface
return;
}
- $token = unserialize($token);
+ $token = $this->safelyUnserialize($token);
if (null !== $this->logger) {
$this->logger->debug('Read existing security token from the session.', array('key' => $this->sessionKey));
@@ -176,4 +178,43 @@ class ContextListener implements ListenerInterface
throw new \RuntimeException(sprintf('There is no user provider for user "%s".', get_class($user)));
}
+
+ private function safelyUnserialize($serializedToken)
+ {
+ $e = $token = null;
+ $prevUnserializeHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
+ $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = array()) use (&$prevErrorHandler) {
+ if (__FILE__ === $file) {
+ throw new \UnexpectedValueException($msg, self::$unserializeExceptionCode);
+ }
+
+ return $prevErrorHandler ? $prevErrorHandler($type, $msg, $file, $line, $context) : false;
+ });
+
+ try {
+ $token = unserialize($serializedToken);
+ } catch (\Error $e) {
+ } catch (\Exception $e) {
+ }
+ restore_error_handler();
+ ini_set('unserialize_callback_func', $prevUnserializeHandler);
+ if ($e) {
+ if (!$e instanceof \UnexpectedValueException || self::$unserializeExceptionCode !== $e->getCode()) {
+ throw $e;
+ }
+ if ($this->logger) {
+ $this->logger->warning('Failed to unserialize the security token from the session.', array('key' => $this->sessionKey, 'received' => $serializedToken, 'exception' => $e));
+ }
+ }
+
+ return $token;
+ }
+
+ /**
+ * @internal
+ */
+ public static function handleUnserializeCallback($class)
+ {
+ throw new \UnexpectedValueException('Class not found: '.$class, self::$unserializeExceptionCode);
+ }
}
diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
index 57592d6503..9edc2b3e27 100644
--- a/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
+++ b/src/Symfony/Component/Security/Http/Tests/Firewall/ContextListenerTest.php
@@ -177,6 +177,8 @@ class ContextListenerTest extends TestCase
public function provideInvalidToken()
{
return array(
+ array('foo'),
+ array('O:8:"NotFound":0:{}'),
array(serialize(new \__PHP_Incomplete_Class())),
array(serialize(null)),
array(null),
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
index 6ed558f7dc..591e6f0496 100644
--- a/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
+++ b/src/Symfony/Component/Serializer/Encoder/JsonEncode.php
@@ -38,7 +38,7 @@ class JsonEncode implements EncoderInterface
$encodedJson = json_encode($data, $context['json_encode_options']);
- if (JSON_ERROR_NONE !== json_last_error()) {
+ if (JSON_ERROR_NONE !== json_last_error() && (false === $encodedJson || !($context['json_encode_options'] & JSON_PARTIAL_OUTPUT_ON_ERROR))) {
throw new UnexpectedValueException(json_last_error_msg());
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
index ad8d57065f..b08b6d5b50 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
@@ -65,6 +65,44 @@ class JsonEncoderTest extends TestCase
$this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
}
+ /**
+ * @expectedException \Symfony\Component\Serializer\Exception\UnexpectedValueException
+ */
+ public function testEncodeNotUtf8WithoutPartialOnError()
+ {
+ $arr = array(
+ 'utf8' => 'Hello World!',
+ 'notUtf8' => "\xb0\xd0\xb5\xd0",
+ );
+
+ $this->encoder->encode($arr, 'json');
+ }
+
+ public function testEncodeNotUtf8WithPartialOnError()
+ {
+ $context = array('json_encode_options' => JSON_PARTIAL_OUTPUT_ON_ERROR);
+
+ $arr = array(
+ 'utf8' => 'Hello World!',
+ 'notUtf8' => "\xb0\xd0\xb5\xd0",
+ );
+
+ $result = $this->encoder->encode($arr, 'json', $context);
+ $jsonLastError = json_last_error();
+
+ $this->assertSame(JSON_ERROR_UTF8, $jsonLastError);
+ $this->assertEquals('{"utf8":"Hello World!","notUtf8":null}', $result);
+
+ $this->assertEquals('0', $this->serializer->serialize(NAN, 'json', $context));
+ }
+
+ public function testDecodeFalseString()
+ {
+ $result = $this->encoder->decode('false', 'json');
+ $this->assertSame(JSON_ERROR_NONE, json_last_error());
+ $this->assertFalse($result);
+ }
+
protected function getJsonSource()
{
return '{"foo":"foo","bar":["a","b"],"baz":{"key":"val","key2":"val","A B":"bar","item":[{"title":"title1"},{"title":"title2"}],"Barry":{"FooBar":{"Baz":"Ed","@id":1}}},"qux":"1"}';
|