tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lib: Let Controller::assertHttpMethod() throw a HttpMethodNotAllowedException 

refs #6281
This commit is contained in:
Eric Lippmann 2015-05-22 09:12:42 +02:00
parent fde60f4a00
commit 71a2324cb9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Icinga/Web/Controller/ActionController.php
View File

@ -7,6 +7,7 @@ use Exception;
use Icinga\Application\Benchmark; use Icinga\Application\Benchmark;
use Icinga\Application\Config; use Icinga\Application\Config;
use Icinga\Authentication\Manager; use Icinga\Authentication\Manager;
use Icinga\Exception\Http\HttpMethodNotAllowedException;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError; use Icinga\Exception\ProgrammingError;
use Icinga\File\Pdf; use Icinga\File\Pdf;
@ -192,16 +193,17 @@ class ActionController extends Zend_Controller_Action
/** /**
* Respond with HTTP 405 if the current request's method is not one of the given methods * Respond with HTTP 405 if the current request's method is not one of the given methods
* *
* @param string $httpMethod Unlimited number of allowed HTTP methods * @param string $httpMethod Unlimited number of allowed HTTP methods
* *
* @throws \Zend_Controller_Action_Exception If the request method is not one of the given methods * @throws HttpMethodNotAllowedException If the request method is not one of the given methods
*/ */
public function assertHttpMethod($httpMethod) public function assertHttpMethod($httpMethod)
{ {
$httpMethods = array_flip(array_map('strtoupper', func_get_args())); $httpMethods = array_flip(array_map('strtoupper', func_get_args()));
if (! isset($httpMethods[$this->getRequest()->getMethod()])) { if (! isset($httpMethods[$this->getRequest()->getMethod()])) {
$this->getResponse()->setHeader('Allow', implode(', ', array_keys($httpMethods))); $e = new HttpMethodNotAllowedException($this->translate('Method Not Allowed'));
throw new \Zend_Controller_Action_Exception($this->translate('Method Not Allowed'), 405); $e->setAllowedMethods(implode(', ', array_keys($httpMethods)));
throw $e;
} }
} }