Permalink
Browse files

Cleaning up code left over from 1.3. If no black-hole callback is spe…

…cified Security::blackHole() now throws an exception. Closes #1532
  • Loading branch information...
1 parent 7f0f224 commit fc5a465189dab0c6ebc357004fab764382c1c056 @ADmad ADmad committed Oct 18, 2011
Showing with 3 additions and 7 deletions.
  1. +3 −7 lib/Cake/Controller/Component/SecurityComponent.php
@@ -274,23 +274,19 @@ public function requireAuth() {
}
/**
- * Black-hole an invalid request with a 404 error or custom callback. If SecurityComponent::$blackHoleCallback
+ * Black-hole an invalid request with a 400 error or custom callback. If SecurityComponent::$blackHoleCallback
* is specified, it will use this callback by executing the method indicated in $error
*
* @param Controller $controller Instantiating controller
* @param string $error Error method
* @return mixed If specified, controller blackHoleCallback's response, or no return otherwise
* @see SecurityComponent::$blackHoleCallback
* @link http://book.cakephp.org/2.0/en/core-libraries/components/security-component.html#handling-blackhole-callbacks
+ * @throws BadRequestException
*/
public function blackHole($controller, $error = '') {
if ($this->blackHoleCallback == null) {
- $code = 404;
- if ($error == 'login') {
- $code = 401;
- $controller->header($this->loginRequest());
- }
- return $controller->redirect(null, $code, true);
+ throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
} else {
return $this->_callback($controller, $this->blackHoleCallback, array($error));
}

0 comments on commit fc5a465

Please sign in to comment.