Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Fix crypto errors.

Mike Caoefb52f5ff11e
diff --git a/lib/crypto.js b/lib/crypto.js
index 1e53aa9d7..74470549e 100644
--- a/lib/crypto.js
+++ b/lib/crypto.js
@@ -15,5 +15,5 @@ export function salt() {
export function uuid(...args) {
if (!args.length) return v4();
- return v5(args.join(''), salt());
+ return v5(hash([...args, salt()]), v5.DNS);
}
diff --git a/pages/api/collect.js b/pages/api/collect.js
index dec2f28d9..7fd7ffdff 100644
--- a/pages/api/collect.js
+++ b/pages/api/collect.js
@@ -5,7 +5,7 @@ import { createToken, unauthorized, send, badRequest, forbidden } from 'next-bas
import { savePageView, saveEvent } from 'queries';
import { useCors, useSession } from 'lib/middleware';
import { getJsonBody, getIpAddress } from 'lib/request';
-import { uuid } from 'lib/crypto';
+import { secret, uuid } from 'lib/crypto';
export default async (req, res) => {
await useCors(req, res);
@@ -87,7 +87,7 @@ export default async (req, res) => {
return badRequest(res);
}
- const token = createToken({ website_id, session_id, session_uuid });
+ const token = createToken({ website_id, session_id, session_uuid }, secret());
return send(res, token);
};