Skip to content

refactor: enhance captcha validation and security policies #45

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
GTPSHAX merged 10 commits into from
May 17, 2026
Merged

refactor: enhance captcha validation and security policies #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7740584
fix: add environment variable checks for hCaptcha and Cloudflare Capt…
GTPSHAX May 17, 2026
3b1ec64
fix: reorder hCaptcha validation to ensure proper execution flow
GTPSHAX May 17, 2026
bcd1770
fix: streamline captcha validation logic in document generation
GTPSHAX May 17, 2026
1ad45e4
fix: refactor CORS trusted hosts parsing and update content security …
GTPSHAX May 17, 2026
9f30b35
fix: enhance content security policy directives for improved security…
GTPSHAX May 17, 2026
8e92503
fix: add Google Analytics to content security policy directives
GTPSHAX May 17, 2026
d3d7a33
fix: refactor host parsing logic for content security policy directives
GTPSHAX May 17, 2026
0e49af0
fix: remove deprecated autofill-ai and generate-docx routes
GTPSHAX May 17, 2026
6f8877c
fix: refactor content security policy directives for improved host ha…
GTPSHAX May 17, 2026
c1bccc3
fix: refactor CORS trusted hosts handling and enhance content securit…
GTPSHAX May 17, 2026
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
60 changes: 48 additions & 12 deletions apps/api/middleware/helmet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,60 @@
import helmet from 'helmet'

const CORS_TRUSTED_HOSTS = process.env.CORS_TRUSTED_HOSTS ? process.env.CORS_TRUSTED_HOSTS.split(',').map(host => host.trim()) : []
const CORS_TRUSTED_CDN_HOSTS = process.env.CORS_TRUSTED_CDN_HOSTS
? process.env.CORS_TRUSTED_CDN_HOSTS.split(',').map(host => host.trim())
: []
/** @returns {string[]} */
const parseEnvHosts = (/** @type {string} */ key) =>
process.env[key]?.split(',').map(h => h.trim()) ?? []

const CORS_TRUSTED_HOSTS = parseEnvHosts('CORS_TRUSTED_HOSTS')
const CORS_TRUSTED_CDN_HOSTS = parseEnvHosts('CORS_TRUSTED_CDN_HOSTS')
const isDevelopment = process.env.NODE_ENV !== 'production'

const defaultDirectives = helmet.contentSecurityPolicy.getDefaultDirectives()
if (isDevelopment) delete defaultDirectives['upgrade-insecure-requests']

const helmetMiddleware = helmet({
contentSecurityPolicy: {
directives: {
...helmet.contentSecurityPolicy.getDefaultDirectives(),

'upgrade-insecure-requests': isDevelopment ? null : [],
...defaultDirectives,
'frame-ancestors': ["'self'", ...CORS_TRUSTED_HOSTS],
'frame-src': ["'self'", 'https://newassets.hcaptcha.com', 'https://js.hcaptcha.com', 'https://challenges.cloudflare.com', ...CORS_TRUSTED_HOSTS],
'script-src': ["'self'", "'unsafe-inline'", 'https://static.cloudflareinsights.com', 'https://js.hcaptcha.com', 'https://newassets.hcaptcha.com', 'https://challenges.cloudflare.com', ...CORS_TRUSTED_CDN_HOSTS],
'style-src': ["'self'", "'unsafe-inline'", 'https://newassets.hcaptcha.com', ...CORS_TRUSTED_CDN_HOSTS],
'img-src': ["'self'", 'data:', 'https://contrib.rocks', ...CORS_TRUSTED_CDN_HOSTS],
'frame-src': [
"'self'",
'https://newassets.hcaptcha.com', 'https://js.hcaptcha.com',
'https://challenges.cloudflare.com',
...CORS_TRUSTED_HOSTS
],
'script-src': [
"'self'", "'unsafe-inline'",
'https://static.cloudflareinsights.com',
'https://js.hcaptcha.com', 'https://newassets.hcaptcha.com',
'https://challenges.cloudflare.com',
'https://www.googletagmanager.com',
'https://www.google-analytics.com',
...CORS_TRUSTED_CDN_HOSTS
],
'style-src': [
"'self'", "'unsafe-inline'",
'https://newassets.hcaptcha.com',
...CORS_TRUSTED_CDN_HOSTS
],
'img-src': [
"'self'", 'data:',
'https://contrib.rocks',
'https://www.google-analytics.com',
'https://www.googletagmanager.com',
...CORS_TRUSTED_CDN_HOSTS
],
'font-src': ["'self'", ...CORS_TRUSTED_CDN_HOSTS],
'connect-src': ["'self'", 'https://hcaptcha.com', 'https://*.hcaptcha.com', 'https://challenges.cloudflare.com']
'connect-src': [
"'self'",
'https://hcaptcha.com', 'https://*.hcaptcha.com',
'https://challenges.cloudflare.com',
'https://pat-issuer.cloudflare.com',
'https://www.google-analytics.com',
'https://analytics.google.com',
'https://stats.g.doubleclick.net',
'https://*.google-analytics.com',
...CORS_TRUSTED_HOSTS
]
}
},
frameguard: false,
Expand Down
75 changes: 47 additions & 28 deletions apps/web/middleware/helmet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,60 @@
import helmet from 'helmet'

const CORS_TRUSTED_HOSTS = process.env.CORS_TRUSTED_HOSTS ? process.env.CORS_TRUSTED_HOSTS.split(',').map(host => host.trim()) : []
const CORS_TRUSTED_CDN_HOSTS = process.env.CORS_TRUSTED_CDN_HOSTS
? process.env.CORS_TRUSTED_CDN_HOSTS.split(',').map(host => host.trim())
: []
const APP_API_BASE_URL = process.env.APP_API_BASE_URL || null
/** @returns {string[]} */
const parseEnvHosts = (/** @type {string} */ key) =>
process.env[key]?.split(',').map(h => h.trim()) ?? []

const CORS_TRUSTED_HOSTS = parseEnvHosts('CORS_TRUSTED_HOSTS')
const CORS_TRUSTED_CDN_HOSTS = parseEnvHosts('CORS_TRUSTED_CDN_HOSTS')
const isDevelopment = process.env.NODE_ENV !== 'production'

/**
* Helper function to remove path from a URL, leaving only the origin (scheme + host + port).
* @param {string} url
* @returns {string}
*/
const removePathFromUrl = (url) => {
try {
const parsedUrl = new URL(url)
parsedUrl.pathname = ''
return parsedUrl.toString().replace(/\/+$/, '') // Remove trailing slash if any
} catch (error) {
console.warn(`Invalid URL provided: ${url}`)
return url
}
}
const defaultDirectives = helmet.contentSecurityPolicy.getDefaultDirectives()
if (isDevelopment) delete defaultDirectives['upgrade-insecure-requests']

const helmetMiddleware = helmet({
contentSecurityPolicy: {
directives: {
...helmet.contentSecurityPolicy.getDefaultDirectives(),

'upgrade-insecure-requests': isDevelopment ? null : [],
...defaultDirectives,
'frame-ancestors': ["'self'", ...CORS_TRUSTED_HOSTS],
'frame-src': ["'self'", 'https://newassets.hcaptcha.com', 'https://js.hcaptcha.com', 'https://challenges.cloudflare.com', ...CORS_TRUSTED_HOSTS],
'script-src': ["'self'", "'unsafe-inline'", 'https://static.cloudflareinsights.com', 'https://js.hcaptcha.com', 'https://newassets.hcaptcha.com', 'https://challenges.cloudflare.com', ...CORS_TRUSTED_CDN_HOSTS],
'style-src': ["'self'", "'unsafe-inline'", 'https://newassets.hcaptcha.com', ...CORS_TRUSTED_CDN_HOSTS],
'img-src': ["'self'", 'data:', 'https://contrib.rocks', ...CORS_TRUSTED_CDN_HOSTS],
'frame-src': [
"'self'",
'https://newassets.hcaptcha.com', 'https://js.hcaptcha.com',
'https://challenges.cloudflare.com',
...CORS_TRUSTED_HOSTS
],
'script-src': [
"'self'", "'unsafe-inline'",
'https://static.cloudflareinsights.com',
'https://js.hcaptcha.com', 'https://newassets.hcaptcha.com',
'https://challenges.cloudflare.com',
'https://www.googletagmanager.com',
'https://www.google-analytics.com',
...CORS_TRUSTED_CDN_HOSTS
],
'style-src': [
"'self'", "'unsafe-inline'",
'https://newassets.hcaptcha.com',
...CORS_TRUSTED_CDN_HOSTS
],
'img-src': [
"'self'", 'data:',
'https://contrib.rocks',
'https://www.google-analytics.com',
'https://www.googletagmanager.com',
...CORS_TRUSTED_CDN_HOSTS
],
'font-src': ["'self'", ...CORS_TRUSTED_CDN_HOSTS],
'connect-src': ["'self'", 'https://hcaptcha.com', 'https://*.hcaptcha.com', 'https://challenges.cloudflare.com', ...(APP_API_BASE_URL ? [removePathFromUrl(APP_API_BASE_URL)] : [])]
'connect-src': [
"'self'",
'https://hcaptcha.com', 'https://*.hcaptcha.com',
'https://challenges.cloudflare.com',
'https://pat-issuer.cloudflare.com',
'https://www.google-analytics.com',
'https://analytics.google.com',
'https://stats.g.doubleclick.net',
'https://*.google-analytics.com',
...CORS_TRUSTED_HOSTS
]
}
},
frameguard: false,
Expand Down
22 changes: 0 additions & 22 deletions apps/web/routes/api/autofill-ai.js
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions apps/web/routes/api/generate-docx.js
View file
Open in desktop

This file was deleted.

14 changes: 8 additions & 6 deletions packages/handlers/handle-generate-docx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,14 @@ function buildRencanaKegiatan (body, kegiatanKeys) {
const handleGenerateDocx = async (body, req) => {
const remoteip = req.ip || req.headers['x-forwarded-for'] || req.socket.remoteAddress

// Validate hCaptcha response before proceeding with document generation
if (!await handleHCaptchaValidation(body)) {
return { status: 400, message: 'hCaptcha validation failed' }
}
if (!await handleCloudflareCaptchaValidation(body, remoteip)) {
return { status: 400, message: 'Cloudflare Captcha validation failed' }
// Validate captcha before proceeding with document generation
const captchaPassed =
await handleCloudflareCaptchaValidation(body, remoteip) ||
await handleHCaptchaValidation(body) ||
(!process.env.HCAPTCHA_SECRET_KEY && !process.env.CLOUDFLARE_API_TOKEN)

if (!captchaPassed) {
return { status: 400, message: 'Captcha validation failed' }
}

const template = 'original' // TODO: Make this dynamic based on request parameter if multiple templates are supported in the future'
Expand Down
Loading