Merge remote-tracking branch 'origin/w/9.2/feature/CLDSRV-812/list-objects-v2-optional-permissions' into w/9.3/feature/CLDSRV-812/list-objects-v2-optional-permissions

Author: DarkIsDude

docs/RELEASE.md

@@ -26,42 +26,33 @@ docker pull ghcr.io/scality/cloudserver:<tag>
 
 To release a production image:
 
-* Create a PR to bump the package version
-  Update Cloudserver's `package.json` by bumping it to the relevant next
-  version in a new PR. Per example if the last released version was
-  `8.4.7`, the next version would be `8.4.8`.
-
-```js
-{
-  "name": "cloudserver",
-  "version": "8.4.8", <--- Here
-  [...]
-}
-```
+* Create a PR to bump the package version :
+  update Cloudserver's `package.json` by bumping it to the relevant next
+  version in a new PR. Per example if the last released version was `8.4.7`,
+  the next version would be `8.4.8`.
+
+  ```js
+  {
+    "name": "cloudserver",
+    "version": "8.4.8", <--- Here
+    [...]
+  }
+  ```
 
 * Review & merge the PR
 
-* Create the release on GitHub
-  
-  * Go the Release tab (https://github.com/scality/cloudserver/releases);
-  * Click on the `Draft new release button`;
-  * In the `tag` field, type the name of the release (`8.4.8`), and confirm
-    to create the tag on publish;
-  * Click on `Generate release notes` button to fill the fields;
-  * Rename the release to `Release x.y.z` (e.g. `Release 8.4.8` in this case);
-  * Click to `Publish the release` to create the GitHub release and git tag
-
-  Notes:
-  * the Git tag will be created automatically.
-  * this should be done as soon as the PR is merged, so that the tag
-    is put on the "version bump" commit.
-
-* With the following parameters, [force a build here](https://eve.devsca.com/github/scality/cloudserver/#/builders/3/force/force)
-
-  * Branch Name: The one used for the tag earlier. In this example `development/8.4`
-  * Override Stage: 'release'
-  * Extra properties:
-    * name: `'tag'`, value: `[release version]`, in this example`'8.4.8'`
+* Trigger the release workflow on GitHub
+
+  * Go to the [**Actions** tab on GitHub](https://github.com/scality/cloudserver/actions)
+  * Select the `release` workflow from the list
+  * Click on **Run workflow** (manual dispatch)
+  * Enter the new tag (e.g., `8.4.8`) in the input field
+  * Start the workflow
+
+  This workflow will create the tag and push the Docker images.
+
+  This should be done as soon as the PR is merged,
+  so that the tag is put on the "version bump" commit.
 
 * Release the release version on Jira
 

lib/api/apiUtils/authorization/prepareRequestContexts.js

@@ -252,6 +252,15 @@ function prepareRequestContexts(apiMethod, request, sourceBucket,
                 generateRequestContext('bypassGovernanceRetention');
             requestContexts.push(checkUserGovernanceBypassRequestContext);
         }
+    } else if (apiMethodAfterVersionCheck === 'bucketGet') {
+        requestContexts.push(generateRequestContext(apiMethodAfterVersionCheck));
+
+        const optionalAttributesHeader = request.headers['x-amz-optional-object-attributes'];
+        const requestedAttributes = optionalAttributesHeader ? optionalAttributesHeader.split(',') : [];
+
+        if (requestedAttributes.filter(attr => attr != 'RestoreStatus').length > 0) {
+            requestContexts.push(generateRequestContext('listObjectsV2OptionalAttributes'));
+        }
     } else {
         const requestContext =
           generateRequestContext(apiMethodAfterVersionCheck);

lib/api/bucketGet.js

@@ -284,6 +284,15 @@ function bucketGet(authInfo, request, log, callback) {
     const params = request.query;
     const bucketName = request.bucketName;
     const v2 = params['list-type'];
+
+    const optionalAttributes =
+        request.headers['x-amz-optional-object-attributes']?.split(',').map(attr => attr.trim()) ?? [];
+    if (optionalAttributes.some(attr => !attr.startsWith('x-amz-meta-') && attr != 'RestoreStatus')) {
+        return callback(
+            errorInstances.InvalidArgument.customizeDescription('Invalid attribute name specified')
+        );
+    }
+
     if (v2 !== undefined && Number.parseInt(v2, 10) !== 2) {
         return callback(errorInstances.InvalidArgument.customizeDescription('Invalid ' +
             'List Type specified in Request'));
@@ -352,21 +361,22 @@ function bucketGet(authInfo, request, log, callback) {
     }
 
     standardMetadataValidateBucket(metadataValParams, request.actionImplicitDenies, log, (err, bucket) => {
-        const corsHeaders = collectCorsHeaders(request.headers.origin,
-            request.method, bucket);
+        const corsHeaders = collectCorsHeaders(request.headers.origin, request.method, bucket);
+
         if (err) {
             log.debug('error processing request', { error: err });
-            monitoring.promMetrics(
-                'GET', bucketName, err.code, 'listBucket');
+            monitoring.promMetrics('GET', bucketName, err.code, 'listBucket');
             return callback(err, null, corsHeaders);
         }
+
         if (params.versions !== undefined) {
             listParams.listingType = 'DelimiterVersions';
             delete listParams.marker;
             listParams.keyMarker = params['key-marker'];
             listParams.versionIdMarker = params['version-id-marker'] ?
                 versionIdUtils.decode(params['version-id-marker']) : undefined;
         }
+
         if (!requestMaxKeys) {
             const emptyList = {
                 CommonPrefixes: [],
@@ -377,14 +387,14 @@ function bucketGet(authInfo, request, log, callback) {
             return handleResult(listParams, requestMaxKeys, encoding, authInfo,
                 bucketName, emptyList, corsHeaders, log, callback);
         }
-        return services.getObjectListing(bucketName, listParams, log,
-        (err, list) => {
+
+        return services.getObjectListing(bucketName, listParams, log, (err, list) => {
             if (err) {
                 log.debug('error processing request', { error: err });
-                monitoring.promMetrics(
-                    'GET', bucketName, err.code, 'listBucket');
+                monitoring.promMetrics('GET', bucketName, err.code, 'listBucket');
                 return callback(err, null, corsHeaders);
             }
+
             return handleResult(listParams, requestMaxKeys, encoding, authInfo,
                 bucketName, list, corsHeaders, log, callback);
         });

package.json

@@ -22,7 +22,6 @@
     "@aws-sdk/client-iam": "^3.930.0",
     "@aws-sdk/client-s3": "^3.908.0",
     "@aws-sdk/client-sts": "^3.930.0",
-    "aws-sdk": "^2.1692.0",
     "@aws-sdk/credential-providers": "^3.864.0",
     "@aws-sdk/middleware-retry": "^3.374.0",
     "@aws-sdk/protocol-http": "^3.374.0",
@@ -31,8 +30,9 @@
     "@azure/storage-blob": "^12.28.0",
     "@hapi/joi": "^17.1.1",
     "@smithy/node-http-handler": "^3.0.0",
-    "arsenal": "git+https://github.com/scality/Arsenal#8.3.0",
+    "arsenal": "git+https://github.com/scality/arsenal#8.3.1",
     "async": "2.6.4",
+    "aws-sdk": "^2.1692.0",
     "bucketclient": "scality/bucketclient#8.2.7",
     "bufferutil": "^4.0.8",
     "commander": "^12.1.0",
@@ -78,6 +78,7 @@
     "node-mocks-http": "^1.16.1",
     "nodemon": "^3.1.10",
     "nyc": "^15.1.0",
+    "pino-pretty": "^13.1.3",
     "sinon": "^13.0.1",
     "tv4": "^1.3.0"
   },
@@ -91,7 +92,7 @@
   },
   "scripts": {
     "cloudserver": "S3METADATA=mongodb npm-run-all --parallel start_dataserver start_s3server",
-    "dev": "nodemon --exec \"yarn run start\"",
+    "dev": "nodemon --exec \"yarn run start\" | pino-pretty -c -S -m message -i \"pid,hostname,name,authn,authz,address,clientPort,clientIP,elapsed_ms\"",
     "ft_awssdk": "cd tests/functional/aws-node-sdk && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json test/ --exit",
     "ft_awssdk_aws": "cd tests/functional/aws-node-sdk && AWS_ON_AIR=true mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json test/ --exit",
     "ft_awssdk_buckets": "cd tests/functional/aws-node-sdk && mocha --reporter mocha-multi-reporters --reporter-options configFile=$INIT_CWD/tests/reporter-config.json test/bucket --exit",