@aws-crypto/kms-keyring - npm Package Compare versions

Comparing version 0.1.0-preview.3 to 0.1.0-preview.4

build/main/kms_keyring.js

@@ -66,3 +66,3 @@ "use strict";
                     .setUnencryptedDataKey(dataKey.Plaintext, trace)
-                    .addEncryptedDataKey(helpers_1.kmsResponseToEncryptedDataKey(dataKey), material_management_1.KeyringTraceFlag.WRAPPING_KEY_ENCRYPTED_DATA_KEY);
+                    .addEncryptedDataKey(helpers_1.kmsResponseToEncryptedDataKey(dataKey), material_management_1.KeyringTraceFlag.WRAPPING_KEY_ENCRYPTED_DATA_KEY | material_management_1.KeyringTraceFlag.WRAPPING_KEY_SIGNED_ENC_CTX);
             }
@@ -76,3 +76,3 @@ else if (generatorKeyId) {
             */
-            const unencryptedDataKey = material.getUnencryptedDataKey();
+            const unencryptedDataKey = material_management_1.unwrapDataKey(material.getUnencryptedDataKey());
             const flags = material_management_1.KeyringTraceFlag.WRAPPING_KEY_ENCRYPTED_DATA_KEY | material_management_1.KeyringTraceFlag.WRAPPING_KEY_SIGNED_ENC_CTX;
@@ -107,2 +107,3 @@ for (const kmsKey of keyIds) {
             });
+            let cmkErrors = [];
             for (const edk of decryptableEDKs) {
@@ -114,6 +115,7 @@ let dataKey = false;
                 catch (e) {
-                    // there should be some debug here?  or wrap?
-                    // Failures decrypt should not short-circuit the process
-                    // If the caller does not have access they may have access
-                    // through another Keyring.
+                    /* Failures onDecrypt should not short-circuit the process
+                     * If the caller does not have access they may have access
+                     * through another Keyring.
+                     */
+                    cmkErrors.push(e);
                 }
@@ -133,2 +135,13 @@ /* Check for early return (Postcondition): clientProvider may not return a client. */
             }
+            /* Postcondition: A CMK must provide a valid data key or KMS must not have raised any errors.
+             * If I have a data key,
+             * decrypt errors can be ignored.
+             * However, if I was unable to decrypt a data key AND I have errors,
+             * these errors should bubble up.
+             * Otherwise, the only error customers will see is that
+             * the material does not have an unencrypted data key.
+             * So I return a concatenated Error message
+             */
+            material_management_1.needs(material.hasValidKey() || (!material.hasValidKey() && !cmkErrors.length), cmkErrors
+                .reduce((m, e, i) => `${m} Error #${i + 1} \n ${e.stack} \n`, 'Unable to decrypt data key and one or more KMS CMKs had an error. \n '));
             return material;
@@ -141,2 +154,2 @@ }
 exports.KmsKeyringClass = KmsKeyringClass;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zX2tleXJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva21zX2tleXJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7Ozs7O0dBYUc7O0FBT0gseUVBV3dDO0FBQ3hDLHVDQUE2RztBQUM3Ryx1RUFBK0Q7QUE0Qi9ELFNBQWdCLGVBQWUsQ0FDN0IsV0FBb0M7SUFFcEMsTUFBTSxVQUFXLFNBQVEsV0FBVztRQU9sQyxZQUFhLEVBQUUsY0FBYyxFQUFFLGNBQWMsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQTJCO1lBQzNHLEtBQUssRUFBRSxDQUFBO1lBQ1AsdUdBQXVHO1lBQ3ZHLDJCQUFLLENBQUMsSUFBSSxDQUFDLFdBQVcsS0FBSyxVQUFVLEVBQUUsK0JBQStCLENBQUMsQ0FBQTtZQUN2RSxxREFBcUQ7WUFDckQsMkJBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLElBQUksQ0FBQyxjQUFjLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsdURBQXVELENBQUMsQ0FBQTtZQUNsSCxrRkFBa0Y7WUFDbEYsMkJBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsY0FBYyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLGdFQUFnRSxDQUFDLENBQUE7WUFDMUgsbURBQW1EO1lBQ25ELDJCQUFLLENBQUMsQ0FBQyxjQUFjLElBQUksQ0FBQyxDQUFDLDZDQUFtQixDQUFDLGNBQWMsQ0FBQyxFQUFFLGdCQUFnQixDQUFDLENBQUE7WUFDakYsMkJBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLDZDQUFtQixDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQTtZQUM5RSxtRUFBbUU7WUFDbkUsMkJBQUssQ0FBQyxPQUFPLGNBQWMsS0FBSyxVQUFV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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zX2tleXJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva21zX2tleXJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOzs7Ozs7Ozs7Ozs7O0dBYUc7O0FBT0gseUVBWXdDO0FBQ3hDLHVDQUE2RztBQUM3Ryx1RUFBK0Q7QUE0Qi9ELFNBQWdCLGVBQWUsQ0FDN0IsV0FBb0M7SUFFcEMsTUFBTSxVQUFXLFNBQVEsV0FBVztRQU9sQyxZQUFhLEVBQUUsY0FBYyxFQUFFLGNBQWMsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQTJCO1lBQzNHLEtBQUssRUFBRSxDQUFBO1lBQ1AsdUdBQXVHO1lBQ3ZHLDJCQUFLLENBQUMsSUFBSSxDQUFDLFdBQVcsS0FBSyxVQUFVLEVBQUUsK0JBQStCLENBQUMsQ0FBQTtZQUN2RSxxREFBcUQ7WUFDckQsMkJBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLElBQUksQ0FBQyxjQUFjLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsdURBQXVELENBQUMsQ0FBQTtZQUNsSCxrRkFBa0Y7WUFDbEYsMkJBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsY0FBYyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLGdFQUFnRSxDQUFDLENBQUE7WUFDMUgsbURBQW1EO1lBQ25ELDJCQUFLLENBQUMsQ0FBQyxjQUFjLElBQUksQ0FBQyxDQUFDLDZDQUFtQixDQUFDLGNBQWMsQ0FBQyxFQUFFLGdCQUFnQixDQUFDLENBQUE7WUFDakYsMkJBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLDZDQUFtQixDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQTtZQUM5RSxtRUFBbUU7WUFDbkUsMkJBQUssQ0FBQyxPQUFPLGNBQWMsS0FBSyxVQUFV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

build/module/kms_keyring.js

@@ -17,3 +17,3 @@ /*
 KeyringTraceFlag, // eslint-disable-line no-unused-vars
-immutableClass, readOnlyProperty } from '@aws-crypto/material-management';
+immutableClass, readOnlyProperty, unwrapDataKey } from '@aws-crypto/material-management';
 import { KMS_PROVIDER_ID, generateDataKey, encrypt, decrypt, kmsResponseToEncryptedDataKey } from './helpers';
@@ -67,3 +67,3 @@ import { regionFromKmsKeyArn } from './region_from_kms_key_arn';
                     .setUnencryptedDataKey(dataKey.Plaintext, trace)
-                    .addEncryptedDataKey(kmsResponseToEncryptedDataKey(dataKey), KeyringTraceFlag.WRAPPING_KEY_ENCRYPTED_DATA_KEY);
+                    .addEncryptedDataKey(kmsResponseToEncryptedDataKey(dataKey), KeyringTraceFlag.WRAPPING_KEY_ENCRYPTED_DATA_KEY | KeyringTraceFlag.WRAPPING_KEY_SIGNED_ENC_CTX);
             }
@@ -77,3 +77,3 @@ else if (generatorKeyId) {
             */
-            const unencryptedDataKey = material.getUnencryptedDataKey();
+            const unencryptedDataKey = unwrapDataKey(material.getUnencryptedDataKey());
             const flags = KeyringTraceFlag.WRAPPING_KEY_ENCRYPTED_DATA_KEY | KeyringTraceFlag.WRAPPING_KEY_SIGNED_ENC_CTX;
@@ -108,2 +108,3 @@ for (const kmsKey of keyIds) {
             });
+            let cmkErrors = [];
             for (const edk of decryptableEDKs) {
@@ -115,6 +116,7 @@ let dataKey = false;
                 catch (e) {
-                    // there should be some debug here?  or wrap?
-                    // Failures decrypt should not short-circuit the process
-                    // If the caller does not have access they may have access
-                    // through another Keyring.
+                    /* Failures onDecrypt should not short-circuit the process
+                     * If the caller does not have access they may have access
+                     * through another Keyring.
+                     */
+                    cmkErrors.push(e);
                 }
@@ -134,2 +136,13 @@ /* Check for early return (Postcondition): clientProvider may not return a client. */
             }
+            /* Postcondition: A CMK must provide a valid data key or KMS must not have raised any errors.
+             * If I have a data key,
+             * decrypt errors can be ignored.
+             * However, if I was unable to decrypt a data key AND I have errors,
+             * these errors should bubble up.
+             * Otherwise, the only error customers will see is that
+             * the material does not have an unencrypted data key.
+             * So I return a concatenated Error message
+             */
+            needs(material.hasValidKey() || (!material.hasValidKey() && !cmkErrors.length), cmkErrors
+                .reduce((m, e, i) => `${m} Error #${i + 1} \n ${e.stack} \n`, 'Unable to decrypt data key and one or more KMS CMKs had an error. \n '));
             return material;
@@ -141,2 +154,2 @@ }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zX2tleXJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva21zX2tleXJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7R0FhRztBQU9ILE9BQU8sRUFDTCxLQUFLLEVBS1MscUNBQXFDO0FBQ25ELGdCQUFnQixFQUNFLHFDQUFxQztBQUN2RCxjQUFjLEVBQ2QsZ0JBQWdCLEVBQ2pCLE1BQU0saUNBQWlDLENBQUE7QUFDeEMsT0FBTyxFQUFFLGVBQWUsRUFBRSxlQUFlLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUM3RyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQTRCL0QsTUFBTSxVQUFVLGVBQWUsQ0FDN0IsV0FBb0M7SUFFcEMsTUFBTSxVQUFXLFNBQVEsV0FBVztRQU9sQyxZQUFhLEVBQUUsY0FBYyxFQUFFLGNBQWMsRUFBRSxNQUFNLEdBQUcsRUFBRSxFQUFFLFdBQVcsRUFBRSxTQUFTLEVBQTJCO1lBQzNHLEtBQUssRUFBRSxDQUFBO1lBQ1AsdUdBQXVHO1lBQ3ZHLEtBQUssQ0FBQyxJQUFJLENBQUMsV0FBVyxLQUFLLFVBQVUsRUFBRSwrQkFBK0IsQ0FBQyxDQUFBO1lBQ3ZFLHFEQUFxRDtZQUNyRCxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsY0FBYyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLHVEQUF1RCxDQUFDLENBQUE7WUFDbEgsa0ZBQWtGO1lBQ2xGLEtBQUssQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsY0FBYyxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLGdFQUFnRSxDQUFDLENBQUE7WUFDMUgsbURBQW1EO1lBQ25ELEtBQUssQ0FBQyxDQUFDLGNBQWMsSUFBSSxDQUFDLENBQUMsbUJBQW1CLENBQUMsY0FBYyxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoia21zX2tleXJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva21zX2tleXJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7R0FhRztBQU9ILE9BQU8sRUFDTCxLQUFLLEVBS1MscUNBQXFDO0FBQ25ELGdCQUFnQixFQUNFLHFDQUFxQztBQUN2RCxjQUFjLEVBQ2QsZ0JBQWdCLEVBQ2hCLGFBQWEsRUFDZCxNQUFNLGlDQUFpQyxDQUFBO0FBQ3hDLE9BQU8sRUFBRSxlQUFlLEVBQUUsZUFBZSxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxXQUFXLENBQUE7QUFDN0csT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUE7QUE0Qi9ELE1BQU0sVUFBVSxlQUFlLENBQzdCLFdBQW9DO0lBRXBDLE1BQU0sVUFBVyxTQUFRLFdBQVc7UUFPbEMsWUFBYSxFQUFFLGNBQWMsRUFBRSxjQUFjLEVBQUUsTUFBTSxHQUFHLEVBQUUsRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUEyQjtZQUMzRyxLQUFLLEVBQUUsQ0FBQTtZQUNQLHVHQUF1RztZQUN2RyxLQUFLLENBQUMsSUFBSSxDQUFDLFdBQVcsS0FBSyxVQUFVLEVBQUUsK0JBQStCLENBQUMsQ0FBQTtZQUN2RSxxREFBcUQ7WUFDckQsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsSUFBSSxDQUFDLGNBQWMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSx1REFBdUQsQ0FBQyxDQUFBO1lBQ2xILGtGQUFrRjtZQUNsRixLQUFLLENBQUMsQ0FBQyxDQUFDLFNBQVMsSUFBSSxDQUFDLGNBQWMsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsRUFBRSxnRUFBZ0UsQ0FBQyxDQUFBO1lBQzFILG1EQUFtRDtZQUNuRCxLQUFLLENBQUMsQ0FBQyxjQUFjLElBQUksQ0FBQyxDQUFDLG1CQUFtQixD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

CHANGELOG.md

@@ -6,2 +6,19 @@ # Change Log
 
+# [0.1.0-preview.4](/compare/@aws-crypto/kms-keyring@0.1.0-preview.3...@aws-crypto/kms-keyring@0.1.0-preview.4) (2019-09-20)
+
+
+### Bug Fixes
+
+* Better error messageing (#212) 7198100, closes #212 #152
+* KeyringTraceFlag requirements and data key caching (#210) 7dfa1ae, closes #210
+
+
+### Features
+
+* Suport Node.js crypto KeyObjects (#200) 77ad031, closes #200 #74
+
+
+
+
+
 # [0.1.0-preview.3](/compare/@aws-crypto/kms-keyring@0.1.0-preview.2...@aws-crypto/kms-keyring@0.1.0-preview.3) (2019-08-08)
@@ -8,0 +25,0 @@

package.json

 {
   "name": "@aws-crypto/kms-keyring",
-  "version": "0.1.0-preview.3",
+  "version": "0.1.0-preview.4",
   "scripts": {
@@ -19,3 +19,3 @@ "prepublishOnly": "npm run build",
   "dependencies": {
-    "@aws-crypto/material-management": "^0.2.0-preview.3",
+    "@aws-crypto/material-management": "^0.2.0-preview.4",
     "tslib": "^1.9.3"
@@ -51,3 +51,3 @@ },
   },
-  "gitHead": "698180f30c85ef77a5739ebadd676d4b41ad441f"
+  "gitHead": "b3e278777e164258f0f40f5ec5d260f1c0d21a9b"
 }

No alert changes

Improved metrics

Total package byte prevSize

400348

increased by1.71%

Lines of code

1086

increased by2.45%

Dependency changes

• Updated@aws-crypto/material-management@^0.2.0-preview.4