Added fixes as per the comments

Signed-off-by: Aayush Chouhan <achouhan@redhat.com>

Author: achouhan09

src/endpoint/s3/ops/s3_get_object.js

@@ -39,6 +39,7 @@ async function get_object(req, res) {
 
     const object_md = await req.object_sdk.read_object_md(md_params);
 
+    http_utils.set_expiration_header(req, res); // setting expiration header for bucket lifecycle
     s3_utils.set_response_object_md(res, object_md);
     s3_utils.set_encryption_response_headers(req, res, object_md.encryption);
     if (object_md.storage_class === s3_utils.STORAGE_CLASS_GLACIER) {

src/endpoint/s3/ops/s3_head_object.js

@@ -24,6 +24,8 @@ async function head_object(req, res) {
     if (req.query.get_from_cache !== undefined) {
         params.get_from_cache = true;
     }
+    http_utils.set_expiration_header(req, res); // setting expiration header for bucket lifecycle
+
     const object_md = await req.object_sdk.read_object_md(params);
 
     s3_utils.set_response_object_md(res, object_md);

src/endpoint/s3/ops/s3_put_object.js

@@ -32,6 +32,8 @@ async function put_object(req, res) {
         sha256_b64: req.content_sha256_buf && req.content_sha256_buf.toString('base64'),
     };
 
+    http_utils.set_expiration_header(req, res); // setting expiration header for bucket lifecycle
+
     dbg.log0('PUT OBJECT', req.params.bucket, req.params.key,
         req.headers['x-amz-copy-source'] || '', encryption || '');
     //for copy, use correct s3_event_method. otherwise, just use default (req.method)

src/endpoint/s3/s3_rest.js

@@ -139,8 +139,6 @@ async function handle_request(req, res) {
     authenticate_request(req);
     await authorize_request(req);
 
-    await http_utils.set_expiration_header(req, res);
-
     dbg.log1('S3 REQUEST', req.method, req.originalUrl, 'op', op_name, 'request_id', req.request_id, req.headers);
     usage_report.s3_usage_info.total_calls += 1;
     usage_report.s3_usage_info[op_name] = (usage_report.s3_usage_info[op_name] || 0) + 1;

src/util/http_utils.js

@@ -665,51 +665,51 @@ function set_amz_headers(req, res) {
     res.setHeader('x-amz-id-2', req.request_id);
 }
 
-const s3_error_options = {
-    ErrorClass: S3Error,
-    error_missing_content_length: S3Error.MissingContentLength
-};
 /**
+ * set_expiration_header sets the `x-amz-expiration` response header for GET, PUT, or HEAD object requests
+ * if the object matches any enabled bucket lifecycle rule
+ *
  * @param {Object} req
  * @param {http.ServerResponse} res
  */
 async function set_expiration_header(req, res) {
-    if (req.method === 'HEAD' || req.method === 'GET' || req.method === 'PUT') {
-        const rules = req.params.bucket && await req.object_sdk.read_bucket_lifecycle_config_info(req.params.bucket);
-        const object_md = {
-                bucket: req.params.bucket,
-                key: req.params.key,
-                size: req.headers['x-amz-decoded-content-length'] || req.headers['content-length'] ? parse_content_length(req, s3_error_options) : undefined,
-                tagging: req.body && req.body.Tagging ? s3_utils.parse_body_tagging_xml(req) : undefined,
-        };
+    const rules = req.params.bucket && await req.object_sdk.read_bucket_lifecycle_config_info(req.params.bucket);
+    const object_md = {
+        bucket: req.params.bucket,
+        key: req.params.key,
+        size: req.headers['x-amz-decoded-content-length'] || req.headers['content-length'] ? parse_content_length(req, {
+            ErrorClass: S3Error,
+            error_missing_content_length: S3Error.MissingContentLength
+        }) : undefined,
+        tagging: req.body && req.body.Tagging ? s3_utils.parse_body_tagging_xml(req) : undefined,
+    };
 
-        if (object_md.key && rules?.length > 0) { // updating x-amz-expiration if object key is present
-            for (const rule of rules) {
-                if (rule?.status !== 'Enabled') continue;
+    if (object_md.key && rules?.length > 0) {
+        for (const rule of rules) {
+            if (rule?.status !== 'Enabled') continue;
 
-                const filter = rule?.filter || {};
+            const filter = rule?.filter || {};
 
-                if (filter.prefix && !object_md?.key.startsWith(filter.prefix)) continue;
+            if (filter.prefix && !object_md?.key.startsWith(filter.prefix)) continue;
 
-                if (filter.object_size_greater_than && object_md?.size <= filter.object_size_greater_than) continue;
-                if (filter.object_size_less_than && object_md?.size >= filter.object_size_less_than) continue;
+            if (filter.object_size_greater_than && object_md?.size <= filter.object_size_greater_than) continue;
+            if (filter.object_size_less_than && object_md?.size >= filter.object_size_less_than) continue;
 
-                if (filter.tagging && Array.isArray(filter.tagging)) {
-                    const obj_tags = object_md?.tagging || [];
+            if (filter.tagging && Array.isArray(filter.tagging)) {
+                const obj_tags = object_md?.tagging || [];
 
-                    const matches_all_tags = filter.tagging.every(filter_tag =>
-                        obj_tags.some(obj_tag => obj_tag.key === filter_tag.key && obj_tag.value === filter_tag.value)
-                    );
+                const matches_all_tags = filter.tagging.every(filter_tag =>
+                    obj_tags.some(obj_tag => obj_tag.key === filter_tag.key && obj_tag.value === filter_tag.value)
+                );
 
-                    if (!matches_all_tags) continue;
-                }
+                if (!matches_all_tags) continue;
+            }
 
-                const expiration_head = parse_expiration_header(rule?.expiration, rule?.id);
-                if (expiration_head) {
-                    dbg.log0('set x_amz_expiration header from applied rule: ', rule);
-                    res.setHeader('x-amz-expiration', expiration_head);
-                    break; // apply only for first matching rule
-                }
+            const expiration_header = parse_expiration_header(rule?.expiration, rule?.id);
+            if (expiration_header) {
+                dbg.log1('set x_amz_expiration header from applied rule: ', rule);
+                res.setHeader('x-amz-expiration', expiration_header);
+                break; // apply only for first matching rule
             }
         }
     }