From a7e91b6f4082f528a6f027ef2ee374f38fb4cc09 Mon Sep 17 00:00:00 2001
From: Thomas M Steenholdt <tsteenholdt@cascadetechnologypartners.com>
Date: Thu, 24 May 2018 16:12:12 -0200
Subject: [PATCH] Fix SOA-EDIT-API options

The options for SOA-EDIT-API included was actually the options used for SOA-EDIT, which is a very different beast.
Those options have been swapped out for the options allowed in SOA-EDIT-API and SOA-EDIT-DNSUPDATE.
---
 app/models.py                        | 52 ++++++++++++++--------------
 app/templates/domain_add.html        | 44 ++++++-----------------
 app/templates/domain_management.html | 28 +++++----------
 3 files changed, 44 insertions(+), 80 deletions(-)

diff --git a/app/models.py b/app/models.py
index a246320..a3592c7 100644
--- a/app/models.py
+++ b/app/models.py
@@ -627,21 +627,19 @@ class Domain(db.Model):
             domain_name = domain_name + '.'
             domain_ns = [ns + '.' for ns in domain_ns]
 
-        if soa_edit_api == 'OFF':
-            post_data = {
-                            "name": domain_name,
-                            "kind": domain_type,
-                            "masters": domain_master_ips,
-                            "nameservers": domain_ns,
-                        }
-        else:
-            post_data = {
-                                "name": domain_name,
-                                "kind": domain_type,
-                                "masters": domain_master_ips,
-                                "nameservers": domain_ns,
-                                "soa_edit_api": soa_edit_api
-                            }
+        if soa_edit_api not in ["DEFAULT", "INCREASE", "EPOCH", "OFF"]:
+            soa_edit_api = 'DEFAULT'
+
+        elif soa_edit_api == 'OFF':
+            soa_edit_api = ''
+
+        post_data = {
+            "name": domain_name,
+            "kind": domain_type,
+            "masters": domain_master_ips,
+            "nameservers": domain_ns,
+            "soa_edit_api": soa_edit_api
+        }
 
         try:
             jdata = utils.fetch_json(urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones'), headers=headers, method='POST', data=post_data)
@@ -662,16 +660,18 @@ class Domain(db.Model):
             return {'status': 'error', 'msg': 'Domain doesnt exist.'}
         headers = {}
         headers['X-API-Key'] = PDNS_API_KEY
-        if soa_edit_api == 'OFF':
-            post_data = {
-                            "soa_edit_api": None,
-                            "kind": domain.type
-                        }
-        else:
-            post_data = {
-                                "soa_edit_api": soa_edit_api,
-                                "kind": domain.type
-            }
+
+        if soa_edit_api not in ["DEFAULT", "INCREASE", "EPOCH", "OFF"]:
+            soa_edit_api = 'DEFAULT'
+
+        elif soa_edit_api == 'OFF':
+            soa_edit_api = ''
+
+        post_data = {
+            "soa_edit_api": soa_edit_api,
+            "kind": domain.type
+        }
+
         try:
             jdata = utils.fetch_json(
             urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/{0}'.format(domain.name)), headers=headers,
@@ -705,7 +705,7 @@ class Domain(db.Model):
                 system_auto_ptr or \
                 domain_auto_ptr
             ):
-            result = self.add(domain_reverse_name, 'Master', 'INCEPTION-INCREMENT', '', '')
+            result = self.add(domain_reverse_name, 'Master', 'DEFAULT', '', '')
             self.update()
             if result['status'] == 'ok':
                 history = History(msg='Add reverse lookup domain {0}'.format(domain_reverse_name), detail=str({'domain_type': 'Master', 'domain_master_ips': ''}), created_by='System')
diff --git a/app/templates/domain_add.html b/app/templates/domain_add.html
index 96daec5..d64beb1 100644
--- a/app/templates/domain_add.html
+++ b/app/templates/domain_add.html
@@ -63,27 +63,12 @@
                         <label>SOA-EDIT-API</label>
                         <div class="radio">
                             <label>
-                                <input type="radio" name="radio_type_soa_edit_api" id="radio_off" value="OFF" checked> (OFF)
+                                <input type="radio" name="radio_type_soa_edit_api" id="radio_default" value="DEFAULT" checked> DEFAULT
                             </label>
                         </div>
                         <div class="radio">
                             <label>
-                                <input type="radio" name="radio_type_soa_edit_api" id="radio_inception_increment" value="INCEPTION-INCREMENT"> INCEPTION-INCREMENT
-                            </label>
-                        </div>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" name="radio_type_soa_edit_api" id="radio_inception" value="INCEPTION"> INCEPTION
-                            </label>
-                        </div>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" name="radio_type_soa_edit_api" id="radio_increment_week" value="INCREMENT-WEEK"> INCREMENT-WEEK
-                            </label>
-                        </div>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" name="radio_type_soa_edit_api" id="radio_increment_weeks" value="INCREMENT-WEEKS"> INCREMENT-WEEKS
+                                <input type="radio" name="radio_type_soa_edit_api" id="radio_increase" value="INCREASE"> INCREASE
                             </label>
                         </div>
                         <div class="radio">
@@ -93,7 +78,7 @@
                         </div>
                         <div class="radio">
                             <label>
-                                <input type="radio" name="radio_type_soa_edit_api" id="radio_inception_epoch" value="INCEPTION-EPOCH"> INCEPTION-EPOCH
+                                <input type="radio" name="radio_type_soa_edit_api" id="radio_off" value="OFF"> OFF
                             </label>
                         </div>
                     </div>
@@ -132,28 +117,19 @@
                         </ul>
                     </dd>
                     <dt>SOA-EDIT-API</dt>
-                    <dd>The SOA-EDIT-API setting defines when and how the SOA serial number will be updated after a change is made to the domain.
+                    <dd>The SOA-EDIT-API setting defines how the SOA serial number will be updated after a change is made to the domain.
                         <ul>
-                            <li>
-                                (OFF) - Not set
+	                    <li>
+                                DEFAULT - Generate a soa serial of YYYYMMDD01. If the current serial is lower than the generated serial, use the generated serial. If the current serial is higher or equal to the generated serial, increase the current serial by 1.
                             </li>
                             <li>
-                                INCEPTION-INCREMENT - Uses YYYYMMDDSS format for SOA serial numbers. If the SOA serial from the backend is within two days after inception, it gets incremented by two (the backend should keep SS below 98).
+                                INCREASE - Increase the current serial by 1.
                             </li>
                             <li>
-                                INCEPTION - Sets the SOA serial to the last inception time in YYYYMMDD01 format. Uses localtime to find the day for inception time. <strong>Not recomended.</strong>
+                                EPOCH - Change the serial to the number of seconds since the EPOCH, aka unixtime.
                             </li>
                             <li>
-                                INCREMENT-WEEK - Sets the SOA serial to the number of weeks since the epoch, which is the last inception time in weeks. <strong>Not recomended.</strong>
-                            </li>
-                            <li>
-                                INCREMENT-WEEKS - Increments the serial with the number of weeks since the UNIX epoch. This should work in every setup; but the result won't look like YYYYMMDDSS anymore.
-                            </li>
-                            <li>
-                                EPOCH - Sets the SOA serial to the number of seconds since the epoch.
-                            </li>
-                            <li>
-                                INCEPTION-EPOCH - Sets the new SOA serial number to the maximum of the old SOA serial number, and age in seconds of the last inception. 
+                                OFF - Disable automatic updates of the SOA serial.
                             </li>
                         </ul>
                     </dd>
@@ -176,4 +152,4 @@
         }
     });
 </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/app/templates/domain_management.html b/app/templates/domain_management.html
index 8ca8507..bf35849 100644
--- a/app/templates/domain_management.html
+++ b/app/templates/domain_management.html
@@ -109,41 +109,29 @@
                     <h3 class="box-title">Change SOA-EDIT-API</h3>
                 </div>
                 <div class="box-body">
-                    <p>The SOA-EDIT-API setting defines when and how the SOA serial number will be updated after a change is made to the domain.</p>
+                    <p>The SOA-EDIT-API setting defines how the SOA serial number will be updated after a change is made to the domain.</p>
                     <ul>
                             <li>
-                                (OFF) - Not set
+                                DEFAULT - Generate a soa serial of YYYYMMDD01. If the current serial is lower than the generated serial, use the generated serial. If the current serial is higher or equal to the generated serial, increase the current serial by 1.
                             </li>
                             <li>
-                                INCEPTION-INCREMENT - Uses YYYYMMDDSS format for SOA serial numbers. If the SOA serial from the backend is within two days after inception, it gets incremented by two (the backend should keep SS below 98).
+                                INCREASE - Increase the current serial by 1.
                             </li>
                             <li>
-                                INCEPTION - Sets the SOA serial to the last inception time in YYYYMMDD01 format. Uses localtime to find the day for inception time. <strong>Not recomended.</strong>
+                                EPOCH - Change the serial to the number of seconds since the EPOCH, aka unixtime.
                             </li>
                             <li>
-                                INCREMENT-WEEK - Sets the SOA serial to the number of weeks since the epoch, which is the last inception time in weeks. <strong>Not recomended.</strong>
-                            </li>
-                            <li>
-                                INCREMENT-WEEKS - Increments the serial with the number of weeks since the UNIX epoch. This should work in every setup; but the result won't look like YYYYMMDDSS anymore.
-                            </li>
-                            <li>
-                                EPOCH - Sets the SOA serial to the number of seconds since the epoch.
-                            </li>
-                            <li>
-                                INCEPTION-EPOCH - Sets the new SOA serial number to the maximum of the old SOA serial number, and age in seconds of the last inception.
+                                OFF - Disable automatic updates of the SOA serial.
                             </li>
                         </ul>
                     <b>New SOA-EDIT-API Setting:</b>
                     <form method="post" action="{{ url_for('domain_change_soa_edit_api', domain_name=domain.name) }}">
                     <select name="soa_edit_api" class="form-control" style="width:15em;">
                         <option selected value="0">- Unchanged -</option>
-                        <option>OFF</option>
-                        <option>INCEPTION-INCREMENT</option>
-                        <option>INCEPTION</option>
-                        <option>INCREMENT-WEEK</option>
-                        <option>INCREMENT-WEEKS</option>
+                        <option>DEFAULT</option>
+                        <option>INCREASE</option>
                         <option>EPOCH</option>
-                        <option>INCEPTION-EPOCH</option>
+                        <option>OFF</option>
                     </select><br/>
                     <button type="submit" class="btn btn-flat btn-primary" id="change_soa_edit_api">
                         <i class="fa fa-check"></i>&nbsp;Change SOA-EDIT-API setting for {{ domain.name }}