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

Parameterize and Update CORS and CSP #244

Merged
merged 6 commits into from
May 24, 2024
Merged

Parameterize and Update CORS and CSP #244

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
14c760a
Specify XFD and RSC urls in cors origin and csp src; remove localhost…
Matthew-Grayson May 10, 2024
271b63e
Add RSC subdomains to docs cors policy; revert cors/csp in backend ap…
Matthew-Grayson May 10, 2024
d572471
Update backend/src/api/app.ts to match develop branch.
Matthew-Grayson May 10, 2024
bc13b18
Update regex in cors origin to include root domain and subdomains of …
Matthew-Grayson May 10, 2024
82170c1
Parameterize CORS and Content Security Policy settings; add environme…
Matthew-Grayson May 17, 2024
3131c73
Fix typo in dev.env.example for CORS_DOCS variable.
Matthew-Grayson May 20, 2024
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
29 changes: 22 additions & 7 deletions frontend/scripts/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import cors from 'cors';
import helmet from 'helmet';
import express from 'express';
import path from 'path';
import { ALLOW_ORIGIN, ALLOW_METHODS } from './constants.js';

export const app = express();

Expand All @@ -17,25 +16,41 @@ app.use((req, res, next) => {
next();
});

app.use(cors({ origin: ALLOW_ORIGIN, methods: ALLOW_METHODS }));
app.use(
cors({
origin: [
/^https:\/\/(.*\.)?crossfeed\.cyber\.dhs\.gov$/,
/^https:\/\/(.*\.)?readysetcyber\.cyber\.dhs\.gov$/
],
methods: ['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS']
})
);

app.use(
helmet({
contentSecurityPolicy: {
directives: {
defaultSrc: [
"'self'",
'https://cognito-idp.us-east-1.amazonaws.com',
'https://api.staging-cd.crossfeed.cyber.dhs.gov'
'https://cognito-idp.*.amazonaws.com',
'https://*.crossfeed.cyber.dhs.gov',
'https://*.readysetcyber.cyber.dhs.gov'
],
frameSrc: ["'self'", 'https://www.dhs.gov/ntas/'],
imgSrc: [
"'self'",
'https://*.crossfeed.cyber.dhs.gov',
'https://*.readysetcyber.cyber.dhs.gov',
'https://www.dhs.gov'
],
objectSrc: ["'none'"],
scriptSrc: [
"'self'",
'https://api.staging-cd.crossfeed.cyber.dhs.gov'
// Add any other allowed script sources here
'https://*.crossfeed.cyber.dhs.gov',
'https://*.readysetcyber.cyber.dhs.gov',
'https://www.dhs.gov'
],
frameAncestors: ["'none'"]
// Add other directives as needed
}
},
hsts: {
Expand Down
3 changes: 0 additions & 3 deletions frontend/scripts/constants.js
View file
Open in desktop

This file was deleted.

12 changes: 9 additions & 3 deletions frontend/scripts/docs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import path from 'path';
import rateLimit from 'express-rate-limit';
import cors from 'cors';
import helmet from 'helmet';
import { ALLOW_ORIGIN, ALLOW_METHODS } from './constants.js';

export const app = express();

Expand All @@ -17,8 +16,15 @@ app.use(

app.use(express.static(path.join(__dirname, '../docs/build')));

app.use(cors({ origin: ALLOW_ORIGIN, methods: ALLOW_METHODS }));

app.use(
cors({
origin: [
/^https:\/\/(.*\.)?crossfeed\.cyber\.dhs\.gov$/,
/^https:\/\/(.*\.)?readysetcyber\.cyber\.dhs\.gov$/
],
methods: 'GET'
})
);
app.use(
helmet({
contentSecurityPolicy: {
Expand Down
Loading