Skip to content

Commit

Permalink
fix: get rid of math.random in utils.generateUUID
Browse files Browse the repository at this point in the history
  • Loading branch information
barisusakli committed May 26, 2022
1 parent 9d9b3f4 commit e802fab
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
9 changes: 0 additions & 9 deletions public/src/utils.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,6 @@ const HTMLEntities = Object.freeze({

/* eslint-disable no-redeclare */
const utils = {
generateUUID: function () {
/* eslint-disable no-bitwise */
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
const r = Math.random() * 16 | 0;
const v = c === 'x' ? r : ((r & 0x3) | 0x8);
return v.toString(16);
});
/* eslint-enable no-bitwise */
},
// https://github.com/substack/node-ent/blob/master/index.js
decodeHTMLEntities: function (html) {
return String(html)
Expand Down
8 changes: 8 additions & 0 deletions public/src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,12 @@ utils.assertPasswordValidity = (password) => {
}
};

utils.generateUUID = function () {
// from https://github.com/tracker1/node-uuid4/blob/master/browser.js
const temp_url = URL.createObjectURL(new Blob());
const uuid = temp_url.toString();
URL.revokeObjectURL(temp_url);
return uuid.split(/[:\/]/g).pop().toLowerCase(); // remove prefixes
};

module.exports = utils;
15 changes: 15 additions & 0 deletions src/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict';

const crypto = require('crypto');

process.profile = function (operation, start) {
console.log('%s took %d milliseconds', operation, process.elapsedTimeSince(start));
};
Expand All @@ -14,4 +16,17 @@ utils.getLanguage = function () {
const meta = require('./meta');
return meta.config && meta.config.defaultLang ? meta.config.defaultLang : 'en-GB';
};

utils.generateUUID = function () {
// from https://github.com/tracker1/node-uuid4/blob/master/index.js
let rnd = crypto.randomBytes(16);
/* eslint-disable no-bitwise */
rnd[6] = (rnd[6] & 0x0f) | 0x40;
rnd[8] = (rnd[8] & 0x3f) | 0x80;
/* eslint-enable no-bitwise */
rnd = rnd.toString('hex').match(/(.{8})(.{4})(.{4})(.{4})(.{12})/);
rnd.shift();
return rnd.join('-');
};

module.exports = utils;

0 comments on commit e802fab

Please sign in to comment.