Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 22:06:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1140 from xmok/check-ttl-before-add-or-update-dns

Browse Source 
make sure TTL is 0-86400 inclusive when add or update
This commit is contained in:
Usman Nasir
2023-10-26 11:52:15 +05:00
committed by GitHub
parent b98f979399 41392b6bda
commit 045cd65850
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dns/dnsManager.py
View File

@@ -257,6 +257,10 @@ class DNSManager:
recordType = data['recordType'] recordType = data['recordType']
recordName = data['recordName'] recordName = data['recordName']
ttl = int(data['ttl']) ttl = int(data['ttl'])
if ttl < 0:
raise ValueError("TTL: The item must be greater than 0")
elif ttl > 86400:
raise ValueError("TTL: The item must be lesser than 86401")
admin = Administrator.objects.get(pk=userID) admin = Administrator.objects.get(pk=userID)
if ACLManager.checkOwnershipZone(zoneDomain, admin, currentACL) == 1: if ACLManager.checkOwnershipZone(zoneDomain, admin, currentACL) == 1:
@@ -444,6 +448,10 @@ class DNSManager:
if data['ttlNow'] != None: if data['ttlNow'] != None:
record.ttl = int(data['ttlNow']) record.ttl = int(data['ttlNow'])
if record.ttl < 0:
raise ValueError("TTL: The item must be greater than 0")
elif record.ttl > 86400:
raise ValueError("TTL: The item must be lesser than 86401")
if data['priorityNow'] != None: if data['priorityNow'] != None:
record.prio = int(data['priorityNow']) record.prio = int(data['priorityNow'])
@@ -826,6 +834,10 @@ class DNSManager:
recordType = data['recordType'] recordType = data['recordType']
recordName = data['recordName'] recordName = data['recordName']
ttl = int(data['ttl']) ttl = int(data['ttl'])
if ttl < 0:
raise ValueError("TTL: The item must be greater than 0")
elif ttl > 86400:
raise ValueError("TTL: The item must be lesser than 86401")
admin = Administrator.objects.get(pk=userID) admin = Administrator.objects.get(pk=userID)
self.admin = admin self.admin = admin

20
dns/templates/dns/addDeleteDNSRecords.html
View File

@@ -88,7 +88,7 @@
</div> </div>
<div class="col-sm-3 aRecord"> <div class="col-sm-3 aRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -114,7 +114,7 @@
</div> </div>
<div class="col-sm-3 aaaaRecord"> <div class="col-sm-3 aaaaRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -141,7 +141,7 @@
</div> </div>
<div class="col-sm-3 cNameRecord"> <div class="col-sm-3 cNameRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -167,7 +167,7 @@
</div> </div>
<div class="col-sm-2 mxRecord"> <div class="col-sm-2 mxRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -199,7 +199,7 @@
</div> </div>
<div class="col-sm-3 spfRecord"> <div class="col-sm-3 spfRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -226,7 +226,7 @@
</div> </div>
<div class="col-sm-3 txtRecord"> <div class="col-sm-3 txtRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -253,7 +253,7 @@
</div> </div>
<div class="col-sm-3 soaRecord"> <div class="col-sm-3 soaRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -280,7 +280,7 @@
</div> </div>
<div class="col-sm-3 nsRecord"> <div class="col-sm-3 nsRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -307,7 +307,7 @@
</div> </div>
<div class="col-sm-2 srvRecord"> <div class="col-sm-2 srvRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
@@ -337,7 +337,7 @@
ng-model="recordName"> ng-model="recordName">
</div> </div>
<div class="col-sm-3 caaRecord"> <div class="col-sm-3 caaRecord">
<input placeholder="{% trans 'TTL' %}" type="number" class="form-control" <input placeholder="{% trans 'TTL' %}" type="number" min="0" max="86400" class="form-control"
ng-model="ttl" required> ng-model="ttl" required>
</div> </div>
<div class="col-sm-3 caaRecord"> <div class="col-sm-3 caaRecord">