Techognito/starter-kit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop moment.js dependency

Browse source 
Addresses CVE-2022-24785
This commit is contained in:
Justin Stephenson 2022-05-19 13:41:12 -04:00
parent 88a167a89a
commit 6f5ec24e16
3 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -55,7 +55,6 @@
"date-fns": "2.25.0", "date-fns": "2.25.0",
"ini": "^1.3.5", "ini": "^1.3.5",
"jquery": "3.5.1", "jquery": "3.5.1",
"moment": "2.27.0",
"raw-loader": "^0.5.1", "raw-loader": "^0.5.1",
"react": "16.13.1", "react": "16.13.1",
"react-dom": "16.13.1", "react-dom": "16.13.1",

17
src/player.jsx
View file

@ -59,7 +59,6 @@ import { journal } from 'journal';
const cockpit = require("cockpit"); const cockpit = require("cockpit");
const _ = cockpit.gettext; const _ = cockpit.gettext;
const moment = require("moment");
const $ = require("jquery"); const $ = require("jquery");
const padInt = function (n, w) { const padInt = function (n, w) {
@ -72,8 +71,22 @@ const padInt = function (n, w) {
return ((i < 0) ? '-' : '') + s; return ((i < 0) ? '-' : '') + s;
}; };
/*
* Format date and time for a number of milliseconds since Epoch.
* YYYY-MM-DD HH:mm:ss
*/
const formatDateTime = function (ms) { const formatDateTime = function (ms) {
return moment(ms).format("YYYY-MM-DD HH:mm:ss"); /* Convert local timezone offset */
let t = new Date(ms);
let z = t.getTimezoneOffset() * 60 * 1000;
let tLocal = t - z;
tLocal = new Date(tLocal);
let iso = tLocal.toISOString();
/* cleanup ISO format */
iso = iso.slice(0, 19);
iso = iso.replace('T', ' ');
return iso;
}; };
/* /*

26
src/recordings.jsx
View file

@ -65,7 +65,6 @@ import { journal } from 'journal';
const $ = require("jquery"); const $ = require("jquery");
const cockpit = require("cockpit"); const cockpit = require("cockpit");
const _ = cockpit.gettext; const _ = cockpit.gettext;
const moment = require("moment");
const Player = require("./player.jsx"); const Player = require("./player.jsx");
const Config = require("./config.jsx"); const Config = require("./config.jsx");
@ -85,14 +84,33 @@ const padInt = function (n, w) {
/* /*
* Format date and time for a number of milliseconds since Epoch. * Format date and time for a number of milliseconds since Epoch.
* YYYY-MM-DD HH:mm:ss
*/ */
const formatDateTime = function (ms) { const formatDateTime = function (ms) {
return moment(ms).format("YYYY-MM-DD HH:mm:ss"); /* Convert local timezone offset */
let t = new Date(ms);
let z = t.getTimezoneOffset() * 60 * 1000;
let tLocal = t - z;
tLocal = new Date(tLocal);
let iso = tLocal.toISOString();
/* cleanup ISO format */
iso = iso.slice(0, 19);
iso = iso.replace('T', ' ');
return iso;
}; };
const formatUTC = function(date) { const formatUTC = function(date) {
return moment(date).utc() let iso = null;
.format("YYYY-MM-DD HH:mm:ss") + " UTC"; try {
iso = new Date(date).toISOString();
iso = iso.slice(0, 19);
iso = iso.replace('T', ' ') + " UTC";
} catch (error) {
iso = "";
}
return iso;
}; };
/* /*