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

graceful fallback if appsec template files are missing #2841

Closed
wants to merge 1 commit into from
Closed

graceful fallback if appsec template files are missing #2841

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
32 changes: 26 additions & 6 deletions packages/dd-trace/src/appsec/blocking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const fs = require('fs')

// TODO: move template loading to a proper spot.
let templateLoaded = false
let templateHtml = ''
let templateJson = ''
let templateHtml = '<html>blocked</html>'
let templateJson = '{"error": "blocked"}'

function block (req, res, rootSpan, abortController) {
if (res.headersSent) {
Expand Down Expand Up @@ -44,16 +44,36 @@ function block (req, res, rootSpan, abortController) {

function loadTemplates (config) {
if (!templateLoaded) {
templateHtml = fs.readFileSync(config.appsec.blockedTemplateHtml)
templateJson = fs.readFileSync(config.appsec.blockedTemplateJson)
try {
templateHtml = fs.readFileSync(config.appsec.blockedTemplateHtml)
} catch (err) {
log.warn(`Unable to read ${config.appsec.blockedTemplateHtml} from disk.`)
}

try {
templateJson = fs.readFileSync(config.appsec.blockedTemplateJson)
} catch (err) {
log.warn(`Unable to read ${config.appsec.blockedTemplateJson} from disk.`)
}

templateLoaded = true
}
}

async function loadTemplatesAsync (config) {
if (!templateLoaded) {
templateHtml = await fs.promises.readFile(config.appsec.blockedTemplateHtml)
templateJson = await fs.promises.readFile(config.appsec.blockedTemplateJson)
try {
templateHtml = await fs.promises.readFile(config.appsec.blockedTemplateHtml)
} catch (err) {
log.warn(`Unable to read ${config.appsec.blockedTemplateHtml} from disk.`)
}

try {
templateJson = await fs.promises.readFile(config.appsec.blockedTemplateJson)
} catch (err) {
log.warn(`Unable to read ${config.appsec.blockedTemplateJson} from disk.`)
}

templateLoaded = true
}
}
Expand Down