ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix If-Modified-Since header parsing

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-12-08 11:28:33 +01:00
parent ec42c0c2b4
commit af57c3bf4f
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Controller/BoardApiController.php
View File

@@ -24,12 +24,14 @@
namespace OCA\Deck\Controller; namespace OCA\Deck\Controller;
use OCA\Deck\StatusException;
use OCP\AppFramework\ApiController; use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest; use OCP\IRequest;
use OCA\Deck\Service\BoardService; use OCA\Deck\Service\BoardService;
use Sabre\HTTP\Util;
/** /**
* Class BoardApiController * Class BoardApiController
@@ -61,10 +63,14 @@ class BoardApiController extends ApiController {
*/ */
public function index() { public function index() {
$modified = $this->request->getHeader('If-Modified-Since'); $modified = $this->request->getHeader('If-Modified-Since');
if ($modified === '') { if ($modified === null || $modified === '') {
$boards = $this->service->findAll(); $boards = $this->service->findAll();
} else { } else {
$boards = $this->service->findAll(strtotime($modified)); $date = Util::parseHTTPDate($modified);
if (!$date) {
throw new StatusException('Invalid If-Modified-Since header provided.');
}
$boards = $this->service->findAll($date->getTimestamp());
} }
return new DataResponse($boards, HTTP::STATUS_OK); return new DataResponse($boards, HTTP::STATUS_OK);
} }

10
lib/Controller/StackApiController.php
View File

@@ -24,12 +24,14 @@
namespace OCA\Deck\Controller; namespace OCA\Deck\Controller;
use OCA\Deck\StatusException;
use OCP\AppFramework\ApiController; use OCP\AppFramework\ApiController;
use OCP\AppFramework\Http; use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Http\DataResponse;
use OCP\IRequest; use OCP\IRequest;
use OCA\Deck\Service\StackService; use OCA\Deck\Service\StackService;
use OCA\Deck\Service\BoardService; use OCA\Deck\Service\BoardService;
use Sabre\HTTP\Util;
/** /**
* Class StackApiController * Class StackApiController
@@ -62,8 +64,12 @@ class StackApiController extends ApiController {
public function index() { public function index() {
$since = 0; $since = 0;
$modified = $this->request->getHeader('If-Modified-Since'); $modified = $this->request->getHeader('If-Modified-Since');
if ($modified !== '') { if ($modified !== null && $modified !== '') {
$since = strtotime($modified); $date = Util::parseHTTPDate($modified);
if (!$date) {
throw new StatusException('Invalid If-Modified-Since header provided.');
}
$since = $date->getTimestamp();
} }
$stacks = $this->stackService->findAll($this->request->getParam('boardId'), $since); $stacks = $this->stackService->findAll($this->request->getParam('boardId'), $since);
return new DataResponse($stacks, HTTP::STATUS_OK); return new DataResponse($stacks, HTTP::STATUS_OK);