Merge branch 'ps-fix-250' into 'master'

Fix #250 - don't leak kbas user:pass in logs

Closes #250

See merge request !296

2 files changed, 6 insertions, 1 deletions

diff --git a/ybd/app.py b/ybd/app.py
index a748cc9..cedb7c5 100644
--- a/ybd/app.py
+++ b/ybd/app.py
@@ -18,6 +18,7 @@ import contextlib
 import datetime
 import os
 import fcntl
+import re
 import shutil
 import sys
 import warnings
@@ -114,6 +115,8 @@ def log_env(log, env, message=''):
     with open(log, "a") as logfile:
         for key in sorted(env):
             msg = env[key] if 'PASSWORD' not in key else '(hidden)'
+            if 'URL' in key.upper():
+                msg = re.sub(r'(https://)[^@]*@', '\\1', env[key])
             logfile.write('%s=%s\n' % (key, msg))
         logfile.write(message + '\n\n')
         logfile.flush()
@@ -238,6 +241,8 @@ def load_configs(config_files):
             for key, value in yaml.safe_load(text).items():
                 config[key.replace('_', '-')] = value
                 msg = value if 'PASSWORD' not in key.upper() else '(hidden)'
+                if 'URL' in key.upper():
+                    msg = re.sub(r'(https://)[^@]*@', '\\1', value)
                 print '   %s=%s' % (key.replace('_', '-'), msg)
         print
 
diff --git a/ybd/cache.py b/ybd/cache.py
index 345a8b2..c3ca632 100644
--- a/ybd/cache.py
+++ b/ybd/cache.py
@@ -229,7 +229,7 @@ def upload(dn):
         try:
             response = requests.post(url=url, data=params, files={"file": f})
             if response.status_code == 201:
-                app.log(dn, 'Uploaded %s to' % dn['cache'], url)
+                app.log(dn, 'Uploaded %s to kbas' % dn['cache'])
                 return
             if response.status_code == 777:
                 app.log(dn, 'Reproduced %s at' % md5(cachefile), dn['cache'])