Merge pull request #190 from alexdebril/issue/180

Handle wrong `if-modified-since` header

Author: alexdebril

Request/ModifiedSince.php

@@ -3,6 +3,7 @@
 namespace Debril\RssAtomBundle\Request;
 
 
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -13,8 +14,11 @@ class ModifiedSince
 
     private $value;
 
-    public function __construct(RequestStack $requestStack)
+    private $logger;
+
+    public function __construct(RequestStack $requestStack, LoggerInterface $logger)
     {
+        $this->logger = $logger;
         $this->value = $this->getModifiedSince($requestStack->getCurrentRequest());
     }
 
@@ -29,10 +33,15 @@ public function getValue(): \DateTime
     private function getModifiedSince(Request $request):\DateTime
     {
         if ($request->headers->has(self::HTTP_HEADER_NAME)) {
-            $string = $request->headers->get(self::HTTP_HEADER_NAME);
-            return \DateTime::createFromFormat(\DateTime::RSS, $string);
+            try {
+                $string = $request->headers->get(self::HTTP_HEADER_NAME);
+                return new \DateTime($string);
+            } catch (\TypeError|\Exception $e) {
+                $this->logger->notice(sprintf('If-Modified-Since Header has a unexpected value, exception was %s', $e->getMessage()));
+            }
         }
 
         return new \DateTime('@1');
     }
+
 }

Tests/Request/ModifiedSinceTest.php

@@ -6,6 +6,7 @@
 
 use Debril\RssAtomBundle\Request\ModifiedSince;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -20,7 +21,42 @@ public function testGetValue()
         $request->headers->set('If-Modified-Since', $date->format(\DATE_RSS));
         $stack->push($request);
 
-        $modifiedSince = new ModifiedSince($stack);
+        $modifiedSince = new ModifiedSince($stack, new NullLogger());
+        $this->assertEquals($date, $modifiedSince->getValue());
+    }
+
+    public function testGetBadValue()
+    {
+        $stack = new RequestStack();
+        $request = new Request();
+        $request->headers->set('If-Modified-Since', 'something that is not a date');
+        $stack->push($request);
+
+        $modifiedSince = new ModifiedSince($stack, new NullLogger());
+        $this->assertInstanceOf('\DateTime', $modifiedSince->getValue());
+    }
+
+    public function testGetEmptyArrayValue()
+    {
+        $stack = new RequestStack();
+        $request = new Request();
+        $request->headers->set('If-Modified-Since', array());
+        $stack->push($request);
+
+        $modifiedSince = new ModifiedSince($stack, new NullLogger());
+        $this->assertInstanceOf('\DateTime', $modifiedSince->getValue());
+    }
+
+
+    public function testGetValueInArray()
+    {
+        $stack = new RequestStack();
+        $request = new Request();
+        $date = new \DateTime('2018-06-01');
+        $request->headers->set('If-Modified-Since', [$date->format(\DATE_RSS)]);
+        $stack->push($request);
+
+        $modifiedSince = new ModifiedSince($stack, new NullLogger());
         $this->assertEquals($date, $modifiedSince->getValue());
     }
 

Tests/Response/FeedBuilderTest.php

@@ -9,6 +9,7 @@
 use FeedIo\Feed;
 use FeedIo\FeedIo;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\NullLogger;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -38,7 +39,7 @@ public function setUp()
         $stack->push($request);
         $this->feedIo = Factory::create()->getFeedIo();
         $this->headersBuilder = new HeadersBuilder();
-        $this->modifiedSince = new ModifiedSince($stack);
+        $this->modifiedSince = new ModifiedSince($stack, new NullLogger());
         parent::setUp();
     }