]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: the swift container acl should support field .ref
authorJing Wenjun <jingwenjun@cmss.chinamobile.com>
Tue, 10 Jan 2017 21:28:43 +0000 (05:28 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 19 Jun 2017 17:12:17 +0000 (19:12 +0200)
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)

src/rgw/rgw_acl_swift.cc

index b0dca2b6592995373681a8b382e0c6c46f34e132..4b3de96a2093f25c9a7f5987d7236ffb0f21cd75 100644 (file)
@@ -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;
 }