Skip to content

BUGFIX: valid custom directive is not added to csp header #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-heuser merged 1 commit into from
Nov 17, 2025
+138 −18
Merged

BUGFIX: valid custom directive is not added to csp header #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions Classes/Factory/PolicyFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,28 @@
class PolicyFactory
{
/**
* @param string[][] $defaultDirective
* @param string[][] $customDirective
* @param string[][] $defaultDirectives
* @param string[][] $customDirectives
* @throws InvalidDirectiveException
*/
public function create(Nonce $nonce, array $defaultDirective, array $customDirective): Policy
public function create(Nonce $nonce, array $defaultDirectives, array $customDirectives): Policy
{
$directiveCollections = [$defaultDirective, $customDirective];
$defaultDirective = array_shift($directiveCollections);

array_walk($defaultDirective, function (array &$item, string $key) use ($directiveCollections) {
foreach ($directiveCollections as $collection) {
if (array_key_exists($key, $collection)) {
$item = array_unique([...$item, ...$collection[$key]]);
}
$resultDirectives = $defaultDirectives;
foreach ($customDirectives as $key => $customDirective) {
if (array_key_exists($key, $resultDirectives)) {
$resultDirectives[$key] = array_merge($resultDirectives[$key], $customDirective);
} else {
// Custom directive is not present in default, still needs to be added.
$resultDirectives[$key] = $customDirective;
}
});

$resultDirectives[$key] = array_unique($resultDirectives[$key]);
}

$policy = new Policy();
$policy->setNonce($nonce);

foreach ($defaultDirective as $directive => $values) {
foreach ($resultDirectives as $directive => $values) {
$policy->addDirective($directive, $values);
}

Expand Down
129 changes: 124 additions & 5 deletions Tests/Unit/Factory/PolicyFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Unit\Factory;

use Flowpack\ContentSecurityPolicy\Exceptions\InvalidDirectiveException;
use Flowpack\ContentSecurityPolicy\Factory\PolicyFactory;
use Flowpack\ContentSecurityPolicy\Model\Directive;
use Flowpack\ContentSecurityPolicy\Model\Nonce;
Expand All @@ -15,34 +16,152 @@
#[CoversClass(PolicyFactory::class)]
#[UsesClass(Policy::class)]
#[UsesClass(Directive::class)]
#[UsesClass(InvalidDirectiveException::class)]
class PolicyFactoryTest extends TestCase
{
public function testCreateShouldReturnPolicy(): void
public function testCreateShouldReturnPolicyAndMergeCustomWithDefaultDirective(): void
{
$policyFactory = new PolicyFactory();
$nonceMock = $this->createMock(Nonce::class);

$defaultDirective = [
'base-uri' => [
'test.com',
],
'script-src' => [
'test.com',
],
];
$customDirective = [
'script-src' => [
'custom.com',
],
];

$expected = [
'base-uri' => [
'test.com',
],
'script-src' => [
'test.com',
'custom.com',
],
];

$result = $policyFactory->create($nonceMock, $defaultDirective, $customDirective);

self::assertSame($expected, $result->getDirectives());
}

public function testCreateShouldReturnPolicyAndHandleSpecialDirectives(): void
{
$policyFactory = new PolicyFactory();
$nonceMock = $this->createMock(Nonce::class);

$defaultDirective = [
'script-src' => [
'{nonce}',
'self',
],
];
$customDirective = [];

$expected = [
'script-src' => [
"'nonce-'",
"'self'",
],
];

$result = $policyFactory->create($nonceMock, $defaultDirective, $customDirective);

self::assertSame($expected, $result->getDirectives());
}

public function testCreateShouldFailWithInvalidDirective(): void
{
$policyFactory = new PolicyFactory();
$nonceMock = $this->createMock(Nonce::class);

$defaultDirective = [
'invalid' => [
'self',
],
'script-src' => [
'self',
],
];
$customDirective = [];

$this->expectException(InvalidDirectiveException::class);
$policyFactory->create($nonceMock, $defaultDirective, $customDirective);
}

public function testCreateShouldReturnPolicyWithUniqueValues(): void
{
$policyFactory = new PolicyFactory();
$nonceMock = $this->createMock(Nonce::class);

$defaultDirective = [
'base-uri' => [
'test.com',
],
'script-src' => [
'test.com',
],
];
$customDirective = [
'base-uri' => [
'test.com',
'test.com',
],
'script-src' => [
'{nonce}',
'test.com',
],
];

$expected = [
'base-uri' => [
"'self'",
'test.com',
],
'script-src' => [
"'self'",
"'nonce-'",
'test.com',
],
];

$result = $policyFactory->create($nonceMock, $defaultDirective, $customDirective);

self::assertSame($expected, $result->getDirectives());
}

public function testCreateShouldAddDirectiveWhichIsPresentInCustomButNotDefaultConfiguration(): void
{
$policyFactory = new PolicyFactory();
$nonceMock = $this->createMock(Nonce::class);

$defaultDirective = [
'base-uri' => [
'test.com',
],
'script-src' => [
'test.com',
],
];
$customDirective = [
'worker-src' => [
'test.com',
],
];

$expected = [
'base-uri' => [
"test.com",
],
'script-src' => [
"test.com",
],
'worker-src' => [
"test.com",
],
];

Expand Down