Browse Source
Update SecurityMiddleware.php
OC::$WEBROOT can be empty in case if your nextcloud installation has no url prefix. This will result in an empty Location Header.
in other areas OC::$WEBROOT is always used together with an /
pull/18867/head
Holger Hees
7 years ago
committed by
Morris Jobke
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
2 changed files with
2 additions and
2 deletions
lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php
@ -211,7 +211,7 @@ class SecurityMiddleware extends Middleware {
public function afterException ( $controller , $methodName , \Exception $exception ) : Response {
public function afterException ( $controller , $methodName , \Exception $exception ) : Response {
if ( $exception instanceof SecurityException ) {
if ( $exception instanceof SecurityException ) {
if ( $exception instanceof StrictCookieMissingException ) {
if ( $exception instanceof StrictCookieMissingException ) {
return new RedirectResponse ( \OC :: $WEBROOT );
return new RedirectResponse ( \OC :: $WEBROOT . '/' );
}
}
if ( stripos ( $this -> request -> getHeader ( 'Accept' ), 'html' ) === false ) {
if ( stripos ( $this -> request -> getHeader ( 'Accept' ), 'html' ) === false ) {
$response = new JSONResponse (
$response = new JSONResponse (
@ -535,7 +535,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
new StrictCookieMissingException ()
new StrictCookieMissingException ()
);
);
$expected = new RedirectResponse ( \OC :: $WEBROOT );
$expected = new RedirectResponse ( \OC :: $WEBROOT . '/' );
$this -> assertEquals ( $expected , $response );
$this -> assertEquals ( $expected , $response );
}
}