mirror of https://github.com/fail2ban/fail2ban
move IPAddr related code to dedicated source file ipaddr.py
Alexander Koeppe
parent
ce54db79bc
commit
1494b14b37
|
|
@ -0,0 +1,294 @@
|
|||
# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
|
||||
# vi: set ft=python sts=4 ts=4 sw=4 noet :
|
||||
|
||||
# This file is part of Fail2Ban.
|
||||
#
|
||||
# Fail2Ban is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# Fail2Ban is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with Fail2Ban; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
# Author: Alexander Koeppe
|
||||
#
|
||||
|
||||
__author__ = "Alexander Koeppe"
|
||||
__copyright__ = "Copyright (c) 2004 Cyril Jaquier"
|
||||
__license__ = "GPL"
|
||||
|
||||
import inspect
|
||||
import socket
|
||||
import struct
|
||||
import re
|
||||
|
||||
from functools import wraps
|
||||
|
||||
##
|
||||
# Helper functions / decorator
|
||||
#
|
||||
#
|
||||
def asip(ip):
|
||||
"""A little helper to guarantee ip being an IPAddr instance"""
|
||||
return ip if isinstance(ip, IPAddr) else IPAddr(ip)
|
||||
|
||||
def iparg(f):
|
||||
"""A helper decorator to simplify use of asip throughout the code"""
|
||||
args = inspect.getargspec(f).args
|
||||
# I consider clarity better than trying to avoid any duplication here
|
||||
# also better to make a decision at code parsing stage, not within the
|
||||
# actual decorator function (i.e. checkip)
|
||||
if args and args[0] == 'self':
|
||||
# method -- just above simpler version
|
||||
@wraps(f)
|
||||
def checkip(self, ip, *argv, **kwargs):
|
||||
return f(self, asip(ip), *argv, **kwargs)
|
||||
else:
|
||||
@wraps(f)
|
||||
def checkip(ip, *argv, **kwargs):
|
||||
return f(asip(ip), *argv, **kwargs)
|
||||
|
||||
return checkip
|
||||
|
||||
|
||||
##
|
||||
# Class for IP address handling.
|
||||
#
|
||||
# This class contains methods for handling IPv4 and IPv6 addresses.
|
||||
|
||||
class IPAddr:
|
||||
""" provide functions to handle IPv4 and IPv6 addresses
|
||||
"""
|
||||
|
||||
IP_CRE = re.compile("^(?:\d{1,3}\.){3}\d{1,3}$")
|
||||
IP6_CRE = re.compile("^[0-9a-fA-F]{4}[0-9a-fA-F:]+:[0-9a-fA-F]{1,4}|::1$")
|
||||
|
||||
# object attributes
|
||||
addr = 0
|
||||
family = socket.AF_UNSPEC
|
||||
plen = 0
|
||||
valid = False
|
||||
raw = ""
|
||||
|
||||
# object methods
|
||||
def __init__(self, ipstring, cidr=-1):
|
||||
""" initialize IP object by converting IP address string
|
||||
to binary to integer
|
||||
"""
|
||||
for family in [socket.AF_INET, socket.AF_INET6]:
|
||||
try:
|
||||
binary = socket.inet_pton(family, ipstring)
|
||||
except socket.error:
|
||||
continue
|
||||
else:
|
||||
self.valid = True
|
||||
break
|
||||
|
||||
if self.valid and family == socket.AF_INET:
|
||||
# convert host to network byte order
|
||||
self.addr, = struct.unpack("!L", binary)
|
||||
self.family = family
|
||||
self.plen = 32
|
||||
|
||||
# mask out host portion if prefix length is supplied
|
||||
if cidr != None and cidr >= 0:
|
||||
mask = ~(0xFFFFFFFFL >> cidr)
|
||||
self.addr = self.addr & mask
|
||||
self.plen = cidr
|
||||
|
||||
elif self.valid and family == socket.AF_INET6:
|
||||
# convert host to network byte order
|
||||
hi, lo = struct.unpack("!QQ", binary)
|
||||
self.addr = (hi << 64) | lo
|
||||
self.family = family
|
||||
self.plen = 128
|
||||
|
||||
# mask out host portion if prefix length is supplied
|
||||
if cidr != None and cidr >= 0:
|
||||
mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL >> cidr)
|
||||
self.addr = self.addr & mask
|
||||
self.plen = cidr
|
||||
|
||||
# if IPv6 address is a IPv4-compatible, make instance a IPv4
|
||||
elif self.isInNet(IPAddr("::ffff:0:0", 96)):
|
||||
self.addr = lo & 0xFFFFFFFFL
|
||||
self.family = socket.AF_INET
|
||||
self.plen = 32
|
||||
else:
|
||||
# string couldn't be converted neither to a IPv4 nor
|
||||
# to a IPv6 address - retain raw input for later use
|
||||
# (e.g. DNS resolution)
|
||||
self.raw = ipstring
|
||||
|
||||
def __repr__(self):
|
||||
return self.ntoa()
|
||||
|
||||
def __str__(self):
|
||||
return self.ntoa()
|
||||
|
||||
@iparg
|
||||
def __eq__(self, other):
|
||||
if not self.valid and not other.valid: return self.raw == other.raw
|
||||
if not self.valid or not other.valid: return False
|
||||
if self.addr != other.addr: return False
|
||||
if self.family != other.family: return False
|
||||
if self.plen != other.plen: return False
|
||||
return True
|
||||
|
||||
@iparg
|
||||
def __ne__(self, other):
|
||||
if not self.valid and not other.valid: return self.raw != other.raw
|
||||
if self.addr != other.addr: return True
|
||||
if self.family != other.family: return True
|
||||
if self.plen != other.plen: return True
|
||||
return False
|
||||
|
||||
@iparg
|
||||
def __lt__(self, other):
|
||||
return self.family < other.family or self.addr < other.addr
|
||||
|
||||
@iparg
|
||||
def __add__(self, other):
|
||||
return "%s%s" % (self, other)
|
||||
|
||||
@iparg
|
||||
def __radd__(self, other):
|
||||
return "%s%s" % (other, self)
|
||||
|
||||
def __hash__(self):
|
||||
return hash(self.addr)^hash((self.plen<<16)|self.family)
|
||||
|
||||
def hexdump(self):
|
||||
""" dump the ip address in as a hex sequence in
|
||||
network byte order - for debug purpose
|
||||
"""
|
||||
if self.family == socket.AF_INET:
|
||||
return "%08x" % self.addr
|
||||
elif self.family == socket.AF_INET6:
|
||||
return "%032x" % self.addr
|
||||
else:
|
||||
return ""
|
||||
|
||||
def ntoa(self):
|
||||
""" represent IP object as text like the depricated
|
||||
C pendant inet_ntoa() but address family independent
|
||||
"""
|
||||
if self.family == socket.AF_INET:
|
||||
# convert network to host byte order
|
||||
binary = struct.pack("!L", self.addr)
|
||||
elif self.family == socket.AF_INET6:
|
||||
# convert network to host byte order
|
||||
hi = self.addr >> 64
|
||||
lo = self.addr & 0xFFFFFFFFFFFFFFFFL
|
||||
binary = struct.pack("!QQ", hi, lo)
|
||||
else:
|
||||
return self.getRaw()
|
||||
|
||||
return socket.inet_ntop(self.family, binary)
|
||||
|
||||
def getPTR(self, suffix=""):
|
||||
""" generates the DNS PTR string of the provided IP address object
|
||||
if "suffix" is provided it will be appended as the second and top
|
||||
level reverse domain.
|
||||
if omitted it is implicitely set to the second and top level reverse
|
||||
domain of the according IP address family
|
||||
"""
|
||||
if self.family == socket.AF_INET:
|
||||
reversed_ip = ".".join(reversed(self.ntoa().split(".")))
|
||||
if not suffix:
|
||||
suffix = "in-addr.arpa."
|
||||
|
||||
return "%s.%s" % (reversed_ip, suffix)
|
||||
|
||||
elif self.family == socket.AF_INET6:
|
||||
reversed_ip = ".".join(reversed(self.hexdump()))
|
||||
if not suffix:
|
||||
suffix = "ip6.arpa."
|
||||
|
||||
return "%s.%s" % (reversed_ip, suffix)
|
||||
|
||||
else:
|
||||
return ""
|
||||
|
||||
def isIPv4(self):
|
||||
""" return true if the IP object is of address family AF_INET
|
||||
"""
|
||||
return True if self.family == socket.AF_INET else False
|
||||
|
||||
def isIPv6(self):
|
||||
""" return true if the IP object is of address family AF_INET6
|
||||
"""
|
||||
return True if self.family == socket.AF_INET6 else False
|
||||
|
||||
def getRaw(self):
|
||||
""" returns the raw attribute - should only be set
|
||||
to a non-empty string if prior address conversion
|
||||
wasn't possible
|
||||
"""
|
||||
return self.raw
|
||||
|
||||
def isValidIP(self):
|
||||
""" returns true if the IP object has been created
|
||||
from a valid IP address or false if not
|
||||
"""
|
||||
return self.valid
|
||||
|
||||
|
||||
@iparg
|
||||
def isInNet(self, net):
|
||||
""" returns true if the IP object is in the provided
|
||||
network (object)
|
||||
"""
|
||||
if self.family != net.family:
|
||||
return False
|
||||
|
||||
if self.family == socket.AF_INET:
|
||||
mask = ~(0xFFFFFFFFL >> net.plen)
|
||||
|
||||
elif self.family == socket.AF_INET6:
|
||||
mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL >> net.plen)
|
||||
else:
|
||||
return False
|
||||
|
||||
if self.addr & mask == net.addr:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
@staticmethod
|
||||
@iparg
|
||||
def masktoplen(mask):
|
||||
""" converts mask string to prefix length
|
||||
only used for IPv4 masks
|
||||
"""
|
||||
plen = 0
|
||||
while mask.addr:
|
||||
mask.addr = (mask.addr << 1) & 0xFFFFFFFFL
|
||||
plen += 1
|
||||
return plen
|
||||
|
||||
|
||||
@staticmethod
|
||||
def searchIP(text):
|
||||
""" Search if an IP address if directly available and return
|
||||
it.
|
||||
"""
|
||||
match = IPAddr.IP_CRE.match(text)
|
||||
if match:
|
||||
return match
|
||||
else:
|
||||
match = IPAddr.IP6_CRE.match(text)
|
||||
if match:
|
||||
return match
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ from .banmanager import BanManager
|
|||
from .jailthread import JailThread
|
||||
from .action import ActionBase, CommandAction, CallingMap
|
||||
from .mytime import MyTime
|
||||
from .filter import IPAddr
|
||||
from ..ipaddr import IPAddr
|
||||
from ..helpers import getLogger
|
||||
|
||||
# Gets the instance of the logger.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ from threading import RLock
|
|||
|
||||
from .mytime import MyTime
|
||||
from .ticket import FailTicket
|
||||
from .filter import IPAddr
|
||||
from ..ipaddr import IPAddr
|
||||
from ..helpers import getLogger
|
||||
|
||||
# Gets the instance of the logger.
|
||||
|
|
|
|||
|
|
@ -22,14 +22,12 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2011-2013 Yaroslav Halchenko"
|
|||
__license__ = "GPL"
|
||||
|
||||
import codecs
|
||||
import inspect
|
||||
import fcntl
|
||||
import locale
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
|
||||
from functools import wraps
|
||||
|
||||
from .failmanager import FailManagerEmpty, FailManager
|
||||
from .ticket import FailTicket
|
||||
|
|
@ -40,6 +38,7 @@ from .mytime import MyTime
|
|||
from .failregex import FailRegex, Regex, RegexException
|
||||
from .action import CommandAction
|
||||
from ..helpers import getLogger
|
||||
from ..ipaddr import IPAddr
|
||||
|
||||
# Gets the instance of the logger.
|
||||
logSys = getLogger(__name__)
|
||||
|
|
@ -912,258 +911,3 @@ class DNSUtils:
|
|||
|
||||
return ipList
|
||||
|
||||
def asip(ip):
|
||||
"""A little helper to guarantee ip being an IPAddr instance"""
|
||||
return ip if isinstance(ip, IPAddr) else IPAddr(ip)
|
||||
|
||||
def iparg(f):
|
||||
"""A helper decorator to simplify use of asip throughout the code"""
|
||||
args = inspect.getargspec(f).args
|
||||
# I consider clarity better than trying to avoid any duplication here
|
||||
# also better to make a decision at code parsing stage, not within the
|
||||
# actual decorator function (i.e. checkip)
|
||||
if args and args[0] == 'self':
|
||||
# method -- just above simpler version
|
||||
@wraps(f)
|
||||
def checkip(self, ip, *argv, **kwargs):
|
||||
return f(self, asip(ip), *argv, **kwargs)
|
||||
else:
|
||||
@wraps(f)
|
||||
def checkip(ip, *argv, **kwargs):
|
||||
return f(asip(ip), *argv, **kwargs)
|
||||
|
||||
return checkip
|
||||
|
||||
|
||||
##
|
||||
# Class for IP address handling.
|
||||
#
|
||||
# This class contains methods for handling IPv4 and IPv6 addresses.
|
||||
|
||||
class IPAddr:
|
||||
""" provide functions to handle IPv4 and IPv6 addresses
|
||||
"""
|
||||
|
||||
IP_CRE = re.compile("^(?:\d{1,3}\.){3}\d{1,3}$")
|
||||
IP6_CRE = re.compile("^[0-9a-fA-F]{4}[0-9a-fA-F:]+:[0-9a-fA-F]{1,4}|::1$")
|
||||
|
||||
# object attributes
|
||||
addr = 0
|
||||
family = socket.AF_UNSPEC
|
||||
plen = 0
|
||||
valid = False
|
||||
raw = ""
|
||||
|
||||
# object methods
|
||||
def __init__(self, ipstring, cidr=-1):
|
||||
""" initialize IP object by converting IP address string
|
||||
to binary to integer
|
||||
"""
|
||||
for family in [socket.AF_INET, socket.AF_INET6]:
|
||||
try:
|
||||
binary = socket.inet_pton(family, ipstring)
|
||||
except socket.error:
|
||||
continue
|
||||
else:
|
||||
self.valid = True
|
||||
break
|
||||
|
||||
if self.valid and family == socket.AF_INET:
|
||||
# convert host to network byte order
|
||||
self.addr, = struct.unpack("!L", binary)
|
||||
self.family = family
|
||||
self.plen = 32
|
||||
|
||||
# mask out host portion if prefix length is supplied
|
||||
if cidr != None and cidr >= 0:
|
||||
mask = ~(0xFFFFFFFFL >> cidr)
|
||||
self.addr = self.addr & mask
|
||||
self.plen = cidr
|
||||
|
||||
elif self.valid and family == socket.AF_INET6:
|
||||
# convert host to network byte order
|
||||
hi, lo = struct.unpack("!QQ", binary)
|
||||
self.addr = (hi << 64) | lo
|
||||
self.family = family
|
||||
self.plen = 128
|
||||
|
||||
# mask out host portion if prefix length is supplied
|
||||
if cidr != None and cidr >= 0:
|
||||
mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL >> cidr)
|
||||
self.addr = self.addr & mask
|
||||
self.plen = cidr
|
||||
|
||||
# if IPv6 address is a IPv4-compatible, make instance a IPv4
|
||||
elif self.isInNet(IPAddr("::ffff:0:0", 96)):
|
||||
self.addr = lo & 0xFFFFFFFFL
|
||||
self.family = socket.AF_INET
|
||||
self.plen = 32
|
||||
else:
|
||||
# string couldn't be converted neither to a IPv4 nor
|
||||
# to a IPv6 address - retain raw input for later use
|
||||
# (e.g. DNS resolution)
|
||||
self.raw = ipstring
|
||||
|
||||
def __repr__(self):
|
||||
return self.ntoa()
|
||||
|
||||
def __str__(self):
|
||||
return self.ntoa()
|
||||
|
||||
@iparg
|
||||
def __eq__(self, other):
|
||||
if not self.valid and not other.valid: return self.raw == other.raw
|
||||
if not self.valid or not other.valid: return False
|
||||
if self.addr != other.addr: return False
|
||||
if self.family != other.family: return False
|
||||
if self.plen != other.plen: return False
|
||||
return True
|
||||
|
||||
@iparg
|
||||
def __ne__(self, other):
|
||||
if not self.valid and not other.valid: return self.raw != other.raw
|
||||
if self.addr != other.addr: return True
|
||||
if self.family != other.family: return True
|
||||
if self.plen != other.plen: return True
|
||||
return False
|
||||
|
||||
@iparg
|
||||
def __lt__(self, other):
|
||||
return self.family < other.family or self.addr < other.addr
|
||||
|
||||
@iparg
|
||||
def __add__(self, other):
|
||||
return "%s%s" % (self, other)
|
||||
|
||||
@iparg
|
||||
def __radd__(self, other):
|
||||
return "%s%s" % (other, self)
|
||||
|
||||
def __hash__(self):
|
||||
return hash(self.addr)^hash((self.plen<<16)|self.family)
|
||||
|
||||
def hexdump(self):
|
||||
""" dump the ip address in as a hex sequence in
|
||||
network byte order - for debug purpose
|
||||
"""
|
||||
if self.family == socket.AF_INET:
|
||||
return "%08x" % self.addr
|
||||
elif self.family == socket.AF_INET6:
|
||||
return "%032x" % self.addr
|
||||
else:
|
||||
return ""
|
||||
|
||||
def ntoa(self):
|
||||
""" represent IP object as text like the depricated
|
||||
C pendant inet_ntoa() but address family independent
|
||||
"""
|
||||
if self.family == socket.AF_INET:
|
||||
# convert network to host byte order
|
||||
binary = struct.pack("!L", self.addr)
|
||||
elif self.family == socket.AF_INET6:
|
||||
# convert network to host byte order
|
||||
hi = self.addr >> 64
|
||||
lo = self.addr & 0xFFFFFFFFFFFFFFFFL
|
||||
binary = struct.pack("!QQ", hi, lo)
|
||||
else:
|
||||
return self.getRaw()
|
||||
|
||||
return socket.inet_ntop(self.family, binary)
|
||||
|
||||
def getPTR(self, suffix=""):
|
||||
""" generates the DNS PTR string of the provided IP address object
|
||||
if "suffix" is provided it will be appended as the second and top
|
||||
level reverse domain.
|
||||
if omitted it is implicitely set to the second and top level reverse
|
||||
domain of the according IP address family
|
||||
"""
|
||||
if self.family == socket.AF_INET:
|
||||
reversed_ip = ".".join(reversed(self.ntoa().split(".")))
|
||||
if not suffix:
|
||||
suffix = "in-addr.arpa."
|
||||
|
||||
return "%s.%s" % (reversed_ip, suffix)
|
||||
|
||||
elif self.family == socket.AF_INET6:
|
||||
reversed_ip = ".".join(reversed(self.hexdump()))
|
||||
if not suffix:
|
||||
suffix = "ip6.arpa."
|
||||
|
||||
return "%s.%s" % (reversed_ip, suffix)
|
||||
|
||||
else:
|
||||
return ""
|
||||
|
||||
def isIPv4(self):
|
||||
""" return true if the IP object is of address family AF_INET
|
||||
"""
|
||||
return True if self.family == socket.AF_INET else False
|
||||
|
||||
def isIPv6(self):
|
||||
""" return true if the IP object is of address family AF_INET6
|
||||
"""
|
||||
return True if self.family == socket.AF_INET6 else False
|
||||
|
||||
def getRaw(self):
|
||||
""" returns the raw attribute - should only be set
|
||||
to a non-empty string if prior address conversion
|
||||
wasn't possible
|
||||
"""
|
||||
return self.raw
|
||||
|
||||
def isValidIP(self):
|
||||
""" returns true if the IP object has been created
|
||||
from a valid IP address or false if not
|
||||
"""
|
||||
return self.valid
|
||||
|
||||
|
||||
def isInNet(self, net):
|
||||
""" returns true if the IP object is in the provided
|
||||
network (object)
|
||||
"""
|
||||
if self.family != net.family:
|
||||
return False
|
||||
|
||||
if self.family == socket.AF_INET:
|
||||
mask = ~(0xFFFFFFFFL >> net.plen)
|
||||
|
||||
elif self.family == socket.AF_INET6:
|
||||
mask = ~(0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFL >> net.plen)
|
||||
else:
|
||||
return False
|
||||
|
||||
if self.addr & mask == net.addr:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
@staticmethod
|
||||
def masktoplen(maskstr):
|
||||
""" converts mask string to prefix length
|
||||
only used for IPv4 masks
|
||||
"""
|
||||
mask = IPAddr(maskstr)
|
||||
plen = 0
|
||||
while mask.addr:
|
||||
mask.addr = (mask.addr << 1) & 0xFFFFFFFFL
|
||||
plen += 1
|
||||
return plen
|
||||
|
||||
|
||||
@staticmethod
|
||||
def searchIP(text):
|
||||
""" Search if an IP address if directly available and return
|
||||
it.
|
||||
"""
|
||||
match = IPAddr.IP_CRE.match(text)
|
||||
if match:
|
||||
return match
|
||||
else:
|
||||
match = IPAddr.IP6_CRE.match(text)
|
||||
if match:
|
||||
return match
|
||||
else:
|
||||
return None
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ import unittest
|
|||
from ..server.banmanager import BanManager
|
||||
from ..server.ticket import BanTicket
|
||||
from .utils import assert_dict_equal
|
||||
from ..server.filter import IPAddr
|
||||
from ..ipaddr import IPAddr
|
||||
|
||||
|
||||
class AddFailure(unittest.TestCase):
|
||||
|
|
|
|||
|
|
@ -29,10 +29,11 @@ import tempfile
|
|||
import sqlite3
|
||||
import shutil
|
||||
|
||||
from ..server.filter import FileContainer, IPAddr
|
||||
from ..server.filter import FileContainer
|
||||
from ..server.mytime import MyTime
|
||||
from ..server.ticket import FailTicket
|
||||
from ..server.actions import Actions
|
||||
from ..ipaddr import IPAddr
|
||||
from .dummyjail import DummyJail
|
||||
try:
|
||||
from ..server.database import Fail2BanDb
|
||||
|
|
|
|||
|
|
@ -38,9 +38,10 @@ except ImportError:
|
|||
|
||||
from ..server.jail import Jail
|
||||
from ..server.filterpoll import FilterPoll
|
||||
from ..server.filter import Filter, FileFilter, DNSUtils, IPAddr
|
||||
from ..server.filter import Filter, FileFilter, DNSUtils
|
||||
from ..server.failmanager import FailManagerEmpty
|
||||
from ..server.mytime import MyTime
|
||||
from ..ipaddr import IPAddr
|
||||
from .utils import setUpMyTime, tearDownMyTime, mtimesleep, LogCaptureTestCase
|
||||
from .dummyjail import DummyJail
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ from ..server.failregex import Regex, FailRegex, RegexException
|
|||
from ..server.server import Server
|
||||
from ..server.jail import Jail
|
||||
from ..server.jailthread import JailThread
|
||||
from ..server.filter import IPAddr
|
||||
from ..ipaddr import IPAddr
|
||||
from .utils import LogCaptureTestCase
|
||||
from ..helpers import getLogger
|
||||
from .. import version
|
||||
|
|
|
|||
Loading…
Reference in New Issue