From: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
Date: Tue, 10 Jan 2017 21:28:43 +0000 (+0800)
Subject: rgw: the swift container acl should support field .ref
X-Git-Tag: v11.2.1~68^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=500eac722d3e59ca8408d1bf9a23cc7368164c58;p=ceph.git

rgw: the swift container acl should support field .ref

On the openstack-swift. The container acl supports .ref, which is ignored on ceph swift.

Fixes: http://tracker.ceph.com/issues/18484
Signed-off-by: Jing Wenjun <jingwenjun@cmss.chinamobile.com>
(cherry picked from commit b06f9cd9f0900db7b0d0fbcaea69cdd0d4b10132)
---

diff --git a/src/rgw/rgw_acl_swift.cc b/src/rgw/rgw_acl_swift.cc
index b0dca2b6592..4b3de96a209 100644
--- a/src/rgw/rgw_acl_swift.cc
+++ b/src/rgw/rgw_acl_swift.cc
@@ -59,6 +59,7 @@ static bool uid_is_public(const string& uid)
     return false;
 
   return sub.compare(".r") == 0 ||
+         sub.compare(".ref") == 0 ||
          sub.compare(".referer") == 0 ||
          sub.compare(".referrer") == 0;
 }
@@ -75,6 +76,7 @@ static bool extract_referer_urlspec(const std::string& uid,
   url_spec = uid.substr(pos + 1);
 
   return sub.compare(".r") == 0 ||
+         sub.compare(".ref") == 0 ||
          sub.compare(".referer") == 0 ||
          sub.compare(".referrer") == 0;
 }