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

[FEATURE] CSP: Increase defaultPolicy2 to sap-target-level-3 #580

Merged
merged 3 commits into from
Mar 1, 2023
Merged

[FEATURE] CSP: Increase defaultPolicy2 to sap-target-level-3 #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d29939c
[FEATURE] CSP: Increase defaultPolicy2 to sap-target-level-3
flovogt Feb 24, 2023
a7597b5
[INTERNAL] Enhance CSP tests
matz3 Feb 28, 2023
f7bb531
[INTERNAL] Fix assertion messages
matz3 Feb 28, 2023
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
2 changes: 1 addition & 1 deletion lib/middleware/MiddlewareManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class MiddlewareManager {
const defaultSAPTargetConfig = {
defaultPolicy: "sap-target-level-1",
defaultPolicyIsReportOnly: true,
defaultPolicy2: "sap-target-level-2",
defaultPolicy2: "sap-target-level-3",
defaultPolicy2IsReportOnly: true,
ignorePaths: ["test-resources/sap/ui/qunit/testrunner.html"]
};
Expand Down
2 changes: 1 addition & 1 deletion lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ async function _addSsl({app, key, cert}) {
* @typedef {object} module:@ui5/server.SAPTargetCSPOptions
* @property {string} [defaultPolicy="sap-target-level-1"]
* @property {string} [defaultPolicyIsReportOnly=true]
* @property {string} [defaultPolicy2="sap-target-level-2"]
* @property {string} [defaultPolicy2="sap-target-level-3"]
* @property {string} [defaultPolicy2IsReportOnly=true]
* @property {string[]} [ignorePaths=["test-resources/sap/ui/qunit/testrunner.html"]]
*/
Expand Down
80 changes: 60 additions & 20 deletions test/lib/server/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ test("CSP (defaults)", async (t) => {
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-1").then((res) => {
t.truthy(res.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(res.headers["content-security-policy"], /script-src\s+'self'\s+'unsafe-eval'\s*;/,
"header should should have the expected content");
"header should have the expected content");
t.is(res.headers["content-security-policy-report-only"], undefined,
"response must not have report-only csp header");
}),
Expand All @@ -418,12 +418,14 @@ test("CSP (defaults)", async (t) => {
t.truthy(res.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(res.headers["content-security-policy-report-only"], /script-src\s+'self'\s+'unsafe-eval'\s*;/,
"header should should have the expected content");
"header should have the expected content");
}),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-2").then((res) => {
t.truthy(res.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(res.headers["content-security-policy"], /script-src\s+'self'\s*;/,
"header should should have the expected content");
"header should have the expected content");
t.regex(res.headers["content-security-policy"], /style-src\s+'self'\s+'unsafe-inline'\s*;/,
"header should have the expected content");
t.is(res.headers["content-security-policy-report-only"], undefined,
"response must not have report-only csp header");
}),
Expand All @@ -434,6 +436,27 @@ test("CSP (defaults)", async (t) => {
"response should have report-only csp header");
t.regex(res.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should have the expected content");
t.regex(res.headers["content-security-policy-report-only"], /style-src\s+'self'\s+'unsafe-inline'\s*;/,
"header should have the expected content");
}),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-3").then((res) => {
t.truthy(res.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(res.headers["content-security-policy"], /script-src\s+'self'\s*;/,
"header should have the expected content");
t.regex(res.headers["content-security-policy"], /style-src\s+'self'\s*;/,
"header should have the expected content");
t.is(res.headers["content-security-policy-report-only"], undefined,
"response must not have report-only csp header");
}),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-3:report-only").then((res) => {
t.is(res.headers["content-security-policy"], undefined,
"response must not have enforcing csp header");
t.truthy(res.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(res.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should have the expected content");
t.regex(res.headers["content-security-policy-report-only"], /style-src\s+'self'\s*;/,
"header should have the expected content");
}),
request.get("/index.html?sap-ui-xx-csp-policy=default-src%20http%3a;").then((res) => {
t.truthy(res.headers["content-security-policy"], "response should have enforcing csp header");
Expand Down Expand Up @@ -480,12 +503,17 @@ test("CSP (sap policies)", async (t) => {
simpleIndex: false
});

const [result1, result2, result3, result4, result5, result6, result7, result8] = await Promise.all([
const [
result1, result2, result3, result4, result5,
result6, result7, result8, result9, result10
] = await Promise.all([
request.get("/index.html"),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-1"),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-1:report-only"),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-2"),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-2:report-only"),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-3"),
request.get("/index.html?sap-ui-xx-csp-policy=sap-target-level-3:report-only"),
request.get("/index.html?sap-ui-xx-csp-policy=default-src%20http%3a;"),
request.get("/index.html?sap-ui-xx-csp-policy=default-src%20http%3a;:report-only"),
request.get("/index.html?sap-ui-xx-csp-policy=default-src%20http%3a;:ro")
Expand All @@ -495,13 +523,13 @@ test("CSP (sap policies)", async (t) => {
t.truthy(result1.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(result1.headers["content-security-policy-report-only"], /script-src\s+'self'\s+'unsafe-eval'\s*;/,
"header should contain the 1st default policy");
t.regex(result1.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should contain the 2nd default policy");
"header should contain the 1st default policy (level-1)");
t.regex(result1.headers["content-security-policy-report-only"], /style-src\s+'self'\s*;/,
"header should contain the 2nd default policy (level-3)");

t.truthy(result2.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(result2.headers["content-security-policy"], /script-src\s+'self'\s+'unsafe-eval'\s*;/,
"header should should have the expected content");
"header should have the expected content");
t.truthy(result2.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(result2.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
Expand All @@ -511,13 +539,13 @@ test("CSP (sap policies)", async (t) => {
t.truthy(result3.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(result3.headers["content-security-policy-report-only"], /script-src\s+'self'\s+'unsafe-eval'\s*;/,
"header should should have the expected content");
"header should have the expected content");
t.regex(result3.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should contain the 2nd default policy");

t.truthy(result4.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(result4.headers["content-security-policy"], /script-src\s+'self'\s*;/,
"header should should have the expected content");
"header should have the expected content");
t.regex(result4.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should contain the 2nd default policy");

Expand All @@ -528,27 +556,39 @@ test("CSP (sap policies)", async (t) => {
"header should have the expected content");

t.truthy(result6.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(result6.headers["content-security-policy"], /default-src\s+http:\s*;/,
"header should contain the configured policy");
t.regex(result6.headers["content-security-policy"], /style-src\s+'self'\s*;/,
"header should have the expected content");
t.regex(result6.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should contain the level-3 policy");

t.is(result7.headers["content-security-policy"], undefined, "response must not have enforcing csp header");
t.truthy(result7.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(result7.headers["content-security-policy-report-only"], /style-src\s+'self'\s*;/,
"header should have the expected content");

t.truthy(result8.headers["content-security-policy"], "response should have enforcing csp header");
t.regex(result8.headers["content-security-policy"], /default-src\s+http:\s*;/,
"header should contain the configured policy");
t.regex(result8.headers["content-security-policy-report-only"], /script-src\s+'self'\s*;/,
"header should contain the 2nd default policy");

t.is(result7.headers["content-security-policy"], undefined,
t.is(result9.headers["content-security-policy"], undefined,
"response must not have enforcing csp header");
t.truthy(result7.headers["content-security-policy-report-only"],
t.truthy(result9.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(result7.headers["content-security-policy-report-only"], /default-src\s+http:\s*;/,
t.regex(result9.headers["content-security-policy-report-only"], /default-src\s+http:\s*;/,
"header should contain the configured policy");
t.regex(result7.headers["content-security-policy-report-only"], /default-src\s+'self'\s*;/,
t.regex(result9.headers["content-security-policy-report-only"], /default-src\s+'self'\s*;/,
"header should contain the 2nd default policy");

t.is(result8.headers["content-security-policy"], undefined,
t.is(result10.headers["content-security-policy"], undefined,
"response must not have enforcing csp header");
t.truthy(result8.headers["content-security-policy-report-only"],
t.truthy(result10.headers["content-security-policy-report-only"],
"response should have report-only csp header");
t.regex(result8.headers["content-security-policy-report-only"], /default-src\s+http:\s*;/,
t.regex(result10.headers["content-security-policy-report-only"], /default-src\s+http:\s*;/,
"header should contain the configured policy");
t.regex(result8.headers["content-security-policy-report-only"], /default-src\s+'self'\s*;/,
t.regex(result10.headers["content-security-policy-report-only"], /default-src\s+'self'\s*;/,
"header should contain the 2nd default policy");

await new Promise((resolve, reject) => {
Expand Down
6 changes: 3 additions & 3 deletions test/lib/server/middleware/MiddlewareManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ test("addStandardMiddleware: CSP middleware configured correctly (enabled)", asy
},
defaultPolicy: "sap-target-level-1",
defaultPolicyIsReportOnly: true,
defaultPolicy2: "sap-target-level-2",
defaultPolicy2: "sap-target-level-3",
defaultPolicy2IsReportOnly: true,
ignorePaths: [
"test-resources/sap/ui/qunit/testrunner.html",
Expand All @@ -864,7 +864,7 @@ test("addStandardMiddleware: CSP middleware configured correctly (custom)", asyn
sendSAPTargetCSP: {
defaultPolicy: "sap-target-level-1",
defaultPolicyIsReportOnly: false,
defaultPolicy2: "sap-target-level-3",
defaultPolicy2: "sap-target-level-2",
defaultPolicy2IsReportOnly: true,
ignorePaths: ["lord/tirek.html"]
},
Expand Down Expand Up @@ -907,7 +907,7 @@ test("addStandardMiddleware: CSP middleware configured correctly (custom)", asyn
},
defaultPolicy: "sap-target-level-1",
defaultPolicyIsReportOnly: false,
defaultPolicy2: "sap-target-level-3",
defaultPolicy2: "sap-target-level-2",
defaultPolicy2IsReportOnly: true,
ignorePaths: [
"lord/tirek.html",
Expand Down
2 changes: 1 addition & 1 deletion test/lib/server/middleware/csp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ test("Default Settings", async (t) => {
await new Promise((resolve) => {
middleware({
method: "GET",
url: "/test.html?sap-ui-xx-csp-policy=sap-target-level-2",
url: "/test.html?sap-ui-xx-csp-policy=sap-target-level-3",
headers: {}
}, res, resolve);
});
Expand Down