deblan/PowerDNS-Admin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

domain stripping was not limited to the end of a name

Browse source
This commit is contained in:
Kees Monshouwer 2018-04-12 02:20:49 +02:00 committed by mind04
parent a12af5345d
commit df9e392e26
No known key found for this signature in database
GPG key ID: 2698B1807E43953E
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/utils.py
View file

@ -130,7 +130,7 @@ def display_record_name(data):
if record_name == domain_name:
return '@'
else:
return record_name.replace('.'+domain_name, '')
return re.sub('\.{}$'.format(domain_name), '', record_name)
def display_master_name(data):

4
app/views.py
View file

@ -917,14 +917,14 @@ def create_template_from_zone():
if NEW_SCHEMA:
for jr in jrecords:
if jr['type'] in app.config['RECORDS_ALLOW_EDIT']:
name = '@' if jr['name'] == domain_name else jr['name'].replace('.'+domain_name, '')
name = '@' if jr['name'] == domain_name else re.sub('\.{}$'.format(domain_name), '', jr['name'])
for subrecord in jr['records']:
record = DomainTemplateRecord(name=name, type=jr['type'], status=True if subrecord['disabled'] else False, ttl=jr['ttl'], data=subrecord['content'])
records.append(record)
else:
for jr in jrecords:
if jr['type'] in app.config['RECORDS_ALLOW_EDIT']:
name = '@' if jr['name'] == domain_name else jr['name'].replace('.'+domain_name, '')
name = '@' if jr['name'] == domain_name else re.sub('\.{}$'.format(domain_name), '', jr['name'])
record = DomainTemplateRecord(name=name, type=jr['type'], status=True if jr['disabled'] else False, ttl=jr['ttl'], data=jr['content'])
records.append(record)