watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 12:47:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updated useConfig. Added SSO page.

Browse source
This commit is contained in:
Mike Cao 2022-10-31 11:02:37 -07:00
parent f10c8ba9e2
commit c58e037a7e
8 changed files with 69 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/auth.js
View file

@ -1,22 +1,26 @@
import { parseSecureToken, parseToken } from 'next-basics';
import { getAccount, getWebsite } from 'queries';
import debug from 'debug';
import { SHARE_TOKEN_HEADER, TYPE_ACCOUNT, TYPE_WEBSITE } from 'lib/constants';
import { secret } from 'lib/crypto';
export function getAuthToken(req) {
const log = debug('umami:auth');
export function parseAuthToken(req) {
try {
const token = req.headers.authorization;
return parseSecureToken(token.split(' ')[1], secret());
} catch {
} catch (e) {
log(e);
return null;
}
}
export function getShareToken(req) {
export function parseShareToken(req) {
try {
return parseToken(req.headers[SHARE_TOKEN_HEADER], secret());
} catch {
} catch (e) {
log(e);
return null;
}
}
@ -29,6 +33,7 @@ export function isValidToken(token, validation) {
return validation(token);
}
} catch (e) {
log(e);
return false;
}

4
lib/crypto.js
View file

@ -9,11 +9,11 @@ export function secret() {
export function salt() {
const ROTATING_SALT = hash(startOfMonth(new Date()).toUTCString());
return hash([secret(), ROTATING_SALT]);
return hash(secret(), ROTATING_SALT);
}
export function uuid(...args) {
if (!args.length) return v4();
return v5(hash([...args, salt()]), v5.DNS);
return v5(hash(...args, salt()), v5.DNS);
}

6
lib/middleware.js
View file

@ -1,7 +1,7 @@
import { createMiddleware, unauthorized, badRequest, serverError } from 'next-basics';
import cors from 'cors';
import { getSession } from './session';
import { getAuthToken, getShareToken } from './auth';
import { parseAuthToken, parseShareToken } from './auth';
export const useCors = createMiddleware(cors());
@ -26,8 +26,8 @@ export const useSession = createMiddleware(async (req, res, next) => {
});
export const useAuth = createMiddleware(async (req, res, next) => {
const token = await getAuthToken(req);
const shareToken = await getShareToken(req);
const token = await parseAuthToken(req);
const shareToken = await parseShareToken(req);
if (!token && !shareToken) {
return unauthorized(res);