From ab6cfc0bae811f16a93068062966b84d8e6f1c19 Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Fri, 2 Oct 2026 15:38:18 +0200 Subject: [PATCH] sensors added to settings --- .../__pycache__/admin.cpython-313.pyc | Bin 12356 -> 12075 bytes .../__pycache__/models.cpython-313.pyc | Bin 15232 -> 16507 bytes fireworks_detect/admin.py | 23 +--- .../0008_sensor_owner_sensor_archived_at.py | 23 ++++ ...r_owner_sensor_archived_at.cpython-313.pyc | Bin 0 -> 1423 bytes fireworks_detect/models.py | 20 +++ frontend/src/styles/pages/settings.css | 12 +- .../__pycache__/sensor_views.cpython-313.pyc | Bin 0 -> 5048 bytes .../__pycache__/settings_urls.cpython-313.pyc | Bin 472 -> 1086 bytes .../__pycache__/test_sensors.cpython-313.pyc | Bin 0 -> 12526 bytes members/__pycache__/views.cpython-313.pyc | Bin 6865 -> 7293 bytes members/sensor_views.py | 94 ++++++++++++++ members/settings_urls.py | 7 + members/templates/members/sensor_manage.html | 52 ++++++++ members/templates/members/user_settings.html | 21 +++ members/test_sensors.py | 120 ++++++++++++++++++ members/views.py | 5 +- .../src/entries/settings.js-FwiRFq6j.js | 1 + staticfiles/vite/assets/settings-Ber8sUeT.css | 1 + 19 files changed, 360 insertions(+), 19 deletions(-) create mode 100644 fireworks_detect/migrations/0008_sensor_owner_sensor_archived_at.py create mode 100644 fireworks_detect/migrations/__pycache__/0008_sensor_owner_sensor_archived_at.cpython-313.pyc create mode 100644 members/__pycache__/sensor_views.cpython-313.pyc create mode 100644 members/__pycache__/test_sensors.cpython-313.pyc create mode 100644 members/sensor_views.py create mode 100644 members/templates/members/sensor_manage.html create mode 100644 members/test_sensors.py create mode 100644 staticfiles/vite/assets/frontend/src/entries/settings.js-FwiRFq6j.js create mode 100644 staticfiles/vite/assets/settings-Ber8sUeT.css diff --git a/fireworks_detect/__pycache__/admin.cpython-313.pyc b/fireworks_detect/__pycache__/admin.cpython-313.pyc index 477b8beb49ee89fc8b16a3d5c7acf935830b1c2f..558168bcc5b7d18ac49c2c3fd2e16538589ac330 100644 GIT binary patch delta 2375 zcmZuy|4&m_6o0Q@UR$7)0;Mf&X(=u6_)-+b?^Bd9wS1et;AV!_2Yo=BG2>1|>m7{j=jAS2|LGJ=hm4&XS>PI0DK>fGq?_)Oz?ct2tsOo=C;|6S9OF zaE#lfG(B|mTQ`1 zx8s{87spc)eqgF`2Z*TT6BuKj+6otKp?O)%dE%Ju_~7W@6j%kRw_!1aY9EQ7%9U ze(VTyaS*rSe;t?DC>|-<#SY{9C9TeOqE-!xcv@0TLU&6`t03@J)Pf6~*R_Ru@Lgvm zyKQF4>Cw9(;VB(zfmjy^tepeS^So9NBbpT>fiY&uR!k15knuZ8p1AGGx2I_$BgO`nZ#bOynLP>F0QuDG3X;@6ibdxo=n8jsduF$a)PmoA+w1%LQ>kIba~AYpA9|X=ysd&f$;ai zJ%rQ;y}kNCEyDC&86+^tbhG$@$D5xal#>+#E9eA$M2DYy97lA5p(*Q_G`s_D^bw42 zx2%ru5W{nwXH6B2jeSi`5)t~Fwo4m&d7a9ol5!$RIxsHD;u$GUY*PPb^5EN5lkIx7 zU{DfKx>pj@F(oagGm5GokkZITmRK$D*NLohS*uYNdnH-r`ciT#gVr|`o~RBtUM5_n zl>nJ?F3+N?Zr)Y5;EG(fj&n=i@H9Vf-?eCOp0_tYEP3KyunXfHj_^LxeC@mf&G)e8 zQZF>0)^w*pqWz3O`hkF&t6hb54Ui_fL0~o43!s2zq=Q^FQrh|~!8D7fY6I*Q{8R0x z>!+%n)-IW<{!v=1UjP?6OtthUBss1~X@#~QIs}%x0AB*k0=%l8zXAgQRIl&6A2Ik5K=gbN0u9xk4W3zrm z&u}}Ibs#S1;E(IWR@!$Ep07bs{G|R~u{}N{CI?cHOgbSek-_w^jBNO3q-?Z+un;{? z*bp6*DmR=WMWLW#&^Q1}0HCy02Dv~^gKS39Ktf4NNX_X0kG=8XM3R1%wZ;~JNn4lh zmkth^8hm+F^DeTCEh9_2(Qo7(=8*C??q~>N)G!@%v%R{j;l;w>d|_~ffj6>Eo$I*{ IL^@dh2Wt--#Q*>R delta 2616 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 delta 4206 zcmbtXc}$$g75|344_H{1`&y0#*6d=y0UKk$7ud!eF^k5Na))2$Nxe*2qiqnF%s8Tlk*uBOb^qo;be6p#YCgL8*U zd_6X56I0_sdrvw|7h}`Gj2;KgbW8bCg%mIsN&(AJ>tMy)Vv)lsNLC=(R!P}{WCv3E z3TdlLkTQVeIO=NFp&F7za|AULs9Ec%xyOjtxr_|`?91dEHWLov_vwDZKG@N~3e$Y% zfIeVqCDh8YvT`#}B_LP=)>a+0A;}3OTasiyY8WhJhe}tar z%x#cK89QU>Ehz?i9{g7=0B5AzuEGo3&Y5X7ve&Y|8`@o^FoZ+(svH|pL8RoSHEgG` zIIj@KsvTffy6wn5KlSX?qB);dvn5vnd*1i~ak04RKwT3sP(8vH01y*8CC{f(A5IJj zPQ-5@s?VCe`e5^V3zEU;%G1tSB+Doua>KE5O<&ou!s|m=6#)6|lzi zOEWwp7E%+z<8p{5hUHL#JH%X_7#@qNYE+5SM^Lnp;;p$ZuAHX3QSu&~8bjmbay&w} zA&Xwq)Vgl#UcodHm17ZA#hba|M{AIpN#(FYBdj~4lGL)%jQulcNDz{gu3ZC-((fhR z-aP7tAuUI!K&S-ZreH9lgo8nf0n06Wj)!PB9>+KH&{dt#WkuWss=;hMD&zQ zg|&sD)AxoF^3Y?^Fw!BB$M;+cMgHiS-u{Rkd}G6WF{csq)|7Jviw zHFncc>B!8zm09_2X5}k;mogh?53qfi)ArAdCPS^Z&(3DD3)m-_ACV?@FYDK&nO$-= zl%U*xuQ}D-X)pWOSy-9kcy1n?h{;1!<1#%A`tLf)xpwg#-JoW8_g*rd)RY1J`ooyXJ@56yGNW2z->eFWMYqY3yOE8 z2N7h15W)yT9{@MWaZLTlI=`k;d{8pOjzQSb#M*O5HO&VXuH>H6k$tSS@cIm%&W)-l zJi_JNI2MXegksa_ed4d1%Hs-6tX$zCt`tH7UHyT9L2m5Z)qi+bZ>qrJ)_^iW!DLQRMUdql*-xM92!;=6mpn~kW1w=k*Q}uEQ(e$0H9iD=bbg* zc9mb~OqOh*hl#}gX=qHNo7lOMg6=OwA+YegJ!r`&6tT#ziAYqb4+cSjU~qU_}6=&$8@dS)Tr?5t%;PV7jZgs8lD-~@d z!CtM{3lgyDSSk}GC)Nbe@57j`zdrkRWh?nAyII-3vZJo*>Nb>5F9Re6uM&9C=an9( z&|Nh(zRp~p?I32r6VJlk8xMNN(?-rRYqb|R8fpqyUv;c#0l8j7==}o!&FV(-JTum4 z{6E=`{{5G(zHx*T4}BRXUIRCb#1tsmNip1l#juM~g>vhWP;5dQZ&buz+ej|3VC_oIPMDW_#H zg{p&Pw|f>^_nURQ$R%d98BbE^74lg)s}k#m|YH5TsT)^3H$(PQz0@|0Gi&4I3=VE^IXUU~}I4kA1Uz%4z2 zfqv~BAZ#ew#w2q$jgmfguBmF~1!Tqi<(bJ$3#y_j(*az26k+YPAadF~P8I0Ji7749 zUO^U-3L->*hSTc^Zz2fG{tZVTBiu*8I>*z4!Eg;$qp%!{1%qBfzXfE`H^EcLc5)T= zEgas`nWi;{lj3Eu(EJp+%9>j)Z+{(_rqdsVhg&p$%q^di;|XqBnQC2X{vln86>Y6~ zcz?G;dw88axwUMizb`zq^#H&`ajqo1?2{uxKkcOZ`NSc`%*oD^8 z86l<=x&JR&AetMs-nUvX4Z;HJOBy%9yOt`aWbRrqOBeHRx09cHdnd{ zw1K|5rdcj3ZbT~7V)mo9+){K3*GJ^|6wg`}h4!vT(%bAWZLM-Lp!>b{hexzjV#YJxHLSZ*T{P8=P%EL@P1voXbWc`7G~=#ufzf@ zzOHy~WHb~%rqsjthg>gDhUIb5Eg{ebI?KH1KW. 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 0000000000000000000000000000000000000000..7e4851f70de4c6b36ce7004adfe40ba03f89c7e5 GIT binary patch literal 1423 zcmaJ>&2QsG6d!-aag%MEmZj{XCF)kYHHV}Z1eFkKrFDh+g%l@9D}|06dz!lIjKkPz zl@mxvoZ-O#P;MN#0Vg<;a!54@fy8NVSrr6F-q>}wyR8_>Gw;25^Lrn^8K0NSCW7(r zm){-URuKAADEZJXg!2XnUm*uM(iYm3m{b+Ayd`fcOxaYKn(E4y#`FcWh#d6}aGf9gecW>F z2HyGLk-g1JmmUF$xv}p18zN069uPM-pd&$-Zjm9^{X>^_BQErBk6f=MtzdMg;y|+6L=RMl$@}jGf1G}m@PnvbNCSV>jzPf)DIyV?YS%o z4r#qVOb#Mi&!W~}rnUb3snvntcW}lMPD#s^E1jqY1l4;-o literal 0 HcmV?d00001 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/members/__pycache__/sensor_views.cpython-313.pyc b/members/__pycache__/sensor_views.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d2bd4a83997821dc2c0367cc19060ec35d8caabd GIT binary patch literal 5048 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 GsQEVlJtQRn delta 235 zcmdnTaf4aoGcPX}0}#aQ*^~7MNIwQ~V1OOU_?*HpQ9~vvhEa(jm?efehy$hoK?k!2 zvsp5ORj>n9fXzh6f>^;EAQk#dMQrJunp`hILYj=XSPBwLGF~!5IINTV7y}gjG}&)) zr(`AOrRVFF7UdKdF#~0b*gym;h+v=mib;C1GINxK0FVpPT5JU*J}@&fGTvp7dCDL> Uc?Pov&j(g!ex^q5B0iuT0B_kSaR2}S diff --git a/members/__pycache__/test_sensors.cpython-313.pyc b/members/__pycache__/test_sensors.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0a372ef8885c80a9174fee8ec2e6e1a7e99f3349 GIT binary patch literal 12526 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 HCN2FhCEYbI literal 0 HcmV?d00001 diff --git a/members/__pycache__/views.cpython-313.pyc b/members/__pycache__/views.cpython-313.pyc index a7676217ec5d66f96216a620aaf7cecd0c836243..a712bd732dd77fda3f891d8a655bacd6e0bda4fd 100644 GIT binary patch delta 1897 zcma)7O>7%g5Z<@WZv6ifr*>?oiQT42HVF=hB>fLiL8~Nf3E4z|oMCB*cLO3W@|LBxauD7NQ;)$=`eP&Aj*a z&6^oN82$TLbT<+SN+@HW+kH;L})^-|<~g@<=53 z@4kB@T{v?XLLRyip`!^0$q+}lF8vTn-0HiZD?SVj-)|X)0{^+?E7s0$Dqa1w9D2xA zM#wid@j}by^4lgDw&l3cM+W{-8DX?A!wc%KEY1C`M;9_^@miNn$0;wFnhH78Ax)%j z$#gvh7h5YHGr*6W<^yrqAUSCWjt?Qw)949xVDsXx5!~O#G_G-4fA8s!NPO< z+)&j+C3;37dYHc-9bAa$(c`Sf=G6W@z8XWn$Q-jN3xw$Sy>_apy{gT%mgpsg%&DV$ z(L3=5h9`^R8EM*P#&|f^%~E_QHmE)AF2|dmPeySUgT?qyvGe~cyxLR3tHm$EDclpw z&2QBlw_K~3SZ34lH^*l+*;DH4H50sK87h~oHB7UzYZ#VOTeWRWX1s#rMeK5IX%(|y zB(B%$h@y4)z4)qi5DuUV91(t44@Mn~3YeI%aGDGWg2yEToupFHLJI5@BBY(s{10{y1?zyzn;Ue?$G!y>^)WStqg%dP8N+7UBp^i%W_t$@OD)Q zl={??LtBy#Effkp_0ZBw?MqMXp{L$r0zEAB&|3mI7z{lGO8efZYHHE}eR}iWH?wcv zd~g1|aJ(EpRg{>7WPR*vww{ArJrDVM0Sc<5%er#4ST8}T zJ_S=aj~65;>j}h)ov)kqv`uL4+=2-DH6PGEFoWRu5Y*vrp4>BgJIJ%Tjtg@b zsPKoum&C4ru?#PV&u4Pz^};>Vag2_sg`j|Q%=JdNuqgI?hUN^UgYmY*OB#A^nLV}W2N9KdN1;| z*fe^L*yr<9!vEC6OEw2!HFvvq$Ap{EwOv?8#u_in3ndk;7S(Pv!e~&Ir;h@BNB)3) z#2?5N_8yOnJxb}3CEqdyaa5%S+br{I%Eue3aGU`>8pOFBYDk;s&IH6{bM|T9);zx> zm-&@=jV*A9Yplk)2|FRxQbF={e|H;~yTxSaZc5H!L$!hg% znY8$ua1p5*^CDf_aSgj=qBwlx*E6WOJVrdlGVIO(wIj5^zZf4J6oGPust9*Xx7mkg z3rxc`;SvRs1Vf#XRU{}81Q5KiGibF?jzHyuC_##Vgbo`B-dM{r4clxt+lFf(AIaUm z4K*U5o^q0xw%y%ZP0MiHrfWJbQVkRiKTIvLDgJvZTf9PCk$>DV-o?0BfKr2Ho=&e$ zie9`-B!XA*=R9WIOn)6cUcGTYVcm;ZN9M$3CLgbK?#p}k0(+nyg)_gf5M>A&|26yl z0kux|4-_cW(YmH7Ks^8%0+Fof5pgbY);I+e1kaD{DufQNlaHE2luq*x8=Ykg@F;fQO>}p=EyJbKY$J8=Xfj`9DA4B%$83@Ni?1C7sePT{eTX-T3hjk@{kCa2 zKrhblCh55vzD#puQNP0qfjE!Ij=ECRN_^`Zd`QVbW%MGKaKnLRz5@F=rG9ljK{)aA dhs9~Gl-86kJM~Mx/", 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}