[openstack-ceilometer] remove token from notifier middleware bz#1112949

[slinabery]

commit 60015b87202022b53683cbf3751f8891f9bd1477
Author: Steve Linabery <slinaber at redhat.com>
Date:   Wed Jun 25 14:56:22 2014 -0500

    remove token from notifier middleware bz#1112949

 ...ing-key-is-specified-in-the-address-for-a.patch |    2 +-
 0002-remove-token-from-notifier-middleware.patch   |   27 ++++++++++++++++++++
 openstack-ceilometer.spec                          |    9 +++++-
 3 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch b/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
index 59dc268..5808e12 100644
--- a/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+++ b/0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
@@ -1,4 +1,4 @@
-From 81d2cd61980f39ef952bc715d4dec4d3a1d7efd1 Mon Sep 17 00:00:00 2001
+From e420f26fa20b25328be88eb3ab3cf5d4413b9e50 Mon Sep 17 00:00:00 2001
 From: Russell Bryant <rbryant at redhat.com>
 Date: Mon, 9 Jun 2014 17:02:12 -0400
 Subject: [PATCH] Ensure routing key is specified in the address for a direct
diff --git a/0002-remove-token-from-notifier-middleware.patch b/0002-remove-token-from-notifier-middleware.patch
new file mode 100644
index 0000000..0e9338b
--- /dev/null
+++ b/0002-remove-token-from-notifier-middleware.patch
@@ -0,0 +1,27 @@
+From 5dfc60336bc670fd0c1d1830958499e960b49933 Mon Sep 17 00:00:00 2001
+From: gordon chung <chungg at ca.ibm.com>
+Date: Fri, 30 May 2014 17:11:18 -0400
+Subject: [PATCH] remove token from notifier middleware
+
+notifier middleware is capturing token and sending it to MQ. this
+is not advisable so we should filter it out.
+
+Change-Id: Ia1bfa1bd24989681db1d2f385defc12e69a01f8d
+Closes-Bug: #1321080
+---
+ ceilometer/openstack/common/middleware/notifier.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ceilometer/openstack/common/middleware/notifier.py b/ceilometer/openstack/common/middleware/notifier.py
+index 00aafe3..e46e208 100644
+--- a/ceilometer/openstack/common/middleware/notifier.py
++++ b/ceilometer/openstack/common/middleware/notifier.py
+@@ -68,7 +68,7 @@ class RequestNotifier(base.Middleware):
+ 
+         """
+         return dict((k, v) for k, v in six.iteritems(environ)
+-                    if k.isupper())
++                    if k.isupper() and k != 'HTTP_X_AUTH_TOKEN')
+ 
+     @log_and_ignore_error
+     def process_request(self, request):
diff --git a/openstack-ceilometer.spec b/openstack-ceilometer.spec
index 310994a..061dca7 100644
--- a/openstack-ceilometer.spec
+++ b/openstack-ceilometer.spec
@@ -4,7 +4,7 @@
 
 Name:             openstack-ceilometer
 Version:          2014.1.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          OpenStack measurement collection service
 
 Group:            Applications/System
@@ -23,9 +23,10 @@ Source15:         %{name}-alarm-evaluator.service
 Source16:         %{name}-notification.service
 
 #
-# patches_base=2014.1.1
+# patches_base=d3899f186fee9ad4f050ec41a779814eed87258c
 #
 Patch0001: 0001-Ensure-routing-key-is-specified-in-the-address-for-a.patch
+Patch0002: 0002-remove-token-from-notifier-middleware.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -241,6 +242,7 @@ This package contains documentation files for ceilometer.
 %setup -q -n ceilometer-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -527,6 +529,9 @@ fi
 
 
 %changelog
+* Wed Jun 25 2014 Steve Linabery <slinaber at redhat.com> - 2014.1.1-3
+- remove token from notifier middleware bz#1112949
+
 * Wed Jun 11 2014 Steve Linabery <slinaber at redhat.com> - 2014.1.1-2
 - Update to upstream 2014.1.1
 - fix message routing with newer QPID (rhbz#1103800)