CVE-2015-6918

@@ -6,6 +6,7 @@
 
 # Import python libs
 import os
+import re
 import subprocess
 
 # Import salt libs
@@ -62,6 +63,7 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
                 result = __salt__['cmd.run_all'](cmd,
                                                  cwd=cwd,
                                                  runas=runas,
+                                                 output_loglevel='quiet',
                                                  env=env,
                                                  python_shell=False,
                                                  **kwargs)
@@ -73,7 +75,8 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
             if result['retcode'] == 0:
                 return result['stdout']
             else:
-                stderrs.append(result['stderr'])
+                stderr = _remove_sensitive_data(result['stderr'])
+                stderrs.append(stderr)
 
         # we've tried all IDs and still haven't passed, so error out
         raise CommandExecutionError("\n\n".join(stderrs))
@@ -82,6 +85,7 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
         result = __salt__['cmd.run_all'](cmd,
                                          cwd=cwd,
                                          runas=runas,
+                                         output_loglevel='quiet',
                                          env=env,
                                          python_shell=False,
                                          **kwargs)
@@ -90,9 +94,16 @@ def _git_run(cmd, cwd=None, runas=None, identity=None, **kwargs):
         if retcode == 0:
             return result['stdout']
         else:
+            stderr = _remove_sensitive_data(result['stderr'])
             raise CommandExecutionError(
-                'Command {0!r} failed. Stderr: {1!r}'.format(cmd,
-                                                             result['stderr']))
+                'Command {0!r} failed. Stderr: {1!r}'.format(cmd, stderr))
+
+
+def _remove_sensitive_data(sensitive_output):
+    '''
+        Remove HTTP user and password.
+    '''
+    return re.sub('(https?)://.*@', r'\1://<redacted>@', sensitive_output)
 
 
 def _git_getdir(cwd, user=None):

@@ -37,6 +37,24 @@ def test_http_basic_authentication(self):
             result = git._add_http_basic_auth(**kwargs)
             self.assertEqual(result, expected)
 
+    def test_https_user_and_pw_is_confidential(self):
+        sensitive_outputs = (
+            'https://deadbeaf@example.com',
+            'https://user:pw@example.com',
+        )
+        sanitized = 'https://<redacted>@example.com'
+        for sensitive_output in sensitive_outputs:
+            result = git._remove_sensitive_data(sensitive_output)
+            self.assertEqual(result, sanitized)
+
+    def test_git_ssh_user_is_not_treated_as_sensitive(self):
+        not_sensitive_outputs = (
+            'ssh://user@example.com',
+        )
+        for not_sensitive_output in not_sensitive_outputs:
+            result = git._remove_sensitive_data(not_sensitive_output)
+            self.assertEqual(result, not_sensitive_output)
+
 
 if __name__ == '__main__':
     from integration import run_tests