Fix sanitize basic auth urls same line bug

bosondata · Sep 29, 2016 · a2787e4 · a2787e4
1 parent 54ccf51
commit a2787e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/badwolf/utils.py b/badwolf/utils.py
@@ -8,7 +8,7 @@
 import six
 
 BASIC_AUTH_URL_RE = re.compile(
-    r'(?P<protocol>\S+?//)(?P<username>[^:]+?):(?P<password>[^@]+?)@(?P<address>\S+?)',
+    r'(?P<protocol>\S+?//)(?P<username>[^:\s]+?):(?P<password>[^@\s]+?)@(?P<address>\S+?)',
     re.I | re.U
 )
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -41,3 +41,16 @@ def test_sanitize_basic_auth_urls():
     assert 'pwd' not in sanitized
     assert 'http://example.com' in sanitized
     assert 'git+https://***:***@example.com' in sanitized
+
+
+def test_sanitize_basic_auth_urls_same_line():
+    text = '''abc
+    http://example.com -e git+https://user:pwd@example.com/
+
+    def
+    '''
+    sanitized = sanitize_sensitive_data(text)
+    assert 'user' not in sanitized
+    assert 'pwd' not in sanitized
+    assert 'http://example.com' in sanitized
+    assert 'git+https://***:***@example.com' in sanitized