CLDSRV-774: Move copy-source aclRequired logic into storeServerAccessLogInfo

Author: dvasilas

lib/metadata/metadataUtils.js

@@ -50,6 +50,11 @@ function storeServerAccessLogInfo(request, bucket, raftSessionId, options = {})
             target.enabled = true;
             target.loggingEnabled = bucket.getBucketLoggingStatus().getLoggingEnabled();
         }
+        // Source auth runs on the same request object and overwrites the
+        // destination's aclRequired. Move the source value to its log entry
+        // and restore the destination value that was saved before source auth.
+        target.aclRequired = request.serverAccessLog.aclRequired;
+        request.serverAccessLog.aclRequired = options.savedAclRequired;
     } else {
         // Default behavior: store in main serverAccessLog
         request.serverAccessLog.raftSessionID = raftSessionId;
@@ -326,8 +331,10 @@ function standardMetadataValidateBucketAndObj(params, actionImplicitDenies, log,
     if (!Array.isArray(requestType)) {
         requestType = [requestType];
     }
-    const isCopySource = params.serverAccessLogOptions?.copySource;
-    const savedAclRequired = isCopySource ? request?.serverAccessLog?.aclRequired : undefined;
+    if (params.serverAccessLogOptions?.copySource) {
+        // eslint-disable-next-line no-param-reassign
+        params.serverAccessLogOptions.savedAclRequired = request?.serverAccessLog?.aclRequired;
+    }
     async.waterfall([
         next => {
             // versionId may be 'null', which asks metadata to fetch the null key specifically
@@ -424,12 +431,6 @@ function standardMetadataValidateBucketAndObj(params, actionImplicitDenies, log,
         },
     ], (err, bucket, objMD, raftSessionId) => {
         storeServerAccessLogInfo(request, bucket, raftSessionId, params.serverAccessLogOptions);
-        if (isCopySource && request?.sourceServerAccessLog) {
-            request.sourceServerAccessLog.aclRequired = request.serverAccessLog?.aclRequired;
-            if (request.serverAccessLog) {
-                request.serverAccessLog.aclRequired = savedAclRequired;
-            }
-        }
         if (err) {
             // still return bucket for cors headers
             return callback(err, bucket);