mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-01-19 14:13:34 +01:00
Fixed proxying Etherpad with nginx. (#6388)
This commit is contained in:
parent
e6e1af5810
commit
3e9c90e994
3 changed files with 4921 additions and 3843 deletions
|
@ -7,6 +7,7 @@
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "tsc && vite build",
|
"build": "tsc && vite build",
|
||||||
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
|
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
|
||||||
|
"build-copy": "tsc && vite build --outDir ../src/templates/admin --emptyOutDir",
|
||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
8682
pnpm-lock.yaml
8682
pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
|
@ -2,11 +2,13 @@
|
||||||
import {ArgsExpressType} from "../../types/ArgsExpressType";
|
import {ArgsExpressType} from "../../types/ArgsExpressType";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
import fs from "fs";
|
import fs from "fs";
|
||||||
import express from "express";
|
import * as url from "node:url";
|
||||||
|
import {MapArrayType} from "../../types/MapType";
|
||||||
|
|
||||||
const settings = require('ep_etherpad-lite/node/utils/Settings');
|
const settings = require('ep_etherpad-lite/node/utils/Settings');
|
||||||
|
|
||||||
const ADMIN_PATH = path.join(settings.root, 'src', 'templates', 'admin');
|
const ADMIN_PATH = path.join(settings.root, 'src', 'templates');
|
||||||
|
const PROXY_HEADER = "x-proxy-path"
|
||||||
/**
|
/**
|
||||||
* Add the admin navigation link
|
* Add the admin navigation link
|
||||||
* @param hookName {String} the name of the hook
|
* @param hookName {String} the name of the hook
|
||||||
|
@ -15,10 +17,69 @@ const ADMIN_PATH = path.join(settings.root, 'src', 'templates', 'admin');
|
||||||
* @return {*}
|
* @return {*}
|
||||||
*/
|
*/
|
||||||
exports.expressCreateServer = (hookName: string, args: ArgsExpressType, cb: Function): any => {
|
exports.expressCreateServer = (hookName: string, args: ArgsExpressType, cb: Function): any => {
|
||||||
args.app.use('/admin/', express.static(path.join(__dirname, '../../../templates/admin'), {maxAge: 1000 * 60 * 60 * 24}));
|
|
||||||
args.app.get('/admin/*', (_request:any, response:any)=>{
|
if (!fs.existsSync(ADMIN_PATH)) {
|
||||||
response.sendFile(path.resolve(__dirname,'../../../templates/admin', 'index.html'));
|
console.error('admin template not found, skipping admin interface. You need to rebuild it in /admin with pnpm run build-copy')
|
||||||
|
return cb();
|
||||||
|
}
|
||||||
|
args.app.get('/admin/*', (req: any, res: any) => {
|
||||||
|
// parse URL
|
||||||
|
const parsedUrl = url.parse(req.url);
|
||||||
|
// extract URL path
|
||||||
|
let pathname = ADMIN_PATH + `${parsedUrl.pathname}`;
|
||||||
|
// based on the URL path, extract the file extension. e.g. .js, .doc, ...
|
||||||
|
let ext = path.parse(pathname).ext;
|
||||||
|
// maps file extension to MIME typere
|
||||||
|
const map: MapArrayType<string> = {
|
||||||
|
'.ico': 'image/x-icon',
|
||||||
|
'.html': 'text/html',
|
||||||
|
'.js': 'text/javascript',
|
||||||
|
'.json': 'application/json',
|
||||||
|
'.css': 'text/css',
|
||||||
|
'.png': 'image/png',
|
||||||
|
'.jpg': 'image/jpeg',
|
||||||
|
'.wav': 'audio/wav',
|
||||||
|
'.mp3': 'audio/mpeg',
|
||||||
|
'.svg': 'image/svg+xml',
|
||||||
|
'.pdf': 'application/pdf',
|
||||||
|
'.doc': 'application/msword'
|
||||||
|
};
|
||||||
|
|
||||||
|
fs.exists(pathname, function (exist) {
|
||||||
|
if (!exist) {
|
||||||
|
// if the file is not found, return 404
|
||||||
|
res.statusCode = 200;
|
||||||
|
pathname = ADMIN_PATH + "/admin/index.html"
|
||||||
|
ext = path.parse(pathname).ext;
|
||||||
|
}
|
||||||
|
|
||||||
|
// if is a directory search for index file matching the extension
|
||||||
|
if (fs.statSync(pathname).isDirectory()) {
|
||||||
|
pathname = pathname + '/index.html';
|
||||||
|
ext = path.parse(pathname).ext;
|
||||||
|
}
|
||||||
|
|
||||||
|
// read file from file system
|
||||||
|
fs.readFile(pathname, function (err, data) {
|
||||||
|
if (err) {
|
||||||
|
res.statusCode = 500;
|
||||||
|
res.end(`Error getting the file: ${err}.`);
|
||||||
|
} else {
|
||||||
|
let dataToSend:Buffer|string = data
|
||||||
|
// if the file is found, set Content-type and send data
|
||||||
|
res.setHeader('Content-type', map[ext] || 'text/plain');
|
||||||
|
if (ext === ".html" || ext === ".js" || ext === ".css") {
|
||||||
|
if (req.header(PROXY_HEADER)) {
|
||||||
|
let string = data.toString()
|
||||||
|
dataToSend = string.replaceAll("/admin", req.header(PROXY_HEADER) + "/admin")
|
||||||
|
dataToSend = dataToSend.replaceAll("/socket.io", req.header(PROXY_HEADER) + "/socket.io")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
res.end(dataToSend);
|
||||||
|
}
|
||||||
|
});
|
||||||
})
|
})
|
||||||
|
});
|
||||||
args.app.get('/admin', (req: any, res: any, next: Function) => {
|
args.app.get('/admin', (req: any, res: any, next: Function) => {
|
||||||
if ('/' !== req.path[req.path.length - 1]) return res.redirect('./admin/');
|
if ('/' !== req.path[req.path.length - 1]) return res.redirect('./admin/');
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue