added hive warehouse db/table match and tightened domain\user format to avoid newlines and carriage returns

HariSekhon · HariSekhon · commit 7a857e497faf · 2020-01-23T13:13:08.000Z
diff --git a/anonymize.py b/anonymize.py
@@ -90,7 +90,7 @@
     sys.exit(4)
 
 __author__ = 'Hari Sekhon'
-__version__ = '0.10.8'
+__version__ = '0.10.9'
 
 ip_regex = r'(?!127\.0\.0\.)' + ip_regex
 subnet_mask_regex = r'(?!127\.0\.0\.)' + subnet_mask_regex
@@ -320,6 +320,7 @@ def __init__(self):
                            id_or_name=id_or_name,
                            switch_prefix=switch_prefix),
             'db4': r'(\s(?:in|of)\s+(column|table|database|schema)\s+[\'"])[^\'"]+',
+            'db5': r'/+user/+hive/+warehouse/+([A-Za-z0-9_-]+/+)*[A-Za-z0-9_-]+.db/+[A-Za-z0-9_-]+',
             'generic': r'(\bfileb?)://{filename_regex}'.format(filename_regex=filename_regex),
             'generic2': r'({switch_prefix}key{id_or_name}?{arg_sep})\S+'\
                    .format(arg_sep=arg_sep,
@@ -357,7 +358,7 @@ def __init__(self):
             'user': r'([-\.]{user_name}{sep})\S+'.format(user_name=user_name, sep=arg_sep),
             'user2': r'/(home|user)/{user}'.format(user=user_regex),
             'user3': r'({user_name}{sep}){user}'.format(user_name=user_name, sep=arg_sep, user=user_regex),
-            'user4': r'(?<![\w\\]){NT_DOMAIN}(?!\\n\d\d\d\d-\d\d-\d\d)\\{user}(?!\\)'\
+            'user4': r'(?<![\w\\]){NT_DOMAIN}(?!\\r|\\n)(?!\\n\d\d\d\d-\d\d-\d\d)\\{user}(?!\\)'\
                      .format(NT_DOMAIN=r'\b[\w-]{1,15}\b', user=user_regex),
             'user5': r'for\s+user\s+{user}'.format(user=user_regex),
             # (?<!>/) exclude patterns '>/' where we have already matched and token replaced
@@ -456,6 +457,7 @@ def __init__(self):
             'db2': r'\1<database_instance>',
             'db3': r'\1<schema>',
             'db4': r'\1<\2>',
+            'db5': r'/user/hive/warehouse/<database>.db/<table>',
             'generic': r'\1://<file>',
             'generic2': r'\1<key>',
             'generic3': r'\1<cluster>',
