|
90 | 90 | sys.exit(4) |
91 | 91 |
|
92 | 92 | __author__ = 'Hari Sekhon' |
93 | | -__version__ = '0.10.0' |
| 93 | +__version__ = '0.10.1' |
94 | 94 |
|
95 | 95 | ip_regex = r'(?!127\.0\.0\.)' + ip_regex |
96 | 96 | subnet_mask_regex = r'(?!127\.0\.0\.)' + subnet_mask_regex |
@@ -296,6 +296,8 @@ def __init__(self): |
296 | 296 | 'aws4': r'\b[A-Za-z0-9][A-Za-z0-9/+=-]{38}[A-Za-z0-9]\b', # secret key |
297 | 297 | 'aws5': r'\b[A-Za-z0-9][A-Za-z0-9/+=-]{238,}', # STS token - no \b at end as it'll stop before '==' suffix |
298 | 298 | 'aws6': r'\bASIA[A-Za-z0-9]{16}\b', # sts temporary access key |
| 299 | + 'aws7': r'\bsg-[a-z0-9]{8}(?!\w)', # security group id |
| 300 | + 'aws8': r'(\bs3a?)://[^/]+/', # s3 bucket name |
299 | 301 | # don't change hostname or fqdn regex without updating hash_hostnames() option parse |
300 | 302 | # since that replaces these replacements and needs to match the grouping captures and surrounding format |
301 | 303 | 'hostname2': r'({aws_host_ip})(?!-\d)'.format(aws_host_ip=aws_host_ip_regex), |
@@ -407,6 +409,8 @@ def __init__(self): |
407 | 409 | 'aws4': r'<secret_key>', |
408 | 410 | 'aws5': r'<sts_token>', |
409 | 411 | 'aws6': r'<sts_access_key>', |
| 412 | + 'aws7': r'<security_group>', |
| 413 | + 'aws8': r'\1://<bucket>/', |
410 | 414 | 'hostname': r'<hostname>:\2', |
411 | 415 | #'hostname2': '<aws_hostname>', |
412 | 416 | 'hostname2': r'<ip-x-x-x-x>', |
|
0 commit comments