Added x-amz-expiration, missing HTTP header in the response of object GET/PUT/HEAD

Signed-off-by: Aayush Chouhan <[email protected]>

Author: achouhan09

src/api/bucket_api.js

@@ -1215,6 +1215,7 @@ module.exports = {
                     $ref: 'common_api#/definitions/bucket_policy'
                 },
                 replication_policy_id: { objectid: true },
+                lifecycle_configuration_rules: { $ref: 'common_api#/definitions/bucket_lifecycle_configuration' },
             }
         },
 

src/endpoint/s3/s3_rest.js

@@ -116,10 +116,13 @@ async function handle_request(req, res) {
     }
 
     const op_name = parse_op_name(req);
-    const cors = req.params.bucket && await req.object_sdk.read_bucket_sdk_cors_info(req.params.bucket);
 
+    const cors = req.params.bucket && await req.object_sdk.read_bucket_sdk_cors_info(req.params.bucket);
     http_utils.set_cors_headers_s3(req, res, cors);
 
+    const rules = req.params.bucket && await req.object_sdk.read_bucket_lifecycle_config_info(req.params.bucket);
+    http_utils.set_expiration_header(req, res, rules);
+
     if (req.method === 'OPTIONS') {
         dbg.log1('s3_rest: handle_request : S3 request method is ', req.method);
         const error_code = req.headers.origin && req.headers['access-control-request-method'] ? 403 : 400;
@@ -139,6 +142,7 @@ async function handle_request(req, res) {
     authenticate_request(req);
     await authorize_request(req);
 
+
     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/sdk/object_sdk.js

@@ -223,6 +223,11 @@ class ObjectSDK {
         return policy_info;
     }
 
+    async read_bucket_lifecycle_config_info(name) {
+        const { bucket } = await bucket_namespace_cache.get_with_cache({ sdk: this, name });
+        return bucket.bucket_info.lifecycle_configuration_rules;
+    }
+
     async read_bucket_usage_info(name) {
         const { bucket } = await bucket_namespace_cache.get_with_cache({ sdk: this, name });
         return bucket.bucket_info.data;

src/server/system_services/bucket_server.js

@@ -1653,6 +1653,7 @@ function get_bucket_info({
         website: bucket.website,
         s3_policy: bucket.s3_policy,
         replication_policy_id: bucket.replication_policy_id,
+        lifecycle_configuration_rules: bucket.lifecycle_configuration_rules,
     };
 
     const metrics = _calc_metrics({ bucket, nodes_aggregate_pool, hosts_aggregate_pool, tiering_pools_status, info });

src/util/http_utils.js

@@ -664,6 +664,50 @@ function set_amz_headers(req, res) {
     res.setHeader('x-amz-id-2', req.request_id);
 }
 
+/**
+ * @param {Object} req
+ * @param {http.ServerResponse} res
+ * @param {Object} rules
+ */
+async function set_expiration_header(req, res, rules) {
+    if (req.method === 'HEAD' || req.method === 'GET' || req.method === 'PUT') {
+        // TODO: For every object key we need to apply the mupltiple rules obtained in lifecycle and then update the x-amz-expiration accordingly
+        // currently putting the first rule expiration to every object
+        if (rules?.length > 0) {
+            const expiration_head = parse_expiration_header(rules[0]?.expiration, rules[0]?.id);
+            if (expiration_head) {
+                res.setHeader('x-amz-expiration', expiration_head);
+            }
+        }
+    }
+}
+
+/**
+ * parse_expiration_header converts an expiration rule (either with `date` or `days`)
+ * into an s3 style `x-amz-expiration` header value
+ *
+ * @param {Object} expiration - expiration object from lifecycle config
+ * @param {string} rule_id - id of the lifecycle rule
+ * @returns {string|undefined}
+ *
+ * Example output:
+ *   expiry-date="Thu, 10 Apr 2025 00:00:00 GMT", rule-id="rule_id"
+ */
+function parse_expiration_header(expiration, rule_id) {
+    if (!expiration || (!expiration.date && !expiration.days)) return undefined;
+
+    const expiration_date = expiration.date ?
+        new Date(expiration.date) :
+        new Date(Date.UTC(
+            new Date().getUTCFullYear(),
+            new Date().getUTCMonth(),
+            new Date().getUTCDate() + expiration.days
+        ));
+
+    return `expiry-date="${expiration_date.toUTCString()}", rule-id="${rule_id}"`;
+}
+
+
 /**
  * @typedef {{
  *      allow_origin: string;
@@ -945,6 +989,7 @@ exports.set_keep_alive_whitespace_interval = set_keep_alive_whitespace_interval;
 exports.parse_xml_to_js = parse_xml_to_js;
 exports.check_headers = check_headers;
 exports.set_amz_headers = set_amz_headers;
+exports.set_expiration_header = set_expiration_header;
 exports.set_cors_headers = set_cors_headers;
 exports.set_cors_headers_s3 = set_cors_headers_s3;
 exports.set_cors_headers_sts = set_cors_headers_sts;