]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Handle x-amz-request-payer in pre-signed urls
authorJavier M. Mellid <jmunhoz@igalia.com>
Wed, 14 Oct 2015 19:20:41 +0000 (21:20 +0200)
committerJavier M. Mellid <jmunhoz@igalia.com>
Thu, 15 Oct 2015 09:19:26 +0000 (11:19 +0200)
Fixes: #13427
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
src/rgw/rgw_common.cc

index 614a3918e6a80299f476da14974667bbc9109eda..b628db95cdb4a1c75110de453f4d9a7954902e81 100644 (file)
@@ -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;
 }