Only delete a record by type and name, not only name.

ajenti · May 4, 2023 · 47fd91e · 47fd91e
1 parent 0538d59
commit 47fd91e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/plugins/dns_api/manager.py b/plugins/dns_api/manager.py
@@ -18,8 +18,8 @@ def add_record(self, record):
     def update_record(self, record):
         return self.api.update_record(self.fqdn, record)
 
-    def delete_record(self, name):
-        return self.api.delete_record(self.fqdn, name)
+    def delete_record(self, rtype, name):
+        return self.api.delete_record(self.fqdn, rtype, name)
 
 
 class DomainManager:

diff --git a/plugins/dns_api/providers/gandi.py b/plugins/dns_api/providers/gandi.py
@@ -142,20 +142,22 @@ def update_record(self, fqdn, record):
         except Exception as e:
             logging.error(e)
 
-    def delete_record(self, fqdn, name):
+    def delete_record(self, fqdn, rtype, name):
         """
         Delete a record from a given domain.
 
         :param fqdn: the domain, like example.com
         :type fqdn: basestring
-        :param record: the record name, like test (to delete the entry test.example.com)
-        :type record: Record object
+        :param rtype: type of the DNS entry, like CNAME or AAAA
+        :type rtype: basestring
+        :param name: the record name, like test (to delete the entry test.example.com)
+        :type name: basestring
         :return: status of the request and message
         :rtype: tuple
         """
 
         try:
-            resp = self._req('delete', apiurl=f"/{fqdn}/records/{name}")
+            resp = self._req('delete', apiurl=f"/{fqdn}/records/{name}/{rtype}")
             if resp.content:
                 messages = json.loads(resp.content)
             else:

diff --git a/plugins/dns_api/resources/js/controllers/index.controller.es b/plugins/dns_api/resources/js/controllers/index.controller.es
@@ -77,13 +77,13 @@ angular.module('ajenti.dns_api').controller('DnsAPIIndexController', function($s
         $scope.detailsVisible = false;
     };
 
-    $scope.delete = (name) => {
+    $scope.delete = (record) => {
         messagebox.show({
-            text: gettext(`Really delete the entry ${name}?`),
+            text: gettext(`Really delete the entry "${record.name} ${record.type} ${record.values}"?`),
             positive: gettext('Delete'),
             negative: gettext('Cancel')
         }).then(() => {
-            $http.delete(`/api/dns_api/domain/${$scope.active_domain}/records/${name}`).then((resp) => {
+            $http.delete(`/api/dns_api/domain/${$scope.active_domain}/records/${record.type}/${record.name}`).then((resp) => {
                 code = resp.data[0];
                 msg = resp.data[1];
                 if (code >= 200 && code < 300) {

diff --git a/plugins/dns_api/resources/partial/index.html b/plugins/dns_api/resources/partial/index.html
@@ -49,7 +49,7 @@ <h2>{{provider}}</h2>
                     </button>
                 </td>
                 <td>
-                    <button class="btn btn-default" ng:click="delete(record.name)">
+                    <button class="btn btn-default" ng:click="delete(record)">
                         <i class="fas fa-trash"></i>
                     </button>
                 </td>

diff --git a/plugins/dns_api/views.py b/plugins/dns_api/views.py
@@ -48,7 +48,7 @@ def handle_api_dns_put_record(self, http_context, fqdn, name):
         )
         return self.mgr.domains[fqdn].update_record(record)
 
-    @delete(r'/api/dns_api/domain/(?P<fqdn>[\w\.]+)/records/(?P<name>.*)')
+    @delete(r'/api/dns_api/domain/(?P<fqdn>[\w\.]+)/records/(?P<rtype>[A-Z]*)/(?P<name>.*)')
     @endpoint(api=True)
-    def handle_api_dns_delete_record(self, http_context, fqdn, name):
-        return self.mgr.domains[fqdn].delete_record(name)
+    def handle_api_dns_delete_record(self, http_context, fqdn, rtype, name):
+        return self.mgr.domains[fqdn].delete_record(rtype, name)