Skip to content

Node.js based forum software built for the modern web

fix(activitypub): serve federated emoji with nosniff/attachment headers

Julian Lamdb3581d4ff25
diff --git a/src/controllers/activitypub/emoji.js b/src/controllers/activitypub/emoji.js
index 518953dcb9..95d60f7b15 100644
--- a/src/controllers/activitypub/emoji.js
+++ b/src/controllers/activitypub/emoji.js
@@ -6,6 +6,7 @@ const nconf = require('nconf');
const winston = require('winston');
const emoji = require('../../activitypub/emoji');
+const uploads = require('../../middleware/uploads');
const Controller = module.exports;
@@ -54,6 +55,9 @@ Controller.serve = async (req, res) => {
res.setHeader('Cache-Control', 'public, max-age=31536000, immutable');
res.setHeader('Expires', new Date(Date.now() + 31536000000).toUTCString());
+ // SVG protections, etc.
+ uploads.setSafeFileHeaders(res, path.basename(filePath));
+
// Stream the file
const { createReadStream } = require('fs');
const stream = createReadStream(filePath);
diff --git a/src/middleware/uploads.js b/src/middleware/uploads.js
index a68846e41b..54bb99ab16 100644
--- a/src/middleware/uploads.js
+++ b/src/middleware/uploads.js
@@ -71,20 +71,26 @@ exports.addUploadHeaders = helpers.try(function addUploadHeaders(req, res, next)
const requestedPath = normalizeUploadRequestPath(req.path);
if (requestedPath.startsWith('/uploads/')) {
let basename = path.basename(requestedPath);
- const extname = path.extname(requestedPath).trim().toLowerCase();
- // Trim uploaded files' timestamps when downloading + force download if unsafe
+ // Trim uploaded files' timestamps when downloading
if (timestampedUploadRegex.test(basename)) {
basename = basename.slice(14);
}
- res.setHeader('X-Content-Type-Options', 'nosniff');
- if (unsafeExtensions.has(extname)) {
- res.attachment(basename);
- }
+
+ // Force download if unsafe
+ exports.setSafeFileHeaders(res, basename);
}
next();
});
+exports.setSafeFileHeaders = function (res, basename) {
+ const extname = path.extname(basename).trim().toLowerCase();
+ res.setHeader('X-Content-Type-Options', 'nosniff');
+ if (unsafeExtensions.has(extname)) {
+ res.attachment(basename);
+ }
+};
+
function normalizeUploadRequestPath(requestPath) {
let decodedPath;
try {
diff --git a/test/uploads.js b/test/uploads.js
index 5764cfb313..4e7fafec92 100644
--- a/test/uploads.js
+++ b/test/uploads.js
@@ -17,6 +17,7 @@ const socketUser = require('../src/socket.io/user');
const helpers = require('./helpers');
const file = require('../src/file');
const image = require('../src/image');
+const uploads = require('../src/middleware/uploads');
const request = require('../src/request');
const emptyUploadsFolder = async () => {
@@ -798,6 +799,41 @@ describe('Upload Controllers', () => {
after(emptyUploadsFolder);
});
+ describe('middleware.setSafeFileHeaders()', () => {
+ function mockRes() {
+ const headers = {};
+ return {
+ headers,
+ setHeader(name, value) {
+ headers[name.toLowerCase()] = value;
+ return this;
+ },
+ attachment(filename) {
+ this.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
+ return this;
+ },
+ };
+ }
+
+ it('should always set X-Content-Type-Options: nosniff', () => {
+ const res = mockRes();
+ uploads.setSafeFileHeaders(res, 'test.png');
+ assert.strictEqual(res.headers['x-content-type-options'], 'nosniff');
+ });
+
+ it('should force a download for unsafe extensions (SVG)', () => {
+ const res = mockRes();
+ uploads.setSafeFileHeaders(res, 'pwn.svg');
+ assert.strictEqual(res.headers['content-disposition'], 'attachment; filename="pwn.svg"');
+ });
+
+ it('should not force a download for safe image extensions', () => {
+ const res = mockRes();
+ uploads.setSafeFileHeaders(res, 'test.png');
+ assert.strictEqual(res.headers['content-disposition'], undefined);
+ });
+ });
+
describe('library methods', () => {
describe('.getOrphans()', () => {
before(async () => {