diff --git a/dashboard/Cargo.lock b/dashboard/Cargo.lock index 2b1e733ac540c52f9dba57f3e50ad440d9802447..8330b06818938fca8afee5e64d6e4bea1e146aa4 100644 --- a/dashboard/Cargo.lock +++ b/dashboard/Cargo.lock @@ -300,12 +300,32 @@ dependencies = [ "inout", ] +[[package]] +name = "combine" +version = "4.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4356eba6976435498d05a311ee9fc486da3bc81c200d3f0d7dd9703b41913f92" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "const-oid" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -561,6 +581,12 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b04dc5a38e4f151a79d9f2451ae6037fb6eaf5cba34771f44781f80e508498e3" +[[package]] +name = "either" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" + [[package]] name = "elliptic-curve" version = "0.13.8" @@ -594,18 +620,6 @@ dependencies = [ "simdutf8", ] -[[package]] -name = "enum-as-inner" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -894,59 +908,77 @@ dependencies = [ "hashbrown 0.15.5", ] -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hickory-net" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c480823ed7c2c5d0f09c41020cb6b7c28029ce60ec42dc942158dcf22f8e0a4d" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "futures-channel", + "futures-io", + "futures-util", + "hickory-proto", + "idna", + "ipnet", + "jni", + "rand 0.10.3", + "thiserror 2.0.21", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "hickory-proto" -version = "0.25.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a6fe56c0038198998a6f217ca4e7ef3a5e51f46163bd6dd60b5c71ca6c6502" +checksum = "12b92608f679a6fa515dd1d15c1ff89443026e391200a2c840c7afcba482893d" dependencies = [ - "async-trait", - "cfg-if", "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", "idna", "ipnet", + "jni", "once_cell", - "rand 0.9.5", + "prefix-trie", + "rand 0.10.3", "ring", "thiserror 2.0.21", "tinyvec", - "tokio", "tracing", "url", ] [[package]] name = "hickory-resolver" -version = "0.25.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a" +checksum = "3f3da5255c95d5a716857d54b5b8f4e8d67c3484d3beaaaae2ce25063b3ba981" dependencies = [ "cfg-if", "futures-util", + "hickory-net", "hickory-proto", "ipconfig", + "ipnet", + "jni", "moka", + "ndk-context", "once_cell", "parking_lot", - "rand 0.9.5", + "rand 0.10.3", "resolv-conf", "smallvec", + "system-configuration", "thiserror 2.0.21", "tokio", "tracing", @@ -1287,6 +1319,9 @@ name = "ipnet" version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" +dependencies = [ + "serde", +] [[package]] name = "itoa" @@ -1294,6 +1329,55 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.21", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.119", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.119", +] + [[package]] name = "js-sys" version = "0.3.106" @@ -1479,6 +1563,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + [[package]] name = "new_debug_unreachable" version = "1.0.6" @@ -1833,6 +1923,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "prefix-trie" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7" +dependencies = [ + "either", + "ipnet", + "num-traits", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -2234,9 +2335,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.45" +version = "0.23.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" +checksum = "48e13bd8c0e9365c43cfa5c9e8f9ad49d3c8444926c9aac819e0e4dc503c8fdf" dependencies = [ "once_cell", "ring", @@ -2258,9 +2359,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "ring", "rustls-pki-types", @@ -2536,6 +2637,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simd_cesu8" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simdutf8" version = "0.1.5" @@ -2728,6 +2839,27 @@ dependencies = [ "syn 3.0.6", ] +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tagptr" version = "0.2.0" @@ -2831,9 +2963,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.53.1" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "bytes", "libc", @@ -3286,9 +3418,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a" +checksum = "f5f280bbb2b287bc8e7de7e3852945a0ff50d1bbcb5ed42b6c7a568c546df171" dependencies = [ "rustls-pki-types", ] diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index 07eba1ea89b6d1242b5f06bca8f893e8fa31f18a..c1c892252993936a45a3655c8ec607a4cde2aad0 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -11,7 +11,7 @@ bytes = "1" chrono = "0.4" futures = "0.3" globset = "0.4" -hickory-resolver = "0.25" +hickory-resolver = "0.26.2" openssl = "0.10" percent-encoding = "2" rand = "0.9" diff --git a/dashboard/package.json b/dashboard/package.json index 919d3cf51542cf6215065f50a2bbe56045f6a31f..a3228079d1427e0a8c68078e00e64ca8679376f3 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -9,7 +9,7 @@ "start": "cargo run --release" }, "dependencies": { - "hono": "^4.13.9" + "hono": "^4.13.16" }, "devDependencies": { "@clo/terminal": "file:vendor/clo-terminal-0.1.0.tgz", @@ -18,10 +18,10 @@ "@types/node": "^26.6.2", "esbuild": "0.28.2", "lucide-solid": "^1.48.0", - "solid-js": "^1.9.15", + "solid-js": "^1.9.18", "typescript": "^7.0.2", "uplot": "^1.6.32", - "vite": "^8.3.1", + "vite": "^8.3.5", "vite-plugin-solid": "^2.11.14" } } diff --git a/dashboard/pnpm-lock.yaml b/dashboard/pnpm-lock.yaml index 13b306c9cd4b221db71af30def1dadcd6ee5ad29..fc486dfee1699b9292156488f837220199c7cb07 100644 --- a/dashboard/pnpm-lock.yaml +++ b/dashboard/pnpm-lock.yaml @@ -9,18 +9,18 @@ importers: .: dependencies: hono: - specifier: ^4.13.9 - version: 4.13.9 + specifier: ^4.13.16 + version: 4.13.16 devDependencies: '@clo/terminal': specifier: file:vendor/clo-terminal-0.1.0.tgz - version: file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.15) + version: file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.18) '@novnc/novnc': specifier: ^1.7.0 version: 1.7.0 '@solidjs/router': specifier: ^1.0.0 - version: 1.0.0(solid-js@1.9.15) + version: 1.0.0(solid-js@1.9.18) '@types/node': specifier: ^26.6.2 version: 26.6.2 @@ -29,10 +29,10 @@ importers: version: 0.28.2 lucide-solid: specifier: ^1.48.0 - version: 1.48.0(solid-js@1.9.15) + version: 1.48.0(solid-js@1.9.18) solid-js: - specifier: ^1.9.15 - version: 1.9.15 + specifier: ^1.9.18 + version: 1.9.18 typescript: specifier: ^7.0.2 version: 7.0.2 @@ -40,11 +40,11 @@ importers: specifier: ^1.6.32 version: 1.6.32 vite: - specifier: ^8.3.1 - version: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) + specifier: ^8.3.5 + version: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) vite-plugin-solid: specifier: ^2.11.14 - 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)) + 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)) packages: @@ -316,95 +316,101 @@ packages: '@novnc/novnc@1.7.0': resolution: {integrity: sha512-ucEJOx4T2avIRCleodk7YobZj5O2Ga2AeLfQ69A/yjG9HHba2+PDgwSkN3FttrmG+70ZGx21sElNFouK13RzyA==} - '@oxc-project/types@0.151.0': - resolution: {integrity: sha512-J1yXrIlNDZVzE3ada310xeAw7nH8yCAyLPuUIsjKatFPmfn5bS1oW+cM+QsGOtVWd5nhSpbwZWx/rue+r5Z+PA==} + '@oxc-project/types@0.156.0': + resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} - '@rolldown/binding-android-arm-eabi@1.2.11': - resolution: {integrity: sha512-A5kXfGKvKWWZE0TtPrfsvT+q4Y5d1QG8gGUzpYjGydM+fARM9MuX90PrXYXe0XbsDVgyxxNzHo6giCj90bsFNw==} + '@rolldown/binding-android-arm-eabi@1.2.16': + resolution: {integrity: sha512-ia3DwAs0OsMGS7+IConptSiyk9pEXkOx/AbJ2n/lAGxH3QkWQus1t8d7gnAT38FCU2sQu8lUbeR6AiZFv4JxaA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@rolldown/binding-android-arm64@1.2.11': - resolution: {integrity: sha512-z6cTycz+iJ4PVkuL4HHW4DfTfoeU/2nqYYuSOrTmH7yHK5Y0LCOnA03V4ZNxavyVaU1oOqUgIg2klN/s+USGOA==} + '@rolldown/binding-android-arm64@1.2.16': + resolution: {integrity: sha512-kx5wBiMB6E7TEvpl2B9gjLU004BkvEm2Dr941BFjx/SontPwSzNuQUIoVKxHHoSjpFIfHMmcguyLOtyn0hObRg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.2.11': - resolution: {integrity: sha512-jShvqNtP6vDC6/A5JOAzbVV+DkgHqhl/ScVCJEbt+TUY6QYz7YnXcrg3sLtFBniro0f/Ld50ZwCWA6f7KYD1nQ==} + '@rolldown/binding-darwin-arm64@1.2.16': + resolution: {integrity: sha512-qslZrXnKJU4cUpjoAmtAo/KQM9e2IRMlmpig6Zpwj+8KWxW8v+nkAf9216Bsek9lOC1jvg2yCjygCFo2f83msQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.2.11': - resolution: {integrity: sha512-f2i2xiNWq1Z1l2++q2fuhZRdLAT3aqxD6vRNm1RAxpUoBcdqNB3C0s1Bt+K+PbEx2F5F4gQp6hqKkphCY/xF9w==} + '@rolldown/binding-darwin-x64@1.2.16': + resolution: {integrity: sha512-FdF+y48ND13eAyM2mQn+85kvAqNlvRWROy2rhgA463X/0Gv4vGtazZtfaF1mRBLscYvtOlh4QnLjOWiFzX69OQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.2.11': - resolution: {integrity: sha512-4Ir5FSOKIAMr4r0kExpt1s3bMgzJU3rA45AYOHtQpls0oNeqcYBKrWMlckrYH4KCfGLfkfn1tN1dmZPMVsdXow==} + '@rolldown/binding-freebsd-x64@1.2.16': + resolution: {integrity: sha512-ddjqFM5e95AgLbUPtKIS7V1KTVlA0RUgCVr5mn+/IEhsdy3pr+Vuj/HZ7nlMN2FyxIwUktOH1LEPIQXO1v9y1Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.2.11': - resolution: {integrity: sha512-/gnRDM+39BROzAN/k1OZjDPnDMcZxB/0EUxKjONO5yVkNEvlsoMDrxGNKgZi/ttFriS2gwlDNzB65pvNbFOXIQ==} + '@rolldown/binding-linux-arm-gnueabihf@1.2.16': + resolution: {integrity: sha512-tHdKWbFkFBI687iim3LIyIvyL7j66VvQYkDPss5Stn/qyE2tWkR1YD0dXmXPFKKqT/o5ZEJVsaRsWS2meQwGOA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.2.11': - resolution: {integrity: sha512-PFaK8HwvAHbaKbBcDNQihjMKYvFnA5hiENx/l5tphTDz1E0WFp32l0A7aq7lyUwGsRw/xSrNIy/gIK4thrSCrw==} + '@rolldown/binding-linux-arm64-gnu@1.2.16': + resolution: {integrity: sha512-FJiLGAblPBMlBEdbOqw6kW6QcXDWAf/oJu7gYs9ZJZwmg+K+/zjFLxPTIY9izJUzxzc24FHvmseyA0IvJSl17w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] - '@rolldown/binding-linux-arm64-musl@1.2.11': - resolution: {integrity: sha512-AskzJUIKRLPxkruR1wLKewGbOw+EYfU/9lOrBFj4AFrEA8hPpKFnODWNu2WLaNs0QNkEb9QIJufmVZZIL/bJlg==} + '@rolldown/binding-linux-arm64-musl@1.2.16': + resolution: {integrity: sha512-hrJpblMsrQ58U9veWpbXzkhV5zStunds6HWLprqq1qauvgBr1E6P+24kLj6lSLI9vjRn/RYpjprhkHQPKGWpNg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] - '@rolldown/binding-linux-ppc64-gnu@1.2.11': - resolution: {integrity: sha512-qlUGAheh2yh8afH7QBgx0PrRHN85hKnNd78x8MeMhXivuevgd8vgf6/CstOzmNKY/lLTHvNTrPy98cLnAugzJw==} + '@rolldown/binding-linux-ppc64-gnu@1.2.16': + resolution: {integrity: sha512-qJd/dC6j6CwLG9/s/RP2nb1RZ0GIgj7Ioj7x/SYa3RzjVrlzrmH0fhIOpfvqQDeIsdP0loi+kHaMhJzY1PBIaA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] - '@rolldown/binding-linux-s390x-gnu@1.2.11': - resolution: {integrity: sha512-secpEad+0vCbSfn8upFySkDskv+bGPk3THSDS9Y89yc4rb4kzqHp8Dmyd9BkQW4SnhNXBZCl/6CrO//hZahNJQ==} + '@rolldown/binding-linux-s390x-gnu@1.2.16': + resolution: {integrity: sha512-Vx7Xg5uUJuNcujJjI70OICaH0EYj80BtOLZTSN7uOYg8QOLlyKnaG0IW7Fn/J0IpJsaKzmDKMhOQv1JBM9m9vg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] - '@rolldown/binding-linux-x64-gnu@1.2.11': - resolution: {integrity: sha512-mOVBT3dPpkWm8XBWPmU4bf+U6dYDLeMo/9ojUmis4N0L5uu10qra5vOyngZ7/PSdoE4G9KvRt4bloRxNjLas7A==} + '@rolldown/binding-linux-x64-gnu@1.2.16': + resolution: {integrity: sha512-TNKhgE3uJTsTzatUSSYt0Kgo+Oa2uSlSjz4r1aEIea7HX6ULBym4fAlYUhG1i6pjNf2njfCUAfKwr6C3E9Xg1w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] - '@rolldown/binding-linux-x64-musl@1.2.11': - resolution: {integrity: sha512-Is78i9A8Ui4SqcxUwFJ9uMmjDn58IbVTjFWYdQestFEgeuEmHMLGNriXnVJKkwG2YiZjw8cP0zCTyDMdDGtOOg==} + '@rolldown/binding-linux-x64-musl@1.2.16': + resolution: {integrity: sha512-7chXdpjXZ8qG0+mIxECN3cT9kvhZ3/oZhMX6Pp876P7CDrIy8nJswva6Mq357JR7eYXfuskwZxMeV1SzoZdHrA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] - '@rolldown/binding-openharmony-arm64@1.2.11': - resolution: {integrity: sha512-dUCXneZ87INUMyQ0D+C0HrEBNUPNXHaPmU5GTjyKTJEiussw9Kaj5Ln8UztPe4epV/ffvgNBEadksdYhmW6xJA==} + '@rolldown/binding-openharmony-arm64@1.2.16': + resolution: {integrity: sha512-Kwjt+7uNTJK5/MDkGWGVO2KQPnj8yAV75dMpfwyHZrJSXWHrniOB0aUEWlVYf3H1hOqFLIStLdM5QXq6bnKmOQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@rolldown/binding-win32-arm64-msvc@1.2.11': - resolution: {integrity: sha512-jByxb6qfd+bH1xUd0qnfFnb17i9sWBPY2tOavJ0l3tdr3OTu+Kvtm8cd/JV5nFt657b1VqGltxg9olOEfofXWw==} + '@rolldown/binding-win32-arm64-msvc@1.2.16': + resolution: {integrity: sha512-/LH6WfjDRXXJz/p5xl4TmU+jpcnwcxbKEQBW/GZE0JHfN0lGIyTtsUEGaQ/q/GikkGJ2yLKe6pwm7AnEWO8pdw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@rolldown/binding-win32-x64-msvc@1.2.11': - resolution: {integrity: sha512-/PzKqzAJ03i19oy2ItPvyvaVjOjBCNnfaJs8yvUdGBKmiESgnrJSQ2awd81QzFbbnAmu7YO9ZnJrDCb9VSJPRA==} + '@rolldown/binding-win32-x64-msvc@1.2.16': + resolution: {integrity: sha512-1lv1KvX0Z871zfk7vw+dnXMMnHNyDwMzWG8Kv3HxDXMOhzCX4SHc7HK319fInP0i+0p9D8brkfzL7pJOaGl+tw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -632,8 +638,8 @@ packages: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} - hono@4.13.9: - resolution: {integrity: sha512-7dMkQmZoC4E6F7AtaQSPhlWAdnBti+j7rreMZl8QB4jFiEhP9TWbGWUMi8WYzBCgmgulxuvLQupKqo+Co6Omyg==} + hono@4.13.16: + resolution: {integrity: sha512-AOLOEhvrV+iH92xXCnFr/5+3KjPKcI3xP63XJtX5spAnkznPdHijlIsUTpi7/9EhWqrTCekw5c5zh1K+YsVw7A==} engines: {node: '>=16.9.0'} html-entities@2.3.3: @@ -691,24 +697,28 @@ packages: engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] lightningcss-linux-arm64-musl@1.33.0: resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [musl] lightningcss-linux-x64-gnu@1.33.0: resolution: {integrity: sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [glibc] lightningcss-linux-x64-musl@1.33.0: resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [musl] lightningcss-win32-arm64-msvc@1.33.0: resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==} @@ -741,8 +751,8 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - nanoid@3.3.19: - resolution: {integrity: sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==} + nanoid@3.3.20: + resolution: {integrity: sha512-uKdg2G3GNCKQn9byYOpxbGqrT2fGO5KRt5J/8b3pok8rT6qxGWF6hxMyJiEYtAf+FVyYuD9hRaDqX5uPFYJ4ZQ==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -760,12 +770,12 @@ packages: resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} engines: {node: '>=12'} - postcss@8.5.28: - resolution: {integrity: sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==} + postcss@8.5.32: + resolution: {integrity: sha512-LJlKCCAUFKOuZxipUdYw1NzIITEsPcgyOG9LkvRJvuKj/bRzbuRY0ARXvL0pWGpsZvn8jku+LMep2eU0seHp8g==} engines: {node: ^10 || ^12 || >=14} - rolldown@1.2.11: - resolution: {integrity: sha512-qpSwIyz0jHQq5qXBTNxFmE6664rJ7O+4TvPFOiOaBSrz8IOHc1koKKSqTM2H6u1UG1+TveuC6vaDHKXFOvb1Kw==} + rolldown@1.2.16: + resolution: {integrity: sha512-bWvlMpFKiTfDKfnK7FC2MPgPeWCf/Kpwsq49ApdW+FQaBZb6O6dZ4MAPbPUjp7hYQrw/RobqCzn64BRrQecGHw==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true @@ -773,26 +783,26 @@ packages: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true - seroval-plugins@1.5.6: - resolution: {integrity: sha512-HXuLAX2pu/UByPpaeo/TaMfvMIi+1QqIoPJYCcAtU8QkVNwgR6MPlGuCQTErV1JwraaMbYaWVIBX7mppzGLATQ==} + seroval-plugins@1.6.12: + resolution: {integrity: sha512-+reiwp/lYxiyctSrdvX7OQ1YLrcbWYgBiZrhSFL+V43b0/DGRLNVSDyZINbQe+tWplPOI2fw2dPrdv6hcc09kQ==} engines: {node: '>=10'} peerDependencies: seroval: ^1.0 - seroval@1.5.6: - resolution: {integrity: sha512-rVQVWjjSvlINzaQPZH5JFqsqEsIWdTxY3iJZCnTL/5gQbXIRooVZKI60tVCkOVfzcRPejboxO2t0P89dg5mQaA==} + seroval@1.6.12: + resolution: {integrity: sha512-CqbIVfk/7GL3ITwZI55lcPbpQbjHZ2DD5cUj4iH7E9YsCfHNJV1mx7yNp86Z84w5IpmkZZS/2s5vPOWmVWSdQg==} engines: {node: '>=10'} - solid-js@1.9.15: - resolution: {integrity: sha512-EeiY2xfpZJqPLjXspVEKjAII4yv8NyG//NxZ3IpOFHdUNnnTyL0uJOeS9LWGvA7cFCz5y94cjFwYlmw5Luncsg==} + solid-js@1.9.18: + resolution: {integrity: sha512-CHGO5YFk6Y9m/1YSxVtKnXfrW7JD3Tmof8HmR4z6TmCPsS8efo8LnzIR8CQh3cUvffqYm6DWyBFfk8dQw1CNQQ==} solid-refresh@0.6.3: resolution: {integrity: sha512-F3aPsX6hVw9ttm5LYlth8Q15x6MlI/J3Dn+o3EQyRTtTxidepSTwAYdozt01/YA+7ObcciagGEyXIopGZzQtbA==} peerDependencies: solid-js: ^1.3 - source-map-js@1.2.1: - resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} + source-map-js@1.2.2: + resolution: {integrity: sha512-KGj/8Y43x35aZVDtt+J4mK1hoLGHULMYfSkODJNQjNDC3oW1PqPoxMwo0pLUsWM/UEGzON/NxeHywEfNXNP3Vw==} engines: {node: '>=0.10.0'} tinyglobby@0.2.17: @@ -831,13 +841,13 @@ packages: '@testing-library/jest-dom': optional: true - vite@8.3.1: - resolution: {integrity: sha512-/bvH9E9tmCXRGp2uXY3WbOldqpTwFkbha/8ANaEQ6VkxhH60KyqLwgZq6lG2y+4uT55x9+9eUHMpQ7uGnOCKjA==} + vite@8.3.5: + resolution: {integrity: sha512-z1YpjieJ9g0ebTmQpLBv/oq9E3F9EIlOe+7LahW8SrE3LTiG3udBRUXQOlYXP9b+IC2q2phHeVxj9xGlw34OEQ==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: '@types/node': ^20.19.0 || >=22.12.0 - '@vitejs/devtools': ^0.7.1 + '@vitejs/devtools': ^0.7.1 || ^0.8.0 esbuild: ^0.27.0 || ^0.28.0 jiti: '>=1.21.0' less: ^4.0.0 @@ -998,9 +1008,9 @@ snapshots: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@clo/terminal@file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.15)': + '@clo/terminal@file:vendor/clo-terminal-0.1.0.tgz(solid-js@1.9.18)': optionalDependencies: - solid-js: 1.9.15 + solid-js: 1.9.18 '@esbuild/aix-ppc64@0.28.2': optional: true @@ -1101,58 +1111,58 @@ snapshots: '@novnc/novnc@1.7.0': {} - '@oxc-project/types@0.151.0': {} + '@oxc-project/types@0.156.0': {} - '@rolldown/binding-android-arm-eabi@1.2.11': + '@rolldown/binding-android-arm-eabi@1.2.16': optional: true - '@rolldown/binding-android-arm64@1.2.11': + '@rolldown/binding-android-arm64@1.2.16': optional: true - '@rolldown/binding-darwin-arm64@1.2.11': + '@rolldown/binding-darwin-arm64@1.2.16': optional: true - '@rolldown/binding-darwin-x64@1.2.11': + '@rolldown/binding-darwin-x64@1.2.16': optional: true - '@rolldown/binding-freebsd-x64@1.2.11': + '@rolldown/binding-freebsd-x64@1.2.16': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.2.11': + '@rolldown/binding-linux-arm-gnueabihf@1.2.16': optional: true - '@rolldown/binding-linux-arm64-gnu@1.2.11': + '@rolldown/binding-linux-arm64-gnu@1.2.16': optional: true - '@rolldown/binding-linux-arm64-musl@1.2.11': + '@rolldown/binding-linux-arm64-musl@1.2.16': optional: true - '@rolldown/binding-linux-ppc64-gnu@1.2.11': + '@rolldown/binding-linux-ppc64-gnu@1.2.16': optional: true - '@rolldown/binding-linux-s390x-gnu@1.2.11': + '@rolldown/binding-linux-s390x-gnu@1.2.16': optional: true - '@rolldown/binding-linux-x64-gnu@1.2.11': + '@rolldown/binding-linux-x64-gnu@1.2.16': optional: true - '@rolldown/binding-linux-x64-musl@1.2.11': + '@rolldown/binding-linux-x64-musl@1.2.16': optional: true - '@rolldown/binding-openharmony-arm64@1.2.11': + '@rolldown/binding-openharmony-arm64@1.2.16': optional: true - '@rolldown/binding-win32-arm64-msvc@1.2.11': + '@rolldown/binding-win32-arm64-msvc@1.2.16': optional: true - '@rolldown/binding-win32-x64-msvc@1.2.11': + '@rolldown/binding-win32-x64-msvc@1.2.16': optional: true '@rolldown/pluginutils@1.0.1': {} - '@solidjs/router@1.0.0(solid-js@1.9.15)': + '@solidjs/router@1.0.0(solid-js@1.9.18)': dependencies: - solid-js: 1.9.15 + solid-js: 1.9.18 '@types/babel__core@7.20.5': dependencies: @@ -1248,12 +1258,12 @@ snapshots: html-entities: 2.3.3 parse5: 7.3.0 - babel-preset-solid@1.9.15(@babel/core@7.29.7)(solid-js@1.9.15): + babel-preset-solid@1.9.15(@babel/core@7.29.7)(solid-js@1.9.18): dependencies: '@babel/core': 7.29.7 babel-plugin-jsx-dom-expressions: 0.40.10(@babel/core@7.29.7) optionalDependencies: - solid-js: 1.9.15 + solid-js: 1.9.18 baseline-browser-mapping@2.11.26: {} @@ -1321,7 +1331,7 @@ snapshots: gensync@1.0.0-beta.2: {} - hono@4.13.9: {} + hono@4.13.16: {} html-entities@2.3.3: {} @@ -1386,9 +1396,9 @@ snapshots: dependencies: yallist: 3.1.1 - lucide-solid@1.48.0(solid-js@1.9.15): + lucide-solid@1.48.0(solid-js@1.9.18): dependencies: - solid-js: 1.9.15 + solid-js: 1.9.18 merge-anything@5.1.7: dependencies: @@ -1396,7 +1406,7 @@ snapshots: ms@2.1.3: {} - nanoid@3.3.19: {} + nanoid@3.3.20: {} node-releases@2.0.57: {} @@ -1408,57 +1418,57 @@ snapshots: picomatch@4.0.7: {} - postcss@8.5.28: + postcss@8.5.32: dependencies: - nanoid: 3.3.19 + nanoid: 3.3.20 picocolors: 1.1.1 - source-map-js: 1.2.1 + source-map-js: 1.2.2 - rolldown@1.2.11: + rolldown@1.2.16: dependencies: - '@oxc-project/types': 0.151.0 + '@oxc-project/types': 0.156.0 '@rolldown/pluginutils': 1.0.1 optionalDependencies: - '@rolldown/binding-android-arm-eabi': 1.2.11 - '@rolldown/binding-android-arm64': 1.2.11 - '@rolldown/binding-darwin-arm64': 1.2.11 - '@rolldown/binding-darwin-x64': 1.2.11 - '@rolldown/binding-freebsd-x64': 1.2.11 - '@rolldown/binding-linux-arm-gnueabihf': 1.2.11 - '@rolldown/binding-linux-arm64-gnu': 1.2.11 - '@rolldown/binding-linux-arm64-musl': 1.2.11 - '@rolldown/binding-linux-ppc64-gnu': 1.2.11 - '@rolldown/binding-linux-s390x-gnu': 1.2.11 - '@rolldown/binding-linux-x64-gnu': 1.2.11 - '@rolldown/binding-linux-x64-musl': 1.2.11 - '@rolldown/binding-openharmony-arm64': 1.2.11 - '@rolldown/binding-win32-arm64-msvc': 1.2.11 - '@rolldown/binding-win32-x64-msvc': 1.2.11 + '@rolldown/binding-android-arm-eabi': 1.2.16 + '@rolldown/binding-android-arm64': 1.2.16 + '@rolldown/binding-darwin-arm64': 1.2.16 + '@rolldown/binding-darwin-x64': 1.2.16 + '@rolldown/binding-freebsd-x64': 1.2.16 + '@rolldown/binding-linux-arm-gnueabihf': 1.2.16 + '@rolldown/binding-linux-arm64-gnu': 1.2.16 + '@rolldown/binding-linux-arm64-musl': 1.2.16 + '@rolldown/binding-linux-ppc64-gnu': 1.2.16 + '@rolldown/binding-linux-s390x-gnu': 1.2.16 + '@rolldown/binding-linux-x64-gnu': 1.2.16 + '@rolldown/binding-linux-x64-musl': 1.2.16 + '@rolldown/binding-openharmony-arm64': 1.2.16 + '@rolldown/binding-win32-arm64-msvc': 1.2.16 + '@rolldown/binding-win32-x64-msvc': 1.2.16 semver@6.3.1: {} - seroval-plugins@1.5.6(seroval@1.5.6): + seroval-plugins@1.6.12(seroval@1.6.12): dependencies: - seroval: 1.5.6 + seroval: 1.6.12 - seroval@1.5.6: {} + seroval@1.6.12: {} - solid-js@1.9.15: + solid-js@1.9.18: dependencies: csstype: 3.2.3 - seroval: 1.5.6 - seroval-plugins: 1.5.6(seroval@1.5.6) + seroval: 1.6.12 + seroval-plugins: 1.6.12(seroval@1.6.12) - solid-refresh@0.6.3(solid-js@1.9.15): + solid-refresh@0.6.3(solid-js@1.9.18): dependencies: '@babel/generator': 7.29.8 '@babel/helper-module-imports': 7.29.7 '@babel/types': 7.29.8 - solid-js: 1.9.15 + solid-js: 1.9.18 transitivePeerDependencies: - supports-color - source-map-js@1.2.1: {} + source-map-js@1.2.2: {} tinyglobby@0.2.17: dependencies: @@ -1505,25 +1515,25 @@ snapshots: uplot@1.6.32: {} - 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)): + 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)): dependencies: '@babel/core': 7.29.7 '@types/babel__core': 7.20.5 - babel-preset-solid: 1.9.15(@babel/core@7.29.7)(solid-js@1.9.15) + babel-preset-solid: 1.9.15(@babel/core@7.29.7)(solid-js@1.9.18) merge-anything: 5.1.7 - solid-js: 1.9.15 - solid-refresh: 0.6.3(solid-js@1.9.15) - vite: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) - vitefu: 1.1.3(vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)) + solid-js: 1.9.18 + solid-refresh: 0.6.3(solid-js@1.9.18) + vite: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) + vitefu: 1.1.3(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)) transitivePeerDependencies: - supports-color - vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15): + vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 - postcss: 8.5.28 - rolldown: 1.2.11 + postcss: 8.5.32 + rolldown: 1.2.16 tinyglobby: 0.2.17 optionalDependencies: '@types/node': 26.6.2 @@ -1531,8 +1541,8 @@ snapshots: fsevents: 2.3.3 tsx: 4.23.15 - vitefu@1.1.3(vite@8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)): + vitefu@1.1.3(vite@8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15)): optionalDependencies: - vite: 8.3.1(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) + vite: 8.3.5(@types/node@26.6.2)(esbuild@0.28.2)(tsx@4.23.15) yallist@3.1.1: {} diff --git a/dashboard/pnpm-workspace.yaml b/dashboard/pnpm-workspace.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5ed0b5af0d45919f64c66edfb16a5f4512461fa1 --- /dev/null +++ b/dashboard/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +allowBuilds: + esbuild: true diff --git a/dashboard/src/atproto.rs b/dashboard/src/atproto.rs index de5708f4d9c6e5094e2a5032a1698967f2183896..e2516ec074391fcf26e8ff9ba21318cd7c25781c 100644 --- a/dashboard/src/atproto.rs +++ b/dashboard/src/atproto.rs @@ -172,7 +172,8 @@ async fn handle_did(handle: &str) -> Result { } let resolver = hickory_resolver::Resolver::builder_tokio() .map_err(|_| reject())? - .build(); + .build() + .map_err(|_| reject())?; if let Ok(Ok(records)) = tokio::time::timeout( Duration::from_secs(5), resolver.txt_lookup(format!("_atproto.{handle}.")), @@ -180,10 +181,14 @@ async fn handle_did(handle: &str) -> Result { .await { let dids: Vec<_> = records + .answers() .iter() .filter_map(|record| { + let hickory_resolver::proto::rr::RData::TXT(record) = &record.data else { + return None; + }; let text = record - .txt_data() + .txt_data .iter() .flat_map(|part| part.iter().copied()) .collect::>(); diff --git a/flake.lock b/flake.lock index d1f2e7629a4fe3714e6787560e215734fe1a86c1..8efe6882a3b79475f8ca0031b3332fd90fdca8ca 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1790113641, - "narHash": "sha256-D2aaQetafdpHxbwA4ldAxs51UX0b11pXL+JL/5L8VrM=", + "lastModified": 1793633738, + "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bc55b9def8165e82073919945c3239903fe4dc2", + "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd", "type": "github" }, "original": { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d67af41031c65d2ef4bdd1d15b9cb34f7563d1cb..0cf7981f6f2a844c1e940547191be2ba4d7b38fd 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -47,6 +47,28 @@ let }); in { + nixpkgs.overlays = [ (final: prev: { + nomad = prev.stdenvNoCC.mkDerivation rec { + pname = "nomad"; + version = "2.1.1"; + src = prev.fetchurl { + url = "https://releases.hashicorp.com/nomad/${version}/nomad_${version}_linux_amd64.zip"; + hash = "sha256-BzCE92kP2up1b/Hv+LZpslw6bBd3jxmuDEdgaXPtPzk="; + }; + nativeBuildInputs = [ prev.unzip prev.autoPatchelfHook ]; + buildInputs = [ final.glibc ]; + sourceRoot = "."; + dontBuild = true; + installPhase = '' + runHook preInstall + install -Dm755 nomad $out/bin/nomad + install -Dm444 LICENSE.txt $out/share/licenses/nomad/LICENSE.txt + runHook postInstall + ''; + meta = prev.nomad.meta // { platforms = [ "x86_64-linux" ]; }; + }; + }) ]; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomad" "nvidia-x11" "nvidia-kernel-modules" "gpu-unlock-firmware" ]; networking.firewall = { @@ -63,7 +85,7 @@ in enable = true; package = pkgs.caddy.withPlugins { plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ]; - hash = "sha256-2tcvl9ZDpe7SAy3tZCPNwmw0KoIIakqggVaRtVAg9R0="; + hash = "sha256-iWtaVD4LrOgCFZc90crAlHYbHHxz8zCFnvD2ZLRkO0Q="; }; extraConfig = "import /var/lib/caddy/routes.caddy"; virtualHosts = { diff --git a/nixos/dashboard.nix b/nixos/dashboard.nix index b3fb316aaeb5d19fe1686ff7ecc6f4891f6ec17c..3829f0d47321b4aceb7a8a3c3123c2f94544a850 100644 --- a/nixos/dashboard.nix +++ b/nixos/dashboard.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, runCommand, nodejs_24, pnpm_10, fetchPnpmDeps, pnpmConfigHook, sqlite, openssl, pkg-config, dockerTools, coreutils, callPackage, python3, yt-dlp, ffmpeg }: +{ stdenv, lib, rustPlatform, runCommand, nodejs_24, pnpm_11, fetchPnpmDeps, pnpmConfigHook, sqlite, openssl, pkg-config, dockerTools, coreutils, callPackage, python3, yt-dlp, ffmpeg }: let nativePkl = callPackage ./pkl.nix { }; youtubePython = python3.withPackages (packages: [ packages.pyyaml ]); @@ -15,7 +15,7 @@ let src = lib.fileset.toSource { root = ../.; fileset = lib.fileset.unions [ - ../dashboard/web ../dashboard/vendor ../dashboard/package.json ../dashboard/pnpm-lock.yaml + ../dashboard/web ../dashboard/vendor ../dashboard/package.json ../dashboard/pnpm-lock.yaml ../dashboard/pnpm-workspace.yaml ../dashboard/tsconfig.json ../dashboard/vite.config.ts ../dashboard/src/claude.svg ../dashboard/src/openai.svg ]; @@ -23,11 +23,11 @@ let sourceRoot = "source/dashboard"; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src sourceRoot; - pnpm = pnpm_10; + pnpm = pnpm_11; fetcherVersion = 3; - hash = "sha256-Jhk4mAOCqoljelFJfC7o+3t66x9GPFYb2e928jeaPSk="; + hash = "sha256-GLXA5XkcKIPZD2g2xBUejjpPJcupbNOL6YYujv1FB5A="; }; - nativeBuildInputs = [ nodejs_24 pnpm_10 pnpmConfigHook ]; + nativeBuildInputs = [ nodejs_24 pnpm_11 pnpmConfigHook ]; buildPhase = "pnpm run build"; installPhase = "cp -r dist $out"; }); diff --git a/nixos/tests/nomad-upgrade.nix b/nixos/tests/nomad-upgrade.nix new file mode 100644 index 0000000000000000000000000000000000000000..b66e46a4137d2da134ef25b0eccae56e3518010e --- /dev/null +++ b/nixos/tests/nomad-upgrade.nix @@ -0,0 +1,48 @@ +{ pkgs }: +pkgs.testers.runNixOSTest { + name = "nomad-upgrade"; + globalTimeout = 600; + nodes.machine = { lib, ... }: { + virtualisation.memorySize = 2048; + services.nomad = { + enable = true; + package = pkgs.nomad_1_11; + enableDocker = false; + dropPrivileges = false; + settings = { + bind_addr = "127.0.0.1"; + advertise = { http = "127.0.0.1"; rpc = "127.0.0.1"; serf = "127.0.0.1"; }; + server = { enabled = true; bootstrap_expect = 1; }; + client.enabled = true; + acl.enabled = true; + plugin.raw_exec.config.enabled = true; + }; + }; + specialisation.patched.configuration.services.nomad.package = lib.mkForce pkgs.nomad; + environment.systemPackages = [ pkgs.python3 ]; + }; + testScript = '' + import json + start_all() + machine.wait_for_unit("nomad.service") + machine.wait_until_succeeds("umask 077; nomad acl bootstrap -json > /run/bootstrap.json", timeout=60) + 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") + machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad var put nomad/jobs/fixture proof=synthetic") + 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}}]}]} + machine.succeed("cat > /run/fixture.json <<'EOF'\n" + json.dumps(job) + "\nEOF") + machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job run -json -detach /run/fixture.json") + 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) + allocation = machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job allocs -json fixture") + machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad operator snapshot save /run/before.snap") + machine.succeed("/run/current-system/specialisation/patched/bin/switch-to-configuration test") + machine.wait_for_unit("nomad.service") + machine.wait_until_succeeds("NOMAD_TOKEN=$(cat /run/nomad-token) nomad status", timeout=60) + assert machine.succeed("nomad version").splitlines()[0] == "Nomad v2.1.1" + 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'}\"") + after = machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad job allocs -json fixture") + assert {a['ID'] for a in json.loads(allocation)} == {a['ID'] for a in json.loads(after)} + assert all(a['ClientStatus'] == 'running' for a in json.loads(after)) + machine.succeed("NOMAD_TOKEN=$(cat /run/nomad-token) nomad operator snapshot save /run/after.snap") + print("Nomad upgrade preserved ACLs, variables, the running allocation, and snapshot access") + ''; +} diff --git a/service/cliproxy/service.pkl b/service/cliproxy/service.pkl index dd9f57abd7f5ab29cd391d48bf3bffce22ddb206..093abffc0e801396d71fb5460c8d291372664707 100644 --- a/service/cliproxy/service.pkl +++ b/service/cliproxy/service.pkl @@ -29,6 +29,7 @@ container { volumes { ["/data"] {} ["/snowglobe/start.sh"] { config = "start.sh" } + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } } env { ["HOME"] = "/data" diff --git a/service/ddns-updater/service.pkl b/service/ddns-updater/service.pkl index 66d40524c7ef822b580a341a7b9cf269ddf591e0..8f1a0e164487ec3152e21903ee3839a4362d59c0 100644 --- a/service/ddns-updater/service.pkl +++ b/service/ddns-updater/service.pkl @@ -33,7 +33,10 @@ container { authRole = "infra-admin" } - volumes { ["/updater/data"] {} } + volumes { + ["/updater/data"] {} + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } + } env { ["PERIOD"] = "5m" diff --git a/service/forward-auth/Dockerfile b/service/forward-auth/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..1c648020d857d4d427f46fd2d2ea09810911a656 --- /dev/null +++ b/service/forward-auth/Dockerfile @@ -0,0 +1,11 @@ +FROM docker.io/library/golang@sha256:d1f3216ef30257c850cc136ba42a359ccd9d3e75f19b2c276e520c0b4ef327ce AS build +WORKDIR /src +RUN wget -q -O /tmp/source.tar.gz https://github.com/oauth2-proxy/oauth2-proxy/archive/refs/tags/v7.15.5.tar.gz \ + && echo 'cf8055fecef1f89bcc89834d3342009b4067e80b1994e6bb5c2456d8ff68995b /tmp/source.tar.gz' | sha256sum -c - \ + && tar -xzf /tmp/source.tar.gz --strip-components=1 && rm /tmp/source.tar.gz +RUN CGO_ENABLED=0 go build -trimpath \ + -ldflags='-X github.com/oauth2-proxy/oauth2-proxy/v7/pkg/version.VERSION=7.15.5' \ + -o /oauth2-proxy github.com/oauth2-proxy/oauth2-proxy/v7 + +FROM quay.io/oauth2-proxy/oauth2-proxy@sha256:0d989b27d90d5e527fb2b045d864c4001c3104bdd763b3211b7e9ba2110380ea +COPY --from=build /oauth2-proxy /bin/oauth2-proxy diff --git a/service/forward-auth/service.pkl b/service/forward-auth/service.pkl index 6e4e43055d22c751674dd0a2fb4c87977f3b1791..8c8a69f4acdffd51c523e71572a529da65525be4 100644 --- a/service/forward-auth/service.pkl +++ b/service/forward-auth/service.pkl @@ -26,7 +26,7 @@ secrets { } container { - image = "quay.io/oauth2-proxy/oauth2-proxy@sha256:56e3daedf765c7a1eea6e366fbe684be7d3084830ade14b6174570d3c7960954" + build = "../forward-auth" cpu = 100 memory = 256 diff --git a/service/jellyfin/prepare.py b/service/jellyfin/prepare.py index bd7237ff1bd088f2e48f247a824802a19accb1cf..2c29910e21d59080096163be20f76ffd09734a68 100644 --- a/service/jellyfin/prepare.py +++ b/service/jellyfin/prepare.py @@ -2,6 +2,7 @@ import json import os from pathlib import Path +import shutil import subprocess import sys import xml.etree.ElementTree as ET @@ -20,18 +21,23 @@ variable = json.loads(subprocess.check_output( plugins = root / "plugins" plugins.mkdir(parents=True, exist_ok=True) os.chown(plugins, uid, uid) -plugin = plugins / "SSO Authentication_4.0.0.4" files = {"meta.json", "Duende.IdentityModel.dll", "SSO-Auth.dll", "Duende.IdentityModel.OidcClient.dll"} -if not all((plugin / name).is_file() for name in files): - with zipfile.ZipFile(Path(__file__).with_name("sso-authentication_4.0.0.4.zip")) as source: - if set(source.namelist()) != files: - raise ValueError("unexpected SSO plugin archive contents") +archive, = Path(__file__).parent.glob("sso-authentication_*.zip") +with zipfile.ZipFile(archive) as source: + if set(source.namelist()) != files: + raise ValueError("unexpected SSO plugin archive contents") + metadata = json.loads(source.read("meta.json")) + plugin = plugins / f"{metadata['name']}_{metadata['version']}" + if not all((plugin / name).is_file() for name in files): plugin.mkdir(exist_ok=True) os.chown(plugin, uid, uid) for name in files: path = plugin / name path.write_bytes(source.read(name)) os.chown(path, uid, uid) + for previous in plugins.glob(f"{metadata['name']}_*"): + if previous.is_dir() and previous != plugin: + shutil.rmtree(previous) configs = plugins / "configurations" configs.mkdir(parents=True, exist_ok=True) diff --git a/service/jellyfin/service.pkl b/service/jellyfin/service.pkl index 35887232132c6faf328fc3efb37210d081ee51f5..3de7ec048bb8d59619fa72470a1b1a3724d0383e 100644 --- a/service/jellyfin/service.pkl +++ b/service/jellyfin/service.pkl @@ -23,7 +23,7 @@ requirements { } container { - image = "docker.io/jellyfin/jellyfin@sha256:aefb67e6a7ff1debdd154a78a7bbb780fd0c873d8639210a7f6a2016ad2b35db" + image = "docker.io/jellyfin/jellyfin@sha256:7da5184caa38c553f219f6772476540081f392a68049e2b68c923f6daf877f8e" cpu = 500 memory = 3072 diff --git a/service/jellyfin/sso-authentication_4.0.0.4.zip b/service/jellyfin/sso-authentication_4.0.0.4.zip deleted file mode 100644 index f2996a08889fd8c1bf5457c2411ee54c323a148f..0000000000000000000000000000000000000000 Binary files a/service/jellyfin/sso-authentication_4.0.0.4.zip and /dev/null differ diff --git a/service/jellyfin/sso-authentication_5.0.0.0.zip b/service/jellyfin/sso-authentication_5.0.0.0.zip new file mode 100644 index 0000000000000000000000000000000000000000..a230276a33890e9a9ec739a4d8634a7251000f88 Binary files /dev/null and b/service/jellyfin/sso-authentication_5.0.0.0.zip differ diff --git a/service/jellyfin/update-plugin.py b/service/jellyfin/update-plugin.py index 5db95ba3410ebf1ec5ee497ee2ddebb5419ed08e..08e08a8d98986902667d947cfb816f4ae0a68bc6 100644 --- a/service/jellyfin/update-plugin.py +++ b/service/jellyfin/update-plugin.py @@ -4,10 +4,10 @@ from pathlib import Path import urllib.request -version = "4.0.0.4" -digest = "c09f16ba31059a434ddd7f811e4f9608d4b4c4514cc80a5bf1ca33bee61e1107" +version = "5.0.0.0" +digest = "61d29c16d8840900fad6ce0fb6a0e59abc6a350382390d293ec9bfbcdb84d840" name = f"sso-authentication_{version}.zip" -url = f"https://github.com/9p4/jellyfin-plugin-sso/releases/download/v{version}/{name}" +url = f"https://github.com/xdnewlun1/Jellyfin-OAuth-Plugin/releases/download/v{version}/{name}" with urllib.request.urlopen(url, timeout=30) as response: archive = response.read() if hashlib.sha256(archive).hexdigest() != digest: diff --git a/service/navidrome/service.pkl b/service/navidrome/service.pkl index 4705f192dd7b3e4ee1cbf4122c673918f3a77070..b94e1ba82810c50460f5e0da02c9ae52864dc3ad 100644 --- a/service/navidrome/service.pkl +++ b/service/navidrome/service.pkl @@ -42,6 +42,7 @@ containers { volumes { ["/data"] {} ["/socket"] {} + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } when (site.preview) { ["/music"] {} } when (!site.preview) { ["/music"] { src = "\(site.mediaRoot)/Music"; readOnly = true } } } diff --git a/service/pds/service.pkl b/service/pds/service.pkl index 7d17be5d7198c96c30d59c62b88542878473cdb9..31c3888863f5afb60a45e7bea947ce3892edbac2 100644 --- a/service/pds/service.pkl +++ b/service/pds/service.pkl @@ -41,6 +41,7 @@ container { volumes { ["/pds"] {} ["/snowglobe/start.sh"] { config = "start.sh" } + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } } env { @@ -61,7 +62,7 @@ container { ["PDS_RATE_LIMITS_ENABLED"] = "true" ["PDS_CONTACT_EMAIL_ADDRESS"] = site.ownerEmail ["LOG_ENABLED"] = "true" - ["NODE_OPTIONS"] = "--import=@atproto/pds/telemetry" + ["NODE_OPTIONS"] = "--use-openssl-ca --import=@atproto/pds/telemetry" ["OTEL_SERVICE_NAME"] = module.id ["OTEL_EXPORTER_OTLP_TRACES_PROTOCOL"] = "http/protobuf" ["OTEL_EXPORTER_OTLP_METRICS_PROTOCOL"] = "http/protobuf" diff --git a/service/tailscale/service.pkl b/service/tailscale/service.pkl index 42c7f3f660dabbccdf59a1d0a2649c805fabde52..e53f6dcfd501ce1e25cef1bd2e57aba783e7082b 100644 --- a/service/tailscale/service.pkl +++ b/service/tailscale/service.pkl @@ -5,7 +5,7 @@ import "../../config/site.pkl" as site name = "Tailscale" container { - image = "docker.io/tailscale/tailscale@sha256:2667499ed87ae29218f292556ba062918402dd5e92e93637af14867e4df12dd3" + image = "docker.io/tailscale/tailscale@sha256:519bf6f2c386992052216ea7e9391d5ace3a859d458f4f61bc8db8c58377eb7d" // The node joins the tailnet through its own network stack and TUN device. hostNetwork = true imageUser = true diff --git a/service/victoria/service.pkl b/service/victoria/service.pkl index 5a4ae3c9bbde47a418d5502182387648b69f6dfc..15d5a33672aafa3885a9fafa2a728c0fec83a6be 100644 --- a/service/victoria/service.pkl +++ b/service/victoria/service.pkl @@ -18,7 +18,10 @@ containers { metricsPath = "/metrics" } - volumes { ["/logs"] {} } + volumes { + ["/logs"] {} + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } + } } ["metrics"] { image = "docker.io/victoriametrics/victoria-metrics:v1.152.0" @@ -34,7 +37,10 @@ containers { metricsPath = "/metrics" } - volumes { ["/metrics"] {} } + volumes { + ["/metrics"] {} + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } + } } ["traces"] { image = "docker.io/victoriametrics/victoria-traces:v0.11.1" @@ -50,6 +56,9 @@ containers { metricsPath = "/metrics" } - volumes { ["/traces"] {} } + volumes { + ["/traces"] {} + ["/etc/ssl/certs/ca-certificates.crt"] { src = "/var/lib/snowglobe/ca-bundle.crt"; readOnly = true } + } } } diff --git a/tools/dashboard-package-test.py b/tools/dashboard-package-test.py index 4ea686cec6cad94aed61aec3d1563aebec6b55ce..c756120f51018a23ffc7127949de6ccb7d2bfeff 100644 --- a/tools/dashboard-package-test.py +++ b/tools/dashboard-package-test.py @@ -1,14 +1,11 @@ #!/usr/bin/env python3 import argparse -from http.client import HTTPConnection -from http.server import BaseHTTPRequestHandler, HTTPServer import json import os from pathlib import Path import subprocess import socket import tempfile -import threading import time import urllib.error import urllib.request @@ -36,7 +33,7 @@ def main(): token.write_text(proof) os.chown(token, 0, 65534) token.chmod(0o440) - season = data / "media/jellyfin/Indie Shows/Fixture/Season 1" + season = data / "media/Indie Shows/Fixture/Season 1" season.mkdir(parents=True) (season / "S01E01 - Fixture.mp4").write_bytes(b"fixture") (season / "S01E01 - Fixture.nfo").write_text("Packaged worker") @@ -100,75 +97,46 @@ print('refused') capture_output=True, text=True, timeout=10) assert unsecured.returncode != 0 and "Set SNOWGLOBE_PROXY_TOKEN_FILE" in unsecured.stderr, unsecured.stderr - class Auth(BaseHTTPRequestHandler): - def do_GET(self): - self.send_response(200 if self.headers.get("Cookie") == "fixture=1" else 401) - self.send_header("X-Auth-Request-Preferred-Username", "fixture") - self.send_header("X-Auth-Request-Groups", "role:media") - self.end_headers() - - def log_message(self, *args): - pass - - with HTTPServer(("127.0.0.1", 0), Auth) as auth: - threading.Thread(target=auth.serve_forever, daemon=True).start() - router.nomad = lambda path, _: { - "/v1/services": [{"Namespace": "default", "Services": [{"ServiceName": "forward-auth"}]}], - "/v1/service/forward-auth": [{"ServiceName": "forward-auth", "AllocID": "fixture", "Address": "127.0.0.1", "Port": auth.server_port, "Tags": []}], - "/v1/allocation/fixture/checks": {"ready": {"Status": "success"}}, - }[path] - os.environ.update(SNOWGLOBE_DOMAIN="snowglobe.test", SNOWGLOBE_DASHBOARD_PORT=port, SNOWGLOBE_PROXY_TOKEN_FILE=str(token)) - with socket.socket() as reservation: - reservation.bind(("127.0.0.1", 0)) - proxy_port = reservation.getsockname()[1] - config = Path(temporary) / "Caddyfile" - config.write_text("{\n admin off\n auto_https off\n}\n" + router.render("fixture").replace( - "globe.snowglobe.test {", "http://127.0.0.1:" + str(proxy_port) + " {" - ).replace(" tls internal\n", "")) - config.chmod(0o600) - log = Path(temporary) / "caddy.log" - caddy_binary = (Path("/proc") / shell("systemctl", "show", "-P", "MainPID", "caddy").strip() / "exe").resolve(strict=True) - with log.open("w") as output: - caddy = subprocess.Popen([str(caddy_binary), "run", "--config", str(config), "--adapter", "caddyfile"], - stdout=output, stderr=output, env={**os.environ, "XDG_DATA_HOME": temporary, "XDG_CONFIG_HOME": temporary}) - try: - deadline = time.monotonic() + 10 - while True: - try: - with socket.create_connection(("127.0.0.1", proxy_port), timeout=.2): - break - except OSError: - if time.monotonic() >= deadline or caddy.poll() is not None: - raise AssertionError(log.read_text().replace(proof, "")) - time.sleep(.1) - forged = {"User-Name": "snow", "User-Groups": "infra-admin", "Snowglobe-Proxy-Token": "0" * 64} - request = urllib.request.Request("http://127.0.0.1:" + str(proxy_port) + "/api/me", - headers={**forged, "Cookie": "fixture=1"}) - with urllib.request.urlopen(request, timeout=10) as response: - me = json.load(response) - assert me["name"] == "fixture" and "infra-admin" not in me["groups"], me - request.full_url = "http://127.0.0.1:" + str(proxy_port) + "/api/deploys" + router.nomad = lambda path, _: {"/v1/services": []}[path] + os.environ.update(SNOWGLOBE_DOMAIN="snowglobe.test", SNOWGLOBE_DASHBOARD_PORT=port, SNOWGLOBE_PROXY_TOKEN_FILE=str(token)) + os.environ.pop("SNOWGLOBE_INTERNAL_PORT", None) + dashboard_route = router.render("fixture").split("snowglobe.snowglobe.test {\n", 1)[1] + with socket.socket() as reservation: + reservation.bind(("127.0.0.1", 0)) + proxy_port = reservation.getsockname()[1] + config = Path(temporary) / "Caddyfile" + 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", "")) + config.chmod(0o600) + log = Path(temporary) / "caddy.log" + caddy_binary = (Path("/proc") / shell("systemctl", "show", "-P", "MainPID", "caddy").strip() / "exe").resolve(strict=True) + with log.open("w") as output: + caddy = subprocess.Popen([str(caddy_binary), "run", "--config", str(config), "--adapter", "caddyfile"], + stdout=output, stderr=output, env={**os.environ, "XDG_DATA_HOME": temporary, "XDG_CONFIG_HOME": temporary}) + try: + deadline = time.monotonic() + 10 + while True: + try: + with socket.create_connection(("127.0.0.1", proxy_port), timeout=.2): + break + except OSError: + if time.monotonic() >= deadline or caddy.poll() is not None: + raise AssertionError(log.read_text().replace(proof, "")) + time.sleep(.1) + forged = {"User-Name": "snow", "User-Groups": "infra-admin", "Snowglobe-Proxy-Token": "0" * 64} + for path in ("/api/me", "/api/deploys"): + request = urllib.request.Request("http://127.0.0.1:" + str(proxy_port) + path, headers=forged) try: urllib.request.urlopen(request, timeout=10) - raise AssertionError("forged admin role survived Caddy") + raise AssertionError("forged identity survived Caddy") except urllib.error.HTTPError as error: - assert error.code == 403, error.code - connection = HTTPConnection("127.0.0.1", proxy_port, timeout=10) - try: - connection.request("GET", "/api/me", headers=forged) - response = connection.getresponse() - assert response.status == 302 and response.getheader("Location").startswith("/snow.oauth2/sign_in?"), response.status - response.read() - finally: - connection.close() - finally: - caddy.terminate() - try: - caddy.wait(timeout=10) - except subprocess.TimeoutExpired: - caddy.kill() - caddy.wait() - auth.shutdown() + assert error.code == 401, (path, error.code) + finally: + caddy.terminate() + try: + caddy.wait(timeout=10) + except subprocess.TimeoutExpired: + caddy.kill() + caddy.wait() apps = json.loads(get("/api/launcher")) assert any(app["id"] == "shale" for app in apps), apps assert all(app["url"].endswith(".snowglobe.test") for app in apps), apps @@ -187,7 +155,7 @@ print('refused') assert subprocess.run(["podman", "exec", container, "test", "-e", denied], capture_output=True).returncode == 1, denied result = {"proxy_proof_required": "passed", "neighbor_identity_forgery_refused": "passed", "wildcard_startup_without_proof_refused": "passed", - "caddy_identity_scrubbing_and_proof_injection": "passed", "anonymous_forgery_redirected_to_signin": "passed", + "caddy_identity_scrubbing_and_proof_injection": "passed", "launcher_from_immutable_image": "passed", "service_icons": "passed", "unprivileged_youtube_library": "passed", "python_yaml": "passed", "ffmpeg_and_ytdlp": "passed", "host_release_and_control_paths_absent": "passed"} diff --git a/tools/snowglobe-build-test.py b/tools/snowglobe-build-test.py new file mode 100644 index 0000000000000000000000000000000000000000..2057a66b64ebc815fe4cfd6307b33170e52f9bdb --- /dev/null +++ b/tools/snowglobe-build-test.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python3 +from pathlib import Path +import tempfile +import unittest +from unittest.mock import patch + +import snowglobe + + +class BuildBoundary(unittest.TestCase): + def test_shared_context_stays_inside_the_service_tree(self): + with tempfile.TemporaryDirectory() as temporary: + root = Path(temporary).resolve() + consumer = root / "service/consumer" + shared = root / "service/shared" + consumer.mkdir(parents=True) + (consumer / "service.pkl").touch() + shared.mkdir() + (shared / "Dockerfile").touch() + (root / "Dockerfile").touch() + (consumer / "escape").symlink_to(root, target_is_directory=True) + with patch.object(snowglobe, "REPO", root), patch.object(snowglobe, "SERVICES", root / "service"): + self.assertEqual(snowglobe.build_context("consumer", "../shared"), shared) + for relative in ("../..", "escape", "."): + with self.subTest(relative=relative), self.assertRaises(ValueError): + snowglobe.build_context("consumer", relative) + with self.assertRaises(ValueError): + snowglobe.config_path("consumer", "../shared/Dockerfile") + + +if __name__ == "__main__": + unittest.main() diff --git a/tools/snowglobe.py b/tools/snowglobe.py index fdd3132fb74edadeed2492c5a70849d36d81dc6f..7d84ed0d4dd3a7b94d52b98194947faa661a93e0 100644 --- a/tools/snowglobe.py +++ b/tools/snowglobe.py @@ -133,9 +133,7 @@ def load(name, properties, instance_id=None): raise ValueError(f"{name}.{task_name} needs one image or build directory") if task.get("build"): if REPO.parent == Path("/opt/snowglobe/releases").resolve(): - context = config_path(name, task["build"]) - if not context.is_dir() or not (context / "Dockerfile").is_file(): - raise ValueError(f"invalid build context: {name}.{task_name}") + context = build_context(name, task["build"]) digest = hashlib.sha256() for path in sorted(context.rglob("*")): if path.is_file(): @@ -183,6 +181,13 @@ def config_path(service, relative): return source +def build_context(service, relative): + source = (service_dir(service) / relative).resolve() + if not source.is_relative_to((REPO / "service").resolve()) or not (source / "Dockerfile").is_file(): + raise ValueError(f"invalid build context: {relative}") + return source + + def config_assets(data): paths = set() for task in data["containers"].values(): @@ -643,7 +648,7 @@ def build_images(data): if task.get("build"): image = task["image"] if subprocess.run(["podman", "image", "exists", image]).returncode: - command("podman", "build", "-t", image, str(config_path(data["sourceId"], task["build"]))) + command("podman", "build", "-t", image, str(build_context(data["sourceId"], task["build"]))) def clone_dataset(source, snapshot, dataset, mount):