| author | |
| committer | |
| log | 34decd157cba7bd22c0b167fb47fb5b1f998a24c |
| tree | cba93ac1529f9dc35fd862735525879681676f42 |
| parent | df4161ba6e1bae0f7c7596554bde1ccfe49ea94d |
| signature | Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU |
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-sol26 files changed, 524 insertions(+), 268 deletions(-)
dashboard/Cargo.lock+167-35| ... | @@ -300,12 +300,32 @@ dependencies = [ | ... | @@ -300,12 +300,32 @@ dependencies = [ |
| 300 | "inout", | 300 | "inout", |
| 301 | ] | 301 | ] |
| 302 | 302 | ||
| 303 | [[package]] | ||
| 304 | name = "combine" | ||
| 305 | version = "4.6.9" | ||
| 306 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 307 | checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" | ||
| 308 | dependencies = [ | ||
| 309 | "bytes", | ||
| 310 | "memchr", | ||
| 311 | ] | ||
| 312 | |||
| 303 | [[package]] | 313 | [[package]] |
| 304 | name = "const-oid" | 314 | name = "const-oid" |
| 305 | version = "0.9.6" | 315 | version = "0.9.6" |
| 306 | source = "registry+https://github.com/rust-lang/crates.io-index" | 316 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 307 | checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" | 317 | checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" |
| 308 | 318 | ||
| 319 | [[package]] | ||
| 320 | name = "core-foundation" | ||
| 321 | version = "0.9.4" | ||
| 322 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 323 | checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" | ||
| 324 | dependencies = [ | ||
| 325 | "core-foundation-sys", | ||
| 326 | "libc", | ||
| 327 | ] | ||
| 328 | |||
| 309 | [[package]] | 329 | [[package]] |
| 310 | name = "core-foundation-sys" | 330 | name = "core-foundation-sys" |
| 311 | version = "0.8.7" | 331 | version = "0.8.7" |
| ... | @@ -561,6 +581,12 @@ version = "0.11.0" | ... | @@ -561,6 +581,12 @@ version = "0.11.0" |
| 561 | source = "registry+https://github.com/rust-lang/crates.io-index" | 581 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 562 | checksum = "b04dc5a38e4f151a79d9f2451ae6037fb6eaf5cba34771f44781f80e508498e3" | 582 | checksum = "b04dc5a38e4f151a79d9f2451ae6037fb6eaf5cba34771f44781f80e508498e3" |
| 563 | 583 | ||
| 584 | [[package]] | ||
| 585 | name = "either" | ||
| 586 | version = "1.19.0" | ||
| 587 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 588 | checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" | ||
| 589 | |||
| 564 | [[package]] | 590 | [[package]] |
| 565 | name = "elliptic-curve" | 591 | name = "elliptic-curve" |
| 566 | version = "0.13.8" | 592 | version = "0.13.8" |
| ... | @@ -594,18 +620,6 @@ dependencies = [ | ... | @@ -594,18 +620,6 @@ dependencies = [ |
| 594 | "simdutf8", | 620 | "simdutf8", |
| 595 | ] | 621 | ] |
| 596 | 622 | ||
| 597 | [[package]] | ||
| 598 | name = "enum-as-inner" | ||
| 599 | version = "0.6.1" | ||
| 600 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 601 | checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" | ||
| 602 | dependencies = [ | ||
| 603 | "heck", | ||
| 604 | "proc-macro2", | ||
| 605 | "quote", | ||
| 606 | "syn 2.0.119", | ||
| 607 | ] | ||
| 608 | |||
| 609 | [[package]] | 623 | [[package]] |
| 610 | name = "equivalent" | 624 | name = "equivalent" |
| 611 | version = "1.0.2" | 625 | version = "1.0.2" |
| ... | @@ -894,12 +908,6 @@ dependencies = [ | ... | @@ -894,12 +908,6 @@ dependencies = [ |
| 894 | "hashbrown 0.15.5", | 908 | "hashbrown 0.15.5", |
| 895 | ] | 909 | ] |
| 896 | 910 | ||
| 897 | [[package]] | ||
| 898 | name = "heck" | ||
| 899 | version = "0.5.0" | ||
| 900 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 901 | checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" | ||
| 902 | |||
| 903 | [[package]] | 911 | [[package]] |
| 904 | name = "hex" | 912 | name = "hex" |
| 905 | version = "0.4.3" | 913 | version = "0.4.3" |
| ... | @@ -907,46 +915,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | ... | @@ -907,46 +915,70 @@ source = "registry+https://github.com/rust-lang/crates.io-index" |
| 907 | checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" | 915 | checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" |
| 908 | 916 | ||
| 909 | [[package]] | 917 | [[package]] |
| 910 | name = "hickory-proto" | 918 | name = "hickory-net" |
| 911 | version = "0.25.2" | 919 | version = "0.26.3" |
| 912 | source = "registry+https://github.com/rust-lang/crates.io-index" | 920 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 913 | checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" | 921 | checksum = "c480823ed7c2c5d0f09c41020cb6b7c28029ce60ec42dc942158dcf22f8e0a4d" |
| 914 | dependencies = [ | 922 | dependencies = [ |
| 915 | "async-trait", | 923 | "async-trait", |
| 916 | "cfg-if", | 924 | "cfg-if", |
| 917 | "data-encoding", | 925 | "data-encoding", |
| 918 | "enum-as-inner", | ||
| 919 | "futures-channel", | 926 | "futures-channel", |
| 920 | "futures-io", | 927 | "futures-io", |
| 921 | "futures-util", | 928 | "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]] | ||
| 942 | name = "hickory-proto" | ||
| 943 | version = "0.26.3" | ||
| 944 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 945 | checksum = "12b92608f679a6fa515dd1d15c1ff89443026e391200a2c840c7afcba482893d" | ||
| 946 | dependencies = [ | ||
| 947 | "data-encoding", | ||
| 922 | "idna", | 948 | "idna", |
| 923 | "ipnet", | 949 | "ipnet", |
| 950 | "jni", | ||
| 924 | "once_cell", | 951 | "once_cell", |
| 925 | "rand 0.9.5", | 952 | "prefix-trie", |
| 953 | "rand 0.10.3", | ||
| 926 | "ring", | 954 | "ring", |
| 927 | "thiserror 2.0.21", | 955 | "thiserror 2.0.21", |
| 928 | "tinyvec", | 956 | "tinyvec", |
| 929 | "tokio", | ||
| 930 | "tracing", | 957 | "tracing", |
| 931 | "url", | 958 | "url", |
| 932 | ] | 959 | ] |
| 933 | 960 | ||
| 934 | [[package]] | 961 | [[package]] |
| 935 | name = "hickory-resolver" | 962 | name = "hickory-resolver" |
| 936 | version = "0.25.2" | 963 | version = "0.26.3" |
| 937 | source = "registry+https://github.com/rust-lang/crates.io-index" | 964 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 938 | checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" | 965 | checksum = "3f3da5255c95d5a716857d54b5b8f4e8d67c3484d3beaaaae2ce25063b3ba981" |
| 939 | dependencies = [ | 966 | dependencies = [ |
| 940 | "cfg-if", | 967 | "cfg-if", |
| 941 | "futures-util", | 968 | "futures-util", |
| 969 | "hickory-net", | ||
| 942 | "hickory-proto", | 970 | "hickory-proto", |
| 943 | "ipconfig", | 971 | "ipconfig", |
| 972 | "ipnet", | ||
| 973 | "jni", | ||
| 944 | "moka", | 974 | "moka", |
| 975 | "ndk-context", | ||
| 945 | "once_cell", | 976 | "once_cell", |
| 946 | "parking_lot", | 977 | "parking_lot", |
| 947 | "rand 0.9.5", | 978 | "rand 0.10.3", |
| 948 | "resolv-conf", | 979 | "resolv-conf", |
| 949 | "smallvec", | 980 | "smallvec", |
| 981 | "system-configuration", | ||
| 950 | "thiserror 2.0.21", | 982 | "thiserror 2.0.21", |
| 951 | "tokio", | 983 | "tokio", |
| 952 | "tracing", | 984 | "tracing", |
| ... | @@ -1287,6 +1319,9 @@ name = "ipnet" | ... | @@ -1287,6 +1319,9 @@ name = "ipnet" |
| 1287 | version = "2.12.2" | 1319 | version = "2.12.2" |
| 1288 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1320 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1289 | checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" | 1321 | checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" |
| 1322 | dependencies = [ | ||
| 1323 | "serde", | ||
| 1324 | ] | ||
| 1290 | 1325 | ||
| 1291 | [[package]] | 1326 | [[package]] |
| 1292 | name = "itoa" | 1327 | name = "itoa" |
| ... | @@ -1294,6 +1329,55 @@ version = "1.0.18" | ... | @@ -1294,6 +1329,55 @@ version = "1.0.18" |
| 1294 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1329 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1295 | checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" | 1330 | checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" |
| 1296 | 1331 | ||
| 1332 | [[package]] | ||
| 1333 | name = "jni" | ||
| 1334 | version = "0.22.4" | ||
| 1335 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1336 | checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" | ||
| 1337 | dependencies = [ | ||
| 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]] | ||
| 1350 | name = "jni-macros" | ||
| 1351 | version = "0.22.4" | ||
| 1352 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1353 | checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" | ||
| 1354 | dependencies = [ | ||
| 1355 | "proc-macro2", | ||
| 1356 | "quote", | ||
| 1357 | "rustc_version", | ||
| 1358 | "simd_cesu8", | ||
| 1359 | "syn 2.0.119", | ||
| 1360 | ] | ||
| 1361 | |||
| 1362 | [[package]] | ||
| 1363 | name = "jni-sys" | ||
| 1364 | version = "0.4.1" | ||
| 1365 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1366 | checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" | ||
| 1367 | dependencies = [ | ||
| 1368 | "jni-sys-macros", | ||
| 1369 | ] | ||
| 1370 | |||
| 1371 | [[package]] | ||
| 1372 | name = "jni-sys-macros" | ||
| 1373 | version = "0.4.1" | ||
| 1374 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1375 | checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" | ||
| 1376 | dependencies = [ | ||
| 1377 | "quote", | ||
| 1378 | "syn 2.0.119", | ||
| 1379 | ] | ||
| 1380 | |||
| 1297 | [[package]] | 1381 | [[package]] |
| 1298 | name = "js-sys" | 1382 | name = "js-sys" |
| 1299 | version = "0.3.106" | 1383 | version = "0.3.106" |
| ... | @@ -1479,6 +1563,12 @@ version = "1.0.0" | ... | @@ -1479,6 +1563,12 @@ version = "1.0.0" |
| 1479 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1563 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1480 | checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" | 1564 | checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" |
| 1481 | 1565 | ||
| 1566 | [[package]] | ||
| 1567 | name = "ndk-context" | ||
| 1568 | version = "0.1.1" | ||
| 1569 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1570 | checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" | ||
| 1571 | |||
| 1482 | [[package]] | 1572 | [[package]] |
| 1483 | name = "new_debug_unreachable" | 1573 | name = "new_debug_unreachable" |
| 1484 | version = "1.0.6" | 1574 | version = "1.0.6" |
| ... | @@ -1833,6 +1923,17 @@ version = "0.1.1" | ... | @@ -1833,6 +1923,17 @@ version = "0.1.1" |
| 1833 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1923 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 1834 | checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" | 1924 | checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" |
| 1835 | 1925 | ||
| 1926 | [[package]] | ||
| 1927 | name = "prefix-trie" | ||
| 1928 | version = "0.8.4" | ||
| 1929 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1930 | checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7" | ||
| 1931 | dependencies = [ | ||
| 1932 | "either", | ||
| 1933 | "ipnet", | ||
| 1934 | "num-traits", | ||
| 1935 | ] | ||
| 1936 | |||
| 1836 | [[package]] | 1937 | [[package]] |
| 1837 | name = "primeorder" | 1938 | name = "primeorder" |
| 1838 | version = "0.13.6" | 1939 | version = "0.13.6" |
| ... | @@ -2234,9 +2335,9 @@ dependencies = [ | ... | @@ -2234,9 +2335,9 @@ dependencies = [ |
| 2234 | 2335 | ||
| 2235 | [[package]] | 2336 | [[package]] |
| 2236 | name = "rustls" | 2337 | name = "rustls" |
| 2237 | version = "0.23.45" | 2338 | version = "0.23.46" |
| 2238 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2339 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2239 | checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" | 2340 | checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" |
| 2240 | dependencies = [ | 2341 | dependencies = [ |
| 2241 | "once_cell", | 2342 | "once_cell", |
| 2242 | "ring", | 2343 | "ring", |
| ... | @@ -2258,9 +2359,9 @@ dependencies = [ | ... | @@ -2258,9 +2359,9 @@ dependencies = [ |
| 2258 | 2359 | ||
| 2259 | [[package]] | 2360 | [[package]] |
| 2260 | name = "rustls-webpki" | 2361 | name = "rustls-webpki" |
| 2261 | version = "0.103.15" | 2362 | version = "0.103.16" |
| 2262 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2363 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2263 | checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" | 2364 | checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" |
| 2264 | dependencies = [ | 2365 | dependencies = [ |
| 2265 | "ring", | 2366 | "ring", |
| 2266 | "rustls-pki-types", | 2367 | "rustls-pki-types", |
| ... | @@ -2536,6 +2637,16 @@ dependencies = [ | ... | @@ -2536,6 +2637,16 @@ dependencies = [ |
| 2536 | "rand_core 0.6.4", | 2637 | "rand_core 0.6.4", |
| 2537 | ] | 2638 | ] |
| 2538 | 2639 | ||
| 2640 | [[package]] | ||
| 2641 | name = "simd_cesu8" | ||
| 2642 | version = "1.2.0" | ||
| 2643 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2644 | checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" | ||
| 2645 | dependencies = [ | ||
| 2646 | "rustc_version", | ||
| 2647 | "simdutf8", | ||
| 2648 | ] | ||
| 2649 | |||
| 2539 | [[package]] | 2650 | [[package]] |
| 2540 | name = "simdutf8" | 2651 | name = "simdutf8" |
| 2541 | version = "0.1.5" | 2652 | version = "0.1.5" |
| ... | @@ -2728,6 +2839,27 @@ dependencies = [ | ... | @@ -2728,6 +2839,27 @@ dependencies = [ |
| 2728 | "syn 3.0.6", | 2839 | "syn 3.0.6", |
| 2729 | ] | 2840 | ] |
| 2730 | 2841 | ||
| 2842 | [[package]] | ||
| 2843 | name = "system-configuration" | ||
| 2844 | version = "0.7.0" | ||
| 2845 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2846 | checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" | ||
| 2847 | dependencies = [ | ||
| 2848 | "bitflags", | ||
| 2849 | "core-foundation", | ||
| 2850 | "system-configuration-sys", | ||
| 2851 | ] | ||
| 2852 | |||
| 2853 | [[package]] | ||
| 2854 | name = "system-configuration-sys" | ||
| 2855 | version = "0.6.0" | ||
| 2856 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 2857 | checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" | ||
| 2858 | dependencies = [ | ||
| 2859 | "core-foundation-sys", | ||
| 2860 | "libc", | ||
| 2861 | ] | ||
| 2862 | |||
| 2731 | [[package]] | 2863 | [[package]] |
| 2732 | name = "tagptr" | 2864 | name = "tagptr" |
| 2733 | version = "0.2.0" | 2865 | version = "0.2.0" |
| ... | @@ -2831,9 +2963,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" | ... | @@ -2831,9 +2963,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" |
| 2831 | 2963 | ||
| 2832 | [[package]] | 2964 | [[package]] |
| 2833 | name = "tokio" | 2965 | name = "tokio" |
| 2834 | version = "1.53.1" | 2966 | version = "1.54.1" |
| 2835 | source = "registry+https://github.com/rust-lang/crates.io-index" | 2967 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 2836 | checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" | 2968 | checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" |
| 2837 | dependencies = [ | 2969 | dependencies = [ |
| 2838 | "bytes", | 2970 | "bytes", |
| 2839 | "libc", | 2971 | "libc", |
| ... | @@ -3286,9 +3418,9 @@ dependencies = [ | ... | @@ -3286,9 +3418,9 @@ dependencies = [ |
| 3286 | 3418 | ||
| 3287 | [[package]] | 3419 | [[package]] |
| 3288 | name = "webpki-roots" | 3420 | name = "webpki-roots" |
| 3289 | version = "1.0.9" | 3421 | version = "1.0.11" |
| 3290 | source = "registry+https://github.com/rust-lang/crates.io-index" | 3422 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 3291 | checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" | 3423 | checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" |
| 3292 | dependencies = [ | 3424 | dependencies = [ |
| 3293 | "rustls-pki-types", | 3425 | "rustls-pki-types", |
| 3294 | ] | 3426 | ] |
dashboard/Cargo.toml+1-1| ... | @@ -11,7 +11,7 @@ bytes = "1" | ... | @@ -11,7 +11,7 @@ bytes = "1" |
| 11 | chrono = "0.4" | 11 | chrono = "0.4" |
| 12 | futures = "0.3" | 12 | futures = "0.3" |
| 13 | globset = "0.4" | 13 | globset = "0.4" |
| 14 | hickory-resolver = "0.25" | 14 | hickory-resolver = "0.26.2" |
| 15 | openssl = "0.10" | 15 | openssl = "0.10" |
| 16 | percent-encoding = "2" | 16 | percent-encoding = "2" |
| 17 | rand = "0.9" | 17 | rand = "0.9" |
dashboard/package.json+3-3| ... | @@ -9,7 +9,7 @@ | ... | @@ -9,7 +9,7 @@ |
| 9 | "start": "cargo run --release" | 9 | "start": "cargo run --release" |
| 10 | }, | 10 | }, |
| 11 | "dependencies": { | 11 | "dependencies": { |
| 12 | "hono": "^4.13.9" | 12 | "hono": "^4.13.16" |
| 13 | }, | 13 | }, |
| 14 | "devDependencies": { | 14 | "devDependencies": { |
| 15 | "@clo/terminal": "file:vendor/clo-terminal-0.1.0.tgz", | 15 | "@clo/terminal": "file:vendor/clo-terminal-0.1.0.tgz", |
| ... | @@ -18,10 +18,10 @@ | ... | @@ -18,10 +18,10 @@ |
| 18 | "@types/node": "^26.6.2", | 18 | "@types/node": "^26.6.2", |
| 19 | "esbuild": "0.28.2", | 19 | "esbuild": "0.28.2", |
| 20 | "lucide-solid": "^1.48.0", | 20 | "lucide-solid": "^1.48.0", |
| 21 | "solid-js": "^1.9.15", | 21 | "solid-js": "^1.9.18", |
| 22 | "typescript": "^7.0.2", | 22 | "typescript": "^7.0.2", |
| 23 | "uplot": "^1.6.32", | 23 | "uplot": "^1.6.32", |
| 24 | "vite": "^8.3.1", | 24 | "vite": "^8.3.5", |
| 25 | "vite-plugin-solid": "^2.11.14" | 25 | "vite-plugin-solid": "^2.11.14" |
| 26 | } | 26 | } |
| 27 | } | 27 | } |
dashboard/pnpm-lock.yaml+137-127| ... | @@ -9,18 +9,18 @@ importers: | ... | @@ -9,18 +9,18 @@ importers: |
| 9 | .: | 9 | .: |
| 10 | dependencies: | 10 | dependencies: |
| 11 | hono: | 11 | hono: |
| 12 | specifier: ^4.13.9 | 12 | specifier: ^4.13.16 |
| 13 | version: 4.13.9 | 13 | version: 4.13.16 |
| 14 | devDependencies: | 14 | devDependencies: |
| 15 | '@clo/terminal': | 15 | '@clo/terminal': |
| 16 | specifier: file:vendor/clo-terminal-0.1.0.tgz | 16 | 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) |
| 18 | '@novnc/novnc': | 18 | '@novnc/novnc': |
| 19 | specifier: ^1.7.0 | 19 | specifier: ^1.7.0 |
| 20 | version: 1.7.0 | 20 | version: 1.7.0 |
| 21 | '@solidjs/router': | 21 | '@solidjs/router': |
| 22 | specifier: ^1.0.0 | 22 | specifier: ^1.0.0 |
| 23 | version: 1.0.0(solid-js@1.9.15) | 23 | version: 1.0.0(solid-js@1.9.18) |
| 24 | '@types/node': | 24 | '@types/node': |
| 25 | specifier: ^26.6.2 | 25 | specifier: ^26.6.2 |
| 26 | version: 26.6.2 | 26 | version: 26.6.2 |
| ... | @@ -29,10 +29,10 @@ importers: | ... | @@ -29,10 +29,10 @@ importers: |
| 29 | version: 0.28.2 | 29 | version: 0.28.2 |
| 30 | lucide-solid: | 30 | lucide-solid: |
| 31 | specifier: ^1.48.0 | 31 | specifier: ^1.48.0 |
| 32 | version: 1.48.0(solid-js@1.9.15) | 32 | version: 1.48.0(solid-js@1.9.18) |
| 33 | solid-js: | 33 | solid-js: |
| 34 | specifier: ^1.9.15 | 34 | specifier: ^1.9.18 |
| 35 | version: 1.9.15 | 35 | version: 1.9.18 |
| 36 | typescript: | 36 | typescript: |
| 37 | specifier: ^7.0.2 | 37 | specifier: ^7.0.2 |
| 38 | version: 7.0.2 | 38 | version: 7.0.2 |
| ... | @@ -40,11 +40,11 @@ importers: | ... | @@ -40,11 +40,11 @@ importers: |
| 40 | specifier: ^1.6.32 | 40 | specifier: ^1.6.32 |
| 41 | version: 1.6.32 | 41 | version: 1.6.32 |
| 42 | vite: | 42 | vite: |
| 43 | specifier: ^8.3.1 | 43 | specifier: ^8.3.5 |
| 44 | version: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) | 44 | version: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) |
| 45 | vite-plugin-solid: | 45 | vite-plugin-solid: |
| 46 | specifier: ^2.11.14 | 46 | 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)) |
| 48 | 48 | ||
| 49 | packages: | 49 | packages: |
| 50 | 50 | ||
| ... | @@ -316,95 +316,101 @@ packages: | ... | @@ -316,95 +316,101 @@ packages: |
| 316 | '@novnc/novnc@1.7.0': | 316 | '@novnc/novnc@1.7.0': |
| 317 | resolution: {integrity: sha512-ucEJOx4T2avIRCleodk7YobZj5O2Ga2AeLfQ69A/yjG9HHba2+PDgwSkN3FttrmG+70ZGx21sElNFouK13RzyA==} | 317 | resolution: {integrity: sha512-ucEJOx4T2avIRCleodk7YobZj5O2Ga2AeLfQ69A/yjG9HHba2+PDgwSkN3FttrmG+70ZGx21sElNFouK13RzyA==} |
| 318 | 318 | ||
| 319 | '@oxc-project/types@0.151.0': | 319 | '@oxc-project/types@0.156.0': |
| 320 | resolution: {integrity: sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==} | 320 | resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} |
| 321 | 321 | ||
| 322 | '@rolldown/binding-android-arm-eabi@1.2.11': | 322 | '@rolldown/binding-android-arm-eabi@1.2.16': |
| 323 | resolution: {integrity: sha512-A5kXfGKvKWWZE0TtPrfsvT+q4Y5d1QG8gGUzpYjGydM+fARM9MuX90PrXYXe0XbsDVgyxxNzHo6giCj90bsFNw==} | 323 | resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==} |
| 324 | engines: {node: ^20.19.0 || >=22.12.0} | 324 | engines: {node: ^20.19.0 || >=22.12.0} |
| 325 | cpu: [arm] | 325 | cpu: [arm] |
| 326 | os: [android] | 326 | os: [android] |
| 327 | 327 | ||
| 328 | '@rolldown/binding-android-arm64@1.2.11': | 328 | '@rolldown/binding-android-arm64@1.2.16': |
| 329 | resolution: {integrity: sha512-z6cTycz+iJ4PVkuL4HHW4DfTfoeU/2nqYYuSOrTmH7yHK5Y0LCOnA03V4ZNxavyVaU1oOqUgIg2klN/s+USGOA==} | 329 | resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==} |
| 330 | engines: {node: ^20.19.0 || >=22.12.0} | 330 | engines: {node: ^20.19.0 || >=22.12.0} |
| 331 | cpu: [arm64] | 331 | cpu: [arm64] |
| 332 | os: [android] | 332 | os: [android] |
| 333 | 333 | ||
| 334 | '@rolldown/binding-darwin-arm64@1.2.11': | 334 | '@rolldown/binding-darwin-arm64@1.2.16': |
| 335 | resolution: {integrity: sha512-jShvqNtP6vDC6/A5JOAzbVV+DkgHqhl/ScVCJEbt+TUY6QYz7YnXcrg3sLtFBniro0f/Ld50ZwCWA6f7KYD1nQ==} | 335 | resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==} |
| 336 | engines: {node: ^20.19.0 || >=22.12.0} | 336 | engines: {node: ^20.19.0 || >=22.12.0} |
| 337 | cpu: [arm64] | 337 | cpu: [arm64] |
| 338 | os: [darwin] | 338 | os: [darwin] |
| 339 | 339 | ||
| 340 | '@rolldown/binding-darwin-x64@1.2.11': | 340 | '@rolldown/binding-darwin-x64@1.2.16': |
| 341 | resolution: {integrity: sha512-f2i2xiNWq1Z1l2++q2fuhZRdLAT3aqxD6vRNm1RAxpUoBcdqNB3C0s1Bt+K+PbEx2F5F4gQp6hqKkphCY/xF9w==} | 341 | resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==} |
| 342 | engines: {node: ^20.19.0 || >=22.12.0} | 342 | engines: {node: ^20.19.0 || >=22.12.0} |
| 343 | cpu: [x64] | 343 | cpu: [x64] |
| 344 | os: [darwin] | 344 | os: [darwin] |
| 345 | 345 | ||
| 346 | '@rolldown/binding-freebsd-x64@1.2.11': | 346 | '@rolldown/binding-freebsd-x64@1.2.16': |
| 347 | resolution: {integrity: sha512-4Ir5FSOKIAMr4r0kExpt1s3bMgzJU3rA45AYOHtQpls0oNeqcYBKrWMlckrYH4KCfGLfkfn1tN1dmZPMVsdXow==} | 347 | resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==} |
| 348 | engines: {node: ^20.19.0 || >=22.12.0} | 348 | engines: {node: ^20.19.0 || >=22.12.0} |
| 349 | cpu: [x64] | 349 | cpu: [x64] |
| 350 | os: [freebsd] | 350 | os: [freebsd] |
| 351 | 351 | ||
| 352 | '@rolldown/binding-linux-arm-gnueabihf@1.2.11': | 352 | '@rolldown/binding-linux-arm-gnueabihf@1.2.16': |
| 353 | resolution: {integrity: sha512-/gnRDM+39BROzAN/k1OZjDPnDMcZxB/0EUxKjONO5yVkNEvlsoMDrxGNKgZi/ttFriS2gwlDNzB65pvNbFOXIQ==} | 353 | resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==} |
| 354 | engines: {node: ^20.19.0 || >=22.12.0} | 354 | engines: {node: ^20.19.0 || >=22.12.0} |
| 355 | cpu: [arm] | 355 | cpu: [arm] |
| 356 | os: [linux] | 356 | os: [linux] |
| 357 | 357 | ||
| 358 | '@rolldown/binding-linux-arm64-gnu@1.2.11': | 358 | '@rolldown/binding-linux-arm64-gnu@1.2.16': |
| 359 | resolution: {integrity: sha512-PFaK8HwvAHbaKbBcDNQihjMKYvFnA5hiENx/l5tphTDz1E0WFp32l0A7aq7lyUwGsRw/xSrNIy/gIK4thrSCrw==} | 359 | resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==} |
| 360 | engines: {node: ^20.19.0 || >=22.12.0} | 360 | engines: {node: ^20.19.0 || >=22.12.0} |
| 361 | cpu: [arm64] | 361 | cpu: [arm64] |
| 362 | os: [linux] | 362 | os: [linux] |
| 363 | libc: [glibc] | ||
| 363 | 364 | ||
| 364 | '@rolldown/binding-linux-arm64-musl@1.2.11': | 365 | '@rolldown/binding-linux-arm64-musl@1.2.16': |
| 365 | resolution: {integrity: sha512-AskzJUIKRLPxkruR1wLKewGbOw+EYfU/9lOrBFj4AFrEA8hPpKFnODWNu2WLaNs0QNkEb9QIJufmVZZIL/bJlg==} | 366 | resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==} |
| 366 | engines: {node: ^20.19.0 || >=22.12.0} | 367 | engines: {node: ^20.19.0 || >=22.12.0} |
| 367 | cpu: [arm64] | 368 | cpu: [arm64] |
| 368 | os: [linux] | 369 | os: [linux] |
| 370 | libc: [musl] | ||
| 369 | 371 | ||
| 370 | '@rolldown/binding-linux-ppc64-gnu@1.2.11': | 372 | '@rolldown/binding-linux-ppc64-gnu@1.2.16': |
| 371 | resolution: {integrity: sha512-qlUGAheh2yh8afH7QBgx0PrRHN85hKnNd78x8MeMhXivuevgd8vgf6/CstOzmNKY/lLTHvNTrPy98cLnAugzJw==} | 373 | resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==} |
| 372 | engines: {node: ^20.19.0 || >=22.12.0} | 374 | engines: {node: ^20.19.0 || >=22.12.0} |
| 373 | cpu: [ppc64] | 375 | cpu: [ppc64] |
| 374 | os: [linux] | 376 | os: [linux] |
| 377 | libc: [glibc] | ||
| 375 | 378 | ||
| 376 | '@rolldown/binding-linux-s390x-gnu@1.2.11': | 379 | '@rolldown/binding-linux-s390x-gnu@1.2.16': |
| 377 | resolution: {integrity: sha512-secpEad+0vCbSfn8upFySkDskv+bGPk3THSDS9Y89yc4rb4kzqHp8Dmyd9BkQW4SnhNXBZCl/6CrO//hZahNJQ==} | 380 | resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==} |
| 378 | engines: {node: ^20.19.0 || >=22.12.0} | 381 | engines: {node: ^20.19.0 || >=22.12.0} |
| 379 | cpu: [s390x] | 382 | cpu: [s390x] |
| 380 | os: [linux] | 383 | os: [linux] |
| 384 | libc: [glibc] | ||
| 381 | 385 | ||
| 382 | '@rolldown/binding-linux-x64-gnu@1.2.11': | 386 | '@rolldown/binding-linux-x64-gnu@1.2.16': |
| 383 | resolution: {integrity: sha512-mOVBT3dPpkWm8XBWPmU4bf+U6dYDLeMo/9ojUmis4N0L5uu10qra5vOyngZ7/PSdoE4G9KvRt4bloRxNjLas7A==} | 387 | resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==} |
| 384 | engines: {node: ^20.19.0 || >=22.12.0} | 388 | engines: {node: ^20.19.0 || >=22.12.0} |
| 385 | cpu: [x64] | 389 | cpu: [x64] |
| 386 | os: [linux] | 390 | os: [linux] |
| 391 | libc: [glibc] | ||
| 387 | 392 | ||
| 388 | '@rolldown/binding-linux-x64-musl@1.2.11': | 393 | '@rolldown/binding-linux-x64-musl@1.2.16': |
| 389 | resolution: {integrity: sha512-Is78i9A8Ui4SqcxUwFJ9uMmjDn58IbVTjFWYdQestFEgeuEmHMLGNriXnVJKkwG2YiZjw8cP0zCTyDMdDGtOOg==} | 394 | resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==} |
| 390 | engines: {node: ^20.19.0 || >=22.12.0} | 395 | engines: {node: ^20.19.0 || >=22.12.0} |
| 391 | cpu: [x64] | 396 | cpu: [x64] |
| 392 | os: [linux] | 397 | os: [linux] |
| 398 | libc: [musl] | ||
| 393 | 399 | ||
| 394 | '@rolldown/binding-openharmony-arm64@1.2.11': | 400 | '@rolldown/binding-openharmony-arm64@1.2.16': |
| 395 | resolution: {integrity: sha512-dUCXneZ87INUMyQ0D+C0HrEBNUPNXHaPmU5GTjyKTJEiussw9Kaj5Ln8UztPe4epV/ffvgNBEadksdYhmW6xJA==} | 401 | resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==} |
| 396 | engines: {node: ^20.19.0 || >=22.12.0} | 402 | engines: {node: ^20.19.0 || >=22.12.0} |
| 397 | cpu: [arm64] | 403 | cpu: [arm64] |
| 398 | os: [openharmony] | 404 | os: [openharmony] |
| 399 | 405 | ||
| 400 | '@rolldown/binding-win32-arm64-msvc@1.2.11': | 406 | '@rolldown/binding-win32-arm64-msvc@1.2.16': |
| 401 | resolution: {integrity: sha512-jByxb6qfd+bH1xUd0qnfFnb17i9sWBPY2tOavJ0l3tdr3OTu+Kvtm8cd/JV5nFt657b1VqGltxg9olOEfofXWw==} | 407 | resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==} |
| 402 | engines: {node: ^20.19.0 || >=22.12.0} | 408 | engines: {node: ^20.19.0 || >=22.12.0} |
| 403 | cpu: [arm64] | 409 | cpu: [arm64] |
| 404 | os: [win32] | 410 | os: [win32] |
| 405 | 411 | ||
| 406 | '@rolldown/binding-win32-x64-msvc@1.2.11': | 412 | '@rolldown/binding-win32-x64-msvc@1.2.16': |
| 407 | resolution: {integrity: sha512-/PzKqzAJ03i19oy2ItPvyvaVjOjBCNnfaJs8yvUdGBKmiESgnrJSQ2awd81QzFbbnAmu7YO9ZnJrDCb9VSJPRA==} | 413 | resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==} |
| 408 | engines: {node: ^20.19.0 || >=22.12.0} | 414 | engines: {node: ^20.19.0 || >=22.12.0} |
| 409 | cpu: [x64] | 415 | cpu: [x64] |
| 410 | os: [win32] | 416 | os: [win32] |
| ... | @@ -632,8 +638,8 @@ packages: | ... | @@ -632,8 +638,8 @@ packages: |
| 632 | resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} | 638 | resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} |
| 633 | engines: {node: '>=6.9.0'} | 639 | engines: {node: '>=6.9.0'} |
| 634 | 640 | ||
| 635 | hono@4.13.9: | 641 | hono@4.13.16: |
| 636 | resolution: {integrity: sha512-7dMkQmZoC4E6F7AtaQSPhlWAdnBti+j7rreMZl8QB4jFiEhP9TWbGWUMi8WYzBCgmgulxuvLQupKqo+Co6Omyg==} | 642 | resolution: {integrity: sha512-AOLOEhvrV+iH92xXCnFr/5+3KjPKcI3xP63XJtX5spAnkznPdHijlIsUTpi7/9EhWqrTCekw5c5zh1K+YsVw7A==} |
| 637 | engines: {node: '>=16.9.0'} | 643 | engines: {node: '>=16.9.0'} |
| 638 | 644 | ||
| 639 | html-entities@2.3.3: | 645 | html-entities@2.3.3: |
| ... | @@ -691,24 +697,28 @@ packages: | ... | @@ -691,24 +697,28 @@ packages: |
| 691 | engines: {node: '>= 12.0.0'} | 697 | engines: {node: '>= 12.0.0'} |
| 692 | cpu: [arm64] | 698 | cpu: [arm64] |
| 693 | os: [linux] | 699 | os: [linux] |
| 700 | libc: [glibc] | ||
| 694 | 701 | ||
| 695 | lightningcss-linux-arm64-musl@1.33.0: | 702 | lightningcss-linux-arm64-musl@1.33.0: |
| 696 | resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==} | 703 | resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==} |
| 697 | engines: {node: '>= 12.0.0'} | 704 | engines: {node: '>= 12.0.0'} |
| 698 | cpu: [arm64] | 705 | cpu: [arm64] |
| 699 | os: [linux] | 706 | os: [linux] |
| 707 | libc: [musl] | ||
| 700 | 708 | ||
| 701 | lightningcss-linux-x64-gnu@1.33.0: | 709 | lightningcss-linux-x64-gnu@1.33.0: |
| 702 | resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==} | 710 | resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==} |
| 703 | engines: {node: '>= 12.0.0'} | 711 | engines: {node: '>= 12.0.0'} |
| 704 | cpu: [x64] | 712 | cpu: [x64] |
| 705 | os: [linux] | 713 | os: [linux] |
| 714 | libc: [glibc] | ||
| 706 | 715 | ||
| 707 | lightningcss-linux-x64-musl@1.33.0: | 716 | lightningcss-linux-x64-musl@1.33.0: |
| 708 | resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==} | 717 | resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==} |
| 709 | engines: {node: '>= 12.0.0'} | 718 | engines: {node: '>= 12.0.0'} |
| 710 | cpu: [x64] | 719 | cpu: [x64] |
| 711 | os: [linux] | 720 | os: [linux] |
| 721 | libc: [musl] | ||
| 712 | 722 | ||
| 713 | lightningcss-win32-arm64-msvc@1.33.0: | 723 | lightningcss-win32-arm64-msvc@1.33.0: |
| 714 | resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==} | 724 | resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==} |
| ... | @@ -741,8 +751,8 @@ packages: | ... | @@ -741,8 +751,8 @@ packages: |
| 741 | ms@2.1.3: | 751 | ms@2.1.3: |
| 742 | resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} | 752 | resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} |
| 743 | 753 | ||
| 744 | nanoid@3.3.19: | 754 | nanoid@3.3.20: |
| 745 | resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} | 755 | resolution: {integrity: sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==} |
| 746 | engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} | 756 | engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} |
| 747 | hasBin: true | 757 | hasBin: true |
| 748 | 758 | ||
| ... | @@ -760,12 +770,12 @@ packages: | ... | @@ -760,12 +770,12 @@ packages: |
| 760 | resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} | 770 | resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} |
| 761 | engines: {node: '>=12'} | 771 | engines: {node: '>=12'} |
| 762 | 772 | ||
| 763 | postcss@8.5.28: | 773 | postcss@8.5.32: |
| 764 | resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==} | 774 | resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==} |
| 765 | engines: {node: ^10 || ^12 || >=14} | 775 | engines: {node: ^10 || ^12 || >=14} |
| 766 | 776 | ||
| 767 | rolldown@1.2.11: | 777 | rolldown@1.2.16: |
| 768 | resolution: {integrity: sha512-qpSwIyz0jHQq5qXBTNxFmE6664rJ7O+4TvPFOiOaBSrz8IOHc1koKKSqTM2H6u1UG1+TveuC6vaDHKXFOvb1Kw==} | 778 | resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==} |
| 769 | engines: {node: ^20.19.0 || >=22.12.0} | 779 | engines: {node: ^20.19.0 || >=22.12.0} |
| 770 | hasBin: true | 780 | hasBin: true |
| 771 | 781 | ||
| ... | @@ -773,26 +783,26 @@ packages: | ... | @@ -773,26 +783,26 @@ packages: |
| 773 | resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} | 783 | resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} |
| 774 | hasBin: true | 784 | hasBin: true |
| 775 | 785 | ||
| 776 | seroval-plugins@1.5.6: | 786 | seroval-plugins@1.6.12: |
| 777 | resolution: {integrity: sha512-HXuLAX2pu/UByPpaeo/TaMfvMIi+1QqIoPJYCcAtU8QkVNwgR6MPlGuCQTErV1JwraaMbYaWVIBX7mppzGLATQ==} | 787 | resolution: {integrity: sha512-+reiwp/lYxiyctSrdvX7OQ1YLrcbWYgBiZrhSFL+V43b0/DGRLNVSDyZINbQe+tWplPOI2fw2dPrdv6hcc09kQ==} |
| 778 | engines: {node: '>=10'} | 788 | engines: {node: '>=10'} |
| 779 | peerDependencies: | 789 | peerDependencies: |
| 780 | seroval: ^1.0 | 790 | seroval: ^1.0 |
| 781 | 791 | ||
| 782 | seroval@1.5.6: | 792 | seroval@1.6.12: |
| 783 | resolution: {integrity: sha512-rVQVWjjSvlINzaQPZH5JFqsqEsIWdTxY3iJZCnTL/5gQbXIRooVZKI60tVCkOVfzcRPejboxO2t0P89dg5mQaA==} | 793 | resolution: {integrity: sha512-CqbIVfk/7GL3ITwZI55lcPbpQbjHZ2DD5cUj4iH7E9YsCfHNJV1mx7yNp86Z84w5IpmkZZS/2s5vPOWmVWSdQg==} |
| 784 | engines: {node: '>=10'} | 794 | engines: {node: '>=10'} |
| 785 | 795 | ||
| 786 | solid-js@1.9.15: | 796 | solid-js@1.9.18: |
| 787 | resolution: {integrity: sha512-EeiY2xfpZJqPLjXspVEKjAII4yv8NyG//NxZ3IpOFHdUNnnTyL0uJOeS9LWGvA7cFCz5y94cjFwYlmw5Luncsg==} | 797 | resolution: {integrity: sha512-CHGO5YFk6Y9m/1YSxVtKnXfrW7JD3Tmof8HmR4z6TmCPsS8efo8LnzIR8CQh3cUvffqYm6DWyBFfk8dQw1CNQQ==} |
| 788 | 798 | ||
| 789 | solid-refresh@0.6.3: | 799 | solid-refresh@0.6.3: |
| 790 | resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==} | 800 | resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==} |
| 791 | peerDependencies: | 801 | peerDependencies: |
| 792 | solid-js: ^1.3 | 802 | solid-js: ^1.3 |
| 793 | 803 | ||
| 794 | source-map-js@1.2.1: | 804 | source-map-js@1.2.2: |
| 795 | resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} | 805 | resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} |
| 796 | engines: {node: '>=0.10.0'} | 806 | engines: {node: '>=0.10.0'} |
| 797 | 807 | ||
| 798 | tinyglobby@0.2.17: | 808 | tinyglobby@0.2.17: |
| ... | @@ -831,13 +841,13 @@ packages: | ... | @@ -831,13 +841,13 @@ packages: |
| 831 | '@testing-library/jest-dom': | 841 | '@testing-library/jest-dom': |
| 832 | optional: true | 842 | optional: true |
| 833 | 843 | ||
| 834 | vite@8.3.1: | 844 | vite@8.3.5: |
| 835 | resolution: {integrity: sha512-/bvH9E9tmCXRGp2uXY3WbOldqpTwFkbha/8ANaEQ6VkxhH60KyqLwgZq6lG2y+4uT55x9+9eUHMpQ7uGnOCKjA==} | 845 | resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==} |
| 836 | engines: {node: ^20.19.0 || >=22.12.0} | 846 | engines: {node: ^20.19.0 || >=22.12.0} |
| 837 | hasBin: true | 847 | hasBin: true |
| 838 | peerDependencies: | 848 | peerDependencies: |
| 839 | '@types/node': ^20.19.0 || >=22.12.0 | 849 | '@types/node': ^20.19.0 || >=22.12.0 |
| 840 | '@vitejs/devtools': ^0.7.1 | 850 | '@vitejs/devtools': ^0.7.1 || ^0.8.0 |
| 841 | esbuild: ^0.27.0 || ^0.28.0 | 851 | esbuild: ^0.27.0 || ^0.28.0 |
| 842 | jiti: '>=1.21.0' | 852 | jiti: '>=1.21.0' |
| 843 | less: ^4.0.0 | 853 | less: ^4.0.0 |
| ... | @@ -998,9 +1008,9 @@ snapshots: | ... | @@ -998,9 +1008,9 @@ snapshots: |
| 998 | '@babel/helper-string-parser': 7.29.7 | 1008 | '@babel/helper-string-parser': 7.29.7 |
| 999 | '@babel/helper-validator-identifier': 7.29.7 | 1009 | '@babel/helper-validator-identifier': 7.29.7 |
| 1000 | 1010 | ||
| 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)': |
| 1002 | optionalDependencies: | 1012 | optionalDependencies: |
| 1003 | solid-js: 1.9.15 | 1013 | solid-js: 1.9.18 |
| 1004 | 1014 | ||
| 1005 | '@esbuild/aix-ppc64@0.28.2': | 1015 | '@esbuild/aix-ppc64@0.28.2': |
| 1006 | optional: true | 1016 | optional: true |
| ... | @@ -1101,58 +1111,58 @@ snapshots: | ... | @@ -1101,58 +1111,58 @@ snapshots: |
| 1101 | 1111 | ||
| 1102 | '@novnc/novnc@1.7.0': {} | 1112 | '@novnc/novnc@1.7.0': {} |
| 1103 | 1113 | ||
| 1104 | '@oxc-project/types@0.151.0': {} | 1114 | '@oxc-project/types@0.156.0': {} |
| 1105 | 1115 | ||
| 1106 | '@rolldown/binding-android-arm-eabi@1.2.11': | 1116 | '@rolldown/binding-android-arm-eabi@1.2.16': |
| 1107 | optional: true | 1117 | optional: true |
| 1108 | 1118 | ||
| 1109 | '@rolldown/binding-android-arm64@1.2.11': | 1119 | '@rolldown/binding-android-arm64@1.2.16': |
| 1110 | optional: true | 1120 | optional: true |
| 1111 | 1121 | ||
| 1112 | '@rolldown/binding-darwin-arm64@1.2.11': | 1122 | '@rolldown/binding-darwin-arm64@1.2.16': |
| 1113 | optional: true | 1123 | optional: true |
| 1114 | 1124 | ||
| 1115 | '@rolldown/binding-darwin-x64@1.2.11': | 1125 | '@rolldown/binding-darwin-x64@1.2.16': |
| 1116 | optional: true | 1126 | optional: true |
| 1117 | 1127 | ||
| 1118 | '@rolldown/binding-freebsd-x64@1.2.11': | 1128 | '@rolldown/binding-freebsd-x64@1.2.16': |
| 1119 | optional: true | 1129 | optional: true |
| 1120 | 1130 | ||
| 1121 | '@rolldown/binding-linux-arm-gnueabihf@1.2.11': | 1131 | '@rolldown/binding-linux-arm-gnueabihf@1.2.16': |
| 1122 | optional: true | 1132 | optional: true |
| 1123 | 1133 | ||
| 1124 | '@rolldown/binding-linux-arm64-gnu@1.2.11': | 1134 | '@rolldown/binding-linux-arm64-gnu@1.2.16': |
| 1125 | optional: true | 1135 | optional: true |
| 1126 | 1136 | ||
| 1127 | '@rolldown/binding-linux-arm64-musl@1.2.11': | 1137 | '@rolldown/binding-linux-arm64-musl@1.2.16': |
| 1128 | optional: true | 1138 | optional: true |
| 1129 | 1139 | ||
| 1130 | '@rolldown/binding-linux-ppc64-gnu@1.2.11': | 1140 | '@rolldown/binding-linux-ppc64-gnu@1.2.16': |
| 1131 | optional: true | 1141 | optional: true |
| 1132 | 1142 | ||
| 1133 | '@rolldown/binding-linux-s390x-gnu@1.2.11': | 1143 | '@rolldown/binding-linux-s390x-gnu@1.2.16': |
| 1134 | optional: true | 1144 | optional: true |
| 1135 | 1145 | ||
| 1136 | '@rolldown/binding-linux-x64-gnu@1.2.11': | 1146 | '@rolldown/binding-linux-x64-gnu@1.2.16': |
| 1137 | optional: true | 1147 | optional: true |
| 1138 | 1148 | ||
| 1139 | '@rolldown/binding-linux-x64-musl@1.2.11': | 1149 | '@rolldown/binding-linux-x64-musl@1.2.16': |
| 1140 | optional: true | 1150 | optional: true |
| 1141 | 1151 | ||
| 1142 | '@rolldown/binding-openharmony-arm64@1.2.11': | 1152 | '@rolldown/binding-openharmony-arm64@1.2.16': |
| 1143 | optional: true | 1153 | optional: true |
| 1144 | 1154 | ||
| 1145 | '@rolldown/binding-win32-arm64-msvc@1.2.11': | 1155 | '@rolldown/binding-win32-arm64-msvc@1.2.16': |
| 1146 | optional: true | 1156 | optional: true |
| 1147 | 1157 | ||
| 1148 | '@rolldown/binding-win32-x64-msvc@1.2.11': | 1158 | '@rolldown/binding-win32-x64-msvc@1.2.16': |
| 1149 | optional: true | 1159 | optional: true |
| 1150 | 1160 | ||
| 1151 | '@rolldown/pluginutils@1.0.1': {} | 1161 | '@rolldown/pluginutils@1.0.1': {} |
| 1152 | 1162 | ||
| 1153 | '@solidjs/router@1.0.0(solid-js@1.9.15)': | 1163 | '@solidjs/router@1.0.0(solid-js@1.9.18)': |
| 1154 | dependencies: | 1164 | dependencies: |
| 1155 | solid-js: 1.9.15 | 1165 | solid-js: 1.9.18 |
| 1156 | 1166 | ||
| 1157 | '@types/babel__core@7.20.5': | 1167 | '@types/babel__core@7.20.5': |
| 1158 | dependencies: | 1168 | dependencies: |
| ... | @@ -1248,12 +1258,12 @@ snapshots: | ... | @@ -1248,12 +1258,12 @@ snapshots: |
| 1248 | html-entities: 2.3.3 | 1258 | html-entities: 2.3.3 |
| 1249 | parse5: 7.3.0 | 1259 | parse5: 7.3.0 |
| 1250 | 1260 | ||
| 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): |
| 1252 | dependencies: | 1262 | dependencies: |
| 1253 | '@babel/core': 7.29.7 | 1263 | '@babel/core': 7.29.7 |
| 1254 | babel-plugin-jsx-dom-expressions: 0.40.10(@babel/core@7.29.7) | 1264 | babel-plugin-jsx-dom-expressions: 0.40.10(@babel/core@7.29.7) |
| 1255 | optionalDependencies: | 1265 | optionalDependencies: |
| 1256 | solid-js: 1.9.15 | 1266 | solid-js: 1.9.18 |
| 1257 | 1267 | ||
| 1258 | baseline-browser-mapping@2.11.26: {} | 1268 | baseline-browser-mapping@2.11.26: {} |
| 1259 | 1269 | ||
| ... | @@ -1321,7 +1331,7 @@ snapshots: | ... | @@ -1321,7 +1331,7 @@ snapshots: |
| 1321 | 1331 | ||
| 1322 | gensync@1.0.0-beta.2: {} | 1332 | gensync@1.0.0-beta.2: {} |
| 1323 | 1333 | ||
| 1324 | hono@4.13.9: {} | 1334 | hono@4.13.16: {} |
| 1325 | 1335 | ||
| 1326 | html-entities@2.3.3: {} | 1336 | html-entities@2.3.3: {} |
| 1327 | 1337 | ||
| ... | @@ -1386,9 +1396,9 @@ snapshots: | ... | @@ -1386,9 +1396,9 @@ snapshots: |
| 1386 | dependencies: | 1396 | dependencies: |
| 1387 | yallist: 3.1.1 | 1397 | yallist: 3.1.1 |
| 1388 | 1398 | ||
| 1389 | lucide-solid@1.48.0(solid-js@1.9.15): | 1399 | lucide-solid@1.48.0(solid-js@1.9.18): |
| 1390 | dependencies: | 1400 | dependencies: |
| 1391 | solid-js: 1.9.15 | 1401 | solid-js: 1.9.18 |
| 1392 | 1402 | ||
| 1393 | merge-anything@5.1.7: | 1403 | merge-anything@5.1.7: |
| 1394 | dependencies: | 1404 | dependencies: |
| ... | @@ -1396,7 +1406,7 @@ snapshots: | ... | @@ -1396,7 +1406,7 @@ snapshots: |
| 1396 | 1406 | ||
| 1397 | ms@2.1.3: {} | 1407 | ms@2.1.3: {} |
| 1398 | 1408 | ||
| 1399 | nanoid@3.3.19: {} | 1409 | nanoid@3.3.20: {} |
| 1400 | 1410 | ||
| 1401 | node-releases@2.0.57: {} | 1411 | node-releases@2.0.57: {} |
| 1402 | 1412 | ||
| ... | @@ -1408,57 +1418,57 @@ snapshots: | ... | @@ -1408,57 +1418,57 @@ snapshots: |
| 1408 | 1418 | ||
| 1409 | picomatch@4.0.7: {} | 1419 | picomatch@4.0.7: {} |
| 1410 | 1420 | ||
| 1411 | postcss@8.5.28: | 1421 | postcss@8.5.32: |
| 1412 | dependencies: | 1422 | dependencies: |
| 1413 | nanoid: 3.3.19 | 1423 | nanoid: 3.3.20 |
| 1414 | picocolors: 1.1.1 | 1424 | picocolors: 1.1.1 |
| 1415 | source-map-js: 1.2.1 | 1425 | source-map-js: 1.2.2 |
| 1416 | 1426 | ||
| 1417 | rolldown@1.2.11: | 1427 | rolldown@1.2.16: |
| 1418 | dependencies: | 1428 | dependencies: |
| 1419 | '@oxc-project/types': 0.151.0 | 1429 | '@oxc-project/types': 0.156.0 |
| 1420 | '@rolldown/pluginutils': 1.0.1 | 1430 | '@rolldown/pluginutils': 1.0.1 |
| 1421 | optionalDependencies: | 1431 | optionalDependencies: |
| 1422 | '@rolldown/binding-android-arm-eabi': 1.2.11 | 1432 | '@rolldown/binding-android-arm-eabi': 1.2.16 |
| 1423 | '@rolldown/binding-android-arm64': 1.2.11 | 1433 | '@rolldown/binding-android-arm64': 1.2.16 |
| 1424 | '@rolldown/binding-darwin-arm64': 1.2.11 | 1434 | '@rolldown/binding-darwin-arm64': 1.2.16 |
| 1425 | '@rolldown/binding-darwin-x64': 1.2.11 | 1435 | '@rolldown/binding-darwin-x64': 1.2.16 |
| 1426 | '@rolldown/binding-freebsd-x64': 1.2.11 | 1436 | '@rolldown/binding-freebsd-x64': 1.2.16 |
| 1427 | '@rolldown/binding-linux-arm-gnueabihf': 1.2.11 | 1437 | '@rolldown/binding-linux-arm-gnueabihf': 1.2.16 |
| 1428 | '@rolldown/binding-linux-arm64-gnu': 1.2.11 | 1438 | '@rolldown/binding-linux-arm64-gnu': 1.2.16 |
| 1429 | '@rolldown/binding-linux-arm64-musl': 1.2.11 | 1439 | '@rolldown/binding-linux-arm64-musl': 1.2.16 |
| 1430 | '@rolldown/binding-linux-ppc64-gnu': 1.2.11 | 1440 | '@rolldown/binding-linux-ppc64-gnu': 1.2.16 |
| 1431 | '@rolldown/binding-linux-s390x-gnu': 1.2.11 | 1441 | '@rolldown/binding-linux-s390x-gnu': 1.2.16 |
| 1432 | '@rolldown/binding-linux-x64-gnu': 1.2.11 | 1442 | '@rolldown/binding-linux-x64-gnu': 1.2.16 |
| 1433 | '@rolldown/binding-linux-x64-musl': 1.2.11 | 1443 | '@rolldown/binding-linux-x64-musl': 1.2.16 |
| 1434 | '@rolldown/binding-openharmony-arm64': 1.2.11 | 1444 | '@rolldown/binding-openharmony-arm64': 1.2.16 |
| 1435 | '@rolldown/binding-win32-arm64-msvc': 1.2.11 | 1445 | '@rolldown/binding-win32-arm64-msvc': 1.2.16 |
| 1436 | '@rolldown/binding-win32-x64-msvc': 1.2.11 | 1446 | '@rolldown/binding-win32-x64-msvc': 1.2.16 |
| 1437 | 1447 | ||
| 1438 | semver@6.3.1: {} | 1448 | semver@6.3.1: {} |
| 1439 | 1449 | ||
| 1440 | seroval-plugins@1.5.6(seroval@1.5.6): | 1450 | seroval-plugins@1.6.12(seroval@1.6.12): |
| 1441 | dependencies: | 1451 | dependencies: |
| 1442 | seroval: 1.5.6 | 1452 | seroval: 1.6.12 |
| 1443 | 1453 | ||
| 1444 | seroval@1.5.6: {} | 1454 | seroval@1.6.12: {} |
| 1445 | 1455 | ||
| 1446 | solid-js@1.9.15: | 1456 | solid-js@1.9.18: |
| 1447 | dependencies: | 1457 | dependencies: |
| 1448 | csstype: 3.2.3 | 1458 | csstype: 3.2.3 |
| 1449 | seroval: 1.5.6 | 1459 | seroval: 1.6.12 |
| 1450 | seroval-plugins: 1.5.6(seroval@1.5.6) | 1460 | seroval-plugins: 1.6.12(seroval@1.6.12) |
| 1451 | 1461 | ||
| 1452 | solid-refresh@0.6.3(solid-js@1.9.15): | 1462 | solid-refresh@0.6.3(solid-js@1.9.18): |
| 1453 | dependencies: | 1463 | dependencies: |
| 1454 | '@babel/generator': 7.29.8 | 1464 | '@babel/generator': 7.29.8 |
| 1455 | '@babel/helper-module-imports': 7.29.7 | 1465 | '@babel/helper-module-imports': 7.29.7 |
| 1456 | '@babel/types': 7.29.8 | 1466 | '@babel/types': 7.29.8 |
| 1457 | solid-js: 1.9.15 | 1467 | solid-js: 1.9.18 |
| 1458 | transitivePeerDependencies: | 1468 | transitivePeerDependencies: |
| 1459 | - supports-color | 1469 | - supports-color |
| 1460 | 1470 | ||
| 1461 | source-map-js@1.2.1: {} | 1471 | source-map-js@1.2.2: {} |
| 1462 | 1472 | ||
| 1463 | tinyglobby@0.2.17: | 1473 | tinyglobby@0.2.17: |
| 1464 | dependencies: | 1474 | dependencies: |
| ... | @@ -1505,25 +1515,25 @@ snapshots: | ... | @@ -1505,25 +1515,25 @@ snapshots: |
| 1505 | 1515 | ||
| 1506 | uplot@1.6.32: {} | 1516 | uplot@1.6.32: {} |
| 1507 | 1517 | ||
| 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)): |
| 1509 | dependencies: | 1519 | dependencies: |
| 1510 | '@babel/core': 7.29.7 | 1520 | '@babel/core': 7.29.7 |
| 1511 | '@types/babel__core': 7.20.5 | 1521 | '@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) |
| 1513 | merge-anything: 5.1.7 | 1523 | merge-anything: 5.1.7 |
| 1514 | solid-js: 1.9.15 | 1524 | solid-js: 1.9.18 |
| 1515 | solid-refresh: 0.6.3(solid-js@1.9.15) | 1525 | solid-refresh: 0.6.3(solid-js@1.9.18) |
| 1516 | vite: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) | 1526 | vite: 8.3.5(@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)) | 1527 | vitefu: 1.1.3(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)) |
| 1518 | transitivePeerDependencies: | 1528 | transitivePeerDependencies: |
| 1519 | - supports-color | 1529 | - supports-color |
| 1520 | 1530 | ||
| 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): |
| 1522 | dependencies: | 1532 | dependencies: |
| 1523 | lightningcss: 1.33.0 | 1533 | lightningcss: 1.33.0 |
| 1524 | picomatch: 4.0.7 | 1534 | picomatch: 4.0.7 |
| 1525 | postcss: 8.5.28 | 1535 | postcss: 8.5.32 |
| 1526 | rolldown: 1.2.11 | 1536 | rolldown: 1.2.16 |
| 1527 | tinyglobby: 0.2.17 | 1537 | tinyglobby: 0.2.17 |
| 1528 | optionalDependencies: | 1538 | optionalDependencies: |
| 1529 | '@types/node': 26.6.2 | 1539 | '@types/node': 26.6.2 |
| ... | @@ -1531,8 +1541,8 @@ snapshots: | ... | @@ -1531,8 +1541,8 @@ snapshots: |
| 1531 | fsevents: 2.3.3 | 1541 | fsevents: 2.3.3 |
| 1532 | tsx: 4.23.15 | 1542 | tsx: 4.23.15 |
| 1533 | 1543 | ||
| 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)): |
| 1535 | optionalDependencies: | 1545 | 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) |
| 1537 | 1547 | ||
| 1538 | yallist@3.1.1: {} | 1548 | yallist@3.1.1: {} |
dashboard/pnpm-workspace.yaml created+2| ... | @@ -0,0 +1,2 @@ | ||
| 1 | allowBuilds: | ||
| 2 | esbuild: true | ||
dashboard/src/atproto.rs+7-2| ... | @@ -172,7 +172,8 @@ async fn handle_did(handle: &str) -> Result<String> { | ... | @@ -172,7 +172,8 @@ async fn handle_did(handle: &str) -> Result<String> { |
| 172 | } | 172 | } |
| 173 | let resolver = hickory_resolver::Resolver::builder_tokio() | 173 | let resolver = hickory_resolver::Resolver::builder_tokio() |
| 174 | .map_err(|_| reject())? | 174 | .map_err(|_| reject())? |
| 175 | .build(); | 175 | .build() |
| 176 | .map_err(|_| reject())?; | ||
| 176 | if let Ok(Ok(records)) = tokio::time::timeout( | 177 | if let Ok(Ok(records)) = tokio::time::timeout( |
| 177 | Duration::from_secs(5), | 178 | Duration::from_secs(5), |
| 178 | resolver.txt_lookup(format!("_atproto.{handle}.")), | 179 | resolver.txt_lookup(format!("_atproto.{handle}.")), |
| ... | @@ -180,10 +181,14 @@ async fn handle_did(handle: &str) -> Result<String> { | ... | @@ -180,10 +181,14 @@ async fn handle_did(handle: &str) -> Result<String> { |
| 180 | .await | 181 | .await |
| 181 | { | 182 | { |
| 182 | let dids: Vec<_> = records | 183 | let dids: Vec<_> = records |
| 184 | .answers() | ||
| 183 | .iter() | 185 | .iter() |
| 184 | .filter_map(|record| { | 186 | .filter_map(|record| { |
| 187 | let hickory_resolver::proto::rr::RData::TXT(record) = &record.data else { | ||
| 188 | return None; | ||
| 189 | }; | ||
| 185 | let text = record | 190 | let text = record |
| 186 | .txt_data() | 191 | .txt_data |
| 187 | .iter() | 192 | .iter() |
| 188 | .flat_map(|part| part.iter().copied()) | 193 | .flat_map(|part| part.iter().copied()) |
| 189 | .collect::<Vec<_>>(); | 194 | .collect::<Vec<_>>(); |
flake.lock+3-3| ... | @@ -2,11 +2,11 @@ | ... | @@ -2,11 +2,11 @@ |
| 2 | "nodes": { | 2 | "nodes": { |
| 3 | "nixpkgs": { | 3 | "nixpkgs": { |
| 4 | "locked": { | 4 | "locked": { |
| 5 | "lastModified": 1790113641, | 5 | "lastModified": 1793633738, |
| 6 | "narHash": "sha256-D2aaQetafdpHxbwA4ldAxs51UX0b11pXL+JL/5L8VrM=", | 6 | "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=", |
| 7 | "owner": "NixOS", | 7 | "owner": "NixOS", |
| 8 | "repo": "nixpkgs", | 8 | "repo": "nixpkgs", |
| 9 | "rev": "1bc55b9def8165e82073919945c3239903fe4dc2", | 9 | "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd", |
| 10 | "type": "github" | 10 | "type": "github" |
| 11 | }, | 11 | }, |
| 12 | "original": { | 12 | "original": { |
nixos/configuration.nix+23-1| ... | @@ -47,6 +47,28 @@ let | ... | @@ -47,6 +47,28 @@ let |
| 47 | }); | 47 | }); |
| 48 | in | 48 | in |
| 49 | { | 49 | { |
| 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 | |||
| 50 | nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomad" "nvidia-x11" "nvidia-kernel-modules" "gpu-unlock-firmware" ]; | 72 | nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomad" "nvidia-x11" "nvidia-kernel-modules" "gpu-unlock-firmware" ]; |
| 51 | 73 | ||
| 52 | networking.firewall = { | 74 | networking.firewall = { |
| ... | @@ -63,7 +85,7 @@ in | ... | @@ -63,7 +85,7 @@ in |
| 63 | enable = true; | 85 | enable = true; |
| 64 | package = pkgs.caddy.withPlugins { | 86 | package = pkgs.caddy.withPlugins { |
| 65 | plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ]; | 87 | plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ]; |
| 66 | hash = "sha256-2tcvl9ZDpe7SAy3tZCPNwmw0KoIIakqggVaRtVAg9R0="; | 88 | hash = "sha256-iWtaVD4LrOgCFZc90crAlHYbHHxz8zCFnvD2ZLRkO0Q="; |
| 67 | }; | 89 | }; |
| 68 | extraConfig = "import /var/lib/caddy/routes.caddy"; | 90 | extraConfig = "import /var/lib/caddy/routes.caddy"; |
| 69 | virtualHosts = { | 91 | virtualHosts = { |
nixos/dashboard.nix+5-5| ... | @@ -1,4 +1,4 @@ | ... | @@ -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 }: |
| 2 | let | 2 | let |
| 3 | nativePkl = callPackage ./pkl.nix { }; | 3 | nativePkl = callPackage ./pkl.nix { }; |
| 4 | youtubePython = python3.withPackages (packages: [ packages.pyyaml ]); | 4 | youtubePython = python3.withPackages (packages: [ packages.pyyaml ]); |
| ... | @@ -15,7 +15,7 @@ let | ... | @@ -15,7 +15,7 @@ let |
| 15 | src = lib.fileset.toSource { | 15 | src = lib.fileset.toSource { |
| 16 | root = ../.; | 16 | root = ../.; |
| 17 | fileset = lib.fileset.unions [ | 17 | 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 |
| 19 | ../dashboard/tsconfig.json ../dashboard/vite.config.ts | 19 | ../dashboard/tsconfig.json ../dashboard/vite.config.ts |
| 20 | ../dashboard/src/claude.svg ../dashboard/src/openai.svg | 20 | ../dashboard/src/claude.svg ../dashboard/src/openai.svg |
| 21 | ]; | 21 | ]; |
| ... | @@ -23,11 +23,11 @@ let | ... | @@ -23,11 +23,11 @@ let |
| 23 | sourceRoot = "source/dashboard"; | 23 | sourceRoot = "source/dashboard"; |
| 24 | pnpmDeps = fetchPnpmDeps { | 24 | pnpmDeps = fetchPnpmDeps { |
| 25 | inherit (finalAttrs) pname version src sourceRoot; | 25 | inherit (finalAttrs) pname version src sourceRoot; |
| 26 | pnpm = pnpm_10; | 26 | pnpm = pnpm_11; |
| 27 | fetcherVersion = 3; | 27 | fetcherVersion = 3; |
| 28 | hash = "sha256-Jhk4mAOCqoljelFJfC7o+3t66x9GPFYb2e928jeaPSk="; | 28 | hash = "sha256-GLXA5XkcKIPZD2g2xBUejjpPJcupbNOL6YYujv1FB5A="; |
| 29 | }; | 29 | }; |
| 30 | nativeBuildInputs = [ nodejs_24 pnpm_10 pnpmConfigHook ]; | 30 | nativeBuildInputs = [ nodejs_24 pnpm_11 pnpmConfigHook ]; |
| 31 | buildPhase = "pnpm run build"; | 31 | buildPhase = "pnpm run build"; |
| 32 | installPhase = "cp -r dist $out"; | 32 | installPhase = "cp -r dist $out"; |
| 33 | }); | 33 | }); |
nixos/tests/nomad-upgrade.nix created+48| ... | @@ -0,0 +1,48 @@ | ||
| 1 | { pkgs }: | ||
| 2 | pkgs.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 { | ... | @@ -29,6 +29,7 @@ container { |
| 29 | volumes { | 29 | volumes { |
| 30 | ["/data"] {} | 30 | ["/data"] {} |
| 31 | ["/snowglobe/start.sh"] { config = "start.sh" } | 31 | ["/snowglobe/start.sh"] { config = "start.sh" } |
| 32 | ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } | ||
| 32 | } | 33 | } |
| 33 | env { | 34 | env { |
| 34 | ["HOME"] = "/data" | 35 | ["HOME"] = "/data" |
service/ddns-updater/service.pkl+4-1| ... | @@ -33,7 +33,10 @@ container { | ... | @@ -33,7 +33,10 @@ container { |
| 33 | authRole = "infra-admin" | 33 | authRole = "infra-admin" |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 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 | } | ||
| 37 | 40 | ||
| 38 | env { | 41 | env { |
| 39 | ["PERIOD"] = "5m" | 42 | ["PERIOD"] = "5m" |
service/forward-auth/Dockerfile created+11| ... | @@ -0,0 +1,11 @@ | ||
| 1 | FROM docker.io/library/golang@sha256:d1f3216ef30257c850cc136ba42a359ccd9d3e75f19b2c276e520c0b4ef327ce AS build | ||
| 2 | WORKDIR /src | ||
| 3 | RUN 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 | ||
| 6 | RUN 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 | |||
| 10 | FROM quay.io/oauth2-proxy/oauth2-proxy@sha256:0d989b27d90d5e527fb2b045d864c4001c3104bdd763b3211b7e9ba2110380ea | ||
| 11 | COPY --from=build /oauth2-proxy /bin/oauth2-proxy | ||
service/forward-auth/service.pkl+1-1| ... | @@ -26,7 +26,7 @@ secrets { | ... | @@ -26,7 +26,7 @@ secrets { |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | container { | 28 | container { |
| 29 | image = "quay.io/oauth2-proxy/oauth2-proxy@sha256:56e3daedf765c7a1eea6e366fbe684be7d3084830ade14b6174570d3c7960954" | 29 | build = "../forward-auth" |
| 30 | cpu = 100 | 30 | cpu = 100 |
| 31 | memory = 256 | 31 | memory = 256 |
| 32 | 32 |
service/jellyfin/prepare.py+11-5| ... | @@ -2,6 +2,7 @@ | ... | @@ -2,6 +2,7 @@ |
| 2 | import json | 2 | import json |
| 3 | import os | 3 | import os |
| 4 | from pathlib import Path | 4 | from pathlib import Path |
| 5 | import shutil | ||
| 5 | import subprocess | 6 | import subprocess |
| 6 | import sys | 7 | import sys |
| 7 | import xml.etree.ElementTree as ET | 8 | import xml.etree.ElementTree as ET |
| ... | @@ -20,18 +21,23 @@ variable = json.loads(subprocess.check_output( | ... | @@ -20,18 +21,23 @@ variable = json.loads(subprocess.check_output( |
| 20 | plugins = root / "plugins" | 21 | plugins = root / "plugins" |
| 21 | plugins.mkdir(parents=True, exist_ok=True) | 22 | plugins.mkdir(parents=True, exist_ok=True) |
| 22 | os.chown(plugins, uid, uid) | 23 | os.chown(plugins, uid, uid) |
| 23 | plugin = plugins / "SSO Authentication_4.0.0.4" | ||
| 24 | files = {"meta.json", "Duende.IdentityModel.dll", "SSO-Auth.dll", "Duende.IdentityModel.OidcClient.dll"} | 24 | files = {"meta.json", "Duende.IdentityModel.dll", "SSO-Auth.dll", "Duende.IdentityModel.OidcClient.dll"} |
| 25 | if not all((plugin / name).is_file() for name in files): | 25 | archive, = Path(__file__).parent.glob("sso-authentication_*.zip") |
| 26 | with zipfile.ZipFile(Path(__file__).with_name("sso-authentication_4.0.0.4.zip")) as source: | 26 | with zipfile.ZipFile(archive) as source: |
| 27 | if set(source.namelist()) != files: | 27 | if set(source.namelist()) != files: |
| 28 | raise ValueError("unexpected SSO plugin archive contents") | 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): | ||
| 29 | plugin.mkdir(exist_ok=True) | 32 | plugin.mkdir(exist_ok=True) |
| 30 | os.chown(plugin, uid, uid) | 33 | os.chown(plugin, uid, uid) |
| 31 | for name in files: | 34 | for name in files: |
| 32 | path = plugin / name | 35 | path = plugin / name |
| 33 | path.write_bytes(source.read(name)) | 36 | path.write_bytes(source.read(name)) |
| 34 | os.chown(path, uid, uid) | 37 | 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) | ||
| 35 | 41 | ||
| 36 | configs = plugins / "configurations" | 42 | configs = plugins / "configurations" |
| 37 | configs.mkdir(parents=True, exist_ok=True) | 43 | configs.mkdir(parents=True, exist_ok=True) |
service/jellyfin/service.pkl+1-1| ... | @@ -23,7 +23,7 @@ requirements { | ... | @@ -23,7 +23,7 @@ requirements { |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | container { | 25 | container { |
| 26 | image = "docker.io/jellyfin/jellyfin@sha256:aefb67e6a7ff1debdd154a78a7bbb780fd0c873d8639210a7f6a2016ad2b35db" | 26 | image = "docker.io/jellyfin/jellyfin@sha256:7da5184caa38c553f219f6772476540081f392a68049e2b68c923f6daf877f8e" |
| 27 | cpu = 500 | 27 | cpu = 500 |
| 28 | memory = 3072 | 28 | memory = 3072 |
| 29 | 29 |
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 | ... | @@ -4,10 +4,10 @@ from pathlib import Path |
| 4 | import urllib.request | 4 | import urllib.request |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | version = "4.0.0.4" | 7 | version = "5.0.0.0" |
| 8 | digest = "c09f16ba31059a434ddd7f811e4f9608d4b4c4514cc80a5bf1ca33bee61e1107" | 8 | digest = "61d29c16d8840900fad6ce0fb6a0e59abc6a350382390d293ec9bfbcdb84d840" |
| 9 | name = f"sso-authentication_{version}.zip" | 9 | name = f"sso-authentication_{version}.zip" |
| 10 | url = f"https://github.com/9p4/jellyfin-plugin-sso/releases/download/v{version}/{name}" | 10 | url = f"https://github.com/xdnewlun1/Jellyfin-OAuth-Plugin/releases/download/v{version}/{name}" |
| 11 | with urllib.request.urlopen(url, timeout=30) as response: | 11 | with urllib.request.urlopen(url, timeout=30) as response: |
| 12 | archive = response.read() | 12 | archive = response.read() |
| 13 | if hashlib.sha256(archive).hexdigest() != digest: | 13 | if hashlib.sha256(archive).hexdigest() != digest: |
service/navidrome/service.pkl+1| ... | @@ -42,6 +42,7 @@ containers { | ... | @@ -42,6 +42,7 @@ containers { |
| 42 | volumes { | 42 | volumes { |
| 43 | ["/data"] {} | 43 | ["/data"] {} |
| 44 | ["/socket"] {} | 44 | ["/socket"] {} |
| 45 | ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } | ||
| 45 | when (site.preview) { ["/music"] {} } | 46 | when (site.preview) { ["/music"] {} } |
| 46 | when (!site.preview) { ["/music"] { src = "\(site.mediaRoot)/Music"; readOnly = true } } | 47 | when (!site.preview) { ["/music"] { src = "\(site.mediaRoot)/Music"; readOnly = true } } |
| 47 | } | 48 | } |
service/pds/service.pkl+2-1| ... | @@ -41,6 +41,7 @@ container { | ... | @@ -41,6 +41,7 @@ container { |
| 41 | volumes { | 41 | volumes { |
| 42 | ["/pds"] {} | 42 | ["/pds"] {} |
| 43 | ["/snowglobe/start.sh"] { config = "start.sh" } | 43 | ["/snowglobe/start.sh"] { config = "start.sh" } |
| 44 | ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } | ||
| 44 | } | 45 | } |
| 45 | 46 | ||
| 46 | env { | 47 | env { |
| ... | @@ -61,7 +62,7 @@ container { | ... | @@ -61,7 +62,7 @@ container { |
| 61 | ["PDS_RATE_LIMITS_ENABLED"] = "true" | 62 | ["PDS_RATE_LIMITS_ENABLED"] = "true" |
| 62 | ["PDS_CONTACT_EMAIL_ADDRESS"] = site.ownerEmail | 63 | ["PDS_CONTACT_EMAIL_ADDRESS"] = site.ownerEmail |
| 63 | ["LOG_ENABLED"] = "true" | 64 | ["LOG_ENABLED"] = "true" |
| 64 | ["NODE_OPTIONS"] = "--import=@atproto/pds/telemetry" | 65 | ["NODE_OPTIONS"] = "--use-openssl-ca --import=@atproto/pds/telemetry" |
| 65 | ["OTEL_SERVICE_NAME"] = module.id | 66 | ["OTEL_SERVICE_NAME"] = module.id |
| 66 | ["OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"] = "http/protobuf" | 67 | ["OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"] = "http/protobuf" |
| 67 | ["OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"] = "http/protobuf" | 68 | ["OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"] = "http/protobuf" |
service/tailscale/service.pkl+1-1| ... | @@ -5,7 +5,7 @@ import "../../config/site.pkl" as site | ... | @@ -5,7 +5,7 @@ import "../../config/site.pkl" as site |
| 5 | name = "Tailscale" | 5 | name = "Tailscale" |
| 6 | 6 | ||
| 7 | container { | 7 | container { |
| 8 | image = "docker.io/tailscale/tailscale@sha256:2667499ed87ae29218f292556ba062918402dd5e92e93637af14867e4df12dd3" | 8 | image = "docker.io/tailscale/tailscale@sha256:519bf6f2c386992052216ea7e9391d5ace3a859d458f4f61bc8db8c58377eb7d" |
| 9 | // The node joins the tailnet through its own network stack and TUN device. | 9 | // The node joins the tailnet through its own network stack and TUN device. |
| 10 | hostNetwork = true | 10 | hostNetwork = true |
| 11 | imageUser = true | 11 | imageUser = true |
service/victoria/service.pkl+12-3| ... | @@ -18,7 +18,10 @@ containers { | ... | @@ -18,7 +18,10 @@ containers { |
| 18 | metricsPath = "/metrics" | 18 | metricsPath = "/metrics" |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | volumes { ["/logs"] {} } | 21 | volumes { |
| 22 | ["/logs"] {} | ||
| 23 | ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } | ||
| 24 | } | ||
| 22 | } | 25 | } |
| 23 | ["metrics"] { | 26 | ["metrics"] { |
| 24 | image = "docker.io/victoriametrics/victoria-metrics:v1.152.0" | 27 | image = "docker.io/victoriametrics/victoria-metrics:v1.152.0" |
| ... | @@ -34,7 +37,10 @@ containers { | ... | @@ -34,7 +37,10 @@ containers { |
| 34 | metricsPath = "/metrics" | 37 | metricsPath = "/metrics" |
| 35 | } | 38 | } |
| 36 | 39 | ||
| 37 | volumes { ["/metrics"] {} } | 40 | volumes { |
| 41 | ["/metrics"] {} | ||
| 42 | ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } | ||
| 43 | } | ||
| 38 | } | 44 | } |
| 39 | ["traces"] { | 45 | ["traces"] { |
| 40 | image = "docker.io/victoriametrics/victoria-traces:v0.11.1" | 46 | image = "docker.io/victoriametrics/victoria-traces:v0.11.1" |
| ... | @@ -50,6 +56,9 @@ containers { | ... | @@ -50,6 +56,9 @@ containers { |
| 50 | metricsPath = "/metrics" | 56 | metricsPath = "/metrics" |
| 51 | } | 57 | } |
| 52 | 58 | ||
| 53 | volumes { ["/traces"] {} } | 59 | volumes { |
| 60 | ["/traces"] {} | ||
| 61 | ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } | ||
| 62 | } | ||
| 54 | } | 63 | } |
| 55 | } | 64 | } |
tools/dashboard-package-test.py+39-71| ... | @@ -1,14 +1,11 @@ | ... | @@ -1,14 +1,11 @@ |
| 1 | #!/usr/bin/env python3 | 1 | #!/usr/bin/env python3 |
| 2 | import argparse | 2 | import argparse |
| 3 | from http.client import HTTPConnection | ||
| 4 | from http.server import BaseHTTPRequestHandler, HTTPServer | ||
| 5 | import json | 3 | import json |
| 6 | import os | 4 | import os |
| 7 | from pathlib import Path | 5 | from pathlib import Path |
| 8 | import subprocess | 6 | import subprocess |
| 9 | import socket | 7 | import socket |
| 10 | import tempfile | 8 | import tempfile |
| 11 | import threading | ||
| 12 | import time | 9 | import time |
| 13 | import urllib.error | 10 | import urllib.error |
| 14 | import urllib.request | 11 | import urllib.request |
| ... | @@ -36,7 +33,7 @@ def main(): | ... | @@ -36,7 +33,7 @@ def main(): |
| 36 | token.write_text(proof) | 33 | token.write_text(proof) |
| 37 | os.chown(token, 0, 65534) | 34 | os.chown(token, 0, 65534) |
| 38 | token.chmod(0o440) | 35 | token.chmod(0o440) |
| 39 | season = data / "media/jellyfin/Indie Shows/Fixture/Season 1" | 36 | season = data / "media/Indie Shows/Fixture/Season 1" |
| 40 | season.mkdir(parents=True) | 37 | season.mkdir(parents=True) |
| 41 | (season / "S01E01 - Fixture.mp4").write_bytes(b"fixture") | 38 | (season / "S01E01 - Fixture.mp4").write_bytes(b"fixture") |
| 42 | (season / "S01E01 - Fixture.nfo").write_text("<episodedetails><title>Packaged worker</title></episodedetails>") | 39 | (season / "S01E01 - Fixture.nfo").write_text("<episodedetails><title>Packaged worker</title></episodedetails>") |
| ... | @@ -100,75 +97,46 @@ print('refused') | ... | @@ -100,75 +97,46 @@ print('refused') |
| 100 | capture_output=True, text=True, timeout=10) | 97 | capture_output=True, text=True, timeout=10) |
| 101 | assert unsecured.returncode != 0 and "Set SNOWGLOBE_PROXY_TOKEN_FILE" in unsecured.stderr, unsecured.stderr | 98 | assert unsecured.returncode != 0 and "Set SNOWGLOBE_PROXY_TOKEN_FILE" in unsecured.stderr, unsecured.stderr |
| 102 | 99 | ||
| 103 | class Auth(BaseHTTPRequestHandler): | 100 | router.nomad = lambda path, _: {"/v1/services": []}[path] |
| 104 | def do_GET(self): | 101 | os.environ.update(SNOWGLOBE_DOMAIN="snowglobe.test", SNOWGLOBE_DASHBOARD_PORT=port, SNOWGLOBE_PROXY_TOKEN_FILE=str(token)) |
| 105 | self.send_response(200 if self.headers.get("Cookie") == "fixture=1" else 401) | 102 | os.environ.pop("SNOWGLOBE_INTERNAL_PORT", None) |
| 106 | self.send_header("X-Auth-Request-Preferred-Username", "fixture") | 103 | dashboard_route = router.render("fixture").split("snowglobe.snowglobe.test {\n", 1)[1] |
| 107 | self.send_header("X-Auth-Request-Groups", "role:media") | 104 | with socket.socket() as reservation: |
| 108 | self.end_headers() | 105 | reservation.bind(("127.0.0.1", 0)) |
| 109 | 106 | proxy_port = reservation.getsockname()[1] | |
| 110 | def log_message(self, *args): | 107 | config = Path(temporary) / "Caddyfile" |
| 111 | pass | 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", "")) |
| 112 | 109 | config.chmod(0o600) | |
| 113 | with HTTPServer(("127.0.0.1", 0), Auth) as auth: | 110 | log = Path(temporary) / "caddy.log" |
| 114 | threading.Thread(target=auth.serve_forever, daemon=True).start() | 111 | caddy_binary = (Path("/proc") / shell("systemctl", "show", "-P", "MainPID", "caddy").strip() / "exe").resolve(strict=True) |
| 115 | router.nomad = lambda path, _: { | 112 | with log.open("w") as output: |
| 116 | "/v1/services": [{"Namespace": "default", "Services": [{"ServiceName": "forward-auth"}]}], | 113 | caddy = subprocess.Popen([str(caddy_binary), "run", "--config", str(config), "--adapter", "caddyfile"], |
| 117 | "/v1/service/forward-auth": [{"ServiceName": "forward-auth", "AllocID": "fixture", "Address": "127.0.0.1", "Port": auth.server_port, "Tags": []}], | 114 | stdout=output, stderr=output, env={**os.environ, "XDG_DATA_HOME": temporary, "XDG_CONFIG_HOME": temporary}) |
| 118 | "/v1/allocation/fixture/checks": {"ready": {"Status": "success"}}, | 115 | try: |
| 119 | }[path] | 116 | deadline = time.monotonic() + 10 |
| 120 | os.environ.update(SNOWGLOBE_DOMAIN="snowglobe.test", SNOWGLOBE_DASHBOARD_PORT=port, SNOWGLOBE_PROXY_TOKEN_FILE=str(token)) | 117 | while True: |
| 121 | with socket.socket() as reservation: | 118 | try: |
| 122 | reservation.bind(("127.0.0.1", 0)) | 119 | with socket.create_connection(("127.0.0.1", proxy_port), timeout=.2): |
| 123 | proxy_port = reservation.getsockname()[1] | 120 | break |
| 124 | config = Path(temporary) / "Caddyfile" | 121 | except OSError: |
| 125 | config.write_text("{\n admin off\n auto_https off\n}\n" + router.render("fixture").replace( | 122 | if time.monotonic() >= deadline or caddy.poll() is not None: |
| 126 | "globe.snowglobe.test {", "http://127.0.0.1:" + str(proxy_port) + " {" | 123 | raise AssertionError(log.read_text().replace(proof, "<redacted>")) |
| 127 | ).replace(" tls internal\n", "")) | 124 | time.sleep(.1) |
| 128 | config.chmod(0o600) | 125 | forged = {"User-Name": "snow", "User-Groups": "infra-admin", "Snowglobe-Proxy-Token": "0" * 64} |
| 129 | log = Path(temporary) / "caddy.log" | 126 | for path in ("/api/me", "/api/deploys"): |
| 130 | caddy_binary = (Path("/proc") / shell("systemctl", "show", "-P", "MainPID", "caddy").strip() / "exe").resolve(strict=True) | 127 | request = urllib.request.Request("http://127.0.0.1:" + str(proxy_port) + path, headers=forged) |
| 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" | ||
| 151 | try: | 128 | try: |
| 152 | urllib.request.urlopen(request, timeout=10) | 129 | urllib.request.urlopen(request, timeout=10) |
| 153 | raise AssertionError("forged admin role survived Caddy") | 130 | raise AssertionError("forged identity survived Caddy") |
| 154 | except urllib.error.HTTPError as error: | 131 | except urllib.error.HTTPError as error: |
| 155 | assert error.code == 403, error.code | 132 | assert error.code == 401, (path, error.code) |
| 156 | connection = HTTPConnection("127.0.0.1", proxy_port, timeout=10) | 133 | finally: |
| 157 | try: | 134 | caddy.terminate() |
| 158 | connection.request("GET", "/api/me", headers=forged) | 135 | try: |
| 159 | response = connection.getresponse() | 136 | caddy.wait(timeout=10) |
| 160 | assert response.status == 302 and response.getheader("Location").startswith("/snow.oauth2/sign_in?"), response.status | 137 | except subprocess.TimeoutExpired: |
| 161 | response.read() | 138 | caddy.kill() |
| 162 | finally: | 139 | caddy.wait() |
| 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() | ||
| 172 | apps = json.loads(get("/api/launcher")) | 140 | apps = json.loads(get("/api/launcher")) |
| 173 | assert any(app["id"] == "shale" for app in apps), apps | 141 | assert any(app["id"] == "shale" for app in apps), apps |
| 174 | assert all(app["url"].endswith(".snowglobe.test") for app in apps), apps | 142 | assert all(app["url"].endswith(".snowglobe.test") for app in apps), apps |
| ... | @@ -187,7 +155,7 @@ print('refused') | ... | @@ -187,7 +155,7 @@ print('refused') |
| 187 | assert subprocess.run(["podman", "exec", container, "test", "-e", denied], capture_output=True).returncode == 1, denied | 155 | assert subprocess.run(["podman", "exec", container, "test", "-e", denied], capture_output=True).returncode == 1, denied |
| 188 | result = {"proxy_proof_required": "passed", "neighbor_identity_forgery_refused": "passed", | 156 | result = {"proxy_proof_required": "passed", "neighbor_identity_forgery_refused": "passed", |
| 189 | "wildcard_startup_without_proof_refused": "passed", | 157 | "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", |
| 191 | "launcher_from_immutable_image": "passed", "service_icons": "passed", | 159 | "launcher_from_immutable_image": "passed", "service_icons": "passed", |
| 192 | "unprivileged_youtube_library": "passed", "python_yaml": "passed", | 160 | "unprivileged_youtube_library": "passed", "python_yaml": "passed", |
| 193 | "ffmpeg_and_ytdlp": "passed", "host_release_and_control_paths_absent": "passed"} | 161 | "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 | ||
| 2 | from pathlib import Path | ||
| 3 | import tempfile | ||
| 4 | import unittest | ||
| 5 | from unittest.mock import patch | ||
| 6 | |||
| 7 | import snowglobe | ||
| 8 | |||
| 9 | |||
| 10 | class 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 | |||
| 31 | if __name__ == "__main__": | ||
| 32 | unittest.main() | ||
tools/snowglobe.py+9-4| ... | @@ -133,9 +133,7 @@ def load(name, properties, instance_id=None): | ... | @@ -133,9 +133,7 @@ def load(name, properties, instance_id=None): |
| 133 | raise ValueError(f"{name}.{task_name} needs one image or build directory") | 133 | raise ValueError(f"{name}.{task_name} needs one image or build directory") |
| 134 | if task.get("build"): | 134 | if task.get("build"): |
| 135 | if REPO.parent == Path("/opt/snowglobe/releases").resolve(): | 135 | if REPO.parent == Path("/opt/snowglobe/releases").resolve(): |
| 136 | context = config_path(name, task["build"]) | 136 | context = build_context(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}") | ||
| 139 | digest = hashlib.sha256() | 137 | digest = hashlib.sha256() |
| 140 | for path in sorted(context.rglob("*")): | 138 | for path in sorted(context.rglob("*")): |
| 141 | if path.is_file(): | 139 | if path.is_file(): |
| ... | @@ -183,6 +181,13 @@ def config_path(service, relative): | ... | @@ -183,6 +181,13 @@ def config_path(service, relative): |
| 183 | return source | 181 | return source |
| 184 | 182 | ||
| 185 | 183 | ||
| 184 | def 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 | |||
| 186 | def config_assets(data): | 191 | def config_assets(data): |
| 187 | paths = set() | 192 | paths = set() |
| 188 | for task in data["containers"].values(): | 193 | for task in data["containers"].values(): |
| ... | @@ -643,7 +648,7 @@ def build_images(data): | ... | @@ -643,7 +648,7 @@ def build_images(data): |
| 643 | if task.get("build"): | 648 | if task.get("build"): |
| 644 | image = task["image"] | 649 | image = task["image"] |
| 645 | if subprocess.run(["podman", "image", "exists", image]).returncode: | 650 | 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"]))) |
| 647 | 652 | ||
| 648 | 653 | ||
| 649 | def clone_dataset(source, snapshot, dataset, mount): | 654 | def clone_dataset(source, snapshot, dataset, mount): |