]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: the swift container acl should support field .ref 13833/head
authorJing Wenjun <jingwenjun@cmss.chinamobile.com>
Tue, 10 Jan 2017 21:28:43 +0000 (05:28 +0800)
committerNathan Cutler <ncutler@suse.com>
Tue, 7 Mar 2017 15:40:48 +0000 (16:40 +0100)
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)

Conflicts:
src/rgw/rgw_acl_swift.cc - no extract_referer_urlspec() in jewel
            see https://github.com/ceph/ceph/pull/8657

src/rgw/rgw_acl_swift.cc

index a9729e33cc585a9aaf88fa30afd9f8ca19c6d2a7..ab015cd3359b667b989019de759a04eada8074b5 100644 (file)
@@ -54,6 +54,7 @@ static bool uid_is_public(string& uid)
     return false;
 
   return sub.compare(".r") == 0 ||
+         sub.compare(".ref") == 0 ||
          sub.compare(".referer") == 0 ||
          sub.compare(".referrer") == 0;
 }