Merge "Mask passwords included without quotes at the ends of commands"

openstack-archive · Jun 27, 2014 · e9bb0b5 · e9bb0b5
2 parents 5c835cf + 5e3d3a5
commit e9bb0b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/openstack/common/log.py b/openstack/common/log.py
@@ -62,7 +62,7 @@
                     r'([\'"].*?%(key)s[\'"]\s*:\s*u?[\'"]).*?([\'"])',
                     r'([\'"].*?%(key)s[\'"]\s*,\s*\'--?[A-z]+\'\s*,\s*u?[\'"])'
                     '.*?([\'"])',
-                    r'(%(key)s\s*--?[A-z]+\s*).*?([\s])']
+                    r'(%(key)s\s*--?[A-z]+\s*)\S+(\s*)']
 
 for key in _SANITIZE_KEYS:
     for pattern in _FORMAT_PATTERNS:

diff --git a/tests/unit/test_log.py b/tests/unit/test_log.py
@@ -907,6 +907,12 @@ def test_mask_password(self):
                     "'***', 'nomask'")
         self.assertEqual(expected, log.mask_password(payload))
 
+        payload = ("test = 'node.session.auth.password', '--password', "
+                   "'mypassword'")
+        expected = ("test = 'node.session.auth.password', '--password', "
+                    "'***'")
+        self.assertEqual(expected, log.mask_password(payload))
+
         payload = "test = node.session.auth.password -v mypassword nomask"
         expected = "test = node.session.auth.password -v *** nomask"
         self.assertEqual(expected, log.mask_password(payload))
@@ -916,3 +922,7 @@ def test_mask_password(self):
         expected = ("test = node.session.auth.password --password *** "
                     "nomask")
         self.assertEqual(expected, log.mask_password(payload))
+
+        payload = ("test = node.session.auth.password --password mypassword")
+        expected = ("test = node.session.auth.password --password ***")
+        self.assertEqual(expected, log.mask_password(payload))