Skip to content

[FIX] CSP Middleware: Export middleware, add report-uri #25

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
merged 1 commit into from
Jul 10, 2018
Merged

[FIX] CSP Middleware: Export middleware, add report-uri #25

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
1 change: 1 addition & 0 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const ui5Server = {
server: require("./lib/server"),
sslUtil: require("./lib/sslUtil"),
middleware: {
csp: require("./lib/middleware/csp"),
discovery: require("./lib/middleware/discovery"),
nonReadRequests: require("./lib/middleware/discovery"),
serveResources: require("./lib/middleware/serveResources"),
Expand Down
25 changes: 20 additions & 5 deletions lib/middleware/csp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,24 @@ const rPolicy = /([-_a-zA-Z0-9]+)(:report-only)?/i;

function createMiddleware(sCspUrlParameterName, oConfig) {
const {
allowDynamicPolicySelection=false,
allowDynamicPolicyDefinition=false,
defaultPolicyIsReportOnly=false
allowDynamicPolicySelection = false,
allowDynamicPolicyDefinition = false,
defaultPolicyIsReportOnly = false
} = oConfig;

return function csp(req, res, next) {
let oPolicy;
let bReportOnly = defaultPolicyIsReportOnly;

if (req.method === "POST" &&
req.headers["content-type"] === "application/csp-report" &&
req.url.endsWith("/dummy.csplog")
) {
// In report-only mode there must be a report-uri defined
// For now just ignore the violation. It will be logged in the browser anyway.
return;
}

// If a policy with name 'default' is defined, it will even be send without a present URL parameter.
if (oConfig.definedPolicies["default"]) {
oPolicy = {
Expand All @@ -24,7 +33,6 @@ function createMiddleware(sCspUrlParameterName, oConfig) {
};
}

// Use random protocol, host and port to establish a valid URL for parsing query parameters
let oParsedUrl = url.parse(req.url);
let oQuery = querystring.parse(oParsedUrl.query);
let sCspUrlParameterValue = oQuery[sCspUrlParameterName];
Expand Down Expand Up @@ -54,7 +62,14 @@ function createMiddleware(sCspUrlParameterName, oConfig) {

if (oPolicy) {
let sHeader = bReportOnly ? HEADER_CONTENT_SECURITY_POLICY_REPORT_ONLY : HEADER_CONTENT_SECURITY_POLICY;
let sHeaderValue = oPolicy.policy;
let sHeaderValue;

if (bReportOnly) {
// Add dummy report-uri. This is mandatory for the report-only mode.
sHeaderValue = oPolicy.policy + " report-uri dummy.csplog;";
} else {
sHeaderValue = oPolicy.policy;
}

// Send response with CSP header
res.removeHeader(HEADER_CONTENT_SECURITY_POLICY);
Expand Down