Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ const cors = require('cors');
const morgan = require('morgan');
const passport = require('passport');
const lusca = require('lusca');
const rateLimit = require('express-rate-limit');

const config = require('./runtimeConfig');
const { connect } = require('./database');
const { createHealthHandler, createHealthReporter } = require('./health');
const { initializePostgres, pool, startPostgresMaintenance } = require('./postgres');
const session = require('./middlewares/session');
const { createCorsOptions } = require('./middlewares/cors');
const { createClientAssetsRouter } = require('./middlewares/clientAssets');
const { apiRateLimitOptions } = require('./middlewares/apiRateLimit');
const logger = require('./logger');
const auth = require('./auth');
const api = require('./api');
Expand Down Expand Up @@ -76,13 +79,9 @@ const init = async () => {

app.use(cors(createCorsOptions(config.cors.origin)));

app.get('/api/csrf-token', (req, res) => res.json({ csrfToken: req.csrfToken() }));

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

app.get('/', (req, res) => {
res.sendFile(path.join(__dirname, '../client/build/index.html'));
});
app.get('/api/csrf-token', rateLimit(apiRateLimitOptions()), (req, res) => (
res.json({ csrfToken: req.csrfToken() })
));

app.use('/auth', auth(app, passport));
app.use('/api', api(app, passport));
Expand All @@ -98,9 +97,7 @@ const init = async () => {
res.sendFile(announcementsPath);
});

app.use('/*', (req, res) => {
res.sendFile(path.join(__dirname, '../client/build/index.html'));
});
app.use(createClientAssetsRouter(path.join(__dirname, '../client/build')));

app.listen(config.server.port, '0.0.0.0', (err) => {
if (err) {
Expand Down
19 changes: 19 additions & 0 deletions server/middlewares/clientAssets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const express = require('express');
const path = require('path');
const rateLimit = require('express-rate-limit');
const { apiRateLimitOptions } = require('./apiRateLimit');

const createClientAssetsRouter = (buildPath, rateLimitOptions = apiRateLimitOptions()) => {
const router = express.Router();

router.use(rateLimit(rateLimitOptions));
router.use(express.static(buildPath));
const indexPath = path.join(buildPath, 'index.html');

router.get('/', (req, res) => res.sendFile(indexPath));
router.use((req, res) => res.sendFile(indexPath));

return router;
};

module.exports = { createClientAssetsRouter };
51 changes: 51 additions & 0 deletions server/middlewares/clientAssets.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/** @jest-environment node */
/* eslint-env jest */

const http = require('http');
const path = require('path');
const express = require('express');
const { createClientAssetsRouter } = require('./clientAssets');
const { apiRateLimitOptions } = require('./apiRateLimit');

const request = (server) => new Promise((resolve, reject) => {
const req = http.request({
host: '127.0.0.1',
method: 'GET',
path: '/missing-client-route',
port: server.address().port,
}, (res) => {
let body = '';
res.on('data', (chunk) => { body += chunk; });
res.on('end', () => resolve({ body, status: res.statusCode }));
});
req.on('error', reject);
req.end();
});

describe('client asset rate limiting', () => {
let server;

beforeEach((done) => {
const app = express();
app.use(createClientAssetsRouter(
path.join(__dirname, '../../client'),
apiRateLimitOptions({ limit: 1, windowMs: 60_000 }),
));
server = app.listen(0, '127.0.0.1', () => done());
});

afterEach((done) => {
server.close(() => done());
});

it('serves the client fallback', async () => {
const response = await request(server);

expect(response.status).toBe(200);
expect(response.body).toContain('<html lang="en">');
expect(await request(server)).toEqual({
body: '{"code":"rate_limited","message":"Too many requests. Please try again later."}',
status: 429,
});
});
});
Loading