[Pkg-ceph-commits] [ceph] 01/01: Fix issue setting Swift ACL's on existing containers

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository ceph.

commit ac15233f89d0963f3d47d9302cdcff2a345e4239
Author: James Page <james.page at ubuntu.com>
Date:   Fri May 23 14:13:11 2014 +0100

    Fix issue setting Swift ACL's on existing containers
    
    d/p/bug-8428.patch: Cherry pick proposed fix from upstream VCS.
---
 debian/changelog              |  7 +++++++
 debian/patches/bug-8428.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 16b3f42..366b801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (0.80.1-2) UNRELEASED; urgency=medium
+
+  * Fix issue setting Swift ACL's on existing containers:
+    - d/p/bug-8428.patch: Cherry pick proposed fix from upstream VCS.
+
+ -- James Page <james.page at ubuntu.com>  Fri, 23 May 2014 14:12:13 +0100
+
 ceph (0.80.1-1) unstable; urgency=low
 
   * New upstream release [May 2014].
diff --git a/debian/patches/bug-8428.patch b/debian/patches/bug-8428.patch
new file mode 100644
index 0000000..111cff4
--- /dev/null
+++ b/debian/patches/bug-8428.patch
@@ -0,0 +1,36 @@
+From 88905013d76ee7a7f5708d7fa10a9f9d6d6f1299 Mon Sep 17 00:00:00 2001
+From: Yehuda Sadeh <yehuda at inktank.com>
+Date: Thu, 22 May 2014 18:27:58 -0700
+Subject: [PATCH] rgw: check appropriate entity permission on put_metadata
+
+Fixes: #8428
+
+Signed-off-by: Yehuda Sadeh <yehuda at inktank.com>
+---
+ ceph-object-corpus | 2 +-
+ src/rgw/rgw_op.cc  | 9 +++++++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
+index f3501fb..a57783b 100644
+--- a/src/rgw/rgw_op.cc
++++ b/src/rgw/rgw_op.cc
+@@ -1752,8 +1752,13 @@ void RGWPostObj::execute()
+ 
+ int RGWPutMetadata::verify_permission()
+ {
+-  if (!verify_object_permission(s, RGW_PERM_WRITE))
+-    return -EACCES;
++  if (s->object) {
++    if (!verify_object_permission(s, RGW_PERM_WRITE))
++      return -EACCES;
++  } else {
++    if (!verify_bucket_permission(s, RGW_PERM_WRITE))
++      return -EACCES;
++  }
+ 
+   return 0;
+ }
+-- 
+1.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
index e930da6..431b443 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,7 @@ client-sleep1.patch
 client-sleep2.patch
 client-sleep3.patch
 sleep-recover.patch
+bug-8428.patch
 
 ## Debian
 arch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git