From: Denis V. Meltsaykin <dmeltsaykin@mirantis.com>
Date: Tue, 12 Dec 2017 15:21:32 +0000 (+0100)
Subject: Fix CVE-2016-7031
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a8d3d16ce442a7dcac4b5f17f68f34de9716bb52;p=packages%2Ftrusty%2Fceph.git

Fix CVE-2016-7031

Change-Id: I5ff432f40a1437b4bd8f3c4337398c5d48893643
Related-Bug: 1710582
---

diff --git a/debian/changelog b/debian/changelog
index 0ccbc4f1..b32ab51f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ceph (0.94.5-0u~u14.04+mos3+mos8.0+4) mos8.0; urgency=medium
+
+  * Fix CVE-2016-7031
+
+ -- Denis Meltsaykin <dmeltsaykin@mirantis.com>  Tue, 12 Dec 2017 16:21:00 +0300
+
 ceph (0.94.5-0u~u14.04+mos3+mos8.0+3) mos8.0; urgency=medium
 
   * Fix possible rbd data corruption, http://tracker.ceph.com/issues/17545
diff --git a/debian/patches/mirantis/CVE-2016-7031.patch b/debian/patches/mirantis/CVE-2016-7031.patch
new file mode 100644
index 00000000..35d24bcd
--- /dev/null
+++ b/debian/patches/mirantis/CVE-2016-7031.patch
@@ -0,0 +1,52 @@
+From 99ba6610a8f437604cadf68cbe9969def893e870 Mon Sep 17 00:00:00 2001
+From: root <rahul.1aggarwal@gmail.com>
+Date: Thu, 24 Sep 2015 00:21:13 +0530
+Subject: [PATCH] 13207: Rados Gateway: Anonymous user is able to read bucket
+ with authenticated read ACL
+
+Signed-off-by: root <rahul.1aggarwal@gmail.com>
+---
+ src/rgw/rgw_acl_s3.cc | 2 +-
+ src/rgw/rgw_op.cc     | 9 ++++++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/rgw/rgw_acl_s3.cc b/src/rgw/rgw_acl_s3.cc
+index f0ed08118dfa..490bf98221aa 100644
+--- a/src/rgw/rgw_acl_s3.cc
++++ b/src/rgw/rgw_acl_s3.cc
+@@ -568,7 +568,7 @@ bool RGWAccessControlPolicy_S3::compare_group_name(string& id, ACLGroupTypeEnum
+ {
+   switch (group) {
+   case ACL_GROUP_ALL_USERS:
+-    return (id.compare(rgw_uri_all_users) == 0);
++    return (id.compare(RGW_USER_ANON_ID) == 0);
+   case ACL_GROUP_AUTHENTICATED_USERS:
+     return (id.compare(rgw_uri_auth_users) == 0);
+   default:
+diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
+index ff84aba0b064..91f5229c6cbe 100644
+--- a/src/rgw/rgw_op.cc
++++ b/src/rgw/rgw_op.cc
+@@ -17,6 +17,7 @@
+ #include "rgw_rest.h"
+ #include "rgw_acl.h"
+ #include "rgw_acl_s3.h"
++#include "rgw_acl_swift.h"
+ #include "rgw_user.h"
+ #include "rgw_bucket.h"
+ #include "rgw_log.h"
+@@ -356,7 +357,13 @@ static int rgw_build_policies(RGWRados *store, struct req_state *s, bool only_bu
+     }
+   }
+ 
+-  s->bucket_acl = new RGWAccessControlPolicy(s->cct);
++  if(s->dialect.compare("s3") == 0) {
++    s->bucket_acl = new RGWAccessControlPolicy_S3(s->cct);
++  } else if(s->dialect.compare("swift")  == 0) {
++    s->bucket_acl = new RGWAccessControlPolicy_SWIFT(s->cct);
++  } else {
++    s->bucket_acl = new RGWAccessControlPolicy(s->cct);
++  }
+ 
+   if (s->copy_source) { /* check if copy source is within the current domain */
+     const char *src = s->copy_source;
diff --git a/debian/patches/series b/debian/patches/series
index c3ba227a..09657505 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,5 @@ vivid-does-systemd.patch
 ## Mirantis
 PG-activate-handle-unexpected-cached_removed_snaps-m.patch
 ObjectCacher-fix-bh_read_finish-offset-logic.patch
+
+mirantis/CVE-2016-7031.patch