Merge pull request #48 from anxdpanic/dev

redact user ip from token logging

Author: anxdpanic

addon.xml

@@ -9,9 +9,7 @@
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
-[fix] Python 3 compat.
-[add] fast_bread param to usher
-[add/upd] helix endpoints
+[chg] redact user ip from token logging
         </news>
         <assets>
             <icon>icon.png</icon>

changelog.txt

@@ -1,3 +1,6 @@
+2.0.3
+[chg] redact user ip from token logging
+
 2.0.2
 [fix] Python 3 compat.
 [add] fast_bread param to usher

resources/lib/twitch/log.py

@@ -23,6 +23,7 @@ def _mask(message):
     masked_message = re.sub(r'(USER-IP=[\'"])[^\'"]+', r'\1' + mask, masked_message)
     masked_message = re.sub(r'(["\']client_secret["\']:\s*[\'"])[^\'"]+', r'\1' + mask, masked_message)
     masked_message = re.sub(r'(client_secret=).+?(&|$|\|)', r'\1' + mask + r'\2', masked_message)
+    masked_message = re.sub(r'(\\*"user_ip\\*":\\*").+?(\\*")', r'\1' + mask + r'\2', masked_message)
     return masked_message