From cdc201f4b298f5c13786d690aa2bb3d84123ee59 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 2 Jun 2018 09:48:20 +0200 Subject: [PATCH 1/1] fix log-anon script --- roles/apache/files/log-anon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/apache/files/log-anon b/roles/apache/files/log-anon index 51775a0..32b6c1e 100644 --- a/roles/apache/files/log-anon +++ b/roles/apache/files/log-anon @@ -1,6 +1,6 @@ #!/usr/bin/python import sys, re -from netaddr import IPAddress +from netaddr import IPAddress, AddrFormatError if len(sys.argv) != 2: print >>sys.stderr, "Usage: %s filename" % sys.argv[0] @@ -11,7 +11,7 @@ log = open(sys.argv[1], "a") # group 1 must be the prefix, group 2 the IP, group 3 the suffix ipmatch = r"([0-9a-f.:]+)" accesslog = re.compile(r"^(\S+ )"+ipmatch+r"( .*)$") -errorlog = re.compile(r"^(.* \[client )"+ipmatch+r"(\] .*)$") +errorlog = re.compile(r"^(.* \[client )"+ipmatch+r"(:[0-9]+\] .*)$") while True: line = sys.stdin.readline() @@ -33,7 +33,7 @@ while True: ip = ip & (IPAddress('255.255.255.0') if ip.version == 4 else IPAddress('ffff:ffff:ffff::')) # mask out a bunch of bits # now we have a parsed representation of the IP address we want to print log.write(prefix+str(ip)+suffix+"\n") - except (ValueError, netaddr.core.AddrFormatError): + except (ValueError, AddrFormatError): # not actually an IP address... log.write(line) log.flush() -- 2.30.2