Streaming: use standard cors package instead of custom implementation (#28523)

This commit is contained in:
Emelia Smith 2024-01-04 10:18:03 +01:00 committed by GitHub
parent 9c268c9413
commit 9826b7780a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 16 deletions

View File

@ -5,6 +5,7 @@ const http = require('http');
const path = require('path'); const path = require('path');
const url = require('url'); const url = require('url');
const cors = require('cors');
const dotenv = require('dotenv'); const dotenv = require('dotenv');
const express = require('express'); const express = require('express');
const Redis = require('ioredis'); const Redis = require('ioredis');
@ -187,6 +188,7 @@ const startServer = async () => {
const pgPool = new pg.Pool(pgConfigFromEnv(process.env)); const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
const server = http.createServer(app); const server = http.createServer(app);
app.use(cors());
/** /**
* @type {Object.<string, Array.<function(Object<string, any>): void>>} * @type {Object.<string, Array.<function(Object<string, any>): void>>}
@ -327,19 +329,6 @@ const startServer = async () => {
} }
}; };
/**
* @param {any} req
* @param {any} res
* @param {function(Error=): void} next
*/
const allowCrossDomain = (req, res, next) => {
res.header('Access-Control-Allow-Origin', '*');
res.header('Access-Control-Allow-Headers', 'Authorization, Accept, Cache-Control');
res.header('Access-Control-Allow-Methods', 'GET, OPTIONS');
next();
};
/** /**
* @param {any} req * @param {any} req
* @param {any} res * @param {any} res
@ -987,7 +976,6 @@ const startServer = async () => {
api.use(setRequestId); api.use(setRequestId);
api.use(setRemoteAddress); api.use(setRemoteAddress);
api.use(allowCrossDomain);
api.use(authenticationMiddleware); api.use(authenticationMiddleware);
api.use(errorMiddleware); api.use(errorMiddleware);

View File

@ -16,6 +16,7 @@
"check:types": "tsc --noEmit" "check:types": "tsc --noEmit"
}, },
"dependencies": { "dependencies": {
"cors": "^2.8.5",
"dotenv": "^16.0.3", "dotenv": "^16.0.3",
"express": "^4.18.2", "express": "^4.18.2",
"ioredis": "^5.3.2", "ioredis": "^5.3.2",
@ -28,6 +29,7 @@
"ws": "^8.12.1" "ws": "^8.12.1"
}, },
"devDependencies": { "devDependencies": {
"@types/cors": "^2.8.16",
"@types/express": "^4.17.17", "@types/express": "^4.17.17",
"@types/npmlog": "^7.0.0", "@types/npmlog": "^7.0.0",
"@types/pg": "^8.6.6", "@types/pg": "^8.6.6",

View File

@ -2468,12 +2468,14 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@mastodon/streaming@workspace:streaming" resolution: "@mastodon/streaming@workspace:streaming"
dependencies: dependencies:
"@types/cors": "npm:^2.8.16"
"@types/express": "npm:^4.17.17" "@types/express": "npm:^4.17.17"
"@types/npmlog": "npm:^7.0.0" "@types/npmlog": "npm:^7.0.0"
"@types/pg": "npm:^8.6.6" "@types/pg": "npm:^8.6.6"
"@types/uuid": "npm:^9.0.0" "@types/uuid": "npm:^9.0.0"
"@types/ws": "npm:^8.5.9" "@types/ws": "npm:^8.5.9"
bufferutil: "npm:^4.0.7" bufferutil: "npm:^4.0.7"
cors: "npm:^2.8.5"
dotenv: "npm:^16.0.3" dotenv: "npm:^16.0.3"
eslint-define-config: "npm:^2.0.0" eslint-define-config: "npm:^2.0.0"
express: "npm:^4.18.2" express: "npm:^4.18.2"
@ -3027,6 +3029,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/cors@npm:^2.8.16":
version: 2.8.16
resolution: "@types/cors@npm:2.8.16"
dependencies:
"@types/node": "npm:*"
checksum: ebcfb325b102739249bbaa4845cf1cf4830baf5490a32bcd1a85cd9b8c4d4b9eaaaea94423e454b5b7c9da77e46a64db80d2381d3bc3f940d15d13814e87b70a
languageName: node
linkType: hard
"@types/emoji-mart@npm:^3.0.9": "@types/emoji-mart@npm:^3.0.9":
version: 3.0.14 version: 3.0.14
resolution: "@types/emoji-mart@npm:3.0.14" resolution: "@types/emoji-mart@npm:3.0.14"
@ -5973,6 +5984,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"cors@npm:^2.8.5":
version: 2.8.5
resolution: "cors@npm:2.8.5"
dependencies:
object-assign: "npm:^4"
vary: "npm:^1"
checksum: 373702b7999409922da80de4a61938aabba6929aea5b6fd9096fefb9e8342f626c0ebd7507b0e8b0b311380744cc985f27edebc0a26e0ddb784b54e1085de761
languageName: node
linkType: hard
"cosmiconfig@npm:^7.0.0": "cosmiconfig@npm:^7.0.0":
version: 7.1.0 version: 7.1.0
resolution: "cosmiconfig@npm:7.1.0" resolution: "cosmiconfig@npm:7.1.0"
@ -11953,7 +11974,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1": "object-assign@npm:^4, object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
version: 4.1.1 version: 4.1.1
resolution: "object-assign@npm:4.1.1" resolution: "object-assign@npm:4.1.1"
checksum: 1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414 checksum: 1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414
@ -16728,7 +16749,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"vary@npm:~1.1.2": "vary@npm:^1, vary@npm:~1.1.2":
version: 1.1.2 version: 1.1.2
resolution: "vary@npm:1.1.2" resolution: "vary@npm:1.1.2"
checksum: f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f checksum: f15d588d79f3675135ba783c91a4083dcd290a2a5be9fcb6514220a1634e23df116847b1cc51f66bfb0644cf9353b2abb7815ae499bab06e46dd33c1a6bf1f4f