upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 15:21:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 42

Merge pull request #47650 from nextcloud/chore/cleanup-middleware

Browse source
This commit is contained in:
John Molakvoæ 2024-09-03 09:21:43 +02:00 committed by GitHub
commit b7bd5b0012
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/private/AppFramework/DependencyInjection/DIContainer.php
View file

@ -242,7 +242,6 @@ class DIContainer extends SimpleContainer implements IAppContainer {
new OC\AppFramework\Middleware\Security\CSPMiddleware(
$server->query(OC\Security\CSP\ContentSecurityPolicyManager::class),
$server->query(OC\Security\CSP\ContentSecurityPolicyNonceManager::class),
$server->query(OC\Security\CSRF\CsrfTokenManager::class)
)
);
$dispatcher->registerMiddleware(

21
lib/private/AppFramework/Middleware/Security/CSPMiddleware.php
View file

@ -10,7 +10,6 @@ namespace OC\AppFramework\Middleware\Security;
use OC\Security\CSP\ContentSecurityPolicyManager;
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OC\Security\CSRF\CsrfTokenManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
@ -18,19 +17,11 @@ use OCP\AppFramework\Http\Response;
use OCP\AppFramework\Middleware;
class CSPMiddleware extends Middleware {
/** @var ContentSecurityPolicyManager */
private $contentSecurityPolicyManager;
/** @var ContentSecurityPolicyNonceManager */
private $cspNonceManager;
/** @var CsrfTokenManager */
private $csrfTokenManager;
public function __construct(ContentSecurityPolicyManager $policyManager,
ContentSecurityPolicyNonceManager $cspNonceManager,
CsrfTokenManager $csrfTokenManager) {
$this->contentSecurityPolicyManager = $policyManager;
$this->cspNonceManager = $cspNonceManager;
$this->csrfTokenManager = $csrfTokenManager;
public function __construct(
private ContentSecurityPolicyManager $policyManager,
private ContentSecurityPolicyNonceManager $cspNonceManager,
) {
}
/**
@ -49,8 +40,8 @@ class CSPMiddleware extends Middleware {
return $response;
}
$defaultPolicy = $this->contentSecurityPolicyManager->getDefaultPolicy();
$defaultPolicy = $this->contentSecurityPolicyManager->mergePolicies($defaultPolicy, $policy);
$defaultPolicy = $this->policyManager->getDefaultPolicy();
$defaultPolicy = $this->policyManager->mergePolicies($defaultPolicy, $policy);
if ($this->cspNonceManager->browserSupportsCspV3()) {
$defaultPolicy->useJsNonce($this->cspNonceManager->getNonce());

8
lib/private/AppFramework/Middleware/Security/SameSiteCookieMiddleware.php
View file

@ -46,13 +46,13 @@ class SameSiteCookieMiddleware extends Middleware {
public function afterException($controller, $methodName, \Exception $exception) {
if ($exception instanceof LaxSameSiteCookieFailedException) {
$respone = new Response();
$respone->setStatus(Http::STATUS_FOUND);
$respone->addHeader('Location', $this->request->getRequestUri());
$response = new Response();
$response->setStatus(Http::STATUS_FOUND);
$response->addHeader('Location', $this->request->getRequestUri());
$this->setSameSiteCookie();
return $respone;
return $response;
}
throw $exception;

5
tests/lib/AppFramework/Middleware/Security/CSPMiddlewareTest.php
View file

@ -12,7 +12,6 @@ use OC\AppFramework\Middleware\Security\CSPMiddleware;
use OC\Security\CSP\ContentSecurityPolicy;
use OC\Security\CSP\ContentSecurityPolicyManager;
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OC\Security\CSRF\CsrfTokenManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\EmptyContentSecurityPolicy;
use OCP\AppFramework\Http\Response;
@ -25,8 +24,6 @@ class CSPMiddlewareTest extends \Test\TestCase {
private $controller;
/** @var ContentSecurityPolicyManager&MockObject */
private $contentSecurityPolicyManager;
/** @var CsrfTokenManager&MockObject */
private $csrfTokenManager;
/** @var ContentSecurityPolicyNonceManager&MockObject */
private $cspNonceManager;
@ -35,12 +32,10 @@ class CSPMiddlewareTest extends \Test\TestCase {
$this->controller = $this->createMock(Controller::class);
$this->contentSecurityPolicyManager = $this->createMock(ContentSecurityPolicyManager::class);
$this->csrfTokenManager = $this->createMock(CsrfTokenManager::class);
$this->cspNonceManager = $this->createMock(ContentSecurityPolicyNonceManager::class);
$this->middleware = new CSPMiddleware(
$this->contentSecurityPolicyManager,
$this->cspNonceManager,
$this->csrfTokenManager
);
}