m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-11-15 01:35:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve hash validation.

Browse Source
This commit is contained in:
Mike Cao 2020-07-17 21:01:49 -07:00
parent c681441601
commit e6908d9e04
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/utils.js
View File

@ -11,6 +11,10 @@ export function hash(s) {
return uuid(s, md5(process.env.HASH_SALT)); return uuid(s, md5(process.env.HASH_SALT));
} }
export function validHash(s) {
return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}$/.test(s);
}
export function getIpAddress(req) { export function getIpAddress(req) {
if (req.headers['cf-connecting-ip']) { if (req.headers['cf-connecting-ip']) {
return req.headers['cf-connecting-ip']; return req.headers['cf-connecting-ip'];
@ -58,7 +62,12 @@ export function parseCollectRequest(req) {
session: { website_id, session_id, time, hash: validationHash }, session: { website_id, session_id, time, hash: validationHash },
} = payload; } = payload;
if (hash(`${website_id}${session_id}${time}`) === validationHash) { if (
validHash(website_id) &&
validHash(session_id) &&
validHash(validationHash) &&
hash(`${website_id}${session_id}${time}`) === validationHash
) {
return { return {
valid: true, valid: true,
type, type,