Merge pull request #39 from galaxy-genome-annotation/4.2.5

Prevent from displaying login/password in the logs

Author: abretaud

README.rst

@@ -85,6 +85,8 @@ Or with the Arrow client:
 History
 -------
 
+- 4.2.5
+    - Prevent from displaying login/password in the logs
 - 4.2.4
     - Remove unused dependency
 - 4.2.3

apollo/client.py

@@ -44,6 +44,11 @@ def post(self, client_method, data, post_params=None, is_json=True, files=None,
         else:
             raise Exception("You must add credentials yourself")
 
+        # We don't want username+password in the logs
+        data_log = dict(data)
+        data_log['username'] = 'XXXXXXXXX'
+        data_log['password'] = 'XXXXXXXXX'
+
         if autoconvert_to_json:
             headers = {
                 'Content-Type': 'application/json'
@@ -55,8 +60,12 @@ def post(self, client_method, data, post_params=None, is_json=True, files=None,
         curl_command = ['curl', url]
         for (k, v) in headers.items():
             curl_command += ['-H', quote('%s: %s' % (k, v))]
+
+        curl_command_log = curl_command + ['-d', quote(json.dumps(data_log))]
+
         curl_command += ['-d', quote(json.dumps(data))]
-        log.info(' '.join(curl_command))
+
+        log.info(' '.join(curl_command_log))
 
         resp = requests.post(url, data=data, headers=headers, verify=self.__verify,
                              params=post_params, allow_redirects=False,

arrow/__init__.py

@@ -1 +1 @@
-__version__ = '4.2.4'
+__version__ = '4.2.5'

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="apollo",
-    version='4.2.4',
+    version='4.2.5',
     description="Apollo API library",
     long_description=readme,
     author="Helena Rasche;Anthony Bretaudeau;Nathan Dunn",