From 517f6253c9c3b63d947feed251f61190fd1b6030 Mon Sep 17 00:00:00 2001
From: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
Date: Fri, 15 Jan 2021 09:45:55 +0800
Subject: [PATCH] rgw: fix download object when use v2 presigned url generate
 by sts

fix https://tracker.ceph.com/issues/48885

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit 51af56cee4ba4fc1a2f937c5c195d05cddfb40b7)
---
 src/rgw/rgw_auth_s3.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rgw/rgw_auth_s3.cc b/src/rgw/rgw_auth_s3.cc
index f6348e05b797d..5bf44c38f0935 100644
--- a/src/rgw/rgw_auth_s3.cc
+++ b/src/rgw/rgw_auth_s3.cc
@@ -166,6 +166,9 @@ static inline void get_v2_qs_map(const req_info& info,
     if (k.find("x-amz-meta-") == /* offset */ 0) {
       rgw_add_amz_meta_header(qs_map, k, elt.second);
     }
+    if (k == "x-amz-security-token") {
+      qs_map[k] = elt.second;
+    }
   }
 }
 
-- 
2.47.3