authoravatarclover caruso<git@paperclover.net>2026-11-03 15:04:55-08:00
committeravatarclover caruso<git@paperclover.net>2026-11-12 16:08:55-08:00
log34decd157cba7bd22c0b167fb47fb5b1f998a24c
treecba93ac1529f9dc35fd862735525879681676f42
parentdf4161ba6e1bae0f7c7596554bde1ccfe49ea94d
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Apply Snow Globe security updates

Advance NixOS to the November 2 channel, including Linux 6.18.60, Caddy 2.11.7, Podman 5.8.9, OpenSSL 3.6.5, and refreshed CA trust. Package Nomad 2.1.1 with its patched Go runtime and NixOS linker. Update dashboard DNS/TLS and frontend dependencies, rebuild OAuth2 Proxy 7.15.5 with Go 1.26.10 from one shared context, and update Tailscale and Jellyfin. Move Jellyfin SSO to the compatible plugin and remove obsolete plugin copies. Give outbound service clients the host CA bundle and configure Node to use it. Repair the packaged Caddy and media fixtures to exercise the current routes and storage layout. Verified 61 Rust tests, frontend checks/build, authentication integration, service previews, Nomad state preservation, two isolated cold boots, and packaged runtime/security boundaries. The physical reboot remains held; production activation uses the normal release workflow. Assisted-by: gpt-6.1-sol

26 files changed, 524 insertions(+), 268 deletions(-)

dashboard/Cargo.lock+167-35
......@@ -300,12 +300,32 @@ dependencies = [
300300 "inout",
301301]
302302
303[[package]]
304name = "combine"
305version = "4.6.9"
306source = "registry+https://github.com/rust-lang/crates.io-index"
307checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92"
308dependencies = [
309 "bytes",
310 "memchr",
311]
312
303313[[package]]
304314name = "const-oid"
305315version = "0.9.6"
306316source = "registry+https://github.com/rust-lang/crates.io-index"
307317checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
308318
319[[package]]
320name = "core-foundation"
321version = "0.9.4"
322source = "registry+https://github.com/rust-lang/crates.io-index"
323checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
324dependencies = [
325 "core-foundation-sys",
326 "libc",
327]
328
309329[[package]]
310330name = "core-foundation-sys"
311331version = "0.8.7"
......@@ -561,6 +581,12 @@ version = "0.11.0"
561581source = "registry+https://github.com/rust-lang/crates.io-index"
562582checksum = "b04dc5a38e4f151a79d9f2451ae6037fb6eaf5cba34771f44781f80e508498e3"
563583
584[[package]]
585name = "either"
586version = "1.19.0"
587source = "registry+https://github.com/rust-lang/crates.io-index"
588checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
589
564590[[package]]
565591name = "elliptic-curve"
566592version = "0.13.8"
......@@ -594,18 +620,6 @@ dependencies = [
594620 "simdutf8",
595621]
596622
597[[package]]
598name = "enum-as-inner"
599version = "0.6.1"
600source = "registry+https://github.com/rust-lang/crates.io-index"
601checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
602dependencies = [
603 "heck",
604 "proc-macro2",
605 "quote",
606 "syn 2.0.119",
607]
608
609623[[package]]
610624name = "equivalent"
611625version = "1.0.2"
......@@ -894,12 +908,6 @@ dependencies = [
894908 "hashbrown 0.15.5",
895909]
896910
897[[package]]
898name = "heck"
899version = "0.5.0"
900source = "registry+https://github.com/rust-lang/crates.io-index"
901checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
902
903911[[package]]
904912name = "hex"
905913version = "0.4.3"
......@@ -907,46 +915,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
907915checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
908916
909917[[package]]
910name = "hickory-proto"
911version = "0.25.2"
918name = "hickory-net"
919version = "0.26.3"
912920source = "registry+https://github.com/rust-lang/crates.io-index"
913checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502"
921checksum = "c480823ed7c2c5d0f09c41020cb6b7c28029ce60ec42dc942158dcf22f8e0a4d"
914922dependencies = [
915923 "async-trait",
916924 "cfg-if",
917925 "data-encoding",
918 "enum-as-inner",
919926 "futures-channel",
920927 "futures-io",
921928 "futures-util",
929 "hickory-proto",
930 "idna",
931 "ipnet",
932 "jni",
933 "rand 0.10.3",
934 "thiserror 2.0.21",
935 "tinyvec",
936 "tokio",
937 "tracing",
938 "url",
939]
940
941[[package]]
942name = "hickory-proto"
943version = "0.26.3"
944source = "registry+https://github.com/rust-lang/crates.io-index"
945checksum = "12b92608f679a6fa515dd1d15c1ff89443026e391200a2c840c7afcba482893d"
946dependencies = [
947 "data-encoding",
922948 "idna",
923949 "ipnet",
950 "jni",
924951 "once_cell",
925 "rand 0.9.5",
952 "prefix-trie",
953 "rand 0.10.3",
926954 "ring",
927955 "thiserror 2.0.21",
928956 "tinyvec",
929 "tokio",
930957 "tracing",
931958 "url",
932959]
933960
934961[[package]]
935962name = "hickory-resolver"
936version = "0.25.2"
963version = "0.26.3"
937964source = "registry+https://github.com/rust-lang/crates.io-index"
938checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a"
965checksum = "3f3da5255c95d5a716857d54b5b8f4e8d67c3484d3beaaaae2ce25063b3ba981"
939966dependencies = [
940967 "cfg-if",
941968 "futures-util",
969 "hickory-net",
942970 "hickory-proto",
943971 "ipconfig",
972 "ipnet",
973 "jni",
944974 "moka",
975 "ndk-context",
945976 "once_cell",
946977 "parking_lot",
947 "rand 0.9.5",
978 "rand 0.10.3",
948979 "resolv-conf",
949980 "smallvec",
981 "system-configuration",
950982 "thiserror 2.0.21",
951983 "tokio",
952984 "tracing",
......@@ -1287,6 +1319,9 @@ name = "ipnet"
12871319version = "2.12.2"
12881320source = "registry+https://github.com/rust-lang/crates.io-index"
12891321checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0"
1322dependencies = [
1323 "serde",
1324]
12901325
12911326[[package]]
12921327name = "itoa"
......@@ -1294,6 +1329,55 @@ version = "1.0.18"
12941329source = "registry+https://github.com/rust-lang/crates.io-index"
12951330checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
12961331
1332[[package]]
1333name = "jni"
1334version = "0.22.4"
1335source = "registry+https://github.com/rust-lang/crates.io-index"
1336checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
1337dependencies = [
1338 "cfg-if",
1339 "combine",
1340 "jni-macros",
1341 "jni-sys",
1342 "log",
1343 "simd_cesu8",
1344 "thiserror 2.0.21",
1345 "walkdir",
1346 "windows-link",
1347]
1348
1349[[package]]
1350name = "jni-macros"
1351version = "0.22.4"
1352source = "registry+https://github.com/rust-lang/crates.io-index"
1353checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
1354dependencies = [
1355 "proc-macro2",
1356 "quote",
1357 "rustc_version",
1358 "simd_cesu8",
1359 "syn 2.0.119",
1360]
1361
1362[[package]]
1363name = "jni-sys"
1364version = "0.4.1"
1365source = "registry+https://github.com/rust-lang/crates.io-index"
1366checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
1367dependencies = [
1368 "jni-sys-macros",
1369]
1370
1371[[package]]
1372name = "jni-sys-macros"
1373version = "0.4.1"
1374source = "registry+https://github.com/rust-lang/crates.io-index"
1375checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
1376dependencies = [
1377 "quote",
1378 "syn 2.0.119",
1379]
1380
12971381[[package]]
12981382name = "js-sys"
12991383version = "0.3.106"
......@@ -1479,6 +1563,12 @@ version = "1.0.0"
14791563source = "registry+https://github.com/rust-lang/crates.io-index"
14801564checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d"
14811565
1566[[package]]
1567name = "ndk-context"
1568version = "0.1.1"
1569source = "registry+https://github.com/rust-lang/crates.io-index"
1570checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
1571
14821572[[package]]
14831573name = "new_debug_unreachable"
14841574version = "1.0.6"
......@@ -1833,6 +1923,17 @@ version = "0.1.1"
18331923source = "registry+https://github.com/rust-lang/crates.io-index"
18341924checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
18351925
1926[[package]]
1927name = "prefix-trie"
1928version = "0.8.4"
1929source = "registry+https://github.com/rust-lang/crates.io-index"
1930checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7"
1931dependencies = [
1932 "either",
1933 "ipnet",
1934 "num-traits",
1935]
1936
18361937[[package]]
18371938name = "primeorder"
18381939version = "0.13.6"
......@@ -2234,9 +2335,9 @@ dependencies = [
22342335
22352336[[package]]
22362337name = "rustls"
2237version = "0.23.45"
2338version = "0.23.46"
22382339source = "registry+https://github.com/rust-lang/crates.io-index"
2239checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634"
2340checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf"
22402341dependencies = [
22412342 "once_cell",
22422343 "ring",
......@@ -2258,9 +2359,9 @@ dependencies = [
22582359
22592360[[package]]
22602361name = "rustls-webpki"
2261version = "0.103.15"
2362version = "0.103.16"
22622363source = "registry+https://github.com/rust-lang/crates.io-index"
2263checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
2364checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
22642365dependencies = [
22652366 "ring",
22662367 "rustls-pki-types",
......@@ -2536,6 +2637,16 @@ dependencies = [
25362637 "rand_core 0.6.4",
25372638]
25382639
2640[[package]]
2641name = "simd_cesu8"
2642version = "1.2.0"
2643source = "registry+https://github.com/rust-lang/crates.io-index"
2644checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520"
2645dependencies = [
2646 "rustc_version",
2647 "simdutf8",
2648]
2649
25392650[[package]]
25402651name = "simdutf8"
25412652version = "0.1.5"
......@@ -2728,6 +2839,27 @@ dependencies = [
27282839 "syn 3.0.6",
27292840]
27302841
2842[[package]]
2843name = "system-configuration"
2844version = "0.7.0"
2845source = "registry+https://github.com/rust-lang/crates.io-index"
2846checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
2847dependencies = [
2848 "bitflags",
2849 "core-foundation",
2850 "system-configuration-sys",
2851]
2852
2853[[package]]
2854name = "system-configuration-sys"
2855version = "0.6.0"
2856source = "registry+https://github.com/rust-lang/crates.io-index"
2857checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
2858dependencies = [
2859 "core-foundation-sys",
2860 "libc",
2861]
2862
27312863[[package]]
27322864name = "tagptr"
27332865version = "0.2.0"
......@@ -2831,9 +2963,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee"
28312963
28322964[[package]]
28332965name = "tokio"
2834version = "1.53.1"
2966version = "1.54.1"
28352967source = "registry+https://github.com/rust-lang/crates.io-index"
2836checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
2968checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3"
28372969dependencies = [
28382970 "bytes",
28392971 "libc",
......@@ -3286,9 +3418,9 @@ dependencies = [
32863418
32873419[[package]]
32883420name = "webpki-roots"
3289version = "1.0.9"
3421version = "1.0.11"
32903422source = "registry+https://github.com/rust-lang/crates.io-index"
3291checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
3423checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171"
32923424dependencies = [
32933425 "rustls-pki-types",
32943426]
dashboard/Cargo.toml+1-1
......@@ -11,7 +11,7 @@ bytes = "1"
1111chrono = "0.4"
1212futures = "0.3"
1313globset = "0.4"
14hickory-resolver = "0.25"
14hickory-resolver = "0.26.2"
1515openssl = "0.10"
1616percent-encoding = "2"
1717rand = "0.9"
dashboard/package.json+3-3
......@@ -9,7 +9,7 @@
99 "start": "cargo run --release"
1010 },
1111 "dependencies": {
12 "hono": "^4.13.9"
12 "hono": "^4.13.16"
1313 },
1414 "devDependencies": {
1515 "@clo/terminal": "file:vendor/clo-terminal-0.1.0.tgz",
......@@ -18,10 +18,10 @@
1818 "@types/node": "^26.6.2",
1919 "esbuild": "0.28.2",
2020 "lucide-solid": "^1.48.0",
21 "solid-js": "^1.9.15",
21 "solid-js": "^1.9.18",
2222 "typescript": "^7.0.2",
2323 "uplot": "^1.6.32",
24 "vite": "^8.3.1",
24 "vite": "^8.3.5",
2525 "vite-plugin-solid": "^2.11.14"
2626 }
2727}
dashboard/pnpm-lock.yaml+137-127
......@@ -9,18 +9,18 @@ importers:
99 .:
1010 dependencies:
1111 hono:
12 specifier: ^4.13.9
13 version: 4.13.9
12 specifier: ^4.13.16
13 version: 4.13.16
1414 devDependencies:
1515 '@clo/terminal':
1616 specifier: file:vendor/clo-terminal-0.1.0.tgz
17 version: file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.15)
17 version: file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.18)
1818 '@novnc/novnc':
1919 specifier: ^1.7.0
2020 version: 1.7.0
2121 '@solidjs/router':
2222 specifier: ^1.0.0
23 version: 1.0.0(solid-js@1.9.15)
23 version: 1.0.0(solid-js@1.9.18)
2424 '@types/node':
2525 specifier: ^26.6.2
2626 version: 26.6.2
......@@ -29,10 +29,10 @@ importers:
2929 version: 0.28.2
3030 lucide-solid:
3131 specifier: ^1.48.0
32 version: 1.48.0(solid-js@1.9.15)
32 version: 1.48.0(solid-js@1.9.18)
3333 solid-js:
34 specifier: ^1.9.15
35 version: 1.9.15
34 specifier: ^1.9.18
35 version: 1.9.18
3636 typescript:
3737 specifier: ^7.0.2
3838 version: 7.0.2
......@@ -40,11 +40,11 @@ importers:
4040 specifier: ^1.6.32
4141 version: 1.6.32
4242 vite:
43 specifier: ^8.3.1
44 version: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)
43 specifier: ^8.3.5
44 version: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)
4545 vite-plugin-solid:
4646 specifier: ^2.11.14
47 version: 2.11.14(solid-js@1.9.15)(vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15))
47 version: 2.11.14(solid-js@1.9.18)(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15))
4848
4949packages:
5050
......@@ -316,95 +316,101 @@ packages:
316316 '@novnc/novnc@1.7.0':
317317 resolution: {integrity: sha512-ucEJOx4T2avIRCleodk7YobZj5O2Ga2AeLfQ69A/yjG9HHba2+PDgwSkN3FttrmG+70ZGx21sElNFouK13RzyA==}
318318
319 '@oxc-project/types@0.151.0':
320 resolution: {integrity: sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==}
319 '@oxc-project/types@0.156.0':
320 resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==}
321321
322 '@rolldown/binding-android-arm-eabi@1.2.11':
323 resolution: {integrity: sha512-A5kXfGKvKWWZE0TtPrfsvT+q4Y5d1QG8gGUzpYjGydM+fARM9MuX90PrXYXe0XbsDVgyxxNzHo6giCj90bsFNw==}
322 '@rolldown/binding-android-arm-eabi@1.2.16':
323 resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==}
324324 engines: {node: ^20.19.0 || >=22.12.0}
325325 cpu: [arm]
326326 os: [android]
327327
328 '@rolldown/binding-android-arm64@1.2.11':
329 resolution: {integrity: sha512-z6cTycz+iJ4PVkuL4HHW4DfTfoeU/2nqYYuSOrTmH7yHK5Y0LCOnA03V4ZNxavyVaU1oOqUgIg2klN/s+USGOA==}
328 '@rolldown/binding-android-arm64@1.2.16':
329 resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==}
330330 engines: {node: ^20.19.0 || >=22.12.0}
331331 cpu: [arm64]
332332 os: [android]
333333
334 '@rolldown/binding-darwin-arm64@1.2.11':
335 resolution: {integrity: sha512-jShvqNtP6vDC6/A5JOAzbVV+DkgHqhl/ScVCJEbt+TUY6QYz7YnXcrg3sLtFBniro0f/Ld50ZwCWA6f7KYD1nQ==}
334 '@rolldown/binding-darwin-arm64@1.2.16':
335 resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==}
336336 engines: {node: ^20.19.0 || >=22.12.0}
337337 cpu: [arm64]
338338 os: [darwin]
339339
340 '@rolldown/binding-darwin-x64@1.2.11':
341 resolution: {integrity: sha512-f2i2xiNWq1Z1l2++q2fuhZRdLAT3aqxD6vRNm1RAxpUoBcdqNB3C0s1Bt+K+PbEx2F5F4gQp6hqKkphCY/xF9w==}
340 '@rolldown/binding-darwin-x64@1.2.16':
341 resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==}
342342 engines: {node: ^20.19.0 || >=22.12.0}
343343 cpu: [x64]
344344 os: [darwin]
345345
346 '@rolldown/binding-freebsd-x64@1.2.11':
347 resolution: {integrity: sha512-4Ir5FSOKIAMr4r0kExpt1s3bMgzJU3rA45AYOHtQpls0oNeqcYBKrWMlckrYH4KCfGLfkfn1tN1dmZPMVsdXow==}
346 '@rolldown/binding-freebsd-x64@1.2.16':
347 resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==}
348348 engines: {node: ^20.19.0 || >=22.12.0}
349349 cpu: [x64]
350350 os: [freebsd]
351351
352 '@rolldown/binding-linux-arm-gnueabihf@1.2.11':
353 resolution: {integrity: sha512-/gnRDM+39BROzAN/k1OZjDPnDMcZxB/0EUxKjONO5yVkNEvlsoMDrxGNKgZi/ttFriS2gwlDNzB65pvNbFOXIQ==}
352 '@rolldown/binding-linux-arm-gnueabihf@1.2.16':
353 resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==}
354354 engines: {node: ^20.19.0 || >=22.12.0}
355355 cpu: [arm]
356356 os: [linux]
357357
358 '@rolldown/binding-linux-arm64-gnu@1.2.11':
359 resolution: {integrity: sha512-PFaK8HwvAHbaKbBcDNQihjMKYvFnA5hiENx/l5tphTDz1E0WFp32l0A7aq7lyUwGsRw/xSrNIy/gIK4thrSCrw==}
358 '@rolldown/binding-linux-arm64-gnu@1.2.16':
359 resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==}
360360 engines: {node: ^20.19.0 || >=22.12.0}
361361 cpu: [arm64]
362362 os: [linux]
363 libc: [glibc]
363364
364 '@rolldown/binding-linux-arm64-musl@1.2.11':
365 resolution: {integrity: sha512-AskzJUIKRLPxkruR1wLKewGbOw+EYfU/9lOrBFj4AFrEA8hPpKFnODWNu2WLaNs0QNkEb9QIJufmVZZIL/bJlg==}
365 '@rolldown/binding-linux-arm64-musl@1.2.16':
366 resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==}
366367 engines: {node: ^20.19.0 || >=22.12.0}
367368 cpu: [arm64]
368369 os: [linux]
370 libc: [musl]
369371
370 '@rolldown/binding-linux-ppc64-gnu@1.2.11':
371 resolution: {integrity: sha512-qlUGAheh2yh8afH7QBgx0PrRHN85hKnNd78x8MeMhXivuevgd8vgf6/CstOzmNKY/lLTHvNTrPy98cLnAugzJw==}
372 '@rolldown/binding-linux-ppc64-gnu@1.2.16':
373 resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==}
372374 engines: {node: ^20.19.0 || >=22.12.0}
373375 cpu: [ppc64]
374376 os: [linux]
377 libc: [glibc]
375378
376 '@rolldown/binding-linux-s390x-gnu@1.2.11':
377 resolution: {integrity: sha512-secpEad+0vCbSfn8upFySkDskv+bGPk3THSDS9Y89yc4rb4kzqHp8Dmyd9BkQW4SnhNXBZCl/6CrO//hZahNJQ==}
379 '@rolldown/binding-linux-s390x-gnu@1.2.16':
380 resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==}
378381 engines: {node: ^20.19.0 || >=22.12.0}
379382 cpu: [s390x]
380383 os: [linux]
384 libc: [glibc]
381385
382 '@rolldown/binding-linux-x64-gnu@1.2.11':
383 resolution: {integrity: sha512-mOVBT3dPpkWm8XBWPmU4bf+U6dYDLeMo/9ojUmis4N0L5uu10qra5vOyngZ7/PSdoE4G9KvRt4bloRxNjLas7A==}
386 '@rolldown/binding-linux-x64-gnu@1.2.16':
387 resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==}
384388 engines: {node: ^20.19.0 || >=22.12.0}
385389 cpu: [x64]
386390 os: [linux]
391 libc: [glibc]
387392
388 '@rolldown/binding-linux-x64-musl@1.2.11':
389 resolution: {integrity: sha512-Is78i9A8Ui4SqcxUwFJ9uMmjDn58IbVTjFWYdQestFEgeuEmHMLGNriXnVJKkwG2YiZjw8cP0zCTyDMdDGtOOg==}
393 '@rolldown/binding-linux-x64-musl@1.2.16':
394 resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==}
390395 engines: {node: ^20.19.0 || >=22.12.0}
391396 cpu: [x64]
392397 os: [linux]
398 libc: [musl]
393399
394 '@rolldown/binding-openharmony-arm64@1.2.11':
395 resolution: {integrity: sha512-dUCXneZ87INUMyQ0D+C0HrEBNUPNXHaPmU5GTjyKTJEiussw9Kaj5Ln8UztPe4epV/ffvgNBEadksdYhmW6xJA==}
400 '@rolldown/binding-openharmony-arm64@1.2.16':
401 resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==}
396402 engines: {node: ^20.19.0 || >=22.12.0}
397403 cpu: [arm64]
398404 os: [openharmony]
399405
400 '@rolldown/binding-win32-arm64-msvc@1.2.11':
401 resolution: {integrity: sha512-jByxb6qfd+bH1xUd0qnfFnb17i9sWBPY2tOavJ0l3tdr3OTu+Kvtm8cd/JV5nFt657b1VqGltxg9olOEfofXWw==}
406 '@rolldown/binding-win32-arm64-msvc@1.2.16':
407 resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==}
402408 engines: {node: ^20.19.0 || >=22.12.0}
403409 cpu: [arm64]
404410 os: [win32]
405411
406 '@rolldown/binding-win32-x64-msvc@1.2.11':
407 resolution: {integrity: sha512-/PzKqzAJ03i19oy2ItPvyvaVjOjBCNnfaJs8yvUdGBKmiESgnrJSQ2awd81QzFbbnAmu7YO9ZnJrDCb9VSJPRA==}
412 '@rolldown/binding-win32-x64-msvc@1.2.16':
413 resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==}
408414 engines: {node: ^20.19.0 || >=22.12.0}
409415 cpu: [x64]
410416 os: [win32]
......@@ -632,8 +638,8 @@ packages:
632638 resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
633639 engines: {node: '>=6.9.0'}
634640
635 hono@4.13.9:
636 resolution: {integrity: sha512-7dMkQmZoC4E6F7AtaQSPhlWAdnBti+j7rreMZl8QB4jFiEhP9TWbGWUMi8WYzBCgmgulxuvLQupKqo+Co6Omyg==}
641 hono@4.13.16:
642 resolution: {integrity: sha512-AOLOEhvrV+iH92xXCnFr/5+3KjPKcI3xP63XJtX5spAnkznPdHijlIsUTpi7/9EhWqrTCekw5c5zh1K+YsVw7A==}
637643 engines: {node: '>=16.9.0'}
638644
639645 html-entities@2.3.3:
......@@ -691,24 +697,28 @@ packages:
691697 engines: {node: '>= 12.0.0'}
692698 cpu: [arm64]
693699 os: [linux]
700 libc: [glibc]
694701
695702 lightningcss-linux-arm64-musl@1.33.0:
696703 resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
697704 engines: {node: '>= 12.0.0'}
698705 cpu: [arm64]
699706 os: [linux]
707 libc: [musl]
700708
701709 lightningcss-linux-x64-gnu@1.33.0:
702710 resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==}
703711 engines: {node: '>= 12.0.0'}
704712 cpu: [x64]
705713 os: [linux]
714 libc: [glibc]
706715
707716 lightningcss-linux-x64-musl@1.33.0:
708717 resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
709718 engines: {node: '>= 12.0.0'}
710719 cpu: [x64]
711720 os: [linux]
721 libc: [musl]
712722
713723 lightningcss-win32-arm64-msvc@1.33.0:
714724 resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
......@@ -741,8 +751,8 @@ packages:
741751 ms@2.1.3:
742752 resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
743753
744 nanoid@3.3.19:
745 resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==}
754 nanoid@3.3.20:
755 resolution: {integrity: sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==}
746756 engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
747757 hasBin: true
748758
......@@ -760,12 +770,12 @@ packages:
760770 resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==}
761771 engines: {node: '>=12'}
762772
763 postcss@8.5.28:
764 resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==}
773 postcss@8.5.32:
774 resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==}
765775 engines: {node: ^10 || ^12 || >=14}
766776
767 rolldown@1.2.11:
768 resolution: {integrity: sha512-qpSwIyz0jHQq5qXBTNxFmE6664rJ7O+4TvPFOiOaBSrz8IOHc1koKKSqTM2H6u1UG1+TveuC6vaDHKXFOvb1Kw==}
777 rolldown@1.2.16:
778 resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==}
769779 engines: {node: ^20.19.0 || >=22.12.0}
770780 hasBin: true
771781
......@@ -773,26 +783,26 @@ packages:
773783 resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
774784 hasBin: true
775785
776 seroval-plugins@1.5.6:
777 resolution: {integrity: sha512-HXuLAX2pu/UByPpaeo/TaMfvMIi+1QqIoPJYCcAtU8QkVNwgR6MPlGuCQTErV1JwraaMbYaWVIBX7mppzGLATQ==}
786 seroval-plugins@1.6.12:
787 resolution: {integrity: sha512-+reiwp/lYxiyctSrdvX7OQ1YLrcbWYgBiZrhSFL+V43b0/DGRLNVSDyZINbQe+tWplPOI2fw2dPrdv6hcc09kQ==}
778788 engines: {node: '>=10'}
779789 peerDependencies:
780790 seroval: ^1.0
781791
782 seroval@1.5.6:
783 resolution: {integrity: sha512-rVQVWjjSvlINzaQPZH5JFqsqEsIWdTxY3iJZCnTL/5gQbXIRooVZKI60tVCkOVfzcRPejboxO2t0P89dg5mQaA==}
792 seroval@1.6.12:
793 resolution: {integrity: sha512-CqbIVfk/7GL3ITwZI55lcPbpQbjHZ2DD5cUj4iH7E9YsCfHNJV1mx7yNp86Z84w5IpmkZZS/2s5vPOWmVWSdQg==}
784794 engines: {node: '>=10'}
785795
786 solid-js@1.9.15:
787 resolution: {integrity: sha512-EeiY2xfpZJqPLjXspVEKjAII4yv8NyG//NxZ3IpOFHdUNnnTyL0uJOeS9LWGvA7cFCz5y94cjFwYlmw5Luncsg==}
796 solid-js@1.9.18:
797 resolution: {integrity: sha512-CHGO5YFk6Y9m/1YSxVtKnXfrW7JD3Tmof8HmR4z6TmCPsS8efo8LnzIR8CQh3cUvffqYm6DWyBFfk8dQw1CNQQ==}
788798
789799 solid-refresh@0.6.3:
790800 resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==}
791801 peerDependencies:
792802 solid-js: ^1.3
793803
794 source-map-js@1.2.1:
795 resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
804 source-map-js@1.2.2:
805 resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==}
796806 engines: {node: '>=0.10.0'}
797807
798808 tinyglobby@0.2.17:
......@@ -831,13 +841,13 @@ packages:
831841 '@testing-library/jest-dom':
832842 optional: true
833843
834 vite@8.3.1:
835 resolution: {integrity: sha512-/bvH9E9tmCXRGp2uXY3WbOldqpTwFkbha/8ANaEQ6VkxhH60KyqLwgZq6lG2y+4uT55x9+9eUHMpQ7uGnOCKjA==}
844 vite@8.3.5:
845 resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==}
836846 engines: {node: ^20.19.0 || >=22.12.0}
837847 hasBin: true
838848 peerDependencies:
839849 '@types/node': ^20.19.0 || >=22.12.0
840 '@vitejs/devtools': ^0.7.1
850 '@vitejs/devtools': ^0.7.1 || ^0.8.0
841851 esbuild: ^0.27.0 || ^0.28.0
842852 jiti: '>=1.21.0'
843853 less: ^4.0.0
......@@ -998,9 +1008,9 @@ snapshots:
9981008 '@babel/helper-string-parser': 7.29.7
9991009 '@babel/helper-validator-identifier': 7.29.7
10001010
1001 '@clo/terminal@file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.15)':
1011 '@clo/terminal@file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.18)':
10021012 optionalDependencies:
1003 solid-js: 1.9.15
1013 solid-js: 1.9.18
10041014
10051015 '@esbuild/aix-ppc64@0.28.2':
10061016 optional: true
......@@ -1101,58 +1111,58 @@ snapshots:
11011111
11021112 '@novnc/novnc@1.7.0': {}
11031113
1104 '@oxc-project/types@0.151.0': {}
1114 '@oxc-project/types@0.156.0': {}
11051115
1106 '@rolldown/binding-android-arm-eabi@1.2.11':
1116 '@rolldown/binding-android-arm-eabi@1.2.16':
11071117 optional: true
11081118
1109 '@rolldown/binding-android-arm64@1.2.11':
1119 '@rolldown/binding-android-arm64@1.2.16':
11101120 optional: true
11111121
1112 '@rolldown/binding-darwin-arm64@1.2.11':
1122 '@rolldown/binding-darwin-arm64@1.2.16':
11131123 optional: true
11141124
1115 '@rolldown/binding-darwin-x64@1.2.11':
1125 '@rolldown/binding-darwin-x64@1.2.16':
11161126 optional: true
11171127
1118 '@rolldown/binding-freebsd-x64@1.2.11':
1128 '@rolldown/binding-freebsd-x64@1.2.16':
11191129 optional: true
11201130
1121 '@rolldown/binding-linux-arm-gnueabihf@1.2.11':
1131 '@rolldown/binding-linux-arm-gnueabihf@1.2.16':
11221132 optional: true
11231133
1124 '@rolldown/binding-linux-arm64-gnu@1.2.11':
1134 '@rolldown/binding-linux-arm64-gnu@1.2.16':
11251135 optional: true
11261136
1127 '@rolldown/binding-linux-arm64-musl@1.2.11':
1137 '@rolldown/binding-linux-arm64-musl@1.2.16':
11281138 optional: true
11291139
1130 '@rolldown/binding-linux-ppc64-gnu@1.2.11':
1140 '@rolldown/binding-linux-ppc64-gnu@1.2.16':
11311141 optional: true
11321142
1133 '@rolldown/binding-linux-s390x-gnu@1.2.11':
1143 '@rolldown/binding-linux-s390x-gnu@1.2.16':
11341144 optional: true
11351145
1136 '@rolldown/binding-linux-x64-gnu@1.2.11':
1146 '@rolldown/binding-linux-x64-gnu@1.2.16':
11371147 optional: true
11381148
1139 '@rolldown/binding-linux-x64-musl@1.2.11':
1149 '@rolldown/binding-linux-x64-musl@1.2.16':
11401150 optional: true
11411151
1142 '@rolldown/binding-openharmony-arm64@1.2.11':
1152 '@rolldown/binding-openharmony-arm64@1.2.16':
11431153 optional: true
11441154
1145 '@rolldown/binding-win32-arm64-msvc@1.2.11':
1155 '@rolldown/binding-win32-arm64-msvc@1.2.16':
11461156 optional: true
11471157
1148 '@rolldown/binding-win32-x64-msvc@1.2.11':
1158 '@rolldown/binding-win32-x64-msvc@1.2.16':
11491159 optional: true
11501160
11511161 '@rolldown/pluginutils@1.0.1': {}
11521162
1153 '@solidjs/router@1.0.0(solid-js@1.9.15)':
1163 '@solidjs/router@1.0.0(solid-js@1.9.18)':
11541164 dependencies:
1155 solid-js: 1.9.15
1165 solid-js: 1.9.18
11561166
11571167 '@types/babel__core@7.20.5':
11581168 dependencies:
......@@ -1248,12 +1258,12 @@ snapshots:
12481258 html-entities: 2.3.3
12491259 parse5: 7.3.0
12501260
1251 babel-preset-solid@1.9.15(@babel/core@7.29.7)(solid-js@1.9.15):
1261 babel-preset-solid@1.9.15(@babel/core@7.29.7)(solid-js@1.9.18):
12521262 dependencies:
12531263 '@babel/core': 7.29.7
12541264 babel-plugin-jsx-dom-expressions: 0.40.10(@babel/core@7.29.7)
12551265 optionalDependencies:
1256 solid-js: 1.9.15
1266 solid-js: 1.9.18
12571267
12581268 baseline-browser-mapping@2.11.26: {}
12591269
......@@ -1321,7 +1331,7 @@ snapshots:
13211331
13221332 gensync@1.0.0-beta.2: {}
13231333
1324 hono@4.13.9: {}
1334 hono@4.13.16: {}
13251335
13261336 html-entities@2.3.3: {}
13271337
......@@ -1386,9 +1396,9 @@ snapshots:
13861396 dependencies:
13871397 yallist: 3.1.1
13881398
1389 lucide-solid@1.48.0(solid-js@1.9.15):
1399 lucide-solid@1.48.0(solid-js@1.9.18):
13901400 dependencies:
1391 solid-js: 1.9.15
1401 solid-js: 1.9.18
13921402
13931403 merge-anything@5.1.7:
13941404 dependencies:
......@@ -1396,7 +1406,7 @@ snapshots:
13961406
13971407 ms@2.1.3: {}
13981408
1399 nanoid@3.3.19: {}
1409 nanoid@3.3.20: {}
14001410
14011411 node-releases@2.0.57: {}
14021412
......@@ -1408,57 +1418,57 @@ snapshots:
14081418
14091419 picomatch@4.0.7: {}
14101420
1411 postcss@8.5.28:
1421 postcss@8.5.32:
14121422 dependencies:
1413 nanoid: 3.3.19
1423 nanoid: 3.3.20
14141424 picocolors: 1.1.1
1415 source-map-js: 1.2.1
1425 source-map-js: 1.2.2
14161426
1417 rolldown@1.2.11:
1427 rolldown@1.2.16:
14181428 dependencies:
1419 '@oxc-project/types': 0.151.0
1429 '@oxc-project/types': 0.156.0
14201430 '@rolldown/pluginutils': 1.0.1
14211431 optionalDependencies:
1422 '@rolldown/binding-android-arm-eabi': 1.2.11
1423 '@rolldown/binding-android-arm64': 1.2.11
1424 '@rolldown/binding-darwin-arm64': 1.2.11
1425 '@rolldown/binding-darwin-x64': 1.2.11
1426 '@rolldown/binding-freebsd-x64': 1.2.11
1427 '@rolldown/binding-linux-arm-gnueabihf': 1.2.11
1428 '@rolldown/binding-linux-arm64-gnu': 1.2.11
1429 '@rolldown/binding-linux-arm64-musl': 1.2.11
1430 '@rolldown/binding-linux-ppc64-gnu': 1.2.11
1431 '@rolldown/binding-linux-s390x-gnu': 1.2.11
1432 '@rolldown/binding-linux-x64-gnu': 1.2.11
1433 '@rolldown/binding-linux-x64-musl': 1.2.11
1434 '@rolldown/binding-openharmony-arm64': 1.2.11
1435 '@rolldown/binding-win32-arm64-msvc': 1.2.11
1436 '@rolldown/binding-win32-x64-msvc': 1.2.11
1432 '@rolldown/binding-android-arm-eabi': 1.2.16
1433 '@rolldown/binding-android-arm64': 1.2.16
1434 '@rolldown/binding-darwin-arm64': 1.2.16
1435 '@rolldown/binding-darwin-x64': 1.2.16
1436 '@rolldown/binding-freebsd-x64': 1.2.16
1437 '@rolldown/binding-linux-arm-gnueabihf': 1.2.16
1438 '@rolldown/binding-linux-arm64-gnu': 1.2.16
1439 '@rolldown/binding-linux-arm64-musl': 1.2.16
1440 '@rolldown/binding-linux-ppc64-gnu': 1.2.16
1441 '@rolldown/binding-linux-s390x-gnu': 1.2.16
1442 '@rolldown/binding-linux-x64-gnu': 1.2.16
1443 '@rolldown/binding-linux-x64-musl': 1.2.16
1444 '@rolldown/binding-openharmony-arm64': 1.2.16
1445 '@rolldown/binding-win32-arm64-msvc': 1.2.16
1446 '@rolldown/binding-win32-x64-msvc': 1.2.16
14371447
14381448 semver@6.3.1: {}
14391449
1440 seroval-plugins@1.5.6(seroval@1.5.6):
1450 seroval-plugins@1.6.12(seroval@1.6.12):
14411451 dependencies:
1442 seroval: 1.5.6
1452 seroval: 1.6.12
14431453
1444 seroval@1.5.6: {}
1454 seroval@1.6.12: {}
14451455
1446 solid-js@1.9.15:
1456 solid-js@1.9.18:
14471457 dependencies:
14481458 csstype: 3.2.3
1449 seroval: 1.5.6
1450 seroval-plugins: 1.5.6(seroval@1.5.6)
1459 seroval: 1.6.12
1460 seroval-plugins: 1.6.12(seroval@1.6.12)
14511461
1452 solid-refresh@0.6.3(solid-js@1.9.15):
1462 solid-refresh@0.6.3(solid-js@1.9.18):
14531463 dependencies:
14541464 '@babel/generator': 7.29.8
14551465 '@babel/helper-module-imports': 7.29.7
14561466 '@babel/types': 7.29.8
1457 solid-js: 1.9.15
1467 solid-js: 1.9.18
14581468 transitivePeerDependencies:
14591469 - supports-color
14601470
1461 source-map-js@1.2.1: {}
1471 source-map-js@1.2.2: {}
14621472
14631473 tinyglobby@0.2.17:
14641474 dependencies:
......@@ -1505,25 +1515,25 @@ snapshots:
15051515
15061516 uplot@1.6.32: {}
15071517
1508 vite-plugin-solid@2.11.14(solid-js@1.9.15)(vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)):
1518 vite-plugin-solid@2.11.14(solid-js@1.9.18)(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)):
15091519 dependencies:
15101520 '@babel/core': 7.29.7
15111521 '@types/babel__core': 7.20.5
1512 babel-preset-solid: 1.9.15(@babel/core@7.29.7)(solid-js@1.9.15)
1522 babel-preset-solid: 1.9.15(@babel/core@7.29.7)(solid-js@1.9.18)
15131523 merge-anything: 5.1.7
1514 solid-js: 1.9.15
1515 solid-refresh: 0.6.3(solid-js@1.9.15)
1516 vite: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)
1517 vitefu: 1.1.3(vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15))
1524 solid-js: 1.9.18
1525 solid-refresh: 0.6.3(solid-js@1.9.18)
1526 vite: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)
1527 vitefu: 1.1.3(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15))
15181528 transitivePeerDependencies:
15191529 - supports-color
15201530
1521 vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15):
1531 vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15):
15221532 dependencies:
15231533 lightningcss: 1.33.0
15241534 picomatch: 4.0.7
1525 postcss: 8.5.28
1526 rolldown: 1.2.11
1535 postcss: 8.5.32
1536 rolldown: 1.2.16
15271537 tinyglobby: 0.2.17
15281538 optionalDependencies:
15291539 '@types/node': 26.6.2
......@@ -1531,8 +1541,8 @@ snapshots:
15311541 fsevents: 2.3.3
15321542 tsx: 4.23.15
15331543
1534 vitefu@1.1.3(vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)):
1544 vitefu@1.1.3(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)):
15351545 optionalDependencies:
1536 vite: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)
1546 vite: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)
15371547
15381548 yallist@3.1.1: {}
dashboard/pnpm-workspace.yaml created+2
......@@ -0,0 +1,2 @@
1allowBuilds:
2 esbuild: true
dashboard/src/atproto.rs+7-2
......@@ -172,7 +172,8 @@ async fn handle_did(handle: &str) -> Result<String> {
172172 }
173173 let resolver = hickory_resolver::Resolver::builder_tokio()
174174 .map_err(|_| reject())?
175 .build();
175 .build()
176 .map_err(|_| reject())?;
176177 if let Ok(Ok(records)) = tokio::time::timeout(
177178 Duration::from_secs(5),
178179 resolver.txt_lookup(format!("_atproto.{handle}.")),
......@@ -180,10 +181,14 @@ async fn handle_did(handle: &str) -> Result<String> {
180181 .await
181182 {
182183 let dids: Vec<_> = records
184 .answers()
183185 .iter()
184186 .filter_map(|record| {
187 let hickory_resolver::proto::rr::RData::TXT(record) = &record.data else {
188 return None;
189 };
185190 let text = record
186 .txt_data()
191 .txt_data
187192 .iter()
188193 .flat_map(|part| part.iter().copied())
189194 .collect::<Vec<_>>();
flake.lock+3-3
......@@ -2,11 +2,11 @@
22 "nodes": {
33 "nixpkgs": {
44 "locked": {
5 "lastModified": 1790113641,
6 "narHash": "sha256-D2aaQetafdpHxbwA4ldAxs51UX0b11pXL+JL/5L8VrM=",
5 "lastModified": 1793633738,
6 "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=",
77 "owner": "NixOS",
88 "repo": "nixpkgs",
9 "rev": "1bc55b9def8165e82073919945c3239903fe4dc2",
9 "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd",
1010 "type": "github"
1111 },
1212 "original": {
nixos/configuration.nix+23-1
......@@ -47,6 +47,28 @@ let
4747 });
4848in
4949{
50 nixpkgs.overlays = [ (final: prev: {
51 nomad = prev.stdenvNoCC.mkDerivation rec {
52 pname = "nomad";
53 version = "2.1.1";
54 src = prev.fetchurl {
55 url = "https://releases.hashicorp.com/nomad/${version}/nomad_${version}_linux_amd64.zip";
56 hash = "sha256-BzCE92kP2up1b/Hv+LZpslw6bBd3jxmuDEdgaXPtPzk=";
57 };
58 nativeBuildInputs = [ prev.unzip prev.autoPatchelfHook ];
59 buildInputs = [ final.glibc ];
60 sourceRoot = ".";
61 dontBuild = true;
62 installPhase = ''
63 runHook preInstall
64 install -Dm755 nomad $out/bin/nomad
65 install -Dm444 LICENSE.txt $out/share/licenses/nomad/LICENSE.txt
66 runHook postInstall
67 '';
68 meta = prev.nomad.meta // { platforms = [ "x86_64-linux" ]; };
69 };
70 }) ];
71
5072 nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomad" "nvidia-x11" "nvidia-kernel-modules" "gpu-unlock-firmware" ];
5173
5274 networking.firewall = {
......@@ -63,7 +85,7 @@ in
6385 enable = true;
6486 package = pkgs.caddy.withPlugins {
6587 plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ];
66 hash = "sha256-2tcvl9ZDpe7SAy3tZCPNwmw0KoIIakqggVaRtVAg9R0=";
88 hash = "sha256-iWtaVD4LrOgCFZc90crAlHYbHHxz8zCFnvD2ZLRkO0Q=";
6789 };
6890 extraConfig = "import /var/lib/caddy/routes.caddy";
6991 virtualHosts = {
nixos/dashboard.nix+5-5
......@@ -1,4 +1,4 @@
1{ stdenv, lib, rustPlatform, runCommand, nodejs_24, pnpm_10, fetchPnpmDeps, pnpmConfigHook, sqlite, openssl, pkg-config, dockerTools, coreutils, callPackage, python3, yt-dlp, ffmpeg }:
1{ stdenv, lib, rustPlatform, runCommand, nodejs_24, pnpm_11, fetchPnpmDeps, pnpmConfigHook, sqlite, openssl, pkg-config, dockerTools, coreutils, callPackage, python3, yt-dlp, ffmpeg }:
22let
33 nativePkl = callPackage ./pkl.nix { };
44 youtubePython = python3.withPackages (packages: [ packages.pyyaml ]);
......@@ -15,7 +15,7 @@ let
1515 src = lib.fileset.toSource {
1616 root = ../.;
1717 fileset = lib.fileset.unions [
18 ../dashboard/web ../dashboard/vendor ../dashboard/package.json ../dashboard/pnpm-lock.yaml
18 ../dashboard/web ../dashboard/vendor ../dashboard/package.json ../dashboard/pnpm-lock.yaml ../dashboard/pnpm-workspace.yaml
1919 ../dashboard/tsconfig.json ../dashboard/vite.config.ts
2020 ../dashboard/src/claude.svg ../dashboard/src/openai.svg
2121 ];
......@@ -23,11 +23,11 @@ let
2323 sourceRoot = "source/dashboard";
2424 pnpmDeps = fetchPnpmDeps {
2525 inherit (finalAttrs) pname version src sourceRoot;
26 pnpm = pnpm_10;
26 pnpm = pnpm_11;
2727 fetcherVersion = 3;
28 hash = "sha256-Jhk4mAOCqoljelFJfC7o+3t66x9GPFYb2e928jeaPSk=";
28 hash = "sha256-GLXA5XkcKIPZD2g2xBUejjpPJcupbNOL6YYujv1FB5A=";
2929 };
30 nativeBuildInputs = [ nodejs_24 pnpm_10 pnpmConfigHook ];
30 nativeBuildInputs = [ nodejs_24 pnpm_11 pnpmConfigHook ];
3131 buildPhase = "pnpm run build";
3232 installPhase = "cp -r dist $out";
3333 });
nixos/tests/nomad-upgrade.nix created+48
......@@ -0,0 +1,48 @@
1{ pkgs }:
2pkgs.testers.runNixOSTest {
3 name = "nomad-upgrade";
4 globalTimeout = 600;
5 nodes.machine = { lib, ... }: {
6 virtualisation.memorySize = 2048;
7 services.nomad = {
8 enable = true;
9 package = pkgs.nomad_1_11;
10 enableDocker = false;
11 dropPrivileges = false;
12 settings = {
13 bind_addr = "127.0.0.1";
14 advertise = { http = "127.0.0.1"; rpc = "127.0.0.1"; serf = "127.0.0.1"; };
15 server = { enabled = true; bootstrap_expect = 1; };
16 client.enabled = true;
17 acl.enabled = true;
18 plugin.raw_exec.config.enabled = true;
19 };
20 };
21 specialisation.patched.configuration.services.nomad.package = lib.mkForce pkgs.nomad;
22 environment.systemPackages = [ pkgs.python3 ];
23 };
24 testScript = ''
25 import json
26 start_all()
27 machine.wait_for_unit("nomad.service")
28 machine.wait_until_succeeds("umask 077; nomad acl bootstrap -json > /run/bootstrap.json", timeout=60)
29 machine.succeed("python3 -c \"import json,pathlib; pathlib.Path('/run/nomad-token').write_text(json.load(open('/run/bootstrap.json'))['SecretID'])\"; chmod 600 /run/nomad-token")
30 machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad var put nomad/jobs/fixture proof=synthetic")
31 job = {"ID": "fixture", "Name": "fixture", "Type": "service", "Datacenters": ["dc1"], "TaskGroups": [{"Name": "fixture", "Count": 1, "Tasks": [{"Name": "fixture", "Driver": "raw_exec", "Config": {"command": "${pkgs.coreutils}/bin/sleep", "args": ["infinity"]}, "Resources": {"CPU": 100, "MemoryMB": 32}}]}]}
32 machine.succeed("cat > /run/fixture.json <<'EOF'\n" + json.dumps(job) + "\nEOF")
33 machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job run -json -detach /run/fixture.json")
34 machine.wait_until_succeeds("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job allocs -json fixture | python3 -c \"import json,sys; a=json.load(sys.stdin); assert len(a) == 1 and a[0]['ClientStatus'] == 'running'\"", timeout=60)
35 allocation = machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job allocs -json fixture")
36 machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad operator snapshot save /run/before.snap")
37 machine.succeed("/run/current-system/specialisation/patched/bin/switch-to-configuration test")
38 machine.wait_for_unit("nomad.service")
39 machine.wait_until_succeeds("NOMAD_TOKEN=$(cat /run/nomad-token) nomad status", timeout=60)
40 assert machine.succeed("nomad version").splitlines()[0] == "Nomad v2.1.1"
41 machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad var get -out=json nomad/jobs/fixture | python3 -c \"import json,sys; assert json.load(sys.stdin)['Items'] == {'proof':'synthetic'}\"")
42 after = machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job allocs -json fixture")
43 assert {a['ID'] for a in json.loads(allocation)} == {a['ID'] for a in json.loads(after)}
44 assert all(a['ClientStatus'] == 'running' for a in json.loads(after))
45 machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad operator snapshot save /run/after.snap")
46 print("Nomad upgrade preserved ACLs, variables, the running allocation, and snapshot access")
47 '';
48}
service/cliproxy/service.pkl+1
......@@ -29,6 +29,7 @@ container {
2929 volumes {
3030 ["/data"] {}
3131 ["/snowglobe/start.sh"] { config = "start.sh" }
32 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
3233 }
3334 env {
3435 ["HOME"] = "/data"
service/ddns-updater/service.pkl+4-1
......@@ -33,7 +33,10 @@ container {
3333 authRole = "infra-admin"
3434 }
3535
36 volumes { ["/updater/data"] {} }
36 volumes {
37 ["/updater/data"] {}
38 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
39 }
3740
3841 env {
3942 ["PERIOD"] = "5m"
service/forward-auth/Dockerfile created+11
......@@ -0,0 +1,11 @@
1FROM docker.io/library/golang@sha256:d1f3216ef30257c850cc136ba42a359ccd9d3e75f19b2c276e520c0b4ef327ce AS build
2WORKDIR /src
3RUN wget -q -O /tmp/source.tar.gz https://github.com/oauth2-proxy/oauth2-proxy/archive/refs/tags/v7.15.5.tar.gz \
4 && echo 'cf8055fecef1f89bcc89834d3342009b4067e80b1994e6bb5c2456d8ff68995b /tmp/source.tar.gz' | sha256sum -c - \
5 && tar -xzf /tmp/source.tar.gz --strip-components=1 && rm /tmp/source.tar.gz
6RUN CGO_ENABLED=0 go build -trimpath \
7 -ldflags='-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=7.15.5' \
8 -o /oauth2-proxy github.com/oauth2-proxy/oauth2-proxy/v7
9
10FROM quay.io/oauth2-proxy/oauth2-proxy@sha256:0d989b27d90d5e527fb2b045d864c4001c3104bdd763b3211b7e9ba2110380ea
11COPY --from=build /oauth2-proxy /bin/oauth2-proxy
service/forward-auth/service.pkl+1-1
......@@ -26,7 +26,7 @@ secrets {
2626}
2727
2828container {
29 image = "quay.io/oauth2-proxy/oauth2-proxy@sha256:56e3daedf765c7a1eea6e366fbe684be7d3084830ade14b6174570d3c7960954"
29 build = "../forward-auth"
3030 cpu = 100
3131 memory = 256
3232
service/jellyfin/prepare.py+11-5
......@@ -2,6 +2,7 @@
22import json
33import os
44from pathlib import Path
5import shutil
56import subprocess
67import sys
78import xml.etree.ElementTree as ET
......@@ -20,18 +21,23 @@ variable = json.loads(subprocess.check_output(
2021plugins = root / "plugins"
2122plugins.mkdir(parents=True, exist_ok=True)
2223os.chown(plugins, uid, uid)
23plugin = plugins / "SSO Authentication_4.0.0.4"
2424files = {"meta.json", "Duende.IdentityModel.dll", "SSO-Auth.dll", "Duende.IdentityModel.OidcClient.dll"}
25if not all((plugin / name).is_file() for name in files):
26 with zipfile.ZipFile(Path(__file__).with_name("sso-authentication_4.0.0.4.zip")) as source:
27 if set(source.namelist()) != files:
28 raise ValueError("unexpected SSO plugin archive contents")
25archive, = Path(__file__).parent.glob("sso-authentication_*.zip")
26with zipfile.ZipFile(archive) as source:
27 if set(source.namelist()) != files:
28 raise ValueError("unexpected SSO plugin archive contents")
29 metadata = json.loads(source.read("meta.json"))
30 plugin = plugins / f"{metadata['name']}_{metadata['version']}"
31 if not all((plugin / name).is_file() for name in files):
2932 plugin.mkdir(exist_ok=True)
3033 os.chown(plugin, uid, uid)
3134 for name in files:
3235 path = plugin / name
3336 path.write_bytes(source.read(name))
3437 os.chown(path, uid, uid)
38 for previous in plugins.glob(f"{metadata['name']}_*"):
39 if previous.is_dir() and previous != plugin:
40 shutil.rmtree(previous)
3541
3642configs = plugins / "configurations"
3743configs.mkdir(parents=True, exist_ok=True)
service/jellyfin/service.pkl+1-1
......@@ -23,7 +23,7 @@ requirements {
2323}
2424
2525container {
26 image = "docker.io/jellyfin/jellyfin@sha256:aefb67e6a7ff1debdd154a78a7bbb780fd0c873d8639210a7f6a2016ad2b35db"
26 image = "docker.io/jellyfin/jellyfin@sha256:7da5184caa38c553f219f6772476540081f392a68049e2b68c923f6daf877f8e"
2727 cpu = 500
2828 memory = 3072
2929
service/jellyfin/sso-authentication_4.0.0.4.zip deleted
Binary files a/service/jellyfin/sso-authentication_4.0.0.4.zip and /dev/null differ
service/jellyfin/sso-authentication_5.0.0.0.zip created
Binary files /dev/null and b/service/jellyfin/sso-authentication_5.0.0.0.zip differ
service/jellyfin/update-plugin.py+3-3
......@@ -4,10 +4,10 @@ from pathlib import Path
44import urllib.request
55
66
7version = "4.0.0.4"
8digest = "c09f16ba31059a434ddd7f811e4f9608d4b4c4514cc80a5bf1ca33bee61e1107"
7version = "5.0.0.0"
8digest = "61d29c16d8840900fad6ce0fb6a0e59abc6a350382390d293ec9bfbcdb84d840"
99name = f"sso-authentication_{version}.zip"
10url = f"https://github.com/9p4/jellyfin-plugin-sso/releases/download/v{version}/{name}"
10url = f"https://github.com/xdnewlun1/Jellyfin-OAuth-Plugin/releases/download/v{version}/{name}"
1111with urllib.request.urlopen(url, timeout=30) as response:
1212 archive = response.read()
1313if hashlib.sha256(archive).hexdigest() != digest:
service/navidrome/service.pkl+1
......@@ -42,6 +42,7 @@ containers {
4242 volumes {
4343 ["/data"] {}
4444 ["/socket"] {}
45 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
4546 when (site.preview) { ["/music"] {} }
4647 when (!site.preview) { ["/music"] { src = "\(site.mediaRoot)/Music"; readOnly = true } }
4748 }
service/pds/service.pkl+2-1
......@@ -41,6 +41,7 @@ container {
4141 volumes {
4242 ["/pds"] {}
4343 ["/snowglobe/start.sh"] { config = "start.sh" }
44 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
4445 }
4546
4647 env {
......@@ -61,7 +62,7 @@ container {
6162 ["PDS_RATE_LIMITS_ENABLED"] = "true"
6263 ["PDS_CONTACT_EMAIL_ADDRESS"] = site.ownerEmail
6364 ["LOG_ENABLED"] = "true"
64 ["NODE_OPTIONS"] = "--import=@atproto/pds/telemetry"
65 ["NODE_OPTIONS"] = "--use-openssl-ca --import=@atproto/pds/telemetry"
6566 ["OTEL_SERVICE_NAME"] = module.id
6667 ["OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"] = "http/protobuf"
6768 ["OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"] = "http/protobuf"
service/tailscale/service.pkl+1-1
......@@ -5,7 +5,7 @@ import "../../config/site.pkl" as site
55name = "Tailscale"
66
77container {
8 image = "docker.io/tailscale/tailscale@sha256:2667499ed87ae29218f292556ba062918402dd5e92e93637af14867e4df12dd3"
8 image = "docker.io/tailscale/tailscale@sha256:519bf6f2c386992052216ea7e9391d5ace3a859d458f4f61bc8db8c58377eb7d"
99 // The node joins the tailnet through its own network stack and TUN device.
1010 hostNetwork = true
1111 imageUser = true
service/victoria/service.pkl+12-3
......@@ -18,7 +18,10 @@ containers {
1818 metricsPath = "/metrics"
1919 }
2020
21 volumes { ["/logs"] {} }
21 volumes {
22 ["/logs"] {}
23 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
24 }
2225 }
2326 ["metrics"] {
2427 image = "docker.io/victoriametrics/victoria-metrics:v1.152.0"
......@@ -34,7 +37,10 @@ containers {
3437 metricsPath = "/metrics"
3538 }
3639
37 volumes { ["/metrics"] {} }
40 volumes {
41 ["/metrics"] {}
42 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
43 }
3844 }
3945 ["traces"] {
4046 image = "docker.io/victoriametrics/victoria-traces:v0.11.1"
......@@ -50,6 +56,9 @@ containers {
5056 metricsPath = "/metrics"
5157 }
5258
53 volumes { ["/traces"] {} }
59 volumes {
60 ["/traces"] {}
61 ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true }
62 }
5463 }
5564}
tools/dashboard-package-test.py+39-71
......@@ -1,14 +1,11 @@
11#!/usr/bin/env python3
22import argparse
3from http.client import HTTPConnection
4from http.server import BaseHTTPRequestHandler, HTTPServer
53import json
64import os
75from pathlib import Path
86import subprocess
97import socket
108import tempfile
11import threading
129import time
1310import urllib.error
1411import urllib.request
......@@ -36,7 +33,7 @@ def main():
3633 token.write_text(proof)
3734 os.chown(token, 0, 65534)
3835 token.chmod(0o440)
39 season = data / "media/jellyfin/Indie Shows/Fixture/Season 1"
36 season = data / "media/Indie Shows/Fixture/Season 1"
4037 season.mkdir(parents=True)
4138 (season / "S01E01 - Fixture.mp4").write_bytes(b"fixture")
4239 (season / "S01E01 - Fixture.nfo").write_text("<episodedetails><title>Packaged worker</title></episodedetails>")
......@@ -100,75 +97,46 @@ print('refused')
10097 capture_output=True, text=True, timeout=10)
10198 assert unsecured.returncode != 0 and "Set SNOWGLOBE_PROXY_TOKEN_FILE" in unsecured.stderr, unsecured.stderr
10299
103 class Auth(BaseHTTPRequestHandler):
104 def do_GET(self):
105 self.send_response(200 if self.headers.get("Cookie") == "fixture=1" else 401)
106 self.send_header("X-Auth-Request-Preferred-Username", "fixture")
107 self.send_header("X-Auth-Request-Groups", "role:media")
108 self.end_headers()
109
110 def log_message(self, *args):
111 pass
112
113 with HTTPServer(("127.0.0.1", 0), Auth) as auth:
114 threading.Thread(target=auth.serve_forever, daemon=True).start()
115 router.nomad = lambda path, _: {
116 "/v1/services": [{"Namespace": "default", "Services": [{"ServiceName": "forward-auth"}]}],
117 "/v1/service/forward-auth": [{"ServiceName": "forward-auth", "AllocID": "fixture", "Address": "127.0.0.1", "Port": auth.server_port, "Tags": []}],
118 "/v1/allocation/fixture/checks": {"ready": {"Status": "success"}},
119 }[path]
120 os.environ.update(SNOWGLOBE_DOMAIN="snowglobe.test", SNOWGLOBE_DASHBOARD_PORT=port, SNOWGLOBE_PROXY_TOKEN_FILE=str(token))
121 with socket.socket() as reservation:
122 reservation.bind(("127.0.0.1", 0))
123 proxy_port = reservation.getsockname()[1]
124 config = Path(temporary) / "Caddyfile"
125 config.write_text("{\n admin off\n auto_https off\n}\n" + router.render("fixture").replace(
126 "globe.snowglobe.test {", "http://127.0.0.1:" + str(proxy_port) + " {"
127 ).replace(" tls internal\n", ""))
128 config.chmod(0o600)
129 log = Path(temporary) / "caddy.log"
130 caddy_binary = (Path("/proc") / shell("systemctl", "show", "-P", "MainPID", "caddy").strip() / "exe").resolve(strict=True)
131 with log.open("w") as output:
132 caddy = subprocess.Popen([str(caddy_binary), "run", "--config", str(config), "--adapter", "caddyfile"],
133 stdout=output, stderr=output, env={**os.environ, "XDG_DATA_HOME": temporary, "XDG_CONFIG_HOME": temporary})
134 try:
135 deadline = time.monotonic() + 10
136 while True:
137 try:
138 with socket.create_connection(("127.0.0.1", proxy_port), timeout=.2):
139 break
140 except OSError:
141 if time.monotonic() >= deadline or caddy.poll() is not None:
142 raise AssertionError(log.read_text().replace(proof, "<redacted>"))
143 time.sleep(.1)
144 forged = {"User-Name": "snow", "User-Groups": "infra-admin", "Snowglobe-Proxy-Token": "0" * 64}
145 request = urllib.request.Request("http://127.0.0.1:" + str(proxy_port) + "/api/me",
146 headers={**forged, "Cookie": "fixture=1"})
147 with urllib.request.urlopen(request, timeout=10) as response:
148 me = json.load(response)
149 assert me["name"] == "fixture" and "infra-admin" not in me["groups"], me
150 request.full_url = "http://127.0.0.1:" + str(proxy_port) + "/api/deploys"
100 router.nomad = lambda path, _: {"/v1/services": []}[path]
101 os.environ.update(SNOWGLOBE_DOMAIN="snowglobe.test", SNOWGLOBE_DASHBOARD_PORT=port, SNOWGLOBE_PROXY_TOKEN_FILE=str(token))
102 os.environ.pop("SNOWGLOBE_INTERNAL_PORT", None)
103 dashboard_route = router.render("fixture").split("snowglobe.snowglobe.test {\n", 1)[1]
104 with socket.socket() as reservation:
105 reservation.bind(("127.0.0.1", 0))
106 proxy_port = reservation.getsockname()[1]
107 config = Path(temporary) / "Caddyfile"
108 config.write_text("{\n admin off\n auto_https off\n}\nhttp://127.0.0.1:" + str(proxy_port) + " {\n" + dashboard_route.replace(" tls internal\n", ""))
109 config.chmod(0o600)
110 log = Path(temporary) / "caddy.log"
111 caddy_binary = (Path("/proc") / shell("systemctl", "show", "-P", "MainPID", "caddy").strip() / "exe").resolve(strict=True)
112 with log.open("w") as output:
113 caddy = subprocess.Popen([str(caddy_binary), "run", "--config", str(config), "--adapter", "caddyfile"],
114 stdout=output, stderr=output, env={**os.environ, "XDG_DATA_HOME": temporary, "XDG_CONFIG_HOME": temporary})
115 try:
116 deadline = time.monotonic() + 10
117 while True:
118 try:
119 with socket.create_connection(("127.0.0.1", proxy_port), timeout=.2):
120 break
121 except OSError:
122 if time.monotonic() >= deadline or caddy.poll() is not None:
123 raise AssertionError(log.read_text().replace(proof, "<redacted>"))
124 time.sleep(.1)
125 forged = {"User-Name": "snow", "User-Groups": "infra-admin", "Snowglobe-Proxy-Token": "0" * 64}
126 for path in ("/api/me", "/api/deploys"):
127 request = urllib.request.Request("http://127.0.0.1:" + str(proxy_port) + path, headers=forged)
151128 try:
152129 urllib.request.urlopen(request, timeout=10)
153 raise AssertionError("forged admin role survived Caddy")
130 raise AssertionError("forged identity survived Caddy")
154131 except urllib.error.HTTPError as error:
155 assert error.code == 403, error.code
156 connection = HTTPConnection("127.0.0.1", proxy_port, timeout=10)
157 try:
158 connection.request("GET", "/api/me", headers=forged)
159 response = connection.getresponse()
160 assert response.status == 302 and response.getheader("Location").startswith("/snow.oauth2/sign_in?"), response.status
161 response.read()
162 finally:
163 connection.close()
164 finally:
165 caddy.terminate()
166 try:
167 caddy.wait(timeout=10)
168 except subprocess.TimeoutExpired:
169 caddy.kill()
170 caddy.wait()
171 auth.shutdown()
132 assert error.code == 401, (path, error.code)
133 finally:
134 caddy.terminate()
135 try:
136 caddy.wait(timeout=10)
137 except subprocess.TimeoutExpired:
138 caddy.kill()
139 caddy.wait()
172140 apps = json.loads(get("/api/launcher"))
173141 assert any(app["id"] == "shale" for app in apps), apps
174142 assert all(app["url"].endswith(".snowglobe.test") for app in apps), apps
......@@ -187,7 +155,7 @@ print('refused')
187155 assert subprocess.run(["podman", "exec", container, "test", "-e", denied], capture_output=True).returncode == 1, denied
188156 result = {"proxy_proof_required": "passed", "neighbor_identity_forgery_refused": "passed",
189157 "wildcard_startup_without_proof_refused": "passed",
190 "caddy_identity_scrubbing_and_proof_injection": "passed", "anonymous_forgery_redirected_to_signin": "passed",
158 "caddy_identity_scrubbing_and_proof_injection": "passed",
191159 "launcher_from_immutable_image": "passed", "service_icons": "passed",
192160 "unprivileged_youtube_library": "passed", "python_yaml": "passed",
193161 "ffmpeg_and_ytdlp": "passed", "host_release_and_control_paths_absent": "passed"}
tools/snowglobe-build-test.py created+32
......@@ -0,0 +1,32 @@
1#!/usr/bin/env python3
2from pathlib import Path
3import tempfile
4import unittest
5from unittest.mock import patch
6
7import snowglobe
8
9
10class BuildBoundary(unittest.TestCase):
11 def test_shared_context_stays_inside_the_service_tree(self):
12 with tempfile.TemporaryDirectory() as temporary:
13 root = Path(temporary).resolve()
14 consumer = root / "service/consumer"
15 shared = root / "service/shared"
16 consumer.mkdir(parents=True)
17 (consumer / "service.pkl").touch()
18 shared.mkdir()
19 (shared / "Dockerfile").touch()
20 (root / "Dockerfile").touch()
21 (consumer / "escape").symlink_to(root, target_is_directory=True)
22 with patch.object(snowglobe, "REPO", root), patch.object(snowglobe, "SERVICES", root / "service"):
23 self.assertEqual(snowglobe.build_context("consumer", "../shared"), shared)
24 for relative in ("../..", "escape", "."):
25 with self.subTest(relative=relative), self.assertRaises(ValueError):
26 snowglobe.build_context("consumer", relative)
27 with self.assertRaises(ValueError):
28 snowglobe.config_path("consumer", "../shared/Dockerfile")
29
30
31if __name__ == "__main__":
32 unittest.main()
tools/snowglobe.py+9-4
......@@ -133,9 +133,7 @@ def load(name, properties, instance_id=None):
133133 raise ValueError(f"{name}.{task_name} needs one image or build directory")
134134 if task.get("build"):
135135 if REPO.parent == Path("/opt/snowglobe/releases").resolve():
136 context = config_path(name, task["build"])
137 if not context.is_dir() or not (context / "Dockerfile").is_file():
138 raise ValueError(f"invalid build context: {name}.{task_name}")
136 context = build_context(name, task["build"])
139137 digest = hashlib.sha256()
140138 for path in sorted(context.rglob("*")):
141139 if path.is_file():
......@@ -183,6 +181,13 @@ def config_path(service, relative):
183181 return source
184182
185183
184def build_context(service, relative):
185 source = (service_dir(service) / relative).resolve()
186 if not source.is_relative_to((REPO / "service").resolve()) or not (source / "Dockerfile").is_file():
187 raise ValueError(f"invalid build context: {relative}")
188 return source
189
190
186191def config_assets(data):
187192 paths = set()
188193 for task in data["containers"].values():
......@@ -643,7 +648,7 @@ def build_images(data):
643648 if task.get("build"):
644649 image = task["image"]
645650 if subprocess.run(["podman", "image", "exists", image]).returncode:
646 command("podman", "build", "-t", image, str(config_path(data["sourceId"], task["build"])))
651 command("podman", "build", "-t", image, str(build_context(data["sourceId"], task["build"])))
647652
648653
649654def clone_dataset(source, snapshot, dataset, mount):