diff --git a/auth/index.html b/auth/index.html index f135357..24a4cd4 100644 --- a/auth/index.html +++ b/auth/index.html @@ -213,6 +213,10 @@

Message log

* @returns {Uint8Array} */ var uint8arrayFromHexString = function(hexString) { + var hexRegex = /^[0-9A-Fa-f]+$/; + if (!hexString || hexString.length % 2 != 0 || !hexRegex.test(hexString)) { + throw new Error('cannot create uint8array from invalid hex string: "' + hexString + '"'); + } return new Uint8Array(hexString.match(/../g).map(h=>parseInt(h,16))); } diff --git a/auth/index.test.js b/auth/index.test.js index f480ab1..525a4cf 100644 --- a/auth/index.test.js +++ b/auth/index.test.js @@ -161,6 +161,23 @@ describe("TKHQ", () => { it("contains uint8arrayFromHexString", () => { expect(TKHQ.uint8arrayFromHexString("627566666572").toString()).toEqual("98,117,102,102,101,114"); + + // Error case: bad value + expect(() => { + TKHQ.uint8arrayFromHexString({}); + }).toThrow('cannot create uint8array from invalid hex string: "[object Object]"'); + // Error case: empty string + expect(() => { + TKHQ.uint8arrayFromHexString(""); + }).toThrow('cannot create uint8array from invalid hex string: ""'); + // Error case: odd number of characters + expect(() => { + TKHQ.uint8arrayFromHexString("123"); + }).toThrow('cannot create uint8array from invalid hex string: "123"'); + // Error case: bad characters outside of hex range + expect(() => { + TKHQ.uint8arrayFromHexString("oops"); + }).toThrow('cannot create uint8array from invalid hex string: "oops"'); }) it("contains bigIntToHex", () => { diff --git a/export/index.html b/export/index.html index 7ed5f12..4e6d969 100644 --- a/export/index.html +++ b/export/index.html @@ -212,8 +212,13 @@

Message log

* @param {string} hexString * @returns {Uint8Array} */ - const uint8arrayFromHexString = hexString => - new Uint8Array(hexString.match(/../g).map(h=>parseInt(h,16))); + const uint8arrayFromHexString = function(hexString) { + var hexRegex = /^[0-9A-Fa-f]+$/; + if (!hexString || hexString.length % 2 != 0 || !hexRegex.test(hexString)) { + throw new Error('cannot create uint8array from invalid hex string: "' + hexString + '"'); + } + return new Uint8Array(hexString.match(/../g).map(h=>parseInt(h,16))); + } /** * Takes a Uint8Array and returns a hex string diff --git a/export/index.test.js b/export/index.test.js index 994e387..0664660 100644 --- a/export/index.test.js +++ b/export/index.test.js @@ -137,6 +137,23 @@ describe("TKHQ", () => { it("contains uint8arrayFromHexString", () => { expect(TKHQ.uint8arrayFromHexString("627566666572").toString()).toEqual("98,117,102,102,101,114"); + + // Error case: bad value + expect(() => { + TKHQ.uint8arrayFromHexString({}); + }).toThrow('cannot create uint8array from invalid hex string: "[object Object]"'); + // Error case: empty string + expect(() => { + TKHQ.uint8arrayFromHexString(""); + }).toThrow('cannot create uint8array from invalid hex string: ""'); + // Error case: odd number of characters + expect(() => { + TKHQ.uint8arrayFromHexString("123"); + }).toThrow('cannot create uint8array from invalid hex string: "123"'); + // Error case: bad characters outside of hex range + expect(() => { + TKHQ.uint8arrayFromHexString("oops"); + }).toThrow('cannot create uint8array from invalid hex string: "oops"'); }) it("logs messages and sends messages up", async () => {