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

revert accidentally committed auth changes, #1629

Browse Source
This commit is contained in:
zadam 2021-02-11 23:04:42 +01:00
parent 067ca9ab16
commit 5b679930de
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/routes.js
View File

@ -224,7 +224,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.checkCredentials], setupApiRoute.getSyncSeed, apiResultHandler); route(GET, '/api/setup/sync-seed', [auth.checkBasicAuth], 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 checkCredentials(req, res, next) { function checkBasicAuth(req, res, next) {
const header = req.headers['trilium-cred'] || ''; const header = req.headers.authorization || '';
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,
checkCredentials checkBasicAuth
}; };

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',
headers: { auth: {
// not using Authorization header because some proxy servers will filter it out 'user': username,
'trilium-cred': Buffer.from(username + ':' + password).toString('base64') 'pass': password
}, },
proxy: syncProxy, proxy: syncProxy,
timeout: 30000 // seed request should not take long timeout: 30000 // seed request should not take long