asn1-ts 8.0.3 → 8.0.4

package/dist/node/codecs/ber/decoders/decodeGeneralizedTime.js

@@ -39,20 +39,117 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = decodeGeneralizedTime;
 const errors = __importStar(require("../../../errors"));
 const convertBytesToText_1 = __importDefault(require("../../../utils/convertBytesToText"));
-const values_1 = require("../../../values");
 const validateDateTime_1 = __importDefault(require("../../../validators/validateDateTime"));
+const SMALLEST_CORRECT_GENERALIZED_TIME = "2000120123".length;
+const PERIOD = ".".charCodeAt(0);
+const COMMA = ",".charCodeAt(0);
+const Z = "Z".charCodeAt(0);
+const PLUS = "+".charCodeAt(0);
+const MINUS = "-".charCodeAt(0);
+;
+function isStop(s, i) {
+    const char = s.charCodeAt(i);
+    return (char === PERIOD) || (char === COMMA);
+}
 function decodeGeneralizedTime(value) {
+    if (value.length < SMALLEST_CORRECT_GENERALIZED_TIME) {
+        throw new errors.ASN1Error("Malformed GeneralizedTime string.");
+    }
+    if (value.length > 32) {
+        throw new errors.ASN1Error("Outrageously large GeneralizedTime string.");
+    }
     const dateString = (0, convertBytesToText_1.default)(value);
-    const match = values_1.generalizedTimeRegex.exec(dateString);
-    if (match === null) {
+    const year = Number(dateString.slice(0, 4));
+    const month = (Number(dateString.slice(4, 6)) - 1);
+    const date = Number(dateString.slice(6, 8));
+    const hours = Number(dateString.slice(8, 10));
+    if (value.length === 10) {
+        (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, 0, 0);
+        return new Date(year, month, date, hours, 0, 0);
+    }
+    let i = 10;
+    while (value[i] && value[i] >= 0x30 && value[i] <= 0x39)
+        i++;
+    let minutes = 0;
+    let seconds = 0;
+    let milliseconds = 0;
+    let fractionUnits = 0;
+    if (i == 14) {
+        minutes = Number.parseInt(dateString.slice(10, 12), 10);
+        seconds = Number.parseInt(dateString.slice(12, 14), 10);
+        fractionUnits = 2;
+    }
+    else if (i == 12) {
+        minutes = Number.parseInt(dateString.slice(10, 12), 10);
+        fractionUnits = 1;
+    }
+    else if (i != 10) {
+        throw new errors.ASN1Error("Malformed GeneralizedTime string.");
+    }
+    if (value[i] === undefined) {
+        (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, minutes, seconds);
+        return new Date(year, month, date, hours, minutes, seconds);
+    }
+    if (isStop(dateString, i)) {
+        i++;
+        let j = i;
+        while (value[j] && value[j] >= 0x30 && value[j] <= 0x39)
+            j++;
+        const fractionString = `0.${dateString.slice(i, j)}`;
+        i = j;
+        const fraction = Number.parseFloat(fractionString);
+        if (fractionUnits === 0) {
+            minutes = Math.floor(60 * fraction);
+            seconds = Math.floor((60 * 60 * fraction) % 60);
+        }
+        else if (fractionUnits === 1) {
+            seconds = Math.floor(60 * fraction);
+        }
+        else if (fractionUnits === 2) {
+            milliseconds = Math.floor(1000 * fraction);
+        }
+        else {
+            throw new Error("internal asn1-ts error: invalid FractionalUnits");
+        }
+    }
+    if (value[i] === undefined) {
+        (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, minutes, seconds);
+        return new Date(year, month, date, hours, minutes, seconds, milliseconds);
+    }
+    if (value[i] === Z) {
+        (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, minutes, seconds);
+        return new Date(Date.UTC(year, month, date, hours, minutes, seconds, milliseconds));
+    }
+    if (value[i] === PLUS || value[i] === MINUS) {
+        const isPositive = value[i] === PLUS;
+        i++;
+        let j = i;
+        while (value[j] && value[j] >= 0x30 && value[j] <= 0x39)
+            j++;
+        const offsetSize = j - i;
+        if (value[j] !== undefined) {
+            throw new errors.ASN1Error("Malformed GeneralizedTime string.");
+        }
+        let offsetHour = 0;
+        let offsetMinute = 0;
+        if (offsetSize === 4) {
+            offsetHour = Number.parseInt(dateString.slice(j - 4, j - 2), 10);
+            offsetMinute = Number.parseInt(dateString.slice(j - 2, j), 10);
+        }
+        else if (offsetSize === 2) {
+            offsetHour = Number.parseInt(dateString.slice(j - 2, j));
+        }
+        else {
+            throw new errors.ASN1Error("Malformed GeneralizedTime string.");
+        }
+        let epochTimeInMS = Date.UTC(year, month, date, hours, minutes, seconds, milliseconds);
+        const sign = isPositive ? -1 : 1;
+        epochTimeInMS += sign * ((offsetHour * 60 * 60 * 1000) + (offsetMinute * 60 * 1000));
+        return new Date(epochTimeInMS);
+    }
+    if (value[i] !== undefined) {
         throw new errors.ASN1Error("Malformed GeneralizedTime string.");
     }
-    const year = Number(match[1]);
-    const month = (Number(match[2]) - 1);
-    const date = Number(match[3]);
-    const hours = Number(match[4]);
-    const minutes = Number(match[5]);
-    const seconds = Number(match[6]);
     (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, minutes, seconds);
-    return new Date(Date.UTC(year, month, date, hours, minutes, seconds));
+    return new Date(Date.UTC(year, month, date, hours, minutes, seconds, milliseconds));
 }

package/dist/node/codecs/ber/decoders/decodeUTCTime.js

@@ -39,23 +39,46 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = decodeUTCTime;
 const convertBytesToText_1 = __importDefault(require("../../../utils/convertBytesToText"));
 const errors = __importStar(require("../../../errors"));
-const values_1 = require("../../../values");
 const validateDateTime_1 = __importDefault(require("../../../validators/validateDateTime"));
 function decodeUTCTime(value) {
     const dateString = (0, convertBytesToText_1.default)(value);
-    const match = values_1.utcTimeRegex.exec(dateString);
-    if (match === null) {
-        throw new errors.ASN1Error("Malformed UTCTime string.");
-    }
-    let year = Number(match[1]);
+    let year = Number(dateString.slice(0, 2));
     year = (year <= 49)
         ? (2000 + year)
         : (1900 + year);
-    const month = (Number(match[2]) - 1);
-    const date = Number(match[3]);
-    const hours = Number(match[4]);
-    const minutes = Number(match[5]);
-    const seconds = Number(match[6]);
-    (0, validateDateTime_1.default)("UTCTime", year, month, date, hours, minutes, seconds);
-    return new Date(Date.UTC(year, month, date, hours, minutes, seconds));
+    const month = (Number(dateString.slice(2, 4)) - 1);
+    const date = Number(dateString.slice(4, 6));
+    const hours = Number(dateString.slice(6, 8));
+    const minutes = Number(dateString.slice(8, 10));
+    const char10 = dateString.charCodeAt(10);
+    const secondsFieldPresent = (char10 >= 0x30 && char10 <= 0x39);
+    const seconds = secondsFieldPresent
+        ? Number(dateString.slice(10, 12))
+        : 0;
+    let i = secondsFieldPresent ? 12 : 10;
+    if (dateString[i] === 'Z') {
+        (0, validateDateTime_1.default)("UTCTime", year, month, date, hours, minutes, seconds);
+        return new Date(Date.UTC(year, month, date, hours, minutes, seconds));
+    }
+    if ((dateString[i] !== '+') && (dateString[i] !== '-')) {
+        throw new errors.ASN1Error(`Malformed BER UTCTime: non +/- offset: ${dateString[i]}`);
+    }
+    const isPositive = dateString[i] === '+';
+    i++;
+    let j = 0;
+    while (value[i + j] && value[i + j] >= 0x30 && value[i + j] <= 0x39)
+        j++;
+    if (j !== 4) {
+        throw new errors.ASN1Error("Malformed BER UTCTime: non four-digit offset");
+    }
+    i += j;
+    if (dateString[i] !== undefined) {
+        throw new errors.ASN1Error("Malformed BER UTCTime: trailing data");
+    }
+    const offsetHour = Number.parseInt(dateString.slice(i - 4, i - 2), 10);
+    const offsetMinute = Number.parseInt(dateString.slice(i - 2, i), 10);
+    let epochTimeInMS = Date.UTC(year, month, date, hours, minutes, seconds);
+    const sign = isPositive ? -1 : 1;
+    epochTimeInMS += sign * ((offsetHour * 60 * 60 * 1000) + (offsetMinute * 60 * 1000));
+    return new Date(epochTimeInMS);
 }

package/dist/node/codecs/ber.js

@@ -539,12 +539,6 @@ class BERElement extends x690_1.default {
                     throw new errors.ASN1UndefinedError("Length byte with undefined meaning encountered.", this);
                 }
                 if (numberOfLengthOctets > 4) {
-                    if (bytes instanceof Buffer) {
-                        console.log(bytes.toString("hex"));
-                    }
-                    else {
-                        console.log(Buffer.from(bytes).toString("hex"));
-                    }
                     throw new errors.ASN1OverflowError(`Element length too long to decode to an integer. Content octets occupied ${numberOfLengthOctets} bytes.`, this);
                 }
                 if (cursor + numberOfLengthOctets >= bytes.length) {

package/dist/node/codecs/der/decoders/decodeGeneralizedTime.js

@@ -38,21 +38,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = decodeGeneralizedTime;
 const convertBytesToText_1 = __importDefault(require("../../../utils/convertBytesToText"));
-const values_1 = require("../../../values");
 const errors = __importStar(require("../../../errors"));
 const validateDateTime_1 = __importDefault(require("../../../validators/validateDateTime"));
 function decodeGeneralizedTime(value) {
     const dateString = (0, convertBytesToText_1.default)(value);
-    const match = values_1.distinguishedGeneralizedTimeRegex.exec(dateString);
-    if (match === null) {
-        throw new errors.ASN1Error("Malformed GeneralizedTime string.");
+    if (!dateString.endsWith("Z")) {
+        throw new errors.ASN1Error("Malformed DER GeneralizedTime string: must use UTC timezone");
+    }
+    const year = Number(dateString.slice(0, 4));
+    const month = (Number(dateString.slice(4, 6)) - 1);
+    const date = Number(dateString.slice(6, 8));
+    const hours = Number(dateString.slice(8, 10));
+    const minutes = Number(dateString.slice(10, 12));
+    const seconds = Number(dateString.slice(12, 14));
+    if (dateString[14] === '.') {
+        let i = 15;
+        while (value[i] && value[i] >= 0x30 && value[i] <= 0x39)
+            i++;
+        if (i === 15) {
+            throw new errors.ASN1Error("Malformed DER GeneralizedTime string: trailing stop character");
+        }
+        if (dateString[i] === 'Z') {
+            i++;
+        }
+        if (dateString[i] !== undefined) {
+            throw new errors.ASN1Error("Malformed DER GeneralizedTime string: trailing data");
+        }
+        const fractionString = `0.${dateString.slice(15, i)}`;
+        if (fractionString.endsWith("0")) {
+            throw new errors.ASN1Error("Malformed DER GeneralizedTime string: trailing 0 in milliseconds");
+        }
+        const fraction = Number.parseFloat(fractionString);
+        const milliseconds = Math.floor(1000 * fraction);
+        (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, minutes, seconds);
+        return new Date(Date.UTC(year, month, date, hours, minutes, seconds, milliseconds));
+    }
+    else if (dateString[14] !== 'Z') {
+        throw new errors.ASN1Error("Malformed DER GeneralizedTime string: trailing data");
     }
-    const year = Number(match[1]);
-    const month = (Number(match[2]) - 1);
-    const date = Number(match[3]);
-    const hours = Number(match[4]);
-    const minutes = Number(match[5]);
-    const seconds = Number(match[6]);
     (0, validateDateTime_1.default)("GeneralizedTime", year, month, date, hours, minutes, seconds);
     return new Date(Date.UTC(year, month, date, hours, minutes, seconds));
 }

package/dist/node/codecs/der/decoders/decodeUTCTime.js

@@ -38,24 +38,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = decodeUTCTime;
 const convertBytesToText_1 = __importDefault(require("../../../utils/convertBytesToText"));
-const values_1 = require("../../../values");
 const errors = __importStar(require("../../../errors"));
 const validateDateTime_1 = __importDefault(require("../../../validators/validateDateTime"));
+const DER_UTC_TIME_LENGTH = "920521000000Z".length;
 function decodeUTCTime(value) {
+    if (value.length !== DER_UTC_TIME_LENGTH) {
+        throw new errors.ASN1Error("Malformed DER UTCTime string: not a valid length");
+    }
     const dateString = (0, convertBytesToText_1.default)(value);
-    const match = values_1.distinguishedUTCTimeRegex.exec(dateString);
-    if (match === null) {
-        throw new errors.ASN1Error("Malformed UTCTime string.");
+    if (!dateString.endsWith("Z")) {
+        throw new errors.ASN1Error("Malformed DER UTCTime string: not UTC timezone");
     }
-    let year = Number(match[1]);
+    let year = Number(dateString.slice(0, 2));
+    const month = (Number(dateString.slice(2, 4)) - 1);
+    const date = Number(dateString.slice(4, 6));
+    const hours = Number(dateString.slice(6, 8));
+    const minutes = Number(dateString.slice(8, 10));
+    const seconds = Number(dateString.slice(10, 12));
     year = (year <= 49)
         ? (2000 + year)
         : (1900 + year);
-    const month = (Number(match[2]) - 1);
-    const date = Number(match[3]);
-    const hours = Number(match[4]);
-    const minutes = Number(match[5]);
-    const seconds = Number(match[6]);
     (0, validateDateTime_1.default)("UTCTime", year, month, date, hours, minutes, seconds);
     return new Date(Date.UTC(year, month, date, hours, minutes, seconds));
 }

package/dist/node/validators/validateDate.js

@@ -36,6 +36,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = validateDate;
 const errors = __importStar(require("../errors"));
 function validateDate(dataType, year, month, date) {
+    if (!Number.isSafeInteger(year)) {
+        throw new errors.ASN1Error(`Invalid year in ${dataType}`);
+    }
+    if (!Number.isSafeInteger(month)) {
+        throw new errors.ASN1Error(`Invalid month in ${dataType}`);
+    }
+    if (!Number.isSafeInteger(date) || (date < 1)) {
+        throw new errors.ASN1Error(`Invalid day in ${dataType}`);
+    }
     switch (month) {
         case 0:
         case 2:
@@ -71,6 +80,6 @@ function validateDate(dataType, year, month, date) {
             break;
         }
         default:
-            throw new errors.ASN1Error(`Month greater than 12 encountered in ${dataType}.`);
+            throw new errors.ASN1Error(`Invalid month in ${dataType}`);
     }
 }

package/dist/node/validators/validateTime.js

@@ -36,6 +36,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = validateTime;
 const errors = __importStar(require("../errors"));
 function validateTime(dataType, hours, minutes, seconds) {
+    if (!Number.isSafeInteger(hours)) {
+        throw new errors.ASN1Error(`Invalid hours in ${dataType}`);
+    }
+    if (!Number.isSafeInteger(minutes)) {
+        throw new errors.ASN1Error(`Invalid minutes in ${dataType}`);
+    }
+    if (!Number.isSafeInteger(seconds) || (seconds < 0)) {
+        throw new errors.ASN1Error(`Invalid seconds in ${dataType}`);
+    }
     if (hours > 23) {
         throw new errors.ASN1Error(`Hours > 23 encountered in ${dataType}.`);
     }

package/package.json

@@ -47,5 +47,5 @@
         "test": "npx jest --ci --reporters=default --coverage"
     },
     "types": "./dist/node/index.d.ts",
-    "version": "8.0.3"
+    "version": "8.0.4"
 }