]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: use TempURL when requested regardless of auth token presence.
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Fri, 4 Mar 2016 15:28:25 +0000 (16:28 +0100)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Fri, 4 Mar 2016 21:52:53 +0000 (22:52 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/rgw/rgw_swift.cc

index 7c01461229815a6af4f175162cd7e9f123c43af5..63f96f12f29b316d7c81b3ce17168676470836c5 100644 (file)
@@ -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);
   }