Due to the UNION query in address_list, the assumption that the list of
gids received from the database would be continuous does not hold.
To prevent addresses for domains with multiple entry types from being
listed, it is necessary to check the list of domain gids for every
entry.
Signed-off-by: martin f. krafft <madduck@debian.org>
---
VirtualMailManager/common.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
# -*- coding: UTF-8 -*-# Copyright (c) 2011 - 2012, Pascal Volk# See COPYING for distribution information.""" VirtualMailManager.network ~~~~~~~~~~~~~~~~~~~~~~~~~~ Network/IP address related class and function"""importsocketclassNetInfo(object):"""Simple class for CIDR network addresses an IP addresses."""__slots__=('_addr','_prefix','_bits_max','_family','_nw_addr')def__init__(self,nw_address):"""Creates a new `NetInfo` instance. Argument: `nw_address` : basestring string representation of an IPv4/IPv6 address or network address. E.g. 192.0.2.13, 192.0.2.0/24, 2001:db8::/32 or ::1 When the address has no netmask the prefix length will be set to 32 for IPv4 addresses and 128 for IPv6 addresses. """self._addr=Noneself._prefix=0self._bits_max=0self._family=0self._nw_addr=nw_addressself._parse_net_range()def__hash__(self):returnhash((self._addr,self._family,self._prefix))def__repr__(self):return"NetInfo('%s')"%self._nw_addrdef_parse_net_range(self):"""Parse the network range of `self._nw_addr and assign values to the class attributes. `"""sep='/'ifself._nw_addr.count(sep):ip_address,sep,self._prefix=self._nw_addr.partition(sep)self._family,self._addr=get_ip_addr_info(ip_address)else:self._family,self._addr=get_ip_addr_info(self._nw_addr)self._bits_max=(128,32)[self._familyissocket.AF_INET]ifself._prefixis0:self._prefix=self._bits_maxelse:try:self._prefix=int(self._prefix)exceptValueError:raiseValueError('Invalid prefix length: %r'%self._prefix)ifself._prefix>self._bits_maxorself._prefix<0:raiseValueError('Invalid prefix length: %r'%self._prefix)@propertydeffamily(self):"""Address family: `socket.AF_INET` or `socket.AF_INET6`"""returnself._familydefaddress_in_net(self,ip_address):"""Checks if the `ip_address` belongs to the same subnet."""family,address=get_ip_addr_info(ip_address)iffamily!=self._family:returnFalsereturnaddress>>self._bits_max-self._prefix== \self._addr>>self._bits_max-self._prefixdefget_ip_addr_info(ip_address):"""Checks if the string `ip_address` is a valid IPv4 or IPv6 address. When the `ip_address` could be validated successfully a tuple `(address_family, address_as_long)` will be returned. The `address_family`will be either `socket.AF_INET` or `socket.AF_INET6`. """ifnotisinstance(ip_address,basestring)ornotip_address:raiseTypeError('ip_address must be a non empty string.')ifnotip_address.count(':'):family=socket.AF_INETtry:address=socket.inet_aton(ip_address)exceptsocket.error:raiseValueError('Not a valid IPv4 address: %r'%ip_address)elifnotsocket.has_ipv6:raiseValueError('Unsupported IP address (IPv6): %r'%ip_address)else:family=socket.AF_INET6try:address=socket.inet_pton(family,ip_address)exceptsocket.error:raiseValueError('Not a valid IPv6 address: %r'%ip_address)return(family,long(address.encode('hex'),16))