diff --git a/db.sqlite3 b/db.sqlite3 index c17f67e..29dda90 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/fireworks_detect/__pycache__/admin.cpython-313.pyc b/fireworks_detect/__pycache__/admin.cpython-313.pyc index 477b8be..558168b 100644 Binary files a/fireworks_detect/__pycache__/admin.cpython-313.pyc and b/fireworks_detect/__pycache__/admin.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/models.cpython-313.pyc b/fireworks_detect/__pycache__/models.cpython-313.pyc index 9591945..c61d6d5 100644 Binary files a/fireworks_detect/__pycache__/models.cpython-313.pyc and b/fireworks_detect/__pycache__/models.cpython-313.pyc differ diff --git a/fireworks_detect/admin.py b/fireworks_detect/admin.py index de2be82..a84473d 100644 --- a/fireworks_detect/admin.py +++ b/fireworks_detect/admin.py @@ -7,7 +7,6 @@ from django.core.exceptions import PermissionDenied from django.http import HttpResponseNotAllowed from django.shortcuts import get_object_or_404, redirect from django.urls import path, reverse -from django.utils import timezone from django.utils.html import format_html from django.utils.translation import gettext as _, gettext_lazy, ngettext @@ -124,29 +123,21 @@ class EventAdmin(ClassificationAdmin): @admin.register(Sensor) class SensorAdmin(admin.ModelAdmin): - list_display = ("name", "is_active", "heartbeat_light", "last_heartbeat", "last_submission", "token_prefix") - list_filter = ("is_active",) - search_fields = ("name", "token_prefix") - readonly_fields = ("token_prefix", "last_heartbeat", "last_submission", "created_at") + list_display = ("name", "owner", "is_active", "heartbeat_light", "last_heartbeat", "last_submission", "token_prefix", "archived_at") + list_filter = ("is_active", "owner", "archived_at") + search_fields = ("name", "token_prefix", "owner__username", "owner__email") + readonly_fields = ("token_prefix", "last_heartbeat", "last_submission", "created_at", "archived_at") actions = ("issue_api_token",) fieldsets = ( - (gettext_lazy("Sensor"), {"fields": ("name", "is_active", "created_at")}), + (gettext_lazy("Sensor"), {"fields": ("name", "owner", "is_active", "created_at", "archived_at")}), (gettext_lazy("API token"), {"fields": ("token_prefix",), "description": gettext_lazy("Save the sensor first, select it in the list, then choose ‘Issue or rotate API token’. The complete token is shown once only; its salted hash is the only value stored.")}), (gettext_lazy("Heartbeat"), {"fields": ("last_heartbeat", "last_submission"), "description": gettext_lazy("Devices should POST to /fireworks/heartbeat/ with Authorization: Bearer . Green means seen within 5 minutes; amber within 15; red is older or never seen.")}), ) @admin.display(description=gettext_lazy("Heartbeat")) def heartbeat_light(self, obj): - if not obj.last_heartbeat: - colour, label = "#ef4444", _("Never seen") - else: - age = timezone.now() - obj.last_heartbeat - if age.total_seconds() <= 300: - colour, label = "#22c55e", _("Online") - elif age.total_seconds() <= 900: - colour, label = "#f59e0b", _("Delayed") - else: - colour, label = "#ef4444", _("Offline") + status, label = obj.heartbeat_status() + colour = {"online": "#22c55e", "delayed": "#f59e0b"}.get(status, "#ef4444") return format_html('{}', colour, label) @admin.action(description=gettext_lazy("Issue or rotate API token (shown once)")) diff --git a/fireworks_detect/migrations/0008_sensor_owner_sensor_archived_at.py b/fireworks_detect/migrations/0008_sensor_owner_sensor_archived_at.py new file mode 100644 index 0000000..8ef1d91 --- /dev/null +++ b/fireworks_detect/migrations/0008_sensor_owner_sensor_archived_at.py @@ -0,0 +1,23 @@ +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + dependencies = [ + ("fireworks_detect", "0007_event_direction_accuracy_degrees_and_more"), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name="sensor", + name="owner", + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name="sensors", to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name="sensor", + name="archived_at", + field=models.DateTimeField(blank=True, editable=False, null=True), + ), + ] diff --git a/fireworks_detect/migrations/__pycache__/0008_sensor_owner_sensor_archived_at.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0008_sensor_owner_sensor_archived_at.cpython-313.pyc new file mode 100644 index 0000000..7e4851f Binary files /dev/null and b/fireworks_detect/migrations/__pycache__/0008_sensor_owner_sensor_archived_at.cpython-313.pyc differ diff --git a/fireworks_detect/models.py b/fireworks_detect/models.py index 9bfc094..0d5d47f 100644 --- a/fireworks_detect/models.py +++ b/fireworks_detect/models.py @@ -1,6 +1,7 @@ import math import secrets +from django.conf import settings from django.contrib.auth.hashers import check_password, make_password from django.core.exceptions import ValidationError from django.core.files.storage import default_storage @@ -13,7 +14,9 @@ class Sensor(models.Model): """A physical recorder authorised to submit audio to the device API.""" name = models.CharField(max_length=100, unique=True, help_text=_("A recognisable device name, e.g. Garden ESP32.")) + owner = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, on_delete=models.SET_NULL, related_name="sensors") is_active = models.BooleanField(default=True) + archived_at = models.DateTimeField(null=True, blank=True, editable=False) token_prefix = models.CharField(max_length=15, blank=True, editable=False) token_hash = models.CharField(max_length=256, blank=True, editable=False) last_heartbeat = models.DateTimeField(null=True, blank=True, editable=False) @@ -37,6 +40,23 @@ class Sensor(models.Model): def token_matches(self, token): return bool(self.token_hash) and check_password(token, self.token_hash) + def heartbeat_status(self): + if not self.last_heartbeat: + return "never", _("Never seen") + age = (timezone.now() - self.last_heartbeat).total_seconds() + if age <= 300: + return "online", _("Online") + if age <= 900: + return "delayed", _("Delayed") + return "offline", _("Offline") + + def archive(self): + self.archived_at = timezone.now() + self.is_active = False + self.token_hash = "" + self.token_prefix = "" + self.save(update_fields=["archived_at", "is_active", "token_hash", "token_prefix"]) + def record_heartbeat(self, submission=False): now = timezone.now() self.last_heartbeat = now diff --git a/frontend/src/styles/pages/settings.css b/frontend/src/styles/pages/settings.css index c068160..daef905 100644 --- a/frontend/src/styles/pages/settings.css +++ b/frontend/src/styles/pages/settings.css @@ -1 +1,11 @@ -body{min-width:320px;margin:0;padding:2rem;color:#eef3ff;font-family:Inter,system-ui,sans-serif;background:#090e1d}.card{width:min(100%,42rem);margin:auto;padding:2rem;border:1px solid #2b3d68;border-radius:1rem;background:#172443}h1{margin-top:0}h2{margin:0}.intro,.help{color:#aab9d8;line-height:1.5}.section{margin-top:2rem;padding-top:1.5rem;border-top:1px solid #2b3d68}label{display:block;margin:.9rem 0 .35rem;font-weight:700}input[type=url]{width:100%;min-height:2.8rem;padding:.65rem;border:1px solid #526b9f;border-radius:.55rem;color:#eef3ff;font:inherit;background:#0a1123}.check{display:flex;gap:.6rem;align-items:center}.check label{margin:0}.button{min-height:2.8rem;margin-top:1rem;padding:.6rem 1rem;border:0;border-radius:.55rem;color:#17132b;font:inherit;font-weight:800;background:#a6ccff;cursor:pointer}.button--secondary{margin-right:.7rem;background:#d8c1fb}.alert,.errorlist{margin-top:1rem;padding:.75rem;border-radius:.55rem}.alert--success{color:#d1fae5;background:#14532d}.alert--error,.errorlist{color:#fee2e2;background:#7f1d1d}.messages{padding:0;list-style:none}@media(max-width:32rem){body{padding:1rem}.card{padding:1.4rem}} \ No newline at end of file +body{min-width:320px;margin:0;padding:2rem;color:#eef3ff;font-family:Inter,system-ui,sans-serif;background:#090e1d}.card{width:min(100%,42rem);margin:auto;padding:2rem;border:1px solid #2b3d68;border-radius:1rem;background:#172443}h1{margin-top:0}h2{margin:0}.intro,.help{color:#aab9d8;line-height:1.5}.section{margin-top:2rem;padding-top:1.5rem;border-top:1px solid #2b3d68}label{display:block;margin:.9rem 0 .35rem;font-weight:700}input[type=url]{width:100%;min-height:2.8rem;padding:.65rem;border:1px solid #526b9f;border-radius:.55rem;color:#eef3ff;font:inherit;background:#0a1123}.check{display:flex;gap:.6rem;align-items:center}.check label{margin:0}.button{min-height:2.8rem;margin-top:1rem;padding:.6rem 1rem;border:0;border-radius:.55rem;color:#17132b;font:inherit;font-weight:800;background:#a6ccff;cursor:pointer}.button--secondary{margin-right:.7rem;background:#d8c1fb}.alert,.errorlist{margin-top:1rem;padding:.75rem;border-radius:.55rem}.alert--success{color:#d1fae5;background:#14532d}.alert--error,.errorlist{color:#fee2e2;background:#7f1d1d}.messages{padding:0;list-style:none}@media(max-width:32rem){body{padding:1rem}.card{padding:1.4rem}} +.sensor-card{margin:1rem 0;padding:1rem;border:1px solid var(--theme-line);border-radius:.7rem;background:var(--theme-surface-raised)} +.sensor-card p{margin:.5rem 0;color:var(--theme-muted)} +.sensor-card .button{display:inline-block;text-decoration:none} +.sensor-status{display:inline-block;margin-left:.5rem;color:#ef4444;font-weight:700} +.sensor-status--online{color:#22c55e}.sensor-status--delayed{color:#f59e0b} +input[type=text]{box-sizing:border-box;width:100%;min-height:2.8rem;padding:.65rem;border:1px solid var(--theme-line);border-radius:.55rem;color:var(--theme-ink);font:inherit;background:var(--theme-input)} +.token-once{margin:1rem 0;padding:1rem;border:1px solid #f59e0b;border-radius:.7rem;background:var(--theme-surface-raised)} +.token-once code{display:block;overflow-wrap:anywhere;margin-top:.7rem;padding:.7rem;border-radius:.4rem;background:var(--theme-input);user-select:all} +.button--danger{color:#fff;background:#991b1b} +:root[data-theme=light] .sensor-status:not(.sensor-status--online):not(.sensor-status--delayed){color:#b91c1c} diff --git a/media/fireworks_audio/2026/10/02/sample.wav b/media/fireworks_audio/2026/10/02/sample.wav new file mode 100644 index 0000000..6a8dc96 --- /dev/null +++ b/media/fireworks_audio/2026/10/02/sample.wav @@ -0,0 +1 @@ +RIFF0000WAVEdata \ No newline at end of file diff --git a/media/fireworks_audio/2026/10/02/sound-signal-manual-20261002-131804-53ed07c9.wav b/media/fireworks_audio/2026/10/02/sound-signal-manual-20261002-131804-53ed07c9.wav new file mode 100644 index 0000000..08bc09b Binary files /dev/null and b/media/fireworks_audio/2026/10/02/sound-signal-manual-20261002-131804-53ed07c9.wav differ diff --git a/members/__pycache__/sensor_views.cpython-313.pyc b/members/__pycache__/sensor_views.cpython-313.pyc new file mode 100644 index 0000000..d2bd4a8 Binary files /dev/null and b/members/__pycache__/sensor_views.cpython-313.pyc differ diff --git a/members/__pycache__/settings_urls.cpython-313.pyc b/members/__pycache__/settings_urls.cpython-313.pyc index 3622e95..b48fac4 100644 Binary files a/members/__pycache__/settings_urls.cpython-313.pyc and b/members/__pycache__/settings_urls.cpython-313.pyc differ diff --git a/members/__pycache__/test_sensors.cpython-313.pyc b/members/__pycache__/test_sensors.cpython-313.pyc new file mode 100644 index 0000000..0a372ef Binary files /dev/null and b/members/__pycache__/test_sensors.cpython-313.pyc differ diff --git a/members/__pycache__/views.cpython-313.pyc b/members/__pycache__/views.cpython-313.pyc index a767621..a712bd7 100644 Binary files a/members/__pycache__/views.cpython-313.pyc and b/members/__pycache__/views.cpython-313.pyc differ diff --git a/members/sensor_views.py b/members/sensor_views.py new file mode 100644 index 0000000..aa996f0 --- /dev/null +++ b/members/sensor_views.py @@ -0,0 +1,94 @@ +from django import forms +from django.contrib import messages +from django.contrib.auth.decorators import login_required +from django.shortcuts import get_object_or_404, redirect, render +from django.utils.translation import gettext as _ +from django.views.decorators.http import require_POST +from django.views.decorators.cache import never_cache + +from fireworks_detect.models import Sensor + + +class SensorForm(forms.ModelForm): + class Meta: + model = Sensor + fields = ("name",) + + +def owned_sensor(request, pk): + return get_object_or_404(Sensor, pk=pk, owner=request.user, archived_at__isnull=True) + + +def render_sensor(request, sensor, form=None, token=None): + return render(request, "members/sensor_manage.html", { + "sensor": sensor, + "form": form or SensorForm(instance=sensor), + "token": token, + "heartbeat": sensor.heartbeat_status(), + }) + + +@login_required +@require_POST +@never_cache +def create_sensor(request): + form = SensorForm(request.POST) + if not form.is_valid(): + messages.error(request, _("Enter a valid sensor name. Names must be unique.")) + return redirect("user_settings") + sensor = form.save(commit=False) + sensor.owner = request.user + sensor.save() + token = sensor.issue_token() + return render_sensor(request, sensor, token=token) + + +@login_required +def manage_sensor(request, pk): + sensor = owned_sensor(request, pk) + return render_sensor(request, sensor) + + +@login_required +@require_POST +def rename_sensor(request, pk): + sensor = owned_sensor(request, pk) + form = SensorForm(request.POST, instance=sensor) + if form.is_valid(): + form.save() + messages.success(request, _("Sensor renamed.")) + return redirect("manage_sensor", pk=pk) + return render_sensor(request, sensor, form=form) + + +@login_required +@require_POST +def toggle_sensor(request, pk): + sensor = owned_sensor(request, pk) + sensor.is_active = not sensor.is_active + sensor.save(update_fields=["is_active"]) + return redirect("manage_sensor", pk=pk) + + +@login_required +@require_POST +@never_cache +def rotate_sensor(request, pk): + sensor = owned_sensor(request, pk) + if request.POST.get("confirm") != "rotate": + messages.error(request, _("Confirm token rotation first.")) + return redirect("manage_sensor", pk=pk) + token = sensor.issue_token() + return render_sensor(request, sensor, token=token) + + +@login_required +@require_POST +def remove_sensor(request, pk): + sensor = owned_sensor(request, pk) + if request.POST.get("confirm") != "remove": + messages.error(request, _("Confirm sensor removal first.")) + return redirect("manage_sensor", pk=pk) + sensor.archive() + messages.success(request, _("Sensor removed. Historical events were preserved.")) + return redirect("user_settings") diff --git a/members/settings_urls.py b/members/settings_urls.py index 7b0ab02..e53d8e9 100644 --- a/members/settings_urls.py +++ b/members/settings_urls.py @@ -1,9 +1,16 @@ from django.urls import path from . import views +from . import sensor_views urlpatterns = [ path("", views.user_settings, name="user_settings"), path("notifications/ntfy/test/", views.test_ntfy_notification, name="ntfy_test_notification"), + path("sensors/create/", sensor_views.create_sensor, name="create_sensor"), + path("sensors//", sensor_views.manage_sensor, name="manage_sensor"), + path("sensors//rename/", sensor_views.rename_sensor, name="rename_sensor"), + path("sensors//toggle/", sensor_views.toggle_sensor, name="toggle_sensor"), + path("sensors//rotate/", sensor_views.rotate_sensor, name="rotate_sensor"), + path("sensors//remove/", sensor_views.remove_sensor, name="remove_sensor"), ] diff --git a/members/templates/members/sensor_manage.html b/members/templates/members/sensor_manage.html new file mode 100644 index 0000000..3636b5a --- /dev/null +++ b/members/templates/members/sensor_manage.html @@ -0,0 +1,52 @@ +{% load i18n vite %} + + + + + + {{ sensor.name }} · {% trans "Settings" %} + {% vite_asset "frontend/src/entries/settings.js" %} + +
+ ← {% trans "Settings" %} +

{{ sensor.name }}

+ {% if messages %}
    {% for message in messages %}
  • {{ message }}
  • {% endfor %}
{% endif %} + {% if token %}
+ {% trans "Copy this token now. For security reasons it will not be shown again." %} + {{ token }} + +
{% endif %} +
+ {% with status=heartbeat %}

● {{ status.1 }}

{% endwith %} +

{% trans "Last heartbeat" %}: {{ sensor.last_heartbeat|date:"j M Y, H:i"|default:"—" }}

+

{% trans "Last submission" %}: {{ sensor.last_submission|date:"j M Y, H:i"|default:"—" }}

+

{% trans "Token prefix" %}: {{ sensor.token_prefix|default:"—" }}

+

{% trans "Created" %}: {{ sensor.created_at|date:"j M Y, H:i" }}

+
+

{% trans "Rename" %}

+
{% csrf_token %} + {{ form.name }}{{ form.name.errors }} + +
+
+

{% trans "Device access" %}

+

{% if sensor.is_active %}{% trans "Enabled" %}{% else %}{% trans "Disabled" %}{% endif %}

+
{% csrf_token %} + +
+
+

{% trans "Reissue API token" %}

+

{% trans "The old token will immediately stop authenticating." %}

+
{% csrf_token %} +
+ +
+
+

{% trans "Remove sensor" %}

+

{% trans "This disables the device and revokes its token. Historical events remain linked to it." %}

+
{% csrf_token %} +
+ +
+
+
diff --git a/members/templates/members/user_settings.html b/members/templates/members/user_settings.html index aec5e75..7141100 100644 --- a/members/templates/members/user_settings.html +++ b/members/templates/members/user_settings.html @@ -37,6 +37,27 @@ +
+

{% trans "My sensors" %}

+

{% trans "Manage the devices that authenticate with BoomCast." %}

+ {% for sensor in sensors %} +
+ {{ sensor.name }} + {% with status=sensor.heartbeat_status %}● {{ status.1 }}{% endwith %} +

{% if sensor.is_active %}{% trans "Enabled" %}{% else %}{% trans "Disabled" %}{% endif %} · {% trans "Token prefix" %}: {{ sensor.token_prefix|default:"—" }}

+

{% trans "Last heartbeat" %}: {{ sensor.last_heartbeat|date:"j M Y, H:i"|default:"—" }} · {% trans "Created" %}: {{ sensor.created_at|date:"j M Y" }}

+ {% trans "Manage" %} +
+ {% empty %} +

{% trans "No sensors yet. Add a device to receive an API token for hardware submissions." %}

+ {% endfor %} +
+ {% csrf_token %} + + + +
+
diff --git a/members/test_sensors.py b/members/test_sensors.py new file mode 100644 index 0000000..c460bf1 --- /dev/null +++ b/members/test_sensors.py @@ -0,0 +1,120 @@ +from unittest.mock import MagicMock, patch + +from django.contrib.auth import get_user_model +from django.core.files.uploadedfile import SimpleUploadedFile +from django.test import Client, TestCase +from django.urls import reverse + +from fireworks_detect.models import Event, PendingEvent, Sensor + + +class SensorSettingsTests(TestCase): + def setUp(self): + self.alice = get_user_model().objects.create_user(username="sensor_alice", password="pass") + self.bob = get_user_model().objects.create_user(username="sensor_bob", password="pass") + self.client.force_login(self.alice) + + def test_create_list_and_existing_api(self): + response = self.client.post(reverse("create_sensor"), {"name": "Balcony"}) + sensor = Sensor.objects.get(name="Balcony") + self.assertEqual(sensor.owner, self.alice) + token = response.context["token"] + self.assertNotIn(token, sensor.token_hash) + self.assertTrue(sensor.token_matches(token)) + self.assertContains(response, token) + self.assertNotContains(self.client.get(reverse("manage_sensor", args=[sensor.pk])), token) + self.assertEqual(self.client.post(reverse("fireworks_detect:sensor_heartbeat"), HTTP_AUTHORIZATION=f"Bearer {token}").status_code, 200) + self.client.post(reverse("create_sensor"), {"name": "Portable"}) + self.assertEqual(Sensor.objects.filter(owner=self.alice).count(), 2) + + Sensor.objects.create(name="System") + Sensor.objects.create(name="Bob's device", owner=self.bob) + listing = self.client.get(reverse("user_settings")) + self.assertContains(listing, "Balcony") + self.assertContains(listing, "Portable") + self.assertNotContains(listing, "System") + self.assertNotContains(listing, "Bob's device") + self.client.force_login(self.bob) + listing = self.client.get(reverse("user_settings")) + self.assertContains(listing, "Bob's device") + self.assertNotContains(listing, "Balcony") + + def test_owner_can_manage_rotate_and_archive_preserving_history(self): + sensor = Sensor.objects.create(name="Balcony", owner=self.alice) + old_token = sensor.issue_token() + pending = PendingEvent.objects.create(sensor=sensor, original_filename="test.wav", classifier_response={}) + event = Event.objects.create(sensor=sensor, original_filename="test.wav", classifier_response={}) + self.assertEqual(self.client.post(reverse("rename_sensor", args=[sensor.pk]), {"name": "Roof"}).status_code, 302) + sensor.refresh_from_db() + self.assertEqual(sensor.name, "Roof") + self.client.post(reverse("toggle_sensor", args=[sensor.pk])) + self.assertEqual(self.client.post(reverse("fireworks_detect:sensor_heartbeat"), HTTP_AUTHORIZATION=f"Bearer {old_token}").status_code, 401) + self.client.post(reverse("toggle_sensor", args=[sensor.pk])) + response = self.client.post(reverse("rotate_sensor", args=[sensor.pk]), {"confirm": "rotate"}) + new_token = response.context["token"] + self.assertNotEqual(old_token, new_token) + self.assertEqual(self.client.post(reverse("fireworks_detect:sensor_heartbeat"), HTTP_AUTHORIZATION=f"Bearer {old_token}").status_code, 401) + self.assertEqual(self.client.post(reverse("fireworks_detect:sensor_heartbeat"), HTTP_AUTHORIZATION=f"Bearer {new_token}").status_code, 200) + self.assertNotContains(self.client.get(reverse("manage_sensor", args=[sensor.pk])), new_token) + self.client.post(reverse("remove_sensor", args=[sensor.pk]), {"confirm": "remove"}) + sensor.refresh_from_db() + self.assertIsNotNone(sensor.archived_at) + self.assertFalse(sensor.is_active) + self.assertFalse(sensor.token_hash) + self.assertEqual(self.client.post(reverse("fireworks_detect:sensor_heartbeat"), HTTP_AUTHORIZATION=f"Bearer {new_token}").status_code, 401) + self.assertEqual(PendingEvent.objects.get(pk=pending.pk).sensor_id, sensor.pk) + self.assertEqual(Event.objects.get(pk=event.pk).sensor_id, sensor.pk) + self.assertEqual(self.client.get(reverse("manage_sensor", args=[sensor.pk])).status_code, 404) + + def test_cross_user_id_tampering_is_404_and_does_not_change_sensor(self): + sensor = Sensor.objects.create(name="Bob's device", owner=self.bob) + token = sensor.issue_token() + self.assertEqual(self.client.get(reverse("manage_sensor", args=[sensor.pk])).status_code, 404) + actions = [ + ("rename_sensor", {"name": "Stolen"}), + ("toggle_sensor", {}), + ("rotate_sensor", {"confirm": "rotate"}), + ("remove_sensor", {"confirm": "remove"}), + ] + for route, data in actions: + self.assertEqual(self.client.post(reverse(route, args=[sensor.pk]), data).status_code, 404) + sensor.refresh_from_db() + self.assertEqual(sensor.name, "Bob's device") + self.assertTrue(sensor.is_active) + self.assertTrue(sensor.token_matches(token)) + self.assertIsNone(sensor.archived_at) + + def test_unowned_sensor_token_still_authenticates(self): + sensor = Sensor.objects.create(name="System") + token = sensor.issue_token() + self.assertEqual(self.client.post(reverse("fireworks_detect:sensor_heartbeat"), HTTP_X_SENSOR_TOKEN=token).status_code, 200) + + @patch("fireworks_detect.views.urlopen") + def test_user_sensor_classification_keeps_sensor_relationship(self, urlopen): + sensor = Sensor.objects.create(name="Balcony", owner=self.alice) + token = sensor.issue_token() + reply = MagicMock() + reply.read.return_value = b'{"top_class":"Fireworks"}' + urlopen.return_value.__enter__.return_value = reply + audio = SimpleUploadedFile("sample.wav", b"RIFF0000WAVEdata", content_type="audio/wav") + response = self.client.post(reverse("fireworks_detect:classify"), {"file": audio}, HTTP_AUTHORIZATION=f"Bearer {token}") + self.assertEqual(response.status_code, 201) + self.assertEqual(PendingEvent.objects.get(pk=response.json()["pending_event_id"]).sensor_id, sensor.pk) + + def test_mutating_forms_require_csrf(self): + sensor = Sensor.objects.create(name="Balcony", owner=self.alice) + client = Client(enforce_csrf_checks=True) + client.force_login(self.alice) + for route, data in [ + ("create_sensor", {"name": "Portable"}), + ("rename_sensor", {"name": "Roof"}), + ("toggle_sensor", {}), + ("rotate_sensor", {"confirm": "rotate"}), + ("remove_sensor", {"confirm": "remove"}), + ]: + args = [] if route == "create_sensor" else [sensor.pk] + self.assertEqual(client.post(reverse(route, args=args), data).status_code, 403) + sensor.refresh_from_db() + self.assertEqual(sensor.name, "Balcony") + self.assertTrue(sensor.is_active) + self.assertIsNone(sensor.archived_at) diff --git a/members/views.py b/members/views.py index 87119c3..fab8435 100644 --- a/members/views.py +++ b/members/views.py @@ -10,6 +10,7 @@ from django.utils.translation import gettext as _ from django.views.decorators.http import require_POST from notifications.services import NotificationError, send_ntfy_notification +from fireworks_detect.models import Sensor from .forms import LanguageSettingsForm, MemberForm, UserSettingsForm from .models import Member, UserSettings @@ -75,7 +76,7 @@ def user_settings(request): messages.success(request, _("Language preference saved.")) return redirect("user_settings") form = UserSettingsForm(instance=settings) - return render(request, "members/user_settings.html", {"form": form, "language_form": language_form}) + return render(request, "members/user_settings.html", {"form": form, "language_form": language_form, "sensors": Sensor.objects.filter(owner=request.user, archived_at__isnull=True)}) saved_ntfy_url = settings.ntfy_url if request.method == "POST": form = UserSettingsForm(request.POST, instance=settings) @@ -98,7 +99,7 @@ def user_settings(request): return redirect("user_settings") else: form = UserSettingsForm(instance=settings) - return render(request, "members/user_settings.html", {"form": form, "language_form": language_form}) + return render(request, "members/user_settings.html", {"form": form, "language_form": language_form, "sensors": Sensor.objects.filter(owner=request.user, archived_at__isnull=True)}) @login_required diff --git a/staticfiles/vite/assets/frontend/src/entries/settings.js-FwiRFq6j.js b/staticfiles/vite/assets/frontend/src/entries/settings.js-FwiRFq6j.js new file mode 100644 index 0000000..3a0e868 --- /dev/null +++ b/staticfiles/vite/assets/frontend/src/entries/settings.js-FwiRFq6j.js @@ -0,0 +1 @@ +import"../../../theme-DLdboZXJ.js";document.querySelector("#ntfy-url").addEventListener("input",()=>{document.querySelector("#ntfy-test-result").replaceChildren()}); diff --git a/staticfiles/vite/assets/settings-Ber8sUeT.css b/staticfiles/vite/assets/settings-Ber8sUeT.css new file mode 100644 index 0000000..cc8d83a --- /dev/null +++ b/staticfiles/vite/assets/settings-Ber8sUeT.css @@ -0,0 +1 @@ +body{min-width:320px;margin:0;padding:2rem;color:#eef3ff;font-family:Inter,system-ui,sans-serif;background:#090e1d}.card{width:min(100%,42rem);margin:auto;padding:2rem;border:1px solid #2b3d68;border-radius:1rem;background:#172443}h1{margin-top:0}h2{margin:0}.intro,.help{color:#aab9d8;line-height:1.5}.section{margin-top:2rem;padding-top:1.5rem;border-top:1px solid #2b3d68}label{display:block;margin:.9rem 0 .35rem;font-weight:700}input[type=url]{width:100%;min-height:2.8rem;padding:.65rem;border:1px solid #526b9f;border-radius:.55rem;color:#eef3ff;font:inherit;background:#0a1123}.check{display:flex;gap:.6rem;align-items:center}.check label{margin:0}.button{min-height:2.8rem;margin-top:1rem;padding:.6rem 1rem;border:0;border-radius:.55rem;color:#17132b;font:inherit;font-weight:800;background:#a6ccff;cursor:pointer}.button--secondary{margin-right:.7rem;background:#d8c1fb}.alert,.errorlist{margin-top:1rem;padding:.75rem;border-radius:.55rem}.alert--success{color:#d1fae5;background:#14532d}.alert--error,.errorlist{color:#fee2e2;background:#7f1d1d}.messages{padding:0;list-style:none}@media(max-width:32rem){body{padding:1rem}.card{padding:1.4rem}}.sensor-card{margin:1rem 0;padding:1rem;border:1px solid var(--theme-line);border-radius:.7rem;background:var(--theme-surface-raised)}.sensor-card p{margin:.5rem 0;color:var(--theme-muted)}.sensor-card .button{display:inline-block;text-decoration:none}.sensor-status{display:inline-block;margin-left:.5rem;color:#ef4444;font-weight:700}.sensor-status--online{color:#22c55e}.sensor-status--delayed{color:#f59e0b}input[type=text]{box-sizing:border-box;width:100%;min-height:2.8rem;padding:.65rem;border:1px solid var(--theme-line);border-radius:.55rem;color:var(--theme-ink);font:inherit;background:var(--theme-input)}.token-once{margin:1rem 0;padding:1rem;border:1px solid #f59e0b;border-radius:.7rem;background:var(--theme-surface-raised)}.token-once code{display:block;overflow-wrap:anywhere;margin-top:.7rem;padding:.7rem;border-radius:.4rem;background:var(--theme-input);-webkit-user-select:all;user-select:all}.button--danger{color:#fff;background:#991b1b}:root[data-theme=light] .sensor-status:not(.sensor-status--online):not(.sensor-status--delayed){color:#b91c1c}