From 418e311c8d4ec50be3493eddee79dccde3ddd03b Mon Sep 17 00:00:00 2001 From: Filip Skokan Date: Sun, 21 Jul 2019 18:05:57 +0200 Subject: [PATCH] chore: update dev deps, code lint --- lib/errors.js | 1 + lib/help/consts.js | 6 +++--- lib/help/ecdsa_signatures.js | 4 ++-- lib/help/generate_iv.js | 12 ++++++------ lib/help/rsa_primes.js | 10 +++++----- lib/jwe/encrypt.js | 7 ++++++- lib/jws/sign.js | 2 ++ package.json | 10 +++++----- test/fixtures/index.js | 12 ++++++------ test/jwe/sanity.test.js | 6 +++--- test/jwk/ec.test.js | 2 +- test/jws/sanity.test.js | 6 +++--- 12 files changed, 43 insertions(+), 35 deletions(-) diff --git a/lib/errors.js b/lib/errors.js index da42f5f2..f99508ca 100644 --- a/lib/errors.js +++ b/lib/errors.js @@ -47,6 +47,7 @@ class JOSEMultiError extends JOSEError { } this.#errors = errors } + * [Symbol.iterator] () { for (const error of this.#errors) { yield error diff --git a/lib/help/consts.js b/lib/help/consts.js index 6f6b819f..6a3b0f3d 100644 --- a/lib/help/consts.js +++ b/lib/help/consts.js @@ -27,7 +27,7 @@ module.exports.KEYLENGTHS = { 'A128CBC-HS256': 256, 'A192CBC-HS384': 384, 'A256CBC-HS512': 512, - 'A128GCM': 128, - 'A192GCM': 192, - 'A256GCM': 256 + A128GCM: 128, + A192GCM: 192, + A256GCM: 256 } diff --git a/lib/help/ecdsa_signatures.js b/lib/help/ecdsa_signatures.js index ee2e7424..c6a51f07 100644 --- a/lib/help/ecdsa_signatures.js +++ b/lib/help/ecdsa_signatures.js @@ -102,7 +102,7 @@ module.exports.derToJose = (signature, alg) => { const sPadding = paramBytes - sLength - let dst = Buffer.allocUnsafe(rPadding + rLength + sPadding + sLength) + const dst = Buffer.allocUnsafe(rPadding + rLength + sPadding + sLength) for (offset = 0; offset < rPadding; ++offset) { dst[offset] = 0 @@ -144,7 +144,7 @@ module.exports.joseToDer = (signature, alg) => { const shortLength = rsBytes < MAX_OCTET - let dst = Buffer.allocUnsafe((shortLength ? 2 : 3) + rsBytes) + const dst = Buffer.allocUnsafe((shortLength ? 2 : 3) + rsBytes) let offset = 0 dst[offset++] = ENCODED_TAG_SEQ diff --git a/lib/help/generate_iv.js b/lib/help/generate_iv.js index 01cda4a8..260daf91 100644 --- a/lib/help/generate_iv.js +++ b/lib/help/generate_iv.js @@ -2,14 +2,14 @@ const { randomBytes } = require('crypto') const IVLENGTHS = { 'A128CBC-HS256': 128 / 8, - 'A128GCM': 96 / 8, - 'A128GCMKW': 96 / 8, + A128GCM: 96 / 8, + A128GCMKW: 96 / 8, 'A192CBC-HS384': 128 / 8, - 'A192GCM': 96 / 8, - 'A192GCMKW': 96 / 8, + A192GCM: 96 / 8, + A192GCMKW: 96 / 8, 'A256CBC-HS512': 128 / 8, - 'A256GCM': 96 / 8, - 'A256GCMKW': 96 / 8 + A256GCM: 96 / 8, + A256GCMKW: 96 / 8 } module.exports = alg => randomBytes(IVLENGTHS[alg]) diff --git a/lib/help/rsa_primes.js b/lib/help/rsa_primes.js index 5d77ec06..b9c609c3 100644 --- a/lib/help/rsa_primes.js +++ b/lib/help/rsa_primes.js @@ -20,10 +20,10 @@ const eGcdX = (a, b) => { let v = ZERO while (a !== ZERO) { - let q = b / a - let r = b % a - let m = x - (u * q) - let n = y - (v * q) + const q = b / a + const r = b % a + const m = x - (u * q) + const n = y - (v * q) b = a a = r x = u @@ -49,7 +49,7 @@ const gcd = (a, b) => { b >>= ONE } if (a > b) { - let x = a + const x = a a = b b = x } diff --git a/lib/jwe/encrypt.js b/lib/jwe/encrypt.js index b3fa074a..017ea7e9 100644 --- a/lib/jwe/encrypt.js +++ b/lib/jwe/encrypt.js @@ -19,10 +19,15 @@ const PROCESS_RECIPIENT = Symbol('PROCESS_RECIPIENT') class Encrypt { #aad + #cek + #unprotected + #protected + #cleartext + #recipients constructor (cleartext, protectedHeader, unprotectedHeader, aad) { @@ -86,7 +91,7 @@ class Encrypt { } const { key } = recipient - let enc = jweHeader.enc + const enc = jweHeader.enc let alg = jweHeader.alg if (alg === 'dir') { diff --git a/lib/jws/sign.js b/lib/jws/sign.js index e75f86c2..110ba37c 100644 --- a/lib/jws/sign.js +++ b/lib/jws/sign.js @@ -12,7 +12,9 @@ const PROCESS_RECIPIENT = Symbol('PROCESS_RECIPIENT') class Sign { #b64 + #payload + #recipients constructor (payload) { diff --git a/package.json b/package.json index e07684c8..305fef51 100644 --- a/package.json +++ b/package.json @@ -54,13 +54,13 @@ "asn1.js": "^5.1.1" }, "devDependencies": { - "@commitlint/cli": "^8.0.0", - "@commitlint/config-conventional": "^8.0.0", - "ava": "^2.1.0", + "@commitlint/cli": "^8.1.0", + "@commitlint/config-conventional": "^8.1.0", + "ava": "^2.2.0", "babel-eslint": "^10.0.2", "c8": "^5.0.1", - "husky": "^2.4.1", - "standard": "^12.0.1" + "husky": "^3.0.1", + "standard": "^13.1.0" }, "engines": { "node": ">=12.0.0" diff --git a/test/fixtures/index.js b/test/fixtures/index.js index 13bb6080..0a5e7b2f 100644 --- a/test/fixtures/index.js +++ b/test/fixtures/index.js @@ -56,7 +56,7 @@ module.exports.JWK = { d: '_i_1Ac5oVmbBxGvEvOEFHMpzMXKZi8voUx8I3Gl6IxY' }, - 'secp256k1': { + secp256k1: { kty: 'EC', crv: 'secp256k1', x: 'VRaLqtMjg_JRaDzkbfit7zonkOGDZ42qbZyljhqsg3U', @@ -96,19 +96,19 @@ module.exports.PEM = { private: readFileSync(join(__dirname, 'rsa.key')), public: readFileSync(join(__dirname, 'rsa.pem')) }, - 'Ed25519': { + Ed25519: { private: readFileSync(join(__dirname, 'Ed25519.key')), public: readFileSync(join(__dirname, 'Ed25519.pem')) }, - 'Ed448': { + Ed448: { private: readFileSync(join(__dirname, 'Ed448.key')), public: readFileSync(join(__dirname, 'Ed448.pem')) }, - 'X25519': { + X25519: { private: readFileSync(join(__dirname, 'X25519.key')), public: readFileSync(join(__dirname, 'X25519.pem')) }, - 'X448': { + X448: { private: readFileSync(join(__dirname, 'X448.key')), public: readFileSync(join(__dirname, 'X448.pem')) }, @@ -116,7 +116,7 @@ module.exports.PEM = { private: readFileSync(join(__dirname, 'P-256.key')), public: readFileSync(join(__dirname, 'P-256.pem')) }, - 'secp256k1': { + secp256k1: { private: readFileSync(join(__dirname, 'secp256k1.key')), public: readFileSync(join(__dirname, 'secp256k1.pem')) }, diff --git a/test/jwe/sanity.test.js b/test/jwe/sanity.test.js index 5584840c..d0018684 100644 --- a/test/jwe/sanity.test.js +++ b/test/jwe/sanity.test.js @@ -66,11 +66,11 @@ test('JWE no alg/enc specified (multi recipient)', t => { test('JWE no alg/enc specified (multi recipient) with per-recipient headers', t => { const encrypt = new JWE.Encrypt('foo') - let k1 = generateSync('RSA', undefined, { kid: 'kid_1' }) + const k1 = generateSync('RSA', undefined, { kid: 'kid_1' }) encrypt.recipient(k1, { kid: k1.kid }) - let k2 = generateSync('EC', undefined, { kid: 'kid_2' }) + const k2 = generateSync('EC', undefined, { kid: 'kid_2' }) encrypt.recipient(k2, { kid: k2.kid }) - let k3 = generateSync('oct', 256, { kid: 'kid_3' }) + const k3 = generateSync('oct', 256, { kid: 'kid_3' }) encrypt.recipient(k3, { kid: k3.kid }) const jwe = encrypt.encrypt('general') diff --git a/test/jwk/ec.test.js b/test/jwk/ec.test.js index 80964b0f..ef94e7f8 100644 --- a/test/jwk/ec.test.js +++ b/test/jwk/ec.test.js @@ -25,7 +25,7 @@ test('Unusable with unsupported curves', t => { Object.entries({ 'P-256': ['ES256', 'rDd6H6t9-nJUoz72nTpz8tInvypVWhE2iQoPznj8ZY8'], - 'secp256k1': ['ES256K', 'kWx_DzFzKNHUQz1FkNzj8KmSRingv9EQQzdVY3td21w'], + secp256k1: ['ES256K', 'kWx_DzFzKNHUQz1FkNzj8KmSRingv9EQQzdVY3td21w'], 'P-384': ['ES384', '5gebayAhpztJCs4Pxo-z1hhsN0upoyG2NAoKpiiH2b0'], 'P-521': ['ES512', 'BQtkbSY3xgN4M2ZP3IHMLG7-Rp1L29teCMfNqgJHtTY'] }).forEach(([crv, [alg, kid]]) => { diff --git a/test/jws/sanity.test.js b/test/jws/sanity.test.js index cdb1e8dc..d59128b9 100644 --- a/test/jws/sanity.test.js +++ b/test/jws/sanity.test.js @@ -192,11 +192,11 @@ test('JWS no alg specified (multi recipient)', t => { test('JWS no alg specified (multi recipient) with per-recipient protected headers', t => { const sign = new JWS.Sign({}) - let k1 = generateSync('RSA', undefined, { kid: 'kid_1' }) + const k1 = generateSync('RSA', undefined, { kid: 'kid_1' }) sign.recipient(k1, { kid: k1.kid }) - let k2 = generateSync('EC', undefined, { kid: 'kid_2' }) + const k2 = generateSync('EC', undefined, { kid: 'kid_2' }) sign.recipient(k2, { kid: k2.kid }) - let k3 = generateSync('oct', undefined, { kid: 'kid_3' }) + const k3 = generateSync('oct', undefined, { kid: 'kid_3' }) sign.recipient(k3, { kid: k3.kid }) const jws = sign.sign('general')