Merge remote-tracking branch 'origin/bugfix/CLDSRV-839-fix-logs-operation' into w/9.3/bugfix/CLDSRV-839-fix-logs-operation

Author: BourgoisMickael

lib/api/apiUtils/object/corsResponse.js

@@ -125,7 +125,7 @@ isPreflight) {
             rule.exposeHeaders.join(', ');
     }
     if (isPreflight) {
-        resHeaders['content-length'] = '0';
+        resHeaders['content-length'] = 0;
         resHeaders.date = new Date().toUTCString();
     }
     return resHeaders;

lib/utilities/serverAccessLogger.js

@@ -251,7 +251,7 @@ const methodToResType = Object.freeze({
     'bucketPutEncryption': 'ENCRYPTION',
     'bucketPutLogging': 'LOGGING_STATUS',
     'bucketGetLogging': 'LOGGING_STATUS',
-    // 'corsPreflight': '',
+    'corsPreflight': 'PREFLIGHT',
     'completeMultipartUpload': 'UPLOAD',
     'initiateMultipartUpload': 'UPLOADS',
     'listMultipartUploads': 'UPLOADS',
@@ -295,13 +295,25 @@ function getOperation(req) {
     if (req.apiMethod === 'objectPutCopyPart') {
         return 'REST.COPY.PART';
     }
+    // Special handling for website operations
+    if (req.apiMethod === 'websiteGet') {
+        return 'WEBSITE.GET.OBJECT';
+    }
+    if (req.apiMethod === 'websiteHead') {
+        return 'WEBSITE.HEAD.OBJECT';
+    }
 
     if (!resourceType) {
-        process.emitWarning('Unknown apiMethod for server access log', {
-            type: 'ServerAccessLogWarning',
-            code: 'UNKNOWN_API_METHOD',
-            detail: `apiMethod=${req.apiMethod}, method=${req.method}, url=${req.url}`
-        });
+        // Only emit a warning if apiMethod is not undefined, meaning request is valid.
+        // Otherwise we could get spam by invalid or broken requests.
+        // To help catch missing valid operation.
+        if (req.apiMethod) {
+            process.emitWarning('Unknown apiMethod for server access log', {
+                type: 'ServerAccessLogWarning',
+                code: 'UNKNOWN_API_METHOD',
+                detail: `apiMethod=${req.apiMethod}, method=${req.method}, url=${req.url}`
+            });
+        }
         return `REST.${req.method}.UNKNOWN`;
     }