Attachment #2016 for bug #15687




univention-directory-manager-modules (5.1.13-1) unstable; urgency=low

  * merged with trunk v5.0.45-1 (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Fri, 13 Nov 2009 13:49:52 +0100

univention-directory-manager-modules (5.1.12-2) unstable; urgency=low

  * udm now stores IPv6 addresses as aAAARecord for forward zones in LDAP
    (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Fri, 13 Nov 2009 12:27:41 +0100

univention-directory-manager-modules (5.1.12-1) unstable; urgency=low

  * merged with trunk (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed,  4 Nov 2009 14:04:51 +0100

univention-directory-manager-modules (5.1.11-1) unstable; urgency=low

  * make DNS filters IPv6-capable (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed,  4 Nov 2009 11:48:49 +0100

univention-directory-manager-modules (5.1.10-1) unstable; urgency=low

  * small bugfixes in syntax check (Bug #15555)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 13 Oct 2009 09:39:47 +0200

univention-directory-manager-modules (5.1.9-1) unstable; urgency=low

  * use ipaddr module for syntax check (Bug #15555)
  * fixed typos

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 12 Oct 2009 14:08:31 +0200

univention-directory-manager-modules (5.1.8-1) unstable; urgency=low

  * German translations update in syntax (Bug #15555)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Fri,  9 Oct 2009 12:22:16 +0200

univention-directory-manager-modules (5.1.7-1) unstable; urgency=low

  * IPv6 forward and reverse zones are now correctly stored in ldap (Bug #15687)
  * fixes in DNS syntax check and add another IPv6 syntax check
  * first version which uses new ipaddr module

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Thu,  8 Oct 2009 11:51:26 +0200

univention-directory-manager-modules (5.1.6-1) unstable; urgency=low

  * add IPv6 to 'ipAdress' syntax check
  * bugfixes in IPv6 DNS-handling (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 28 Sep 2009 14:42:14 +0200

univention-directory-manager-modules (5.1.5-1) unstable; urgency=low

  * add IPv6 syntax check for DNS and some comments (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Tue, 22 Sep 2009 09:19:30 +0200

univention-directory-manager-modules (5.1.4-1) unstable; urgency=low

  * alias, forward_zone and ptr_record are now IPv6-ready ( Bug #15687)
  * bugfixes in reverse_zone and host_record

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 21 Sep 2009 14:09:35 +0200

univention-directory-manager-modules (5.1.3-1) unstable; urgency=low

  * udm reverse_zone is now IPv6-ready (Bug #15687)
  * add syntax-checking for IPv6-subnets
  * nicer code in dns/host_record

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Fri, 18 Sep 2009 13:26:19 +0200

univention-directory-manager-modules (5.1.2-1) unstable; urgency=low

  * removed aaaa in UDM (Bug #15687)
  * udm dns/host_record create and modify now handles aRecord and aAAARecord 
  attributes in ldap depending on IP address version
  * udm dns/host_record modify ... --append and --remove checks also IP address 
  version, --set replaces all old entries

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Mon, 14 Sep 2009 15:54:16 +0200

univention-directory-manager-modules (5.1.1-1) unstable; urgency=low

  * add possibility to create AAAA records with UDM: --set aaaa="IPv6-address" (Bug #15687)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Fri,  4 Sep 2009 17:32:34 +0200

univention-directory-manager-modules (5.1.0-1) unstable; urgency=low

  * add possibility to add IPv6 addresses and check syntax for IPv4 / IPv6 in module computers (Bug #15555)

 -- Kai-Wilhelm Bolte <bolte@univention.de>  Wed,  2 Sep 2009 11:56:53 +0200

univention-directory-manager-modules (5.0.45-1) unstable; urgency=low

  * fix some more policy translation bugs (Bug: #14815)




	
def lookup(co, lo, filter_s, base='', superordinate=None, scope="sub", unique=0, required=0, timeout=-1, sizelimit=0):

	filter=univention.admin.filter.conjunction('|', [
		univention.admin.filter.conjunction('&', [
		univention.admin.filter.expression('objectClass', 'dNSZone'),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('ARecord', '*')]),
		univention.admin.filter.expression('CNAMERecord', '*')]),
		univention.admin.filter.conjunction('&', [
		univention.admin.filter.expression('objectClass', 'dNSZone'),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.ip6.arpa')]), # IPv6
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('AAAARecord', '*')]),
		univention.admin.filter.expression('CNAMERecord', '*')])
		])

	if superordinate:

	return res

def identify(dn, attr, canonical=0):
	# IPv4 + IPv6
	return 'dNSZone' in attr.get('objectClass', []) and\
		'@' not in attr.get('relativeDomainName', []) and\
		not attr['zoneName'][0].endswith('.arpa') and\
		'*' in attr.get('CNAMERecord', []) and\
		not ('*' in attr.get('ARecord', []) or '*' in attr.get('AAAARecord', []))

def lookup_alias_filter(lo, filter_s):
	_re=re.compile('(.*)\(dnsAlias=([^=,]+)\)(.*)')

Lines 265-271 Link Here

(-)modules/univention/admin/handlers/dns/forward_zone.py (-4 / +10 lines)
265	def _ldap_modlist(self):	265	def _ldap_modlist(self):
266	ml=univention.admin.handlers.simpleLdap._ldap_modlist(self)	266	ml=univention.admin.handlers.simpleLdap._ldap_modlist(self)
267	if self.hasChanged(['nameserver', 'contact', 'serial', 'refresh', 'retry', 'expire', 'ttl']):	267	if self.hasChanged(['nameserver', 'contact', 'serial', 'refresh', 'retry', 'expire', 'ttl']):
268	ipaddr = re.compile ('^([0-9]{1,3}\.){3}[0-9]{1,3}$') # matches ip addresses - they shouldn't end with a dot!	268	# match IPv4 OR IPv6 address (incl. IPv4-mapped IPv6), they shouldn't end with a dot
		269	ipaddr = re.compile ('^((0\|[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2})(\.(0\|[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2})){3})\|((?!.?::.?::)[0-9a-fA-F]{0,4}(?:(?:(?<!::):\|(?<=::))[0-9a-fA-F]{0,4}){5}(?:(?:(?<!::):\|(?<=::))(?:[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2}0)(?:\.(?:[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2}\|0)){3}\|(?:(?:(?<!::):\|(?<=::))[0-9a-fA-F]{0,4}){2}))$')
269	if len (self['nameserver'][0]) > 0 \	270	if len (self['nameserver'][0]) > 0 \
270	and ipaddr.match (self['nameserver'][0]) == None \	271	and ipaddr.match (self['nameserver'][0]) == None \
271	and self['nameserver'][0].find (':') == -1 \	272	and self['nameserver'][0].find (':') == -1 \
Lines 283-292 Link Here
283		284
284	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):	285	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
285		286
286	filter=univention.admin.filter.conjunction('&', [	287	filter=univention.admin.filter.conjunction('\|', [
		288	univention.admin.filter.conjunction('&', [
287	univention.admin.filter.expression('objectClass', 'dNSZone'),	289	univention.admin.filter.expression('objectClass', 'dNSZone'),
288	univention.admin.filter.expression('relativeDomainName', '@'),	290	univention.admin.filter.expression('relativeDomainName', '@'),
289	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')])	291	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')])]),
		292	univention.admin.filter.conjunction('&', [
		293	univention.admin.filter.expression('objectClass', 'dNSZone'),
		294	univention.admin.filter.expression('relativeDomainName', '@'),
		295	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.ip6.arpa')])]) # IPv6
290	])	296	])
291		297
292	if filter_s:	298	if filter_s:
Lines 304-307 Link Here
304		310
305	return 'dNSZone' in attr.get('objectClass', []) and\	311	return 'dNSZone' in attr.get('objectClass', []) and\
306	['@'] == attr.get('relativeDomainName', []) and\	312	['@'] == attr.get('relativeDomainName', []) and\
307	not attr['zoneName'][0].endswith('.in-addr.arpa')	313	not attr['zoneName'][0].endswith('.arpa') # IPv6 + IPv4

Lines 123-132 Link Here

(-)modules/univention/admin/handlers/dns/ptr_record.py (-3 / +8 lines)
123		123
124	def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0, required=0, timeout=-1, sizelimit=0):	124	def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0, required=0, timeout=-1, sizelimit=0):
125		125
126	filter=univention.admin.filter.conjunction('&', [	126	filter=univention.admin.filter.conjunction('\|', [
		127	univention.admin.filter.conjunction('&', [
127	univention.admin.filter.expression('objectClass', 'dNSZone'),	128	univention.admin.filter.expression('objectClass', 'dNSZone'),
128	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),	129	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
129	univention.admin.filter.expression('zoneName', '*.in-addr.arpa')	130	univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
		131	univention.admin.filter.conjunction('&', [
		132	univention.admin.filter.expression('objectClass', 'dNSZone'),
		133	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
		134	univention.admin.filter.expression('zoneName', '*.ip6.arpa')]) # IPv6
130	])	135	])
131		136
132	if superordinate:	137	if superordinate:
Lines 146-149 Link Here
146		151
147	return 'dNSZone' in attr.get('objectClass', []) and\	152	return 'dNSZone' in attr.get('objectClass', []) and\
148	'@' not in attr.get('relativeDomainName', []) and\	153	'@' not in attr.get('relativeDomainName', []) and\
149	attr['zoneName'][0].endswith('.in-addr.arpa')	154	attr['zoneName'][0].endswith('.arpa') # IPv4 + IPv6




]

def mapSubnet(subnet):
	v=[]
	if ':' in subnet: # IPv6
		q=subnet.split(':')
		for t in q:
			u=t.zfill(4)
			v.append((u))
		[v.append('0000') for x in v if len(v) < 4]
		v=list(''.join(v))
		v.reverse()
		return string.join(v, '.')+'.ip6.arpa'
	else:
		q=subnet.split('.')
		q.reverse()
		return string.join(q, '.')+'.in-addr.arpa'
  
def unmapSubnet(zone):
	if type(zone) == types.ListType:
		zone=zone[0]
	zone=zone.replace('.in-addr.arpa', '')
	q=zone.split('.')
	q.reverse()
	return string.join(q, '.')

	if zone.find('ip6')!=-1: # IPv6
		zone=zone.replace('.ip6.arpa', '')
		q=zone.split('.')
		q.reverse()
		q=[''.join(q[0:4]),''.join(q[4:8]),''.join(q[8:12]),''.join(q[12:16])]
		return string.join(q, ':')

	else:
		zone=zone.replace('.in-addr.arpa', '')
		q=zone.split('.')
		q.reverse()
		return string.join(q, '.')

mapping=univention.admin.mapping.mapping()
mapping.register('subnet', 'zoneName', mapSubnet, unmapSubnet)
mapping.register('zonettl','dNSTTL', None, univention.admin.mapping.ListToString)


def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):

	filter=univention.admin.filter.conjunction('|', [
			univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'dNSZone'),
			univention.admin.filter.expression('relativeDomainName', '@'),
			univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
			univention.admin.filter.conjunction('&', [
			univention.admin.filter.expression('objectClass', 'dNSZone'),
			univention.admin.filter.expression('relativeDomainName', '@'),
			univention.admin.filter.expression('zoneName', '*.ip6.arpa')]) # IPv6
			])

	if filter_s:
		filter_p=univention.admin.filter.parse(filter_s)


	return 'dNSZone' in attr.get('objectClass', []) and\
		['@'] == attr.get('relativeDomainName', []) and\
		attr['zoneName'][0].endswith('.arpa') # IPv4 + IPv6

def quickDescription(rdn):


Lines 163-171 Link Here

(-)modules/univention/admin/handlers/dns/srv_record.py (-3 / +3 lines)
163	filter=univention.admin.filter.conjunction('&', [	163	filter=univention.admin.filter.conjunction('&', [
164	univention.admin.filter.expression('objectClass', 'dNSZone'),	164	univention.admin.filter.expression('objectClass', 'dNSZone'),
165	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),	165	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
166	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),	166	univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.arpa')]),
167	univention.admin.filter.expression('sRVRecord', '*'),	167	univention.admin.filter.expression('sRVRecord', '*'),
168	])	168	]) # IPv4 + IPv6
169		169
170	if superordinate:	170	if superordinate:
171	filter.expressions.append(univention.admin.filter.expression('zoneName', superordinate.mapping.mapValue('zone', superordinate['zone'])))	171	filter.expressions.append(univention.admin.filter.expression('zoneName', superordinate.mapping.mapValue('zone', superordinate['zone'])))
Lines 184-187 Link Here
184		184
185	return 'dNSZone' in attr.get('objectClass', []) and\	185	return 'dNSZone' in attr.get('objectClass', []) and\
186	'@' not in attr.get('relativeDomainName', []) and\	186	'@' not in attr.get('relativeDomainName', []) and\
187	not attr['zoneName'][0].endswith('.in-addr.arpa')	187	not attr['zoneName'][0].endswith('.arpa') # IPv4 + IPv6





mapping=univention.admin.mapping.mapping()
mapping.register('name', 'relativeDomainName', None, univention.admin.mapping.ListToString)
mapping.register('a', 'aRecord')
mapping.register('mx', 'mXRecord', mapMX, unmapMX)
mapping.register('txt', 'tXTRecord')
mapping.register('zonettl', 'dNSTTL', None, univention.admin.mapping.ListToString)


		univention.admin.handlers.simpleLdap.__init__(self, co, lo, position, dn, superordinate)

	def open(self): # IPv6
	    univention.admin.handlers.simpleLdap.open(self)
	    self.info['a']=[]
	    if self.oldattr.has_key('aRecord'):
		self.info['a'].extend((self.oldattr.get('aRecord')))
	    if self.oldattr.has_key('aAAARecord'):
		self.info['a'].extend((self.oldattr.get('aAAARecord')))
	    self.save() # safe current state as old state

	def exists(self):
		return self._exists


			(self.superordinate.mapping.mapName('zone'), self.superordinate.mapping.mapValue('zone', self.superordinate['zone'])),
		]

	def _ldap_modlist(self): # IPv6
		ml=univention.admin.handlers.simpleLdap._ldap_modlist(self)
		old = self.oldinfo.get('a')
		new = self.info.get('a')
		ao=[]
		an=[]
		aaaao=[]
		aaaan=[]

		if old != new:
			if old:
			    for addr in old:
					if ':' in addr: # IPv6
						aaaao.append((addr))
					else:
						ao.append((addr))
						i=i+1
			if new:
			    for addr in new:
					if ':' in addr: # IPv6
						aaaan.append((addr))
					else:
						an.append((addr))
			ml.append(('aRecord', ao, an))
			ml.append(('aAAARecord', aaaao, aaaan))
		#print 'DEBUG: ml: "%s" ' %ml
		return ml

	def _ldap_post_create(self):
		self._updateZone()



def lookup(co, lo, filter_s, base='', superordinate=None,scope="sub", unique=0, required=0, timeout=-1, sizelimit=0):

	filter=univention.admin.filter.conjunction('|', [
		univention.admin.filter.conjunction('&', [
		univention.admin.filter.expression('objectClass', 'dNSZone'),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('CNAMERecord', '*')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('SRVRecord', '*')])]),
		univention.admin.filter.conjunction('&', [
		univention.admin.filter.expression('objectClass', 'dNSZone'),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('relativeDomainName', '@')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('zoneName', '*.ip6.arpa')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('CNAMERecord', '*')]),
		univention.admin.filter.conjunction('!', [univention.admin.filter.expression('SRVRecord', '*')])])
		]) # IPv6

	if superordinate:
		filter.expressions.append(univention.admin.filter.expression('zoneName', superordinate.mapping.mapValue('zone', superordinate['zone'])))

def identify(dn, attr, canonical=0):

	univention.debug.debug(univention.debug.ADMIN, univention.debug.INFO, 'ALIAS(host_record) identify DN=%s'% dn)
	# IPv4 + IPv6
	return 'dNSZone' in attr.get('objectClass', []) and\
		'@' not in attr.get('relativeDomainName', []) and\
		not attr['zoneName'][0].endswith('.arpa') and\
		'*' not in attr.get('CNAMERecord', []) and\
		'*' not in attr.get('SRVRecord', []) and\
		('*' in attr.get('ARecord', []) or '*' in attr.get('AAAARecord', []) or '*' in attr.get('MXRecord', []) )





# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

import copy, types, sys, re, string, ldap
import ipaddr # IPv6 address handling
import univention.debug
import univention.admin.filter
import univention.admin.uldap

	# HELPER
	def __ip_from_ptr( self, zoneName, relativeDomainName ):

		if zoneName.find('ip6')!=-1: # IPv6
			zoneName=zoneName.replace('.ip6.arpa', '').split( '.' )
			zoneName.reverse( )
			zoneName=(''.join(zoneName[0:4]) + ':' + ''.join(zoneName[4:8]) + ':' + ''.join(zoneName[8:12]) + ':' + ''.join(zoneName[12:16]))
			relativeDomainName = relativeDomainName.split( '.' )
			relativeDomainName.reverse( )
			relativeDomainName=(''.join(relativeDomainName[0:4]) + ':' + ''.join(relativeDomainName[4:8]) + ':' + ''.join(relativeDomainName[8:12]) + ':' + ''.join(relativeDomainName[12:16]))
			return '%s:%s' % ( zoneName, relativeDomainName )
		else:
			zoneName = zoneName.replace(  '.in-addr.arpa', '' ).split( '.' )
			zoneName.reverse( )
			relativeDomainName = relativeDomainName.split( '.' )
			relativeDomainName.reverse( )
			return '%s.%s' % ( string.join( zoneName, '.' ) , string.join( relativeDomainName, '.' ) )

		return '%s.%s' % ( string.join( zoneName, '.' ) , string.join( relativeDomainName, '.' ) )

	def __is_mac( self, mac ):
		_re = re.compile( '^[ 0-9a-fA-F ][ 0-9a-fA-F ]??$' )
		m = mac.split( ':' )

		return False

	def __is_ip( self, ip ):
		# return True if valid IPv4 (0.0.0.0 is allowed) or IPv6 address
		try:
			ipaddr.IPAddress(ip)
		except ValueError:
			univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'IP[%s]? -> No' % ip )
			return False
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'IP[%s]? -> Yes' % ip )
		return True

	def open( self ):
		simpleLdap.open( self )

		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should create a dns reverse object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )
		if name and zoneDn and ip:
			univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'dns reverse object: start' )
			if ip.find(':')!=-1: # IPv6, e.g. ip=2001:db8:100::5
				subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.ip6.arpa', '' ).split( '.' )
				subnet.reverse( )
				subnet=[''.join(subnet[0:4]),''.join(subnet[4:8]),''.join(subnet[8:12]),''.join(subnet[12:16])]
				subnet = string.join( subnet, ':' ) + ':' # e.g. '2001:0db8:0100:0000:'
				ip6=(ipaddr.IPv6Address(ip)).exploded # use Python Module ipaddr to 'explode' IPv6 address
				ipPart = ip6.replace( subnet, '' )# e.g. '0000:0000:0000:0005'
				if ipPart == ip:
					raise univention.admin.uexceptions.missingInformation, _( 'Reverse zone and IP address are incompatible.' )
				pointer = string.split( ipPart, ':' )
				pointer=list(''.join(pointer)) # e.g. ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '5']
				pointer.reverse()
				ipPart=string.join(pointer, '.') # e.g. '5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0'
			else:
				subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.in-addr.arpa', '' ).split( '.' )
				subnet.reverse( )
				subnet = string.join( subnet, '.' ) + '.'
				ipPart = ip.replace( subnet, '' )
				if ipPart == ip:
					raise univention.admin.uexceptions.missingInformation, _( 'Reverse zone and IP address are incompatible.' )
				pointer = string.split( ipPart, '.' )
				pointer.reverse( )
				ipPart = string.join( pointer, '.' )
			tmppos = univention.admin.uldap.position( self.position.getDomain( ) )
			# check in which forward zone the ip is set
			hostname_list = []


	def __add_dns_forward_object( self, name, zoneDn, ip ):
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should add a dns forward object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )
		if ip.find(':')!=-1: #IPv6
			if name and ip and zoneDn:
				results = self.lo.search( base = zoneDn, scope = 'domain', attr = [ 'aAAARecord' ], filter = '(&(relativeDomainName=%s)(!(cNAMERecord=*)))' % ( name ), unique = 0 )
				if not results:
					try:
						self.lo.add( 'relativeDomainName=%s,%s'% ( name, zoneDn ), [\
										( 'objectClass', [ 'top', 'dNSZone' ]),\
										( 'zoneName', univention.admin.uldap.explodeDn( zoneDn, 1 )[ 0 ]),\
										( 'aAAARecord', [ ip ]),\
										( 'relativeDomainName', [ name ])])
					except univention.admin.uexceptions.objectExists:
						raise univention.admin.uexceptions.dnsAliasRecordExists

					# TODO: check if zoneDn really a forwardZone, maybe it is a container under a zone
					zone = univention.admin.handlers.dns.forward_zone.object( self.co, self.lo, self.position, zoneDn )
					zone.open()
					zone.modify()
				else:
					for dn, attr in results:
						if attr.has_key( 'aAAARecord' ):
							new_ip_list = copy.deepcopy( attr[ 'aAAARecord' ] )
							if not ip in new_ip_list:
								new_ip_list.append( ip )
								self.lo.modify( dn, [ ( 'aAAARecord', attr[ 'aAAARecord' ],  new_ip_list ) ] )
						else:
							self.lo.modify( dn, [ ( 'aAAARecord', '' ,  ip ) ] )
			pass
		else:
			if name and ip and zoneDn:
				results = self.lo.search( base = zoneDn, scope = 'domain', attr = [ 'aRecord' ], filter = '(&(relativeDomainName=%s)(!(cNAMERecord=*)))' % ( name ), unique = 0 )
				if not results:
					try:
						self.lo.add( 'relativeDomainName=%s,%s'% ( name, zoneDn ), [\
										( 'objectClass', [ 'top', 'dNSZone' ]),\
										( 'zoneName', univention.admin.uldap.explodeDn( zoneDn, 1 )[ 0 ]),\
										( 'ARecord', [ ip ]),\
										( 'relativeDomainName', [ name ])])
					except univention.admin.uexceptions.objectExists:
						raise univention.admin.uexceptions.dnsAliasRecordExists

					# TODO: check if zoneDn really a forwardZone, maybe it is a container under a zone
					zone = univention.admin.handlers.dns.forward_zone.object( self.co, self.lo, self.position, zoneDn )
					zone.open()
					zone.modify()
				else:
					for dn, attr in results:
						if attr.has_key( 'aRecord' ):
							new_ip_list = copy.deepcopy( attr[ 'aRecord' ] )
							if not ip in new_ip_list:
								new_ip_list.append( ip )
								self.lo.modify( dn, [ ( 'aRecord', attr[ 'aRecord' ],  new_ip_list ) ] )
						else:
							self.lo.modify( dn, [ ( 'aRecord', '' ,  ip ) ] )
			pass


	def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias ):
		univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'add a dns alias object: name="%s", dnsForwardZone="%s", dnsAliasZoneContainer="%s", alias="%s"' % ( name, dnsForwardZone, dnsAliasZoneContainer, alias ) )
		if name and dnsForwardZone and dnsAliasZoneContainer and alias:

		return ml

	def calc_dns_reverse_entry_name(self, sip, reverseDN):
		if sip.find(':')!=-1: # IPv6
			subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.ip6.arpa','').split('.')
			ip6=ipaddr.IPv6Address(sip) # use Python Module ipaddr to 'explode' IPv6 address
			ip6=ip6.exploded
			ip6=ip6.split(':')
			ip6=list(''.join(ip6))
			zoneNet=subnet
			zoneNet.reverse()
			length=len(zoneNet)
			count=0
			match=1
			for i in zoneNet:
				if count == length:
					break

				if not ip6[count] == i:
					match=0
				count += 1

			if match == 1:
				stop=(32-length)
				rmIP=''
				ip6.reverse()
				count=0
				for i in ip6:
					if count == stop:
						break
					if len(rmIP) > 0:
						rmIP=rmIP+'.'+ip6[count]
					else:
						rmIP=ip6[count]
					count += 1
				return rmIP
			else:
				return 0

		else:
			subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.in-addr.arpa','').split('.')
			ip=sip.split('.')
			zoneNet=subnet
			zoneNet.reverse()
			length=len(zoneNet)
			count=0
			match=1
			for i in zoneNet:
				if count == length:
					break
				if len(rmIP) > 0:
					rmIP=rmIP+'.'+ip[count]
				else:
					rmIP=ip[count]
				count=count+1
			return rmIP
		else:
			return 0

				if not ip[count] == i:
					match=0
				count += 1

			if match == 1:
				stop=(4-length)
				rmIP=''
				ip.reverse()
				count=0
				for i in ip:
					if count == stop:
						break
					if len(rmIP) > 0:
						rmIP=rmIP+'.'+ip[count]
					else:
						rmIP=ip[count]
					count=count+1
				return rmIP # for ip='10.200.2.5' and subnet='2.200.10.in-addr.arpa' -> rmIP='5' ('5.2' for 200.10.in-addr.arpa)
			else:
				return 0

	def _ldap_pre_create(self):
		self.check_common_name_length()





msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-11-04 13:48+0100\n"
"PO-Revision-Date: 2009-11-04 14:01+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"

msgid ": type was %s"
msgstr ": Typ war %s"

#: modules.py:166 modules.py:353
msgid "Custom"
msgstr "Benutzerdefiniert"

#: modules.py:839
msgid "Search"
msgstr "Suchen"

#: modules.py:839
msgid "Search object(s)"
msgstr "Objekt(e) suchen"

#: modules.py:839
msgid "Add"
msgstr "Hinzufügen"

#: modules.py:839
msgid "Add object(s)"
msgstr "Objekt(e) hinzufügen"


msgid "cannot find fqdn of "
msgstr "FQDN konnte nicht gefunden werden: "

#: syntax.py:105
msgid "not enough arguments"
msgstr "Nicht genug Parameter"

#: syntax.py:109
msgid "too many arguments"
msgstr "Zu viele Parameter"

#: syntax.py:119
msgid "Invalid syntax"
msgstr "Falsche Syntax"

#: syntax.py:247
msgid "Value must be a number!"
msgstr "Der Wert muss eine Zahl sein."

#: syntax.py:259
msgid "Value must be 0 or 1"
msgstr "Der Wert muss 0 oder 1 sein."

#: syntax.py:271
msgid ""
"Value must be an integer followed by one of GB,MB,KB,B or nothing (equals B)!"
msgstr ""
"Der Wert muss eine Zahl sein. Optional kann noch eine Einheit mittels GB,MB,"
"KB oder B angegeben werden."

#: syntax.py:278
msgid "Value may not contain whitespace or exclamation mark !"
msgstr "Der Wert darf keine Leerzeichen oder Ausrufezeichen enthalten."

#: syntax.py:285
msgid "undefined"
msgstr "nicht definiert"

#: syntax.py:286
msgid "mails"
msgstr "Mails"

#: syntax.py:287
msgid "events"
msgstr "Kalender"

#: syntax.py:288
msgid "contacts"
msgstr "Kontakte"

#: syntax.py:289
msgid "tasks"
msgstr "Aufgaben"

#: syntax.py:290
msgid "notes"
msgstr "Notizen"

#: syntax.py:291
msgid "journals"
msgstr "Journal"

#: syntax.py:303 syntax.py:327 syntax.py:390
#: syntax.py:665
msgid "Value may not contain other than numbers, letters and dots!"
msgstr "Der Wert darf nur Zahlen, Buchstaben und Punkte enthalten."

#: syntax.py:314
msgid "Value may not contain other than numbers, letters, dots and spaces!"
msgstr ""
"Der Wert darf nur Zahlen, Buchstaben, Leerzeichen und Punkte enthalten."

#: syntax.py:336
msgid "Field must only contain ASCII characters!"
msgstr "Der Wert darf nur ASCII Buchstaben enthalten!"

#: syntax.py:349
msgid ""
"Value may not contain other than numbers, letters and dots, and may not be "
"admin!"

"Der Wert darf nur Zahlen, Buchstaben und Punkte enthalten. Ausnahme ist die "
"Bezeichnug 'admin', die auch nicht verwendet werden darf"

#: syntax.py:361 syntax.py:378
msgid ""
"Username must only contain numbers, letters and dots, and may not be 'admin'!"
msgstr ""
"Der Wert darf nur Zahlen, Buchstaben und Punkte enthalten. Ausnahme ist die "
"Bezeichnug 'admin', die auch nicht verwendet werden darf"

#: syntax.py:373
msgid "Only the first letter of the username may be uppercase!"
msgstr "Nur der erste Buchstabe des Benutzernames darf groß geschrieben sein!"

#: syntax.py:398
msgid ", a path must begin with \"/\"!"
msgstr ", eine Pfadangabe muss mit \\\"/\\\" beginnen."

#: syntax.py:402
msgid "Value may not contain double quotes (\")!"
msgstr "Der Wert darf kein Anführungszeichen (\") enthalten!"

#: syntax.py:416
msgid "The password is to short, at least 8 characters needed."
msgstr "Das Passwort ist zu kurz, mindestens 8 Zeichen sind erforderlich."

#: syntax.py:424
msgid "Empty password not allowed!"
msgstr "Ein leeres Passwort ist nicht erlaubt!"

#: syntax.py:437
msgid "Not a valid hostname!"
msgstr "Kein gültiger Hostname"

#: syntax.py:451
msgid "Not a valid windows hostname!"
msgstr "Kein gültiger Windows-Hostname"

#: syntax.py:463
msgid "Not a valid IP address!"
msgstr "Keine gültige IP-Adresse"

#: syntax.py:491
msgid "Not a valid hostname or IP address!"
msgstr "Kein gültiger Hostname oder IP-Adresse"

#: syntax.py:534
msgid "Not a valid netmask!"
msgstr "Keine gültige Netzwerkmaske."

#: syntax.py:538
msgid "First Address"
msgstr "Erste Adresse"

#: syntax.py:538
msgid "Last Address"
msgstr "Letzte Adresse"

#: syntax.py:549
msgid "tcp"
msgstr ""

#: syntax.py:549
msgid "udp"
msgstr ""

#: syntax.py:561
msgid "Not an absolute path!"
msgstr "Keine absolute Pfadangabe"

#: syntax.py:572 syntax.py:583
msgid "Not a valid email address!"
msgstr "Keine gültige E-Mail-Adresse"

#: syntax.py:595
msgid ""
"The given date does not confirm iso8601, example: \"2009-01-01T12:00:00+01:00"
"\"."
msgstr ""

#: syntax.py:613
msgid "Not a valid Date"
msgstr "Kein gültiges Datum"

#: syntax.py:625
msgid ""
"An IPv4 subnet consists of one to three numbers ranging from 0 to 255 "
"separated by dots, an IPv6 subnet consists of one to four groups of one to "
"four hexadecimal digits separated by colons (:)."
msgstr "Ein IPv4-Subnetz muss mit ein bis drei Zahlen zwischen 0 und 255 angegeben werden, die mit einem Punkt getrennt werden, ein IPv6-Subnetz muss mit ein bis vier Gruppen aus ein bis vier hexadezimalen Zeichen angegeben werden, die mit einem Doppelpunkt getrennt werden."
"werden, die mit einem Punkt getrennt werden."

#: syntax.py:637
msgid ""
"The name of a reverse zone for IPv4 consists of the reversed subnet address "
"followed by .in-addr.arpa (example: \"0.168.192.in-addr.arpa\") or for IPv6 "
"in nibble format followed by .ip6.arpa (example: \"0.0.0.0.0.0.1.0.8.b."
"d.0.1.0.0.2.ip6.arpa\")"
msgstr "Der Name einer IPv4 Reverse Lookup Zone besteht aus dem inversen Subnetz, gefolgt von .in-addr.arpa (z.B.: \"0.168.192.in-addr.arpa\") oder für IPv6 im Nibble Format, gefolgt von .ip6.arpa (z.B. \"0.0.0.0.0.0.1.0.8.b.d.0.1.0.0.2.ip6.arpa\")."

#: syntax.py:645
msgid "Missing value!"
msgstr "Fehlender Wert!"

#: syntax.py:648 syntax.py:657 syntax.py:667
msgid "Value may not contain other than numbers, letters, dots and colons!"
msgstr "Der Wert darf nur Zahlen, Buchstaben, Leerzeichen, Punkte und Doppelpunkte enthalten."

#: syntax.py:673
msgid "Key"
msgstr ""

#: syntax.py:673
msgid "Value"
msgstr ""

#: syntax.py:678 syntax.py:694
msgid "Priority"
msgstr "Priorität"

#: syntax.py:678
msgid "Mail Server"
msgstr "Mail-Server"

#: syntax.py:683
msgid "Service"
msgstr "Dienst"

#: syntax.py:683
msgid "Protocol"
msgstr "Protokoll"

#: syntax.py:689
msgid "Street"
msgstr "Straße"

#: syntax.py:689
msgid "Postal code"
msgstr "Postleitzahl"

#: syntax.py:689
msgid "City"
msgstr "Stadt"

#: syntax.py:694
msgid "Weight"
msgstr "Gewichtung"

#: syntax.py:694
msgid "Port"
msgstr "Port"

#: syntax.py:694
msgid "Server"
msgstr "Server"

#: syntax.py:704
msgid "Not a valid time format"
msgstr "Keine gültige Zeitangabe"

#: syntax.py:717
msgid "Street"
msgstr "Straße"

#: syntax.py:696
msgid "Postal code"
msgstr "Postleitzahl"

#: syntax.py:696
msgid "City"
msgstr "Stadt"

#: syntax.py:709
msgid "Not a valid time interval"
msgstr "Kein gültiges Zeitintervall"

#: syntax.py:723
msgid "Ethernet"
msgstr "Ethernet"

#: syntax.py:723
msgid "FDDI"
msgstr "FDDI"

#: syntax.py:723
msgid "Token-Ring"
msgstr "Token-Ring"

#: syntax.py:732 syntax.py:748
msgid ""
"Value must have 6 two digit hexadecimal numbers separated by \"-\" or \":\" !"
msgstr ""
"Der Wert muss 6 mal 2 Hexadezimalwerte beinhalten, die mit einem \"-\" oder "
"\":\"getrennt werden"

#: syntax.py:752
msgid "Type"
msgstr "Typ"

#: syntax.py:752
msgid "Address"
msgstr "Adresse"

#: syntax.py:765
msgid ""
"Value may not contain other than numbers, letters, underscore (\"_\") and "
"minus (\"-\")!"

"Der Wert darf nur Zahlen, Buchstaben, Unterstriche (\"_\") und Minuszeichen "
"(\"-\") enthalten."

#: syntax.py:769
msgid "Driver"
msgstr "Treiber"

#: syntax.py:769
msgid "Description"
msgstr "Beschreibung"

#: syntax.py:793 syntax.py:858
msgid "Not a valid LDAP DN"
msgstr "Kein gültiger LDAP-DN"

#: syntax.py:824
msgid "Invitation Policy"
msgstr "Richtlinie für Einladungen"

#: syntax.py:831
msgid "Shared folder user ACL"
msgstr "Benutzer ACLs für gemeinsame Ordner"

#: syntax.py:836 syntax.py:847
msgid "Not a valid shared folder ACL"
msgstr "Keine gültige ACL für gemeinsame Ordner"

#: syntax.py:842
msgid "Shared folder group ACL"
msgstr "Gruppen ACLs für gemeinsame Ordner"

#: syntax.py:879
msgid ""
"Value consists of two integer numbers separated by an \"x\" (e.g. \"1024x768"
"\")"

"Der Wert muss zwei ganzzahlige Werte mit einem \"x\" dazwischen beinhalten "
"(z.B. \"1024x768\")"

#: syntax.py:888
msgid ""
"Value consists of two integer numbers separated by a \"-\" (e.g. \"30-70\")"
msgstr ""
"Der Wert muss aus zwei durch ein \"-\" getrennte ganzzahlige Werte bestehen "
"(z.B. \"30-70\")"

#: syntax.py:1203
msgid "User ID"
msgstr "Benutzer-ID"

#: syntax.py:1208
msgid "Group ID"
msgstr "Gruppen-ID"

#: syntax.py:1216
msgid "Windows Terminal Server Hosts"
msgstr "Windows Terminalserver"

#: syntax.py:1221
msgid "Linux Terminal Server Hosts"
msgstr "Linux Terminalserver"

#: syntax.py:1226
msgid "Authentication Server"
msgstr "Authentisierungsserver"

#: syntax.py:1231
msgid "File Server"
msgstr "Fileserver"

#: syntax.py:1248 syntax.py:1253
msgid "Primary Group"
msgstr "Primäre Gruppe"

#: syntax.py:1258
msgid "Network"
msgstr "Netzwerk"

#: syntax.py:1264 syntax.py:1279
msgid "DNS Entry"
msgstr "DNS-Eintrag"

#: syntax.py:1269 syntax.py:1284
msgid "DNS Entry Reverse"
msgstr "Reverse Lookup DNS-Eintrag"

#: syntax.py:1274 syntax.py:1289
msgid "DHCP Entry"
msgstr "DHCP-Eintrag"

#: syntax.py:1294
msgid "DNS Entry Alias"
msgstr "Alias DNS-Eintrag"

#: syntax.py:1305
#, python-format
msgid "Entry does not have dnsEntryAlias Syntax: %s"
msgstr "Eintrag hat nicht dnsEntryAlias Syntax: %s"

#: syntax.py:1310
msgid "Share"
msgstr "Freigabe"

#: syntax.py:1702 syntax.py:1721 syntax.py:1735 syntax.py:1774 syntax.py:1863
msgid "all"
msgstr "Alle"

#: syntax.py:1703
msgid "January"
msgstr "Januar"

#: syntax.py:1704
msgid "February"
msgstr "Februar"

#: syntax.py:1705
msgid "March"
msgstr "März"

#: syntax.py:1706
msgid "April"
msgstr "April"

#: syntax.py:1707
msgid "May"
msgstr "Mai"

#: syntax.py:1708
msgid "June"
msgstr "Juni"

#: syntax.py:1709
msgid "July"
msgstr "Juli"

#: syntax.py:1710
msgid "August"
msgstr "August"

#: syntax.py:1711
msgid "September"
msgstr "September"

#: syntax.py:1712
msgid "October"
msgstr "Oktober"

#: syntax.py:1713
msgid "November"
msgstr "November"

#: syntax.py:1714
msgid "December"
msgstr "Dezember"

#: syntax.py:1722
msgid "Monday"
msgstr "Montag"

#: syntax.py:1723
msgid "Tuesday"
msgstr "Dienstag"

#: syntax.py:1724
msgid "Wednesday"
msgstr "Mittwoch"

#: syntax.py:1725
msgid "Thursday"
msgstr "Donnerstag"

#: syntax.py:1726
msgid "Friday"
msgstr "Freitag"

#: syntax.py:1727
msgid "Saturday"
msgstr "Samstag"

#: syntax.py:1728
msgid "Sunday"
msgstr "Sonntag"

#: syntax.py:1923
msgid "Domain Group"
msgstr "Globale Gruppe"

#: syntax.py:1924
msgid "Local Group"
msgstr "Lokale Gruppe"

#: syntax.py:1925
msgid "Well-Known Group"
msgstr "Bekannte Gruppe"

#: syntax.py:1934 syntax.py:1941 syntax.py:1948
msgid "Soft limit"
msgstr "Soft-Limit"

#: syntax.py:1934 syntax.py:1941 syntax.py:1948
msgid "Hard limit"
msgstr "Hard-Limit"

#: syntax.py:1934 syntax.py:1948
msgid "Group"
msgstr "Gruppe"

#: syntax.py:1941
msgid "User"
msgstr "Benutzer"

#: syntax.py:1964
msgid "synchronous"
msgstr "synchron"

#: syntax.py:1965
msgid "asynchronous"
msgstr "asynchron"

#: syntax.py:1976
#, python-format
msgid "\"%s\" is not a Univention Admin Module."
msgstr "\"%s\" ist kein Univention Admin Modul"

#: syntax.py:2014
msgid "None"
msgstr "Keine"

#: syntax.py:2019
msgid "About"
msgstr "Über"

#: syntax.py:2019
msgid "Browse"
msgstr "Navigation"

#: syntax.py:2019
msgid "Wizards"
msgstr "Assistenten"

#: syntax.py:2019
msgid "Personal Settings"
msgstr "Persönliche Einstellungen"

#: syntax.py:2033
msgid "No Reboot"
msgstr "Nicht neu starten"

#: syntax.py:2034
msgid "Immediately"
msgstr "Sofort"

#: syntax.py:2040
msgid "Groupware Account"
msgstr "Groupware Konto"

#: syntax.py:2041
msgid "Kerberos Principal"
msgstr "Kerberos Prinzipal"

#: syntax.py:2042
msgid "Personal Information"
msgstr "Persönliche Information"

#: syntax.py:2043
msgid "Samba Account"
msgstr "Samba Konto"

#: syntax.py:2044
msgid "Posix Account"
msgstr "Posix Konto"

#: syntax.py:2045
msgid "Mail Account"
msgstr "Mail Konto"

#: syntax.py:2053
msgid "Disconnect"
msgstr "Trennen"

#: syntax.py:2054
msgid "Reset"
msgstr "Zurücksetzen"

#: syntax.py:2062
msgid "All Clients"
msgstr "Von jedem Client"

#: syntax.py:2063
msgid "Previously used Client"
msgstr "Nur von vorherigem Client"

#: syntax.py:2071 syntax.py:2082
msgid "Disabled"
msgstr "Deaktiviert"

#: syntax.py:2072
msgid "Enabled: Input: on, Message: on"
msgstr "Aktiviert: Eingabe: ein, Benachrichtigen: ein"

#: syntax.py:2073
msgid "Enabled: Input: on, Message: off"
msgstr "Aktiviert: Eingabe: an, Benachrichtigen: aus"

#: syntax.py:2074
msgid "Enabled: Input: off, Message: on"
msgstr "Aktiviert: Eingabe: aus, Benachrichtigen: an"

#: syntax.py:2075
msgid "Enabled: Input: off, Message: off"
msgstr "Aktiviert: Eingabe: aus, Benachrichtigen: aus"

#: syntax.py:2083
msgid "Enabled: Set by Caller"
msgstr ""

#: syntax.py:2084
msgid "Enabled: No Call Back"
msgstr ""

#: syntax.py:2172
msgid "NFS-Share"
msgstr "NFS-Freigabe"

#: syntax.py:2185
msgid "Language code must be in format \"xx_XX\"!"
msgstr "Sprach-Code muss im Format \"xx_XX\" angegeben werden!"

#: syntax.py:2191 syntax.py:2195 syntax.py:2198 syntax.py:2201
msgid "Language code (e.g. en_US)"
msgstr "Sprachcode (z.B. de_DE)"

#: syntax.py:2191
msgid "Text"
msgstr "Text"

#: syntax.py:2195
msgid "Translated short description"
msgstr "Übersetzte Kurzbeschreibung"

#: syntax.py:2198
msgid "Translated long description"
msgstr "Übersetzte Langbeschreibung"

#: syntax.py:2201
msgid "Translated tab name"
msgstr "Übersetzter Karteikartenname"


"The DNS alias entry for this host should contain the zone name, the alias "
"zone container DN and the alias."
msgstr ""
"Der DNS-Alias Eintrag für diesen Rechner sollte den Zonennamen, die LDAP-DN "
"des Alias-Zonencontainers und den Alias-Namen enthalten."

#: uexceptions.py:102
msgid "Next IP address not found."

"Zum Zuweisen von Nagios-Diensten wird ein Eintrag in der DNS Forward Zone "
"benötigt!"

#: uexceptions.py:234
msgid ""
"The DNS forward entry could not be created. Please remove existing alias "
"records or comparable DNS objects with the same name as this host from the "

"DNS-Alias Records oder vergleichbare DNS-Objekte mit dem Namen dieses "
"Rechners aus der DNS-Forward-Zone entfernt werden."

#: uexceptions.py:237
msgid "Circular group dependency detected: "
msgstr "Zyklische Gruppen-Abhängigkeit festgestellt: "


msgid "Authentication failed"
msgstr "Authentisierung fehlgeschlagen"

#: uldap.py:361
msgid "Moving childs is not supported."
msgstr "Das Verschieben von Kindsknoten wird nicht unterstützt."





# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

import re, string, types, math, time, operator
import ipaddr # IPv6 address handling
import univention.debug
import univention.admin.modules
import univention.admin.uexceptions


class ipAddress(simple):
	name='ipAddress'
	min_length=2
	max_length=39
	# match IPv4 (0.0.0.0 is allowed) or IPv6 address (with IPv4-mapped IPv6)

	def parse(self, text):
		if text != None:
			try:
				ipaddr.IPAddress(text)
			except ValueError:
				raise univention.admin.uexceptions.valueError, _("Not a valid IP address!")
			return text
		raise univention.admin.uexceptions.valueError, _("Not a valid IP address!")

class hostOrIP(simple):
	name='host'

	max_length=0

	def ipAddress(self, text):
		# match IPv4 (0.0.0.0 is allowed) or IPv6 address (incl. IPv4-mapped IPv6)
		if text != None:
			try:
				ipaddr.IPAddress(text)
			except ValueError:
				return False
			return True
		else:
			return False

	def hostName(self, text):
		_re = re.compile("(^[a-zA-Z])(([a-zA-Z0-9-]*)([a-zA-Z0-9]$))?$")

			return text
		else:
			raise univention.admin.uexceptions.valueError, _('Not a valid hostname or IP address!')
# TODO: IPv6
class netmask(simple):
	name='netmask'
	min_length=1

class reverseLookupSubnet(simple):
	name='reverseLookupSubnet'
	min_length=1
	max_length=19
	_re = re.compile('^((0|[3-9][0-9]?|2(?:5[0-5]|[0-4]?[0-9])?|1[0-9]{0,2})(\.(0|[3-9][0-9]?|2(?:5[0-5]|[0-4]?[0-9])?|1[0-9]{0,2})){0,2})$|^([0-9a-fA\
-F]{1,4}(?:(?:(?<!::):|(?<=::))[0-9a-fA-F]{0,4}){1,3})$') # IPv4 + IPv6

	def parse(self, text):
		if self._re.match(text) != None:
			for q in text.split('.'):
				if int(q) > 255:
					return
			return text
		raise univention.admin.uexceptions.valueError,_("An IPv4 subnet consists of one to three numbers ranging from 0 to 255 separated by dots, an IPv6 subnet consists of one to four groups of one to four hexadecimal digits separated by colons (:).")

class reverseLookupZoneName(simple):
	name='reverseLookupZoneName'
	min_length=14
	max_length=72 # IPv6
	# TODO: check re.compile IPv6
	_re = re.compile('^((0|[3-9][0-9]?|2(?:5[0-5]|[0-4]?[0-9])?|1[0-9]{0,2})(\.(0|[3-9][0-9]?|2(?:5[0-5]|[0-4]?[0-9])?|1[0-9]{0,2})){3}\.in-addr\.arpa$)|((?!.*?::.*?::)[0-9a-fA-F]{0,4}(?:(?:(?<!::):|(?<=::))[0-9a-fA-F]{0,4}){5}(?:(?:(?<!::):|(?<=::))(?:[3-9][0-9]?|2(?:5[0-5]|[0-4]?[0-9])?|1[0-9]{0,2}|0)(?:\.(?:[3-9][0-9]?|2(?:5[0-5]|[0-4]?[0-9])?|1[0-9]{0,2}|0)){3}|(?:(?:(?<!::):|(?<=::))[0-9a-fA-F]{0,4}){2})\.ip6\.arpa)$') # IPv6

	def parse(self, text):
		if self._re.match(text) != None:
			t=text.replace('in-addr.arpa', '')
			for q in t.split('.'):
				if int(q) > 255:
					return
			return text
		raise univention.admin.uexceptions.valueError,_("The name of a reverse zone for IPv4 consists of the reversed subnet address followed by .in-addr.arpa (example: \"0.168.192.in-addr.arpa\") or for IPv6 in nibble format followed by .ip6.arpa (example: \"0.0.0.0.0.0.1.0.8.b.d.0.1.0.0.2.ip6.arpa\")")

class dnsName(simple):
	name='dnsName'
	_re = re.compile('^[a-zA-Z0-9:][a-zA-Z0-9.:_-]*[a-zA-Z0-9.]$') # IPv6

	def parse(self, text):
		if text==None:
			raise univention.admin.uexceptions.valueError, _("Missing value!")
		if self._re.match(text) != None:
			return text
		raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters, dots and colons!")

class dnsName_umlauts(simple):
	name='dnsName_umlauts'
	_re = re.compile('(?u)(^\w[\w -.:]*\w$)|\w*$') # IPv6

	def parse(self, text):
		if self._re.match(text) != None:
			return text
		raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters, dots and colons!")

class dnsNameDot(simple):
	name='dnsName'
	_re = re.compile('^[0-9a-zA-Z.:-]+$') # IPv6

	def parse(self, text):
		if self._re.match(text) != None:
			return text

		raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters, dots and colons!")


class keyAndValue(complex):

Return to bug 15687

Lines 29-34 Link Here

(-)modules/univention/admin/syntax.py (-37 / +30 lines)
29	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA	29	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
30		30
31	import re, string, types, math, time, operator	31	import re, string, types, math, time, operator
		32	import ipaddr # IPv6 address handling
32	import univention.debug	33	import univention.debug
33	import univention.admin.modules	34	import univention.admin.modules
34	import univention.admin.uexceptions	35	import univention.admin.uexceptions
Lines 451-468 Link Here
451		452
452	class ipAddress(simple):	453	class ipAddress(simple):
453	name='ipAddress'	454	name='ipAddress'
454	min_length=7	455	min_length=2
455	max_length=15	456	max_length=39
456	_re = re.compile('^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$')	457	# match IPv4 (0.0.0.0 is allowed) or IPv6 address (with IPv4-mapped IPv6)
457
458	def parse(self, text):	458	def parse(self, text):
459	if text and self._re.match(text) != None:	459	if text != None:
460	for q in text.split('.'):	460	try:
461	if int(q) > 255:	461	ipaddr.IPAddress(text)
462	raise univention.admin.uexceptions.valueError, _("Not a valid IP address!")	462	except ValueError:
463	return	463	raise univention.admin.uexceptions.valueError, _("Not a valid IP address!")
464	return text	464	return text
465	raise univention.admin.uexceptions.valueError, _("Not a valid IP address!")
466		465
467	class hostOrIP(simple):	466	class hostOrIP(simple):
468	name='host'	467	name='host'
Lines 470-483 Link Here
470	max_length=0	469	max_length=0
471		470
472	def ipAddress(self, text):	471	def ipAddress(self, text):
473	_re = re.compile('(^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$)')	472	# match IPv4 (0.0.0.0 is allowed) or IPv6 address (incl. IPv4-mapped IPv6)
474	if text and _re.match(text) != None:	473	if text != None:
475	for q in text.split('.'):	474	try:
476	if int(q) > 255:	475	ipaddr.IPAddress(text)
477	return False	476	except ValueError:
		477	return False
478	return True	478	return True
479	else:
480	return False
481		479
482	def hostName(self, text):	480	def hostName(self, text):
483	_re = re.compile("(^[a-zA-Z])(([a-zA-Z0-9-]*)([a-zA-Z0-9]$))?$")	481	_re = re.compile("(^[a-zA-Z])(([a-zA-Z0-9-]*)([a-zA-Z0-9]$))?$")
Lines 491-497 Link Here
491	return text	489	return text
492	else:	490	else:
493	raise univention.admin.uexceptions.valueError, _('Not a valid hostname or IP address!')	491	raise univention.admin.uexceptions.valueError, _('Not a valid hostname or IP address!')
494		492	# TODO: IPv6
495	class netmask(simple):	493	class netmask(simple):
496	name='netmask'	494	name='netmask'
497	min_length=1	495	min_length=1
Lines 617-677 Link Here
617	class reverseLookupSubnet(simple):	615	class reverseLookupSubnet(simple):
618	name='reverseLookupSubnet'	616	name='reverseLookupSubnet'
619	min_length=1	617	min_length=1
620	max_length=15	618	max_length=19
621	_re = re.compile('^[0-9]+(\.[0-9]+)?(\.[0-9]+)?$')	619	_re = re.compile('^((0\|[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2})(\.(0\|[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2})){0,2})$\|^([0-9a-fA\
		620	-F]{1,4}(?:(?:(?<!::):\|(?<=::))[0-9a-fA-F]{0,4}){1,3})$') # IPv4 + IPv6
622		621
623	def parse(self, text):	622	def parse(self, text):
624	if self._re.match(text) != None:	623	if self._re.match(text) != None:
625	for q in text.split('.'):
626	if int(q) > 255:
627	return
628	return text	624	return text
629	raise univention.admin.uexceptions.valueError,_("An IP subnet consists of one to three numbers ranging from 0 to 255 separated by dots.")	625	raise univention.admin.uexceptions.valueError,_("An IPv4 subnet consists of one to three numbers ranging from 0 to 255 separated by dots, an IPv6 subnet consists of one to four groups of one to four hexadecimal digits separated by colons (:).")
630		626
631	class reverseLookupZoneName(simple):	627	class reverseLookupZoneName(simple):
632	name='reverseLookupZoneName'	628	name='reverseLookupZoneName'
633	min_length=14	629	min_length=14
634	max_length=30 #?	630	max_length=72 # IPv6
635	_re=re.compile('^[0-9]+(\.[0-9]+)?(\.[0-9]+)?\.in-addr\.arpa$')	631	# TODO: check re.compile IPv6
		632	_re = re.compile('^((0\|[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2})(\.(0\|[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2})){3}\.in-addr\.arpa$)\|((?!.?::.?::)[0-9a-fA-F]{0,4}(?:(?:(?<!::):\|(?<=::))[0-9a-fA-F]{0,4}){5}(?:(?:(?<!::):\|(?<=::))(?:[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2}\|0)(?:\.(?:[3-9][0-9]?\|2(?:5[0-5]\|[0-4]?[0-9])?\|1[0-9]{0,2}\|0)){3}\|(?:(?:(?<!::):\|(?<=::))[0-9a-fA-F]{0,4}){2})\.ip6\.arpa)$') # IPv6
636		633
637	def parse(self, text):	634	def parse(self, text):
638	if self._re.match(text) != None:	635	if self._re.match(text) != None:
639	t=text.replace('in-addr.arpa', '')
640	for q in t.split('.'):
641	if int(q) > 255:
642	return
643	return text	636	return text
644	raise univention.admin.uexceptions.valueError,_("The name of a reverse zone consists of the reversed subnet address followed by .in-addr.arpa. Example: \"0.168.192.in-addr.arpa\"")	637	raise univention.admin.uexceptions.valueError,_("The name of a reverse zone for IPv4 consists of the reversed subnet address followed by .in-addr.arpa (example: \"0.168.192.in-addr.arpa\") or for IPv6 in nibble format followed by .ip6.arpa (example: \"0.0.0.0.0.0.1.0.8.b.d.0.1.0.0.2.ip6.arpa\")")
645		638
646	class dnsName(simple):	639	class dnsName(simple):
647	name='dnsName'	640	name='dnsName'
648	_re = re.compile('^[a-zA-Z0-9][a-zA-Z0-9._-]*[a-zA-Z0-9.]$')	641	_re = re.compile('^[a-zA-Z0-9:][a-zA-Z0-9.:_-]*[a-zA-Z0-9.]$') # IPv6
649		642
650	def parse(self, text):	643	def parse(self, text):
651	if text==None:	644	if text==None:
652	raise univention.admin.uexceptions.valueError, _("Missing value!")	645	raise univention.admin.uexceptions.valueError, _("Missing value!")
653	if self._re.match(text) != None:	646	if self._re.match(text) != None:
654	return text	647	return text
655	raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters and dots!")	648	raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters, dots and colons!")
656		649
657	class dnsName_umlauts(simple):	650	class dnsName_umlauts(simple):
658	name='dnsName_umlauts'	651	name='dnsName_umlauts'
659	_re = re.compile('(?u)(^\w[\w -.]\w$)\|\w$')	652	_re = re.compile('(?u)(^\w[\w -.:]\w$)\|\w$') # IPv6
660		653
661	def parse(self, text):	654	def parse(self, text):
662	if self._re.match(text) != None:	655	if self._re.match(text) != None:
663	return text	656	return text
664	raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters and dots!")	657	raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters, dots and colons!")
665		658
666	class dnsNameDot(simple):	659	class dnsNameDot(simple):
667	name='dnsName'	660	name='dnsName'
668	_re = re.compile('^[0-9a-zA-Z.-]+$')	661	_re = re.compile('^[0-9a-zA-Z.:-]+$') # IPv6
669		662
670	def parse(self, text):	663	def parse(self, text):
671	if self._re.match(text) != None:	664	if self._re.match(text) != None:
672	return text	665	return text
673		666
674	raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters and dots!")	667	raise univention.admin.uexceptions.valueError, _("Value may not contain other than numbers, letters, dots and colons!")
675		668
676		669
677	class keyAndValue(complex):	670	class keyAndValue(complex):

Lines 1-3 Link Here

(-)debian/changelog (+102 lines)
		1	univention-directory-manager-modules (5.1.13-1) unstable; urgency=low
		2
		3	* merged with trunk v5.0.45-1 (Bug #15687)
		4
		5	-- Kai-Wilhelm Bolte <bolte@univention.de> Fri, 13 Nov 2009 13:49:52 +0100
		6
		7	univention-directory-manager-modules (5.1.12-2) unstable; urgency=low
		8
		9	* udm now stores IPv6 addresses as aAAARecord for forward zones in LDAP
		10	(Bug #15687)
		11
		12	-- Kai-Wilhelm Bolte <bolte@univention.de> Fri, 13 Nov 2009 12:27:41 +0100
		13
		14	univention-directory-manager-modules (5.1.12-1) unstable; urgency=low
		15
		16	* merged with trunk (Bug #15687)
		17
		18	-- Kai-Wilhelm Bolte <bolte@univention.de> Wed, 4 Nov 2009 14:04:51 +0100
		19
		20	univention-directory-manager-modules (5.1.11-1) unstable; urgency=low
		21
		22	* make DNS filters IPv6-capable (Bug #15687)
		23
		24	-- Kai-Wilhelm Bolte <bolte@univention.de> Wed, 4 Nov 2009 11:48:49 +0100
		25
		26	univention-directory-manager-modules (5.1.10-1) unstable; urgency=low
		27
		28	* small bugfixes in syntax check (Bug #15555)
		29
		30	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 13 Oct 2009 09:39:47 +0200
		31
		32	univention-directory-manager-modules (5.1.9-1) unstable; urgency=low
		33
		34	* use ipaddr module for syntax check (Bug #15555)
		35	* fixed typos
		36
		37	-- Kai-Wilhelm Bolte <bolte@univention.de> Mon, 12 Oct 2009 14:08:31 +0200
		38
		39	univention-directory-manager-modules (5.1.8-1) unstable; urgency=low
		40
		41	* German translations update in syntax (Bug #15555)
		42
		43	-- Kai-Wilhelm Bolte <bolte@univention.de> Fri, 9 Oct 2009 12:22:16 +0200
		44
		45	univention-directory-manager-modules (5.1.7-1) unstable; urgency=low
		46
		47	* IPv6 forward and reverse zones are now correctly stored in ldap (Bug #15687)
		48	* fixes in DNS syntax check and add another IPv6 syntax check
		49	* first version which uses new ipaddr module
		50
		51	-- Kai-Wilhelm Bolte <bolte@univention.de> Thu, 8 Oct 2009 11:51:26 +0200
		52
		53	univention-directory-manager-modules (5.1.6-1) unstable; urgency=low
		54
		55	* add IPv6 to 'ipAdress' syntax check
		56	* bugfixes in IPv6 DNS-handling (Bug #15687)
		57
		58	-- Kai-Wilhelm Bolte <bolte@univention.de> Mon, 28 Sep 2009 14:42:14 +0200
		59
		60	univention-directory-manager-modules (5.1.5-1) unstable; urgency=low
		61
		62	* add IPv6 syntax check for DNS and some comments (Bug #15687)
		63
		64	-- Kai-Wilhelm Bolte <bolte@univention.de> Tue, 22 Sep 2009 09:19:30 +0200
65
66	univention-directory-manager-modules (5.1.4-1) unstable; urgency=low
67
68	* alias, forward_zone and ptr_record are now IPv6-ready ( Bug #15687)
69	* bugfixes in reverse_zone and host_record
70
71	-- Kai-Wilhelm Bolte <bolte@univention.de> Mon, 21 Sep 2009 14:09:35 +0200
72
73	univention-directory-manager-modules (5.1.3-1) unstable; urgency=low
74
75	* udm reverse_zone is now IPv6-ready (Bug #15687)
76	* add syntax-checking for IPv6-subnets
77	* nicer code in dns/host_record
78
79	-- Kai-Wilhelm Bolte <bolte@univention.de> Fri, 18 Sep 2009 13:26:19 +0200
80
81	univention-directory-manager-modules (5.1.2-1) unstable; urgency=low
82
83	* removed aaaa in UDM (Bug #15687)
84	* udm dns/host_record create and modify now handles aRecord and aAAARecord
85	attributes in ldap depending on IP address version
86	* udm dns/host_record modify ... --append and --remove checks also IP address
87	version, --set replaces all old entries
88
89	-- Kai-Wilhelm Bolte <bolte@univention.de> Mon, 14 Sep 2009 15:54:16 +0200
90
91	univention-directory-manager-modules (5.1.1-1) unstable; urgency=low
92
93	* add possibility to create AAAA records with UDM: --set aaaa="IPv6-address" (Bug #15687)
94
95	-- Kai-Wilhelm Bolte <bolte@univention.de> Fri, 4 Sep 2009 17:32:34 +0200
96
97	univention-directory-manager-modules (5.1.0-1) unstable; urgency=low
98
99	* add possibility to add IPv6 addresses and check syntax for IPv4 / IPv6 in module computers (Bug #15555)
100
101	-- Kai-Wilhelm Bolte <bolte@univention.de> Wed, 2 Sep 2009 11:56:53 +0200
102
1	univention-directory-manager-modules (5.0.45-1) unstable; urgency=low	103	univention-directory-manager-modules (5.0.45-1) unstable; urgency=low
2		104
3	* fix some more policy translation bugs (Bug: #14815)	105	* fix some more policy translation bugs (Bug: #14815)

Lines 174-191 Link Here

(-)modules/univention/admin/handlers/dns/reverse_zone.py (-14 / +39 lines)
174	]	174	]
175		175
176	def mapSubnet(subnet):	176	def mapSubnet(subnet):
177	q=subnet.split('.')	177	v=[]
178	q.reverse()	178	if ':' in subnet: # IPv6
179	return string.join(q, '.')+'.in-addr.arpa'	179	q=subnet.split(':')
180		180	for t in q:
		181	u=t.zfill(4)
		182	v.append((u))
		183	[v.append('0000') for x in v if len(v) < 4]
		184	v=list(''.join(v))
		185	v.reverse()
		186	return string.join(v, '.')+'.ip6.arpa'
		187	else:
		188	q=subnet.split('.')
		189	q.reverse()
		190	return string.join(q, '.')+'.in-addr.arpa'
		191
181	def unmapSubnet(zone):	192	def unmapSubnet(zone):
182	if type(zone) == types.ListType:	193	if type(zone) == types.ListType:
183	zone=zone[0]	194	zone=zone[0]
184	zone=zone.replace('.in-addr.arpa', '')
185	q=zone.split('.')
186	q.reverse()
187	return string.join(q, '.')
188		195
		196	if zone.find('ip6')!=-1: # IPv6
		197	zone=zone.replace('.ip6.arpa', '')
		198	q=zone.split('.')
		199	q.reverse()
		200	q=[''.join(q[0:4]),''.join(q[4:8]),''.join(q[8:12]),''.join(q[12:16])]
		201	return string.join(q, ':')
		202
		203	else:
		204	zone=zone.replace('.in-addr.arpa', '')
		205	q=zone.split('.')
		206	q.reverse()
		207	return string.join(q, '.')
		208
189	mapping=univention.admin.mapping.mapping()	209	mapping=univention.admin.mapping.mapping()
190	mapping.register('subnet', 'zoneName', mapSubnet, unmapSubnet)	210	mapping.register('subnet', 'zoneName', mapSubnet, unmapSubnet)
191	mapping.register('zonettl','dNSTTL', None, univention.admin.mapping.ListToString)	211	mapping.register('zonettl','dNSTTL', None, univention.admin.mapping.ListToString)
Lines 263-273 Link Here
263		283
264	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):	284	def lookup(co, lo, filter_s, base='', superordinate=None, scope='sub', unique=0, required=0, timeout=-1, sizelimit=0):
265		285
266	filter=univention.admin.filter.conjunction('&', [	286	filter=univention.admin.filter.conjunction('\|', [
267	univention.admin.filter.expression('objectClass', 'dNSZone'),	287	univention.admin.filter.conjunction('&', [
268	univention.admin.filter.expression('relativeDomainName', '@'),	288	univention.admin.filter.expression('objectClass', 'dNSZone'),
269	univention.admin.filter.expression('zoneName', '*.in-addr.arpa')	289	univention.admin.filter.expression('relativeDomainName', '@'),
270	])	290	univention.admin.filter.expression('zoneName', '*.in-addr.arpa')]),
		291	univention.admin.filter.conjunction('&', [
		292	univention.admin.filter.expression('objectClass', 'dNSZone'),
		293	univention.admin.filter.expression('relativeDomainName', '@'),
		294	univention.admin.filter.expression('zoneName', '*.ip6.arpa')]) # IPv6
		295	])
271		296
272	if filter_s:	297	if filter_s:
273	filter_p=univention.admin.filter.parse(filter_s)	298	filter_p=univention.admin.filter.parse(filter_s)
Lines 283-289 Link Here
283		308
284	return 'dNSZone' in attr.get('objectClass', []) and\	309	return 'dNSZone' in attr.get('objectClass', []) and\
285	['@'] == attr.get('relativeDomainName', []) and\	310	['@'] == attr.get('relativeDomainName', []) and\
286	attr['zoneName'][0].endswith('.in-addr.arpa')	311	attr['zoneName'][0].endswith('.arpa') # IPv4 + IPv6
287		312
288	def quickDescription(rdn):	313	def quickDescription(rdn):
289		314

Lines 29-34 Link Here

(-)modules/univention/admin/handlers/__init__.py (-71 / +159 lines)
29	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA	29	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
30		30
31	import copy, types, sys, re, string, ldap	31	import copy, types, sys, re, string, ldap
		32	import ipaddr # IPv6 address handling
32	import univention.debug	33	import univention.debug
33	import univention.admin.filter	34	import univention.admin.filter
34	import univention.admin.uldap	35	import univention.admin.uldap
Lines 983-995 Link Here
983	# HELPER	984	# HELPER
984	def __ip_from_ptr( self, zoneName, relativeDomainName ):	985	def __ip_from_ptr( self, zoneName, relativeDomainName ):
985		986
986	zoneName = zoneName.replace( '.in-addr.arpa', '' ).split( '.' )	987	if zoneName.find('ip6')!=-1: # IPv6
987	zoneName.reverse( )	988	zoneName=zoneName.replace('.ip6.arpa', '').split( '.' )
988	relativeDomainName = relativeDomainName.split( '.' )	989	zoneName.reverse( )
989	relativeDomainName.reverse( )	990	zoneName=(''.join(zoneName[0:4]) + ':' + ''.join(zoneName[4:8]) + ':' + ''.join(zoneName[8:12]) + ':' + ''.join(zoneName[12:16]))
		991	relativeDomainName = relativeDomainName.split( '.' )
		992	relativeDomainName.reverse( )
		993	relativeDomainName=(''.join(relativeDomainName[0:4]) + ':' + ''.join(relativeDomainName[4:8]) + ':' + ''.join(relativeDomainName[8:12]) + ':' + ''.join(relativeDomainName[12:16]))
		994	return '%s:%s' % ( zoneName, relativeDomainName )
		995	else:
		996	zoneName = zoneName.replace( '.in-addr.arpa', '' ).split( '.' )
		997	zoneName.reverse( )
		998	relativeDomainName = relativeDomainName.split( '.' )
		999	relativeDomainName.reverse( )
		1000	return '%s.%s' % ( string.join( zoneName, '.' ) , string.join( relativeDomainName, '.' ) )
990		1001
991	return '%s.%s' % ( string.join( zoneName, '.' ) , string.join( relativeDomainName, '.' ) )
992
993	def __is_mac( self, mac ):	1002	def __is_mac( self, mac ):
994	_re = re.compile( '^[ 0-9a-fA-F ][ 0-9a-fA-F ]??$' )	1003	_re = re.compile( '^[ 0-9a-fA-F ][ 0-9a-fA-F ]??$' )
995	m = mac.split( ':' )	1004	m = mac.split( ':' )
Lines 1001-1012 Link Here
1001	return False	1010	return False
1002		1011
1003	def __is_ip( self, ip ):	1012	def __is_ip( self, ip ):
1004	_re = re.compile( '^[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+\.[ 0-9 ]+$' )	1013	# return True if valid IPv4 (0.0.0.0 is allowed) or IPv6 address
1005	if _re.match ( ip ):	1014	try:
1006	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'IP[%s]? -> Yes' % ip )	1015	ipaddr.IPAddress(ip)
1007	return True	1016	except ValueError:
1008	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'IP[%s]? -> No' % ip )	1017	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'IP[%s]? -> No' % ip )
1009	return False	1018	return False
		1019	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'IP[%s]? -> Yes' % ip )
		1020	return True
1010		1021
1011	def open( self ):	1022	def open( self ):
1012	simpleLdap.open( self )	1023	simpleLdap.open( self )
Lines 1362-1377 Link Here
1362	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should create a dns reverse object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )	1373	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should create a dns reverse object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )
1363	if name and zoneDn and ip:	1374	if name and zoneDn and ip:
1364	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'dns reverse object: start' )	1375	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'dns reverse object: start' )
1365	subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.in-addr.arpa', '' ).split( '.' )	1376	if ip.find(':')!=-1: # IPv6, e.g. ip=2001:db8:100::5
1366	subnet.reverse( )	1377	subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.ip6.arpa', '' ).split( '.' )
1367	subnet = string.join( subnet, '.' ) + '.'	1378	subnet.reverse( )
1368	ipPart = ip.replace( subnet, '' )	1379	subnet=[''.join(subnet[0:4]),''.join(subnet[4:8]),''.join(subnet[8:12]),''.join(subnet[12:16])]
1369	if ipPart == ip:	1380	subnet = string.join( subnet, ':' ) + ':' # e.g. '2001:0db8:0100:0000:'
1370	raise univention.admin.uexceptions.missingInformation, _( 'Reverse zone and IP address are incompatible.' )	1381	ip6=(ipaddr.IPv6Address(ip)).exploded # use Python Module ipaddr to 'explode' IPv6 address
1371		1382	ipPart = ip6.replace( subnet, '' )# e.g. '0000:0000:0000:0005'
1372	pointer = string.split( ipPart, '.' )	1383	if ipPart == ip:
1373	pointer.reverse( )	1384	raise univention.admin.uexceptions.missingInformation, _( 'Reverse zone and IP address are incompatible.' )
1374	ipPart = string.join( pointer, '.' )	1385	pointer = string.split( ipPart, ':' )
		1386	pointer=list(''.join(pointer)) # e.g. ['0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '5']
		1387	pointer.reverse()
		1388	ipPart=string.join(pointer, '.') # e.g. '5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0'
		1389	else:
		1390	subnet = ldap.explode_dn( zoneDn, 1 )[ 0 ].replace( '.in-addr.arpa', '' ).split( '.' )
		1391	subnet.reverse( )
		1392	subnet = string.join( subnet, '.' ) + '.'
		1393	ipPart = ip.replace( subnet, '' )
		1394	if ipPart == ip:
		1395	raise univention.admin.uexceptions.missingInformation, _( 'Reverse zone and IP address are incompatible.' )
		1396	pointer = string.split( ipPart, '.' )
		1397	pointer.reverse( )
		1398	ipPart = string.join( pointer, '.' )
1375	tmppos = univention.admin.uldap.position( self.position.getDomain( ) )	1399	tmppos = univention.admin.uldap.position( self.position.getDomain( ) )
1376	# check in which forward zone the ip is set	1400	# check in which forward zone the ip is set
1377	hostname_list = []	1401	hostname_list = []
Lines 1485-1518 Link Here
1485		1509
1486	def __add_dns_forward_object( self, name, zoneDn, ip ):	1510	def __add_dns_forward_object( self, name, zoneDn, ip ):
1487	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should add a dns forward object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )	1511	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'we should add a dns forward object: zoneDn="%s", name="%s", ip="%s"' % ( zoneDn, name, ip ) )
1488	if name and ip and zoneDn:	1512	if ip.find(':')!=-1: #IPv6
1489	results = self.lo.search( base = zoneDn, scope = 'domain', attr = [ 'aRecord' ], filter = '(&(relativeDomainName=%s)(!(cNAMERecord=*)))' % ( name ), unique = 0 )	1513	if name and ip and zoneDn:
1490	if not results:	1514	results = self.lo.search( base = zoneDn, scope = 'domain', attr = [ 'aAAARecord' ], filter = '(&(relativeDomainName=%s)(!(cNAMERecord=*)))' % ( name ), unique = 0 )
1491	try:	1515	if not results:
1492	self.lo.add( 'relativeDomainName=%s,%s'% ( name, zoneDn ), [\	1516	try:
		1517	self.lo.add( 'relativeDomainName=%s,%s'% ( name, zoneDn ), [\
1493	( 'objectClass', [ 'top', 'dNSZone' ]),\	1518	( 'objectClass', [ 'top', 'dNSZone' ]),\
1494	( 'zoneName', univention.admin.uldap.explodeDn( zoneDn, 1 )[ 0 ]),\	1519	( 'zoneName', univention.admin.uldap.explodeDn( zoneDn, 1 )[ 0 ]),\
		1520	( 'aAAARecord', [ ip ]),\
		1521	( 'relativeDomainName', [ name ])])
		1522	except univention.admin.uexceptions.objectExists:
		1523	raise univention.admin.uexceptions.dnsAliasRecordExists
		1524
		1525	# TODO: check if zoneDn really a forwardZone, maybe it is a container under a zone
		1526	zone = univention.admin.handlers.dns.forward_zone.object( self.co, self.lo, self.position, zoneDn )
		1527	zone.open()
		1528	zone.modify()
		1529	else:
		1530	for dn, attr in results:
		1531	if attr.has_key( 'aAAARecord' ):
		1532	new_ip_list = copy.deepcopy( attr[ 'aAAARecord' ] )
		1533	if not ip in new_ip_list:
		1534	new_ip_list.append( ip )
		1535	self.lo.modify( dn, [ ( 'aAAARecord', attr[ 'aAAARecord' ], new_ip_list ) ] )
		1536	else:
		1537	self.lo.modify( dn, [ ( 'aAAARecord', '' , ip ) ] )
		1538	pass
		1539	else:
		1540	if name and ip and zoneDn:
		1541	results = self.lo.search( base = zoneDn, scope = 'domain', attr = [ 'aRecord' ], filter = '(&(relativeDomainName=%s)(!(cNAMERecord=*)))' % ( name ), unique = 0 )
		1542	if not results:
		1543	try:
		1544	self.lo.add( 'relativeDomainName=%s,%s'% ( name, zoneDn ), [\
		1545	( 'objectClass', [ 'top', 'dNSZone' ]),\
		1546	( 'zoneName', univention.admin.uldap.explodeDn( zoneDn, 1 )[ 0 ]),\
1495	( 'ARecord', [ ip ]),\	1547	( 'ARecord', [ ip ]),\
1496	( 'relativeDomainName', [ name ])])	1548	( 'relativeDomainName', [ name ])])
1497	except univention.admin.uexceptions.objectExists:	1549	except univention.admin.uexceptions.objectExists:
1498	raise univention.admin.uexceptions.dnsAliasRecordExists	1550	raise univention.admin.uexceptions.dnsAliasRecordExists
1499		1551
1500	# TODO: check if zoneDn really a forwardZone, maybe it is a container under a zone	1552	# TODO: check if zoneDn really a forwardZone, maybe it is a container under a zone
1501	zone = univention.admin.handlers.dns.forward_zone.object( self.co, self.lo, self.position, zoneDn )	1553	zone = univention.admin.handlers.dns.forward_zone.object( self.co, self.lo, self.position, zoneDn )
1502	zone.open()	1554	zone.open()
1503	zone.modify()	1555	zone.modify()
1504	else:	1556	else:
1505	for dn, attr in results:	1557	for dn, attr in results:
1506	if attr.has_key( 'aRecord' ):	1558	if attr.has_key( 'aRecord' ):
1507	new_ip_list = copy.deepcopy( attr[ 'aRecord' ] )	1559	new_ip_list = copy.deepcopy( attr[ 'aRecord' ] )
1508	if not ip in new_ip_list:	1560	if not ip in new_ip_list:
1509	new_ip_list.append( ip )	1561	new_ip_list.append( ip )
1510	self.lo.modify( dn, [ ( 'aRecord', attr[ 'aRecord' ], new_ip_list ) ] )	1562	self.lo.modify( dn, [ ( 'aRecord', attr[ 'aRecord' ], new_ip_list ) ] )
1511	else:	1563	else:
1512	self.lo.modify( dn, [ ( 'aRecord', '' , ip ) ] )	1564	self.lo.modify( dn, [ ( 'aRecord', '' , ip ) ] )
1513	pass	1565	pass
1514		1566
1515
1516	def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias ):	1567	def __add_dns_alias_object( self, name, dnsForwardZone, dnsAliasZoneContainer, alias ):
1517	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'add a dns alias object: name="%s", dnsForwardZone="%s", dnsAliasZoneContainer="%s", alias="%s"' % ( name, dnsForwardZone, dnsAliasZoneContainer, alias ) )	1568	univention.debug.debug( univention.debug.ADMIN, univention.debug.INFO, 'add a dns alias object: name="%s", dnsForwardZone="%s", dnsAliasZoneContainer="%s", alias="%s"' % ( name, dnsForwardZone, dnsAliasZoneContainer, alias ) )
1518	if name and dnsForwardZone and dnsAliasZoneContainer and alias:	1569	if name and dnsForwardZone and dnsAliasZoneContainer and alias:
Lines 1814-1851 Link Here
1814	return ml	1865	return ml
1815		1866
1816	def calc_dns_reverse_entry_name(self, sip, reverseDN):	1867	def calc_dns_reverse_entry_name(self, sip, reverseDN):
1817	subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.in-addr.arpa','').split('.')	1868	if sip.find(':')!=-1: # IPv6
1818	ip=sip.split('.')	1869	subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.ip6.arpa','').split('.')
1819	zoneNet=subnet	1870	ip6=ipaddr.IPv6Address(sip) # use Python Module ipaddr to 'explode' IPv6 address
1820	zoneNet.reverse()	1871	ip6=ip6.exploded
1821	length=len(zoneNet)	1872	ip6=ip6.split(':')
1822	count=0	1873	ip6=list(''.join(ip6))
1823	match=1	1874	zoneNet=subnet
1824	for i in zoneNet:	1875	zoneNet.reverse()
1825	if count == length:	1876	length=len(zoneNet)
1826	break	1877	count=0
		1878	match=1
		1879	for i in zoneNet:
		1880	if count == length:
		1881	break
1827		1882
1828	if not ip[count] == i:	1883	if not ip6[count] == i:
1829	match=0	1884	match=0
1830	count += 1	1885	count += 1
1831		1886
1832	if match == 1:	1887	if match == 1:
1833	stop=(4-length)	1888	stop=(32-length)
1834	rmIP=''	1889	rmIP=''
1835	ip.reverse()	1890	ip6.reverse()
		1891	count=0
		1892	for i in ip6:
		1893	if count == stop:
		1894	break
		1895	if len(rmIP) > 0:
		1896	rmIP=rmIP+'.'+ip6[count]
		1897	else:
		1898	rmIP=ip6[count]
		1899	count += 1
		1900	return rmIP
		1901	else:
		1902	return 0
		1903
		1904	else:
		1905	subnet=ldap.explode_dn(reverseDN, 1)[0].replace('.in-addr.arpa','').split('.')
		1906	ip=sip.split('.')
		1907	zoneNet=subnet
		1908	zoneNet.reverse()
		1909	length=len(zoneNet)
1836	count=0	1910	count=0
1837	for i in ip:	1911	match=1
1838	if count == stop:	1912	for i in zoneNet:
		1913	if count == length:
1839	break	1914	break
1840	if len(rmIP) > 0:
1841	rmIP=rmIP+'.'+ip[count]
1842	else:
1843	rmIP=ip[count]
1844	count=count+1
1845	return rmIP
1846	else:
1847	return 0
1848		1915
		1916	if not ip[count] == i:
		1917	match=0
		1918	count += 1
		1919
		1920	if match == 1:
		1921	stop=(4-length)
		1922	rmIP=''
		1923	ip.reverse()
		1924	count=0
		1925	for i in ip:
		1926	if count == stop:
		1927	break
		1928	if len(rmIP) > 0:
		1929	rmIP=rmIP+'.'+ip[count]
		1930	else:
		1931	rmIP=ip[count]
		1932	count=count+1
		1933	return rmIP # for ip='10.200.2.5' and subnet='2.200.10.in-addr.arpa' -> rmIP='5' ('5.2' for 200.10.in-addr.arpa)
		1934	else:
		1935	return 0
		1936
1849	def _ldap_pre_create(self):	1937	def _ldap_pre_create(self):
1850	self.check_common_name_length()	1938	self.check_common_name_length()
1851		1939