From: Javier M. Mellid <jmunhoz@igalia.com>
Date: Wed, 14 Oct 2015 19:20:41 +0000 (+0200)
Subject: rgw: Handle x-amz-request-payer in pre-signed urls
X-Git-Tag: v10.0.1~125^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4b8600066d398528cd00ec0ac2e566ba2f71965;p=ceph.git

rgw: Handle x-amz-request-payer in pre-signed urls

Fixes: #13427

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 614a3918e6a8..b628db95cdb4 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -713,11 +713,17 @@ bool verify_requester_payer_permission(struct req_state *s)
     return true;
 
   const char *request_payer = s->info.env->get("HTTP_X_AMZ_REQUEST_PAYER");
-  if (!request_payer)
-    return false;
+  if (!request_payer) {
+    bool exists;
+    request_payer = s->info.args.get("x-amz-request-payer", &exists).c_str();
+    if (!exists) {
+      return false;
+    }
+  }
 
-  if (strcasecmp(request_payer, "requester") == 0)
+  if (strcasecmp(request_payer, "requester") == 0) {
     return true;
+  }
 
   return false;
 }