From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Sun, 24 Apr 2016 15:41:55 +0000 (+0200)
Subject: rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.
X-Git-Tag: v11.0.0~136^2~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8726%2Fhead;p=ceph.git

rgw: fix printing wrong X-Storage-Url in Swift's TempAuth.

If the option "rgw_swift_account_in_url" is being set to true,
both user and subuser IDs will be present in the X-Storage-Url
header generated by the implementation of Swift API's TempAuth.
This patch rectifies this behavior and makes that only the user
identifier will be placed there.

Fixes: http://tracker.ceph.com/issues/15667
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_swift_auth.cc b/src/rgw/rgw_swift_auth.cc
index 32234d7f2c1..8c7f032624e 100644
--- a/src/rgw/rgw_swift_auth.cc
+++ b/src/rgw/rgw_swift_auth.cc
@@ -215,7 +215,7 @@ void RGW_SWIFT_Auth_Get::execute()
     tenant_path.append(g_conf->rgw_swift_tenant_name);
   } else if (g_conf->rgw_swift_account_in_url) {
     tenant_path = "/AUTH_";
-    tenant_path.append(user_str);
+    tenant_path.append(info.user_id.to_str());
   }
 
   STREAM_IO(s)->print("X-Storage-Url: %s/%s/v1%s\r\n", swift_url.c_str(),