Skip to content

Cleanup CSP headers #117

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

Open
Elnadrion wants to merge 1 commit into
base: 3.0.x
Choose a base branch
from
Open

Cleanup CSP headers #117

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
8 changes: 1 addition & 7 deletions src/Header/ContentSecurityPolicy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@ class ContentSecurityPolicy implements MultipleHeaderInterface
{
/**
* Valid directive names
*
* @var array
*/
protected $validDirectiveNames = [
protected array $validDirectiveNames = [
// As per http://www.w3.org/TR/CSP/#directives
// Fetch directives
'child-src',
Expand All @@ -36,7 +34,6 @@ class ContentSecurityPolicy implements MultipleHeaderInterface
'manifest-src',
'media-src',
'object-src',
'prefetch-src',
'script-src',
'script-src-elem',
'script-src-attr',
Expand All @@ -47,7 +44,6 @@ class ContentSecurityPolicy implements MultipleHeaderInterface

// Document directives
'base-uri',
'plugin-types',
'sandbox',

// Navigation directives
Expand All @@ -60,8 +56,6 @@ class ContentSecurityPolicy implements MultipleHeaderInterface
'report-to',

// Other directives
'block-all-mixed-content',
'require-sri-for',
'require-trusted-types-for',
'trusted-types',
'upgrade-insecure-requests',
Expand Down
44 changes: 41 additions & 3 deletions src/Header/ContentSecurityPolicyReportOnly.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,50 @@
*/
class ContentSecurityPolicyReportOnly extends ContentSecurityPolicy
{
/**
* Valid directive names
*/
protected array $validDirectiveNames = [
// As per http://www.w3.org/TR/CSP/#directives
// Fetch directives
'child-src',
'connect-src',
'default-src',
'font-src',
'frame-src',
'img-src',
'manifest-src',
'media-src',
'object-src',
'script-src',
'script-src-elem',
'script-src-attr',
'style-src',
'style-src-elem',
'style-src-attr',
'worker-src',

// Document directives
'base-uri',

// Navigation directives
'form-action',
'frame-ancestors',
'navigate-to',

// Reporting directives
'report-uri',
'report-to',

// Other directives
'require-trusted-types-for',
'trusted-types',
];

/**
* Get the header name
*
* @return string
*/
public function getFieldName()
public function getFieldName(): string
{
return 'Content-Security-Policy-Report-Only';
}
Expand Down
20 changes: 8 additions & 12 deletions test/Header/ContentSecurityPolicyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ public function testContentSecurityPolicyToStringReturnsHeaderFormattedString():
public function testContentSecurityPolicySetDirective(): void
{
$csp = new ContentSecurityPolicy();
$csp->setDirective('default-src', ['https://*.google.com', 'http://foo.com'])
$csp->setDirective('default-src', ['https://*.google.com', 'https://foo.com'])
->setDirective('img-src', ["'self'"])
->setDirective('script-src', ['https://*.googleapis.com', 'https://*.bar.com']);
$header = 'Content-Security-Policy: default-src https://*.google.com http://foo.com; '
$header = 'Content-Security-Policy: default-src https://*.google.com https://foo.com; '
. 'img-src \'self\'; script-src https://*.googleapis.com https://*.bar.com;';
$this->assertEquals($header, $csp->toString());
}
Expand Down Expand Up @@ -100,7 +100,7 @@ public function testContentSecurityPolicyGetFieldValueReturnsProperValue(): void
}

/**
* @see http://en.wikipedia.org/wiki/HTTP_response_splitting
* @see https://en.wikipedia.org/wiki/HTTP_response_splitting
*/
#[Group('ZF2015-04')]
public function testPreventsCRLFAttackViaFromString(): void
Expand All @@ -110,7 +110,7 @@ public function testPreventsCRLFAttackViaFromString(): void
}

/**
* @see http://en.wikipedia.org/wiki/HTTP_response_splitting
* @see https://en.wikipedia.org/wiki/HTTP_response_splitting
*/
#[Group('ZF2015-04')]
public function testPreventsCRLFAttackViaDirective(): void
Expand Down Expand Up @@ -196,29 +196,25 @@ public static function validDirectives(): array
['child-src', ["'self'"], "Content-Security-Policy: child-src 'self';"],
['manifest-src', ["'self'"], "Content-Security-Policy: manifest-src 'self';"],
['worker-src', ["'self'"], "Content-Security-Policy: worker-src 'self';"],
['prefetch-src', ["'self'"], "Content-Security-Policy: prefetch-src 'self';"],
['script-src-elem', ["'self'"], "Content-Security-Policy: script-src-elem 'self';"],
['script-src-attr', ["'self'"], "Content-Security-Policy: script-src-attr 'self';"],
['style-src-elem', ["'self'"], "Content-Security-Policy: style-src-elem 'self';"],
['style-src-attr', ["'self'"], "Content-Security-Policy: style-src-attr 'self';"],
['base-uri', ["'self'", "'unsafe-inline'"], "Content-Security-Policy: base-uri 'self' 'unsafe-inline';"],
['plugin-types', ['text/csv'], 'Content-Security-Policy: plugin-types text/csv;'],
[
'form-action',
['http://*.example.com', "'self'"],
"Content-Security-Policy: form-action http://*.example.com 'self';",
['https://*.example.com', "'self'"],
"Content-Security-Policy: form-action https://*.example.com 'self';",
],
[
'frame-ancestors',
['http://*.example.com', "'self'"],
"Content-Security-Policy: frame-ancestors http://*.example.com 'self';",
['https://*.example.com', "'self'"],
"Content-Security-Policy: frame-ancestors https://*.example.com 'self';",
],
['navigate-to', ['example.com'], 'Content-Security-Policy: navigate-to example.com;'],
['sandbox', ['allow-forms'], 'Content-Security-Policy: sandbox allow-forms;'],

// Other directives
['block-all-mixed-content', [], 'Content-Security-Policy: block-all-mixed-content;'],
['require-sri-for', ['script', 'style'], 'Content-Security-Policy: require-sri-for script style;'],
['require-trusted-types-for', ['script'], 'Content-Security-Policy: require-trusted-types-for script;'],
['trusted-types', ['*'], 'Content-Security-Policy: trusted-types *;'],
['upgrade-insecure-requests', [], 'Content-Security-Policy: upgrade-insecure-requests;'],
Expand Down