Skip to content
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

Jump to bottom

Adding "style-src 'unsafe-inline' 'self'" to default CSP rules #41305

Merged
merged 12 commits into from
Aug 9, 2019
Merged

Adding "style-src 'unsafe-inline' 'self'" to default CSP rules #41305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cfd4d24
Adding "style-src 'unsafe-inline' 'self'" to default CSP rules
kobelb Jul 16, 2019
d33e926
Merge remote-tracking branch 'upstream/master' into csp/style-src
kobelb Jul 16, 2019
f845e88
Updating jest snapshot
kobelb Jul 18, 2019
af2627e
Merge remote-tracking branch 'upstream/master' into csp/style-src
kobelb Jul 25, 2019
c9db527
Fixing api integration smoke test
kobelb Jul 25, 2019
2cc6f7c
Merge branch 'master' of github.com:elastic/kibana into csp/style-src
kobelb Jul 29, 2019
c0d3fe1
Merge branch 'master' of github.com:elastic/kibana into csp/style-src
kobelb Aug 2, 2019
397b5e1
Merge branch 'master' of github.com:elastic/kibana into csp/style-src
kobelb Aug 5, 2019
c80b6b0
Verifying all CSP responses
kobelb Aug 6, 2019
3db12ee
Merge branch 'master' of github.com:elastic/kibana into csp/style-src
kobelb Aug 6, 2019
8dcb305
Merge branch 'master' of github.com:elastic/kibana into csp/style-src
kobelb Aug 9, 2019
de62534
Fixing OIDC implicit flow test
kobelb Aug 9, 2019
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
13 changes: 7 additions & 6 deletions src/legacy/server/csp/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ import {
// the nature of a change in defaults during a PR review.
test('default CSP rules', () => {
expect(DEFAULT_CSP_RULES).toMatchInlineSnapshot(`
Array [
"script-src 'unsafe-eval' 'nonce-{nonce}'",
"worker-src blob:",
"child-src blob:",
]
`);
Array [
"script-src 'unsafe-eval' 'nonce-{nonce}'",
"worker-src blob:",
"child-src blob:",
"style-src 'unsafe-inline' 'self'",
]
`);
});

test('CSP strict mode defaults to disabled', () => {
Expand Down
1 change: 1 addition & 0 deletions src/legacy/server/csp/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export const DEFAULT_CSP_RULES = Object.freeze([
`script-src 'unsafe-eval' 'nonce-{nonce}'`,
'worker-src blob:',
'child-src blob:',
`style-src 'unsafe-inline' 'self'`,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: is there any reason we don't want to use nonce for inline styles as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the nonce has caused quite a few issues, as discussed here and I'd like to find a way to move toward self even for script-src. I could see the argument being made for using the nonce until we switch script-src to self, but it's quite a bit more work which we'd rather quickly get rid of.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I see, thanks for the explanation. Yeah, let's see how it goes then.

]);

export const DEFAULT_CSP_STRICT = true;
Expand Down
24 changes: 19 additions & 5 deletions test/api_integration/apis/general/csp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,27 @@ export default function ({ getService }) {
const response = await supertest.get('/app/kibana');

expect(response.headers).to.have.property('content-security-policy');
});
const header = response.headers['content-security-policy'];
const parsed = new Map(header.split(';').map(rule => {
const parts = rule.trim().split(' ');
const key = parts.splice(0, 1)[0];
return [key, parts];
}));

it('csp header does not allow all inline scripts', async () => {
const response = await supertest.get('/app/kibana');
// ensure script-src uses a nonce, and remove it so we can .eql everything else
const scriptSrc = parsed.get('script-src');
expect(scriptSrc).to.be.an(Array);
const nonceIndex = scriptSrc.findIndex(value => value.startsWith(`'nonce-`));
expect(nonceIndex).greaterThan(-1);
scriptSrc.splice(nonceIndex, 1);

expect(response.headers['content-security-policy']).to.contain('script-src');
expect(response.headers['content-security-policy']).not.to.contain('unsafe-inline');
const entries = Array.from(parsed.entries());
expect(entries).to.eql([
[ 'script-src', [ '\'unsafe-eval\'' ] ],
[ 'worker-src', [ 'blob:' ] ],
[ 'child-src', [ 'blob:' ] ],
[ 'style-src', [ '\'unsafe-inline\'', '\'self\'' ] ]
]);
});
});
}
2 changes: 1 addition & 1 deletion x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function({ getService }: FtrProviderContext) {
expect(response.headers['content-type']).to.be('text/html; charset=utf-8');
expect(response.headers['cache-control']).to.be('private, no-cache, no-store');
expect(response.headers['content-security-policy']).to.be(
`script-src 'unsafe-eval' 'nonce-${scriptNonce}'; worker-src blob:; child-src blob:`
`script-src 'unsafe-eval' 'nonce-${scriptNonce}'; worker-src blob:; child-src blob:; style-src 'unsafe-inline' 'self'`
);

// Check that script that forwards URL fragment worked correctly.
Expand Down