gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam 2021-02-05 22:54:50 +01:00
commit 45516fa7b4
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.45.8", "version": "0.45.9",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

2
src/routes/routes.js
View File

@ -235,7 +235,7 @@ function register(app) {
route(GET, '/api/setup/status', [], setupApiRoute.getStatus, apiResultHandler); route(GET, '/api/setup/status', [], setupApiRoute.getStatus, apiResultHandler);
route(POST, '/api/setup/new-document', [auth.checkAppNotInitialized], setupApiRoute.setupNewDocument, apiResultHandler); route(POST, '/api/setup/new-document', [auth.checkAppNotInitialized], setupApiRoute.setupNewDocument, apiResultHandler);
route(POST, '/api/setup/sync-from-server', [auth.checkAppNotInitialized], setupApiRoute.setupSyncFromServer, apiResultHandler, false); route(POST, '/api/setup/sync-from-server', [auth.checkAppNotInitialized], setupApiRoute.setupSyncFromServer, apiResultHandler, false);
route(GET, '/api/setup/sync-seed', [auth.checkBasicAuth], setupApiRoute.getSyncSeed, apiResultHandler); route(GET, '/api/setup/sync-seed', [auth.checkCredentials], setupApiRoute.getSyncSeed, apiResultHandler);
route(POST, '/api/setup/sync-seed', [auth.checkAppNotInitialized], setupApiRoute.saveSyncSeed, apiResultHandler, false); route(POST, '/api/setup/sync-seed', [auth.checkAppNotInitialized], setupApiRoute.saveSyncSeed, apiResultHandler, false);
apiRoute(GET, '/api/sql/schema', sqlRoute.getSchema); apiRoute(GET, '/api/sql/schema', sqlRoute.getSchema);

6
src/services/auth.js
View File

@ -77,8 +77,8 @@ function reject(req, res, message) {
res.status(401).send(message); res.status(401).send(message);
} }
function checkBasicAuth(req, res, next) { function checkCredentials(req, res, next) {
const header = req.headers.authorization || ''; const header = req.headers['trilium-cred'] || '';
const token = header.split(/\s+/).pop() || ''; const token = header.split(/\s+/).pop() || '';
const auth = new Buffer.from(token, 'base64').toString(); const auth = new Buffer.from(token, 'base64').toString();
const [username, password] = auth.split(/:/); const [username, password] = auth.split(/:/);
@ -100,5 +100,5 @@ module.exports = {
checkAppNotInitialized, checkAppNotInitialized,
checkApiAuthOrElectron, checkApiAuthOrElectron,
checkToken, checkToken,
checkBasicAuth checkCredentials
}; };

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2021-01-11T22:47:11+01:00", buildRevision: "6afc299efb616d47c72b5f58ab2827c0e3e121c2" }; module.exports = { buildDate:"2021-02-05T21:38:32+01:00", buildRevision: "9d7d79ef94bc7734393ae7f89993e76bbc7d97e3" };

6
src/services/setup.js
View File

@ -70,9 +70,9 @@ async function setupSyncFromSyncServer(syncServerHost, syncProxy, username, pass
const resp = await request.exec({ const resp = await request.exec({
method: 'get', method: 'get',
url: syncServerHost + '/api/setup/sync-seed', url: syncServerHost + '/api/setup/sync-seed',
auth: { headers: {
'user': username, // not using Authorization header because some proxy servers will filter it out
'pass': password 'trilium-cred': Buffer.from(username + ':' + password).toString('base64')
}, },
proxy: syncProxy, proxy: syncProxy,
timeout: 30000 // seed request should not take long timeout: 30000 // seed request should not take long