harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

Refactoring and a testcase for channels=None

Browse Source
This commit is contained in:
Pēteris Caune 2018-11-08 11:59:04 +02:00
parent e866d63ca4
commit 16d78db72e
No known key found for this signature in database
GPG Key ID: E28D7679E9A9EDE2
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hc/api/tests/test_update_check.py
View File

@ -151,3 +151,11 @@ class UpdateCheckTestCase(BaseTestCase):
self.check.refresh_from_db() self.check.refresh_from_db()
self.assertEqual(self.check.channel_set.count(), 0) self.assertEqual(self.check.channel_set.count(), 0)
def test_it_rejects_non_string_channels_key(self):
r = self.post(self.check.code, {
"api_key": "X" * 32,
"channels": None
})
self.assertEqual(r.status_code, 400)

21
hc/api/views.py
View File

@ -1,5 +1,4 @@
from datetime import timedelta as td from datetime import timedelta as td
from uuid import UUID
from django.conf import settings from django.conf import settings
from django.core.exceptions import SuspiciousOperation from django.core.exceptions import SuspiciousOperation
@ -83,17 +82,17 @@ def _update(check, spec):
if "channels" in spec: if "channels" in spec:
if spec["channels"] == "*": if spec["channels"] == "*":
check.assign_all_channels() check.assign_all_channels()
else: elif spec["channels"] == "":
check.channel_set.clear() check.channel_set.clear()
if spec["channels"] is not None and spec["channels"] != "": else:
channels = [] channels = []
for raw_channel in spec["channels"].split(","): for chunk in spec["channels"].split(","):
try: try:
channel = Channel.objects.get(code=UUID(raw_channel)) channel = Channel.objects.get(code=chunk)
channels.append(channel) channels.append(channel)
except Channel.objects.model.DoesNotExist: except Channel.DoesNotExist:
raise SuspiciousOperation("One of the specified channels is missing") raise SuspiciousOperation("Invalid channel identifier")
check.channel_set.add(*channels) check.channel_set.set(channels)
return check return check