diff options
| author | justin-hopper <justin.hopper@hp.com> | 2013-09-11 14:09:49 -0700 |
|---|---|---|
| committer | Michael Basnight <mbasnight@gmail.com> | 2013-09-13 20:21:44 -0700 |
| commit | 59a12fe3cffd6d3af49c1dc25128fde99543b563 (patch) | |
| tree | afe4f31a21542bf59d473e09a1373e58b1c8c06e | |
| parent | 7f337fb6d09b4d43689e566580cc6221060e64c6 (diff) | |
| download | trove-2013.2.rc1.tar.gz | |
Fixed Admin Auth Token in Notification2013.2.rc1
before notifications are sent - admin auth token is
set to None to ensure it is not logged
Fixes: Bug 1218028
Change-Id: Ib53244f14d8e2e8c77e0bb67e2156e2eb0165866
(cherry picked from commit 52d892fe546535f88915b2a8582d482af7bae4e1)
| -rw-r--r-- | trove/extensions/mgmt/instances/models.py | 2 | ||||
| -rw-r--r-- | trove/tests/unittests/mgmt/test_models.py | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/trove/extensions/mgmt/instances/models.py b/trove/extensions/mgmt/instances/models.py index 0152c9de..0bd8266e 100644 --- a/trove/extensions/mgmt/instances/models.py +++ b/trove/extensions/mgmt/instances/models.py @@ -156,6 +156,8 @@ def _load_servers(instances, find_server): def publish_exist_events(transformer, admin_context): notifications = transformer() + # clear out admin_context.auth_token so it does not get logged + admin_context.auth_token = None for notification in notifications: notifier.notify(admin_context, CONF.host, diff --git a/trove/tests/unittests/mgmt/test_models.py b/trove/tests/unittests/mgmt/test_models.py index 6fcf96d3..a635655d 100644 --- a/trove/tests/unittests/mgmt/test_models.py +++ b/trove/tests/unittests/mgmt/test_models.py @@ -41,6 +41,7 @@ class MockMgmtInstanceTest(TestCase): def setUp(self): super(MockMgmtInstanceTest, self).setUp() self.context = TroveContext() + self.context.auth_token = 'some_secret_password' self.client = mock(Client) self.server_mgr = mock(ServerManager) self.client.servers = self.server_mgr @@ -277,6 +278,7 @@ class TestMgmtInstanceTasks(MockMgmtInstanceTest): flavor = mock(Flavor) flavor.name = 'db.small' when(self.flavor_mgr).get('flavor_1').thenReturn(flavor) + self.assertThat(self.context.auth_token, Is('some_secret_password')) when(notifier).notify(self.context, any(str), 'trove.instance.exists', @@ -291,3 +293,4 @@ class TestMgmtInstanceTasks(MockMgmtInstanceTest): 'trove.instance.exists', 'INFO', any(dict)) + self.assertThat(self.context.auth_token, Is(None)) |