diff options
| author |  jesopo | 2018-10-04 13:19:59 +0100 |
|---|---|---|
| committer | jesopo | 2018-10-04 13:19:59 +0100 |
| commit | 6b122523c0f86bdd950c789336831b412fda9497 (patch) | |
| tree | adc8aad3f460d2343bea284f1ffe6e2031bbea0c /modules | |
| parent | Look back through scrollback to find ipv4/ipv6 addresses to get rDNS for (diff) | |
Improve(?) IPv6 regex
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ip_addresses.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/ip_addresses.py b/modules/ip_addresses.py index e17e2fa7..84d25aa7 100644 --- a/modules/ip_addresses.py +++ b/modules/ip_addresses.py @@ -2,7 +2,7 @@ import re, socket from src import ModuleManager, utils URL_GEOIP = "http://ip-api.com/json/%s" -REGEX_IP = ("(?:\b|\s|^)((?:(?:[a-f0-9]{1,4}:){2,}|::)[^\s]+)(?:\b|\s|$)" # ipv6 +REGEX_IP = ("((?:(?:[a-f0-9]{1,4}:){2,}|[a-f0-9:]*::)[a-f0-9:]*)" # ipv6 "|" "((?:\d{1,3}\.){3}\d{1,3})") # ipv4 REGEX_IP = re.compile(REGEX_IP, re.I) @@ -77,4 +77,4 @@ class Module(ModuleManager.BaseModule): except (socket.herror, socket.gaierror) as e: event["stderr"].write(e.strerror) return - event["stdout"].write("%s: %s" % (ips[0], hostname)) + event["stdout"].write("(%s) %s" % (ips[0], hostname)) |