gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

using dashes instead of underscores in header names to avoid the fact that nginx by default drops all headers with underscore in the header name

Browse Source
This commit is contained in:
azivner 2018-11-30 15:49:35 +01:00
parent 4cc08bff8b
commit 8ee80cb5f1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/javascripts/services/server.js
View File

@ -12,9 +12,10 @@ function getHeaders() {
// headers need to be lowercase because node.js automatically converts them to lower case // headers need to be lowercase because node.js automatically converts them to lower case
// so hypothetical protectedSessionId becomes protectedsessionid on the backend // so hypothetical protectedSessionId becomes protectedsessionid on the backend
// also avoiding using underscores instead of dashes since nginx filters them out by default
return { return {
protected_session_id: protectedSessionId, 'trilium-protected-session-id': protectedSessionId,
source_id: glob.sourceId 'trilium-source-id': glob.sourceId
}; };
} }

2
src/routes/routes.js
View File

@ -66,7 +66,7 @@ function route(method, path, middleware, routeHandler, resultHandler, transactio
router[method](path, ...middleware, async (req, res, next) => { router[method](path, ...middleware, async (req, res, next) => {
try { try {
const result = await cls.init(async () => { const result = await cls.init(async () => {
cls.namespace.set('sourceId', req.headers.source_id); cls.namespace.set('sourceId', req.headers['trilium-source-id']);
protectedSessionService.setProtectedSessionId(req); protectedSessionService.setProtectedSessionId(req);
if (transactional) { if (transactional) {

2
src/services/protected_session.js
View File

@ -15,7 +15,7 @@ function setDataKey(decryptedDataKey) {
} }
function setProtectedSessionId(req) { function setProtectedSessionId(req) {
cls.namespace.set('protectedSessionId', req.headers.protected_session_id); cls.namespace.set('protectedSessionId', req.headers['trilium-protected-session-id']);
} }
function getProtectedSessionId() { function getProtectedSessionId() {