cwinfo/powerdns-admin
5
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2024-11-10 07:30:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an extra check into reverse domain creation

Browse Source 
and also import strtobool
This commit is contained in:
SIPOS, Peter 2016-11-21 13:44:47 +01:00
parent 791b7656ca
commit 3911935e3b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/models.py
View File

@ -11,6 +11,7 @@ import re
import dns.reversename import dns.reversename
from datetime import datetime from datetime import datetime
from distutils.util import strtobool
from distutils.version import StrictVersion from distutils.version import StrictVersion
from flask_login import AnonymousUserMixin from flask_login import AnonymousUserMixin
@ -609,10 +610,18 @@ class Domain(db.Model):
Check the existing reverse lookup domain, Check the existing reverse lookup domain,
if not exists create a new one automatically if not exists create a new one automatically
""" """
domain_obj = Domain.query.filter(Domain.name == domain).first()
domain_auto_ptr = DomainSetting.query.filter(DomainSetting.domain == domain_obj).filter(DomainSetting.setting == 'auto_ptr').first()
domain_auto_ptr = strtobool(domain_auto_ptr.value) if domain_auto_ptr else False
system_auto_ptr = Setting.query.filter(Setting.name == 'auto_ptr').first()
system_auto_ptr = strtobool(system_auto_ptr.value)
self.name = domain_name self.name = domain_name
domain_id = self.get_id_by_name(domain_reverse_name) domain_id = self.get_id_by_name(domain_reverse_name)
if None == domain_id and app.config['AUTOMATIC_REVERSE_PTR']: if None == domain_id and \
result = self.add(domain_reverse_name, 'Master', 'INCEPTION_INCREMENT', '', '') (
system_auto_ptr or \
domain_auto_ptr
):
result = self.add(domain_reverse_name, 'Master', 'INCEPTION-INCREMENT', '', '') result = self.add(domain_reverse_name, 'Master', 'INCEPTION-INCREMENT', '', '')
self.update() self.update()
if result['status'] == 'ok': if result['status'] == 'ok':