Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 12 additions & 22 deletions tests/api_app/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ class PluginConfigViewSetTestCase(CustomViewSetTestCase):

def setUp(self):
super().setUp()
PluginConfig.objects.all().delete()

def test_plugin_config(self):
org = Organization.create("test_org", self.user)
Expand Down Expand Up @@ -818,7 +817,7 @@ def test_plugin_config_list(self):
if obj["attribute"] == pc0.attribute:
needle = obj
# the owner cannot see configs of other orgs (pc1)
if "organization" in obj.keys():
if "organization" in obj.keys() and obj["organization"] is not None:
self.assertEqual(obj["organization"], "testorg0")
self.assertIsNotNone(needle)
self.assertIn("type", needle)
Expand All @@ -845,7 +844,7 @@ def test_plugin_config_list(self):
if obj["attribute"] == pc0.attribute:
needle = obj
# an admin cannot see configs of other orgs (pc1)
if "organization" in obj.keys():
if "organization" in obj.keys() and obj["organization"] is not None:
self.assertEqual(obj["organization"], "testorg0")
self.assertIsNotNone(needle)
self.assertIn("type", needle)
Expand All @@ -872,7 +871,7 @@ def test_plugin_config_list(self):
if obj["attribute"] == pc1.attribute:
needle = obj
# a user cannot see configs of other orgs (pc0)
if "organization" in obj.keys():
if "organization" in obj.keys() and obj["organization"] is not None:
self.assertEqual(obj["organization"], "testorg1")
self.assertIsNotNone(needle)
self.assertIn("type", needle)
Expand Down Expand Up @@ -1242,11 +1241,11 @@ def test_delete(self):
user=self.user, organization=org, is_owner=False, is_admin=False
)
ac = AnalyzerConfig.objects.get(name="AbuseIPDB")
uri = "/api/plugin-config/1"
uri = "/api/plugin-config"

# logged out
self.client.logout()
response = self.client.delete(uri, {}, format="json")
response = self.client.delete(f"{uri}/1", {}, format="json")
self.assertEqual(response.status_code, 401)

param = Parameter.objects.create(
Expand All @@ -1256,60 +1255,51 @@ def test_delete(self):
required=True,
type="str",
)
pc = PluginConfig(
pc, _ = PluginConfig.objects.get_or_create(
value="supersecret",
for_organization=True,
owner=self.superuser,
parameter=param,
analyzer_config=ac,
id=1,
)
pc.full_clean()
pc.save()
self.assertEqual(pc.owner, org.owner)

# user can not delete org secret
self.client.force_authenticate(user=self.user)
response = self.client.delete(uri, {}, format="json")
response = self.client.delete(f"{uri}/{pc.id}", {}, format="json")
self.assertEqual(response.status_code, 403)

# owner can delete org secret
self.client.force_authenticate(user=self.superuser)
response = self.client.delete(uri, format="json")
response = self.client.delete(f"{uri}/{pc.id}", format="json")
self.assertEqual(response.status_code, 204)

pc = PluginConfig(
pc, _ = PluginConfig.objects.get_or_create(
value="supersecret",
for_organization=True,
owner=self.superuser,
parameter=param,
analyzer_config=ac,
id=1,
)
pc.full_clean()
pc.save()
self.assertEqual(pc.owner, org.owner)

# admin can delete org secret
self.client.force_authenticate(user=self.admin)
response = self.client.delete(uri, {}, format="json")
response = self.client.delete(f"{uri}/{pc.id}", {}, format="json")
self.assertEqual(response.status_code, 204)

pc = PluginConfig(
pc, _ = PluginConfig.objects.get_or_create(
value="supersecret",
for_organization=False,
owner=self.user,
parameter=param,
analyzer_config=ac,
id=1,
)
pc.full_clean()
pc.save()
self.assertEqual(pc.owner, self.user)

# user can delete own personal secret
self.client.force_authenticate(user=self.user)
response = self.client.delete(uri, {}, format="json")
response = self.client.delete(f"{uri}/{pc.id}", {}, format="json")
self.assertEqual(response.status_code, 204)

def test_get_403(self):
Expand Down
Loading