Merge remote-tracking branch 'origin/improvement/CLDSRV-559/kms' into…

… w/8.6/improvement/CLDSRV-559/kms

config.json

@@ -130,5 +130,12 @@
             "type": "dummy",
             "host": "localhost:6000"
         }
-    ]
+    ],
+    "defaultEncryptionKeyPerAccount": true,
+    "kmsAWS": {
+        "region": "us-east-1", 
+        "endpoint": "http://127.0.0.1:8080",
+        "ak": "tbd",
+        "sk": "tbd"
+    }
 }

lib/Config.js

@@ -577,6 +577,60 @@ class Config extends EventEmitter {
         this._configureBackends();
     }
 
+    _parseKmsAWS(config) {
+        if (!config.kmsAWS) {
+            return {};
+        }
+        let kmsAWS = {};
+
+        const { region, endpoint, ak, sk, tls } = config.kmsAWS;
+
+        assert(endpoint, 'Configuration Error: endpoint must be defined in kmsAWS');
+        assert(ak, 'Configuration Error: ak must be defined in kmsAWS');
+        assert(sk, 'Configuration Error: sk must be defined in kmsAWS');
+
+        kmsAWS = {
+            endpoint,
+            ak,
+            sk,
+        };
+
+        if (region) {
+            kmsAWS.region = region;
+        }
+
+        if (tls) {
+            kmsAWS.tls = {};
+            if (tls.rejectUnauthorized !== undefined) {
+                assert(typeof tls.rejectUnauthorized === 'boolean');
+                kmsAWS.tls.rejectUnauthorized = tls.rejectUnauthorized;
+            }
+            // min & max TLS: One of 'TLSv1.3', 'TLSv1.2', 'TLSv1.1', or 'TLSv1'
+            // (see https://nodejs.org/api/tls.html#tlscreatesecurecontextoptions)
+            if (tls.minVersion !== undefined) {
+                assert(typeof tls.minVersion === 'string',
+                    'bad config: KMS AWS TLS minVersion must be a string');
+                kmsAWS.tls.minVersion = tls.minVersion;
+            }
+            if (tls.maxVersion !== undefined) {
+                assert(typeof tls.maxVersion === 'string',
+                    'bad config: KMS AWS TLS maxVersion must be a string');
+                kmsAWS.tls.maxVersion = tls.maxVersion;
+            }
+            if (tls.ca !== undefined) {
+                kmsAWS.tls.ca = this._loadTlsFileArray(tls.ca);
+            }
+            if (tls.cert !== undefined) {
+                kmsAWS.tls.cert = this._loadTlsFileArray(tls.cert);
+            }
+            if (tls.key !== undefined) {
+                kmsAWS.tls.key = this._loadTlsFileArray(tls.key);
+            }
+        }
+
+        return kmsAWS;
+    }
+
     _getLocationConfig() {
         let locationConfig;
         try {
@@ -615,7 +669,7 @@ class Config extends EventEmitter {
         }
         const tlsFilePath = (tlsFileName[0] === '/')
               ? tlsFileName
-              : path.join(this._basepath, tlsFileName);
+              : path.join(this._basePath, tlsFileName);
         let tlsFileContent;
         try {
             tlsFileContent = fs.readFileSync(tlsFilePath);
@@ -626,6 +680,19 @@ class Config extends EventEmitter {
         return tlsFileContent;
     }
 
+    // Load TLS file or array of files
+    // if tlsFilename is a string, result will be a Buffer containing the file content
+    // if tlsFilename is an array of string, result will be  an array of Buffer
+    _loadTlsFileArray(tlsFileName) {
+        let res;
+        if (Array.isArray(tlsFileName)) {
+            res = tlsFileName.map(tlsFile => this._loadTlsFile(tlsFile));
+        } else {
+            res = this._loadTlsFile(tlsFileName);
+        }
+        return res;
+    }
+
     /**
      * Parse list of endpoints.
      * @param {string[] | undefined} listenOn - List of string of the form "ip:port"
@@ -1334,6 +1401,13 @@ class Config extends EventEmitter {
             }
         }
 
+        this.kmsAWS = this._parseKmsAWS(config);
+
+        const defaultEncryptionKeyPerAccount = config.defaultEncryptionKeyPerAccount;
+        this.defaultEncryptionKeyPerAccount = defaultEncryptionKeyPerAccount || false;
+        assert(typeof this.defaultEncryptionKeyPerAccount === 'boolean',
+            'config.defaultEncryptionKeyPerAccount must be a boolean');
+
         this.healthChecks = defaultHealthChecks;
         if (config.healthChecks && config.healthChecks.allowFrom) {
             assert(config.healthChecks.allowFrom instanceof Array,

lib/api/apiUtils/bucket/bucketCreation.js

@@ -130,16 +130,16 @@ function cleanUpBucket(bucketMD, canonicalID, log, callback) {
 /**
  * Manage the server side encryption on bucket creation, as a side effect
  * a bucket key is created in the kms
- * @param {string} bucketName - name of bucket
+ * @param {BucketInfo} bucket - bucket info
  * @param {object} headers - request headers
  * @param {function} log - Werelogs logger
  * @param {function} cb - called on completion
  * @returns {undefined}
  * @callback called with (err, sseInfo: object)
  */
-function bucketLevelServerSideEncryption(bucketName, headers, log, cb) {
+function bucketLevelServerSideEncryption(bucket, headers, log, cb) {
     kms.bucketLevelEncryption(
-        bucketName, headers, log, (err, sseInfo) => {
+        bucket, headers, log, (err, sseInfo) => {
             if (err) {
                 log.debug('error getting bucket encryption info', {
                     error: err,
@@ -250,7 +250,7 @@ function createBucket(authInfo, bucketName, headers,
         if (existingBucketMD === 'NoBucketYet') {
             const sseConfig = parseBucketEncryptionHeaders(headers);
             return bucketLevelServerSideEncryption(
-                bucketName, sseConfig, log,
+                bucket, sseConfig, log,
                 (err, sseInfo) => {
                     if (err) {
                         return cb(err);

lib/api/apiUtils/bucket/bucketDeletion.js

@@ -138,8 +138,15 @@ function deleteBucket(authInfo, bucketMD, bucketName, canonicalID, request, log,
                 return cb(err);
             }
             const serverSideEncryption = bucketMD.getServerSideEncryption();
-            if (serverSideEncryption &&
-                serverSideEncryption.algorithm === 'AES256') {
+            const isScalityManagedEncryptionKey = serverSideEncryption && serverSideEncryption.algorithm === 'AES256';
+            const isAccountEncryptionEnabled = bucketMD.isAccountEncryptionEnabled();
+
+            /**
+             * If all of the following conditions are met, delete the master encryption key:
+             * - The encryption key is managed by Scality (not externally managed).
+             * - The encryption is bucket-specific (to prevent deleting default account encryption key).
+             */
+            if (isScalityManagedEncryptionKey && !isAccountEncryptionEnabled) {
                 const masterKeyId = serverSideEncryption.masterKeyId;
                 return kms.destroyBucketKey(masterKeyId, log, cb);
             }

lib/api/apiUtils/bucket/bucketEncryption.js

@@ -173,7 +173,7 @@ function parseObjectEncryptionHeaders(headers) {
  */
 function createDefaultBucketEncryptionMetadata(bucket, log, cb) {
     return kms.bucketLevelEncryption(
-        bucket.getName(),
+        bucket,
         { algorithm: 'AES256', mandatory: false },
         log,
         (error, sseConfig) => {
@@ -236,7 +236,7 @@ function getObjectSSEConfiguration(headers, bucket, log, cb) {
 
     // If the bucket has a default encryption config, and it is mandatory
     // (created with putBucketEncryption or legacy headers)
-    // pass it through
+    // pass it through.
     if (bucketSSE && bucketSSE.mandatory) {
         return cb(null, bucketSSE);
     }

lib/api/bucketDeleteEncryption.js

@@ -39,6 +39,7 @@ function bucketDeleteEncryption(authInfo, request, log, callback) {
                 algorithm: sseConfig.algorithm,
                 cryptoScheme: sseConfig.cryptoScheme,
                 masterKeyId: sseConfig.masterKeyId,
+                configuredMasterKeyId: sseConfig.configuredMasterKeyId,
             };
 
             bucket.setServerSideEncryption(updatedConfig);

lib/api/bucketPutEncryption.js

@@ -41,8 +41,9 @@ function bucketPutEncryption(authInfo, request, log, callback) {
         },
         (bucket, encryptionConfig, next) => {
             const existingConfig = bucket.getServerSideEncryption();
-            if (existingConfig === null) {
-                return kms.bucketLevelEncryption(bucket.getName(), encryptionConfig, log,
+            // Check if encryption is not configured or if a default master key has not been created yet.
+            if (existingConfig === null || !existingConfig.masterKeyId) {
+                return kms.bucketLevelEncryption(bucket, encryptionConfig, log,
                     (err, updatedConfig) => {
                         if (err) {
                             return next(err);
@@ -51,13 +52,19 @@ function bucketPutEncryption(authInfo, request, log, callback) {
                     });
             }
 
+            // If encryption is already configured and a default master key exists
+
+            // If the request does not specify a custom key, reuse the existing default master key id
+            // This ensures that a new default master key is not generated every time
+            // `putBucketEncryption` is called, avoiding unnecessary key creation
             const updatedConfig = {
                 mandatory: true,
                 algorithm: encryptionConfig.algorithm,
                 cryptoScheme: existingConfig.cryptoScheme,
                 masterKeyId: existingConfig.masterKeyId,
             };
 
+            // If the request specifies a custom master key id, store it in the updated configuration
             const { configuredMasterKeyId } = encryptionConfig;
             if (configuredMasterKeyId) {
                 updatedConfig.configuredMasterKeyId = configuredMasterKeyId;

lib/kms/file/backend.js

@@ -8,13 +8,13 @@ const backend = {
 
     /**
      *
-     * @param {string} bucketName - bucket name
+     * @param {BucketInfo} bucket - bucket info
      * @param {object} log - logger object
      * @param {function} cb - callback
      * @returns {undefined}
      * @callback called with (err, masterKeyId: string)
     */
-    createBucketKey: function createBucketKeyMem(bucketName, log, cb) {
+    createBucketKey: function createBucketKeyMem(bucket, log, cb) {
         process.nextTick(() => {
             // Using createDataKey here for purposes of createBucketKeyMem
             // so that we do not need a separate function.

lib/kms/in_memory/backend.js

@@ -8,15 +8,17 @@ const backend = {
      * Target implementation will be async. let's mimic it
      */
 
+    supportsDefaultKeyPerAccount: false,
+
      /**
       *
-      * @param {string} bucketName - bucket name
+      * @param {BucketInfo} bucket - bucket info
       * @param {object} log - logger object
       * @param {function} cb - callback
       * @returns {undefined}
       * @callback called with (err, masterKeyId: string)
       */
-    createBucketKey: function createBucketKeyMem(bucketName, log, cb) {
+    createBucketKey: function createBucketKeyMem(bucket, log, cb) {
         process.nextTick(() => {
             // Using createDataKey here for purposes of createBucketKeyMem
             // so that we do not need a separate function.