From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Fri, 4 Mar 2016 15:28:25 +0000 (+0100)
Subject: rgw: use TempURL when requested regardless of auth token presence.
X-Git-Tag: v10.1.0~163^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5694397cf43a6f360d6fef2cf10f8f5f25c34100;p=ceph.git

rgw: use TempURL when requested regardless of auth token presence.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_swift.cc b/src/rgw/rgw_swift.cc
index 7c0146122981..63f96f12f29b 100644
--- a/src/rgw/rgw_swift.cc
+++ b/src/rgw/rgw_swift.cc
@@ -668,7 +668,8 @@ bool RGWSwift::verify_swift_token(RGWRados *store, req_state *s)
 
 bool RGWSwift::do_verify_swift_token(RGWRados *store, req_state *s)
 {
-  if (!s->os_auth_token) {
+  if (s->info.args.exists("temp_url_sig") ||
+      s->info.args.exists("temp_url_expires")) {
     int ret = authenticate_temp_url(store, s);
     return (ret >= 0);
   }