Skip to content

Commit

Permalink
Improved tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@peteeckel
peteeckel committed Dec 11, 2023
1 parent e52dd28 commit 67390a7
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 39 deletions.
13 changes: 7 additions & 6 deletions netbox_dns/signals/ipam_coupling.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,17 @@ def ip_address_delete_address_record(instance, **kwargs):
if not get_plugin_config("netbox_dns", "feature_ipam_coupling"):
return

try:
if request is not None:
request = current_request.get()
if request is not None:
try:
for record in instance.netbox_dns_records.all():
check_permission(request, "netbox_dns.delete_record", record)

except DNSPermissionDenied as exc:
if request.path_info.startswith("/api/"):
raise APIPermissionDenied(exc)
except DNSPermissionDenied as exc:
if request.path_info.startswith("/api/"):
raise APIPermissionDenied(exc)

Check warning

Code scanning / CodeQL

Information exposure through an exception Medium

Stack trace information
Loading
flows to this location and may be exposed to an external user.

raise PermissionDenied(exc)
raise PermissionDenied(exc)

for record in instance.netbox_dns_records.all():
record.delete()
Expand Down
68 changes: 35 additions & 33 deletions netbox_dns/tests/ipam_coupling/test_api.py
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
import requests

from unittest import skip

from django.urls import reverse
from django.test import override_settings
from django.core import management
Expand Down Expand Up @@ -59,7 +63,7 @@ def test_create_ip_with_dns_permission(self):
}
response = self.client.post(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_201_CREATED)

ip_address = IPAddress.objects.get(pk=response.data["id"])
address_record = ip_address.netbox_dns_records.first()
Expand Down Expand Up @@ -115,8 +119,7 @@ def test_delete_ip_with_dns_permission(self):
url = reverse("ipam-api:ipaddress-list") + str(ip_address.id) + "/"
response = self.client.delete(url, **self.header)

self.assertTrue(status.is_success(response.status_code))

self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
self.assertFalse(IPAddress.objects.filter(pk=ip_address.pk).exists())
self.assertFalse(Record.objects.filter(pk=address_record.pk).exists())
self.assertFalse(Record.objects.filter(pk=ptr_record_id).exists())
Expand Down Expand Up @@ -149,12 +152,12 @@ def test_delete_ip_with_dns_object_permission(self):
url = reverse("ipam-api:ipaddress-list") + str(ip_address.id) + "/"
response = self.client.delete(url, **self.header)

self.assertTrue(status.is_success(response.status_code))

self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
self.assertFalse(IPAddress.objects.filter(pk=ip_address.pk).exists())
self.assertFalse(Record.objects.filter(pk=address_record.pk).exists())
self.assertFalse(Record.objects.filter(pk=ptr_record_id).exists())

@skip("APIClient has problems handling exceptions")
@override_settings(PLUGINS_CONFIG={"netbox_dns": {"feature_ipam_coupling": True}})
def test_delete_ip_missing_dns_permission(self):
zone = self.zones[0]
Expand All @@ -176,12 +179,12 @@ def test_delete_ip_missing_dns_permission(self):
url = reverse("ipam-api:ipaddress-list") + str(ip_address.id) + "/"
response = self.client.delete(url, **self.header)

self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

# self.assertTrue(IPAddress.objects.filter(pk=ip_address.pk).exists())
# self.assertTrue(Record.objects.filter(pk=address_record.pk).exists())
# self.assertTrue(Record.objects.filter(pk=ptr_record_id).exists())
self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
self.assertTrue(IPAddress.objects.filter(pk=ip_address.pk).exists())
self.assertTrue(Record.objects.filter(pk=address_record.pk).exists())
self.assertTrue(Record.objects.filter(pk=ptr_record_id).exists())

@skip("APIClient has problems handling exceptions")
@override_settings(PLUGINS_CONFIG={"netbox_dns": {"feature_ipam_coupling": True}})
def test_delete_ip_missing_dns_object_permission(self):
zone = self.zones[0]
Expand All @@ -207,16 +210,15 @@ def test_delete_ip_missing_dns_object_permission(self):
},
)
address_record = ip_address.netbox_dns_records.first()
ptr_record_id = address_record.ptr_record.pk
ptr_record_id = address_record.ptr_record_id

url = reverse("ipam-api:ipaddress-list") + str(ip_address.id) + "/"
with disable_warnings("django.request"):
response = self.client.delete(url, **self.header)
self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
response = self.client.delete(url, **self.header)

# self.assertTrue(IPAddress.objects.filter(pk=ip_address.pk).exists())
# self.assertTrue(Record.objects.filter(pk=address_record.pk).exists())
# self.assertTrue(Record.objects.filter(pk=ptr_record_id).exists())
self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
self.assertTrue(IPAddress.objects.filter(pk=ip_address.pk).exists())
self.assertTrue(Record.objects.filter(pk=address_record.pk).exists())
self.assertTrue(Record.objects.filter(pk=ptr_record_id).exists())

@override_settings(PLUGINS_CONFIG={"netbox_dns": {"feature_ipam_coupling": True}})
def test_modify_name_with_dns_permission(self):
Expand Down Expand Up @@ -245,7 +247,7 @@ def test_modify_name_with_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -288,7 +290,7 @@ def test_modify_name_with_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -325,7 +327,7 @@ def test_modify_zone_with_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -368,7 +370,7 @@ def test_modify_zone_with_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -404,7 +406,7 @@ def test_modify_name_missing_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -456,7 +458,7 @@ def test_modify_name_missing_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -499,7 +501,7 @@ def test_modify_zone_missing_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -551,7 +553,7 @@ def test_modify_zone_missing_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

ip_address.refresh_from_db()

Expand Down Expand Up @@ -595,7 +597,7 @@ def test_clear_name_with_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

self.assertFalse(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -646,7 +648,7 @@ def test_clear_name_with_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

self.assertFalse(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -691,7 +693,7 @@ def test_clear_zone_with_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

self.assertFalse(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -742,7 +744,7 @@ def test_clear_zone_with_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertTrue(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_200_OK)

self.assertFalse(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -786,7 +788,7 @@ def test_clear_name_missing_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

self.assertTrue(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -839,7 +841,7 @@ def test_clear_name_missing_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

self.assertTrue(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -883,7 +885,7 @@ def test_clear_zone_missing_dns_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

self.assertTrue(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down Expand Up @@ -936,7 +938,7 @@ def test_clear_zone_missing_dns_object_permission(self):
}
response = self.client.patch(url, data, format="json", **self.header)

self.assertFalse(status.is_success(response.status_code))
self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)

self.assertTrue(
Record.objects.filter(ipam_ip_address=ip_address, managed=True).exists()
Expand Down

0 comments on commit 67390a7

Please sign in to comment.