IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix regular expression for LOC records in DNS.

Browse Source 
- Fractional parts of integers are not mandatory.
- Expressions containing only size or only size + horizontal precision
  are allowed.
- N/S/W/E handling was fixed.

See RFC 1876 section 3 for details.

Reviewed-By: Petr Viktorin <pviktori@redhat.com>
This commit is contained in:
Petr Spacek 2014-02-17 14:37:28 +01:00 committed by Petr Viktorin
parent 96003a45a1
commit 2af96d1c0b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipalib/plugins/dns.py
View File

@ -1136,14 +1136,19 @@ class LOCRecord(DNSRecord):
See RFC 1876 for details""") See RFC 1876 for details""")
def _get_part_values(self, value): def _get_part_values(self, value):
regex = re.compile(\ regex = re.compile(
r'(?P<d1>\d{1,2}\s+)(?P<m1>\d{1,2}\s+)?(?P<s1>\d{1,2}\.?\d{1,3}?\s+)?'\ r'(?P<d1>\d{1,2}\s+)'
r'(?P<dir1>[N|S])\s+'\ r'(?:(?P<m1>\d{1,2}\s+)'
r'(?P<d2>\d{1,3}\s+)(?P<m2>\d{1,2}\s+)?(?P<s2>\d{1,2}\.?\d{1,3}?\s+)?'\ r'(?P<s1>\d{1,2}(?:\.\d{1,3})?\s+)?)?'
r'(?P<dir2>[W|E])\s+'\ r'(?P<dir1>[NS])\s+'
r'(?P<alt>-?\d{1,8}\.?\d{1,2}?)m?\s*'\ r'(?P<d2>\d{1,3}\s+)'
r'(?P<siz>\d{1,8}\.?\d{1,2}?)?m?\s*'\ r'(?:(?P<m2>\d{1,2}\s+)'
r'(?P<hp>\d{1,8}\.?\d{1,2}?)?m?\s*(?P<vp>\d{1,8}\.?\d{1,2}?)?m?\s*$') r'(?P<s2>\d{1,2}(?:\.\d{1,3})?\s+)?)?'
r'(?P<dir2>[WE])\s+'
r'(?P<alt>-?\d{1,8}(?:\.\d{1,2})?)m?'
r'(?:\s+(?P<siz>\d{1,8}(?:\.\d{1,2})?)m?'
r'(?:\s+(?P<hp>\d{1,8}(?:\.\d{1,2})?)m?'
r'(?:\s+(?P<vp>\d{1,8}(?:\.\d{1,2})?)m?\s*)?)?)?$')
m = regex.match(value) m = regex.match(value)