Skip to main content

max / makenotwork

Align SQLite stack: rusqlite 0.39 + sqlx 0.9 (pom/sando/bento/ops-core) Pin rusqlite and sqlx-sqlite to a shared libsqlite3-sys (0.37) so both can co-link in one binary, per synckit-client's SyncStore design (the engine owns a private rusqlite connection even inside sqlx apps). rusqlite 0.40 pulled libsqlite3-sys 0.38, which is disjoint from sqlx-sqlite 0.9's 0.37; walk synckit-client + wam back to rusqlite 0.39 (libsqlite3-sys ^0.37). sqlx 0.8.6 -> 0.9.0 in pom, sando, bento, ops-core. 0.9 gates dynamic SQL behind sqlx::AssertSqlSafe (query/query_as/raw_sql/execute now take a SqlSafeStr; &'static str is accepted, runtime strings are wrapped after an injection audit), and dropped the lifetime on the ArgumentBuffer/Arguments associated types (custom Encode impls updated). server and multithreaded (postgres + query! macros) are held: sqlx 0.9 changed the offline .sqlx cache format, so they need `cargo sqlx prepare` against the astra postgres before they build. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Author: Max Johnson <me@maxj.phd> · 2026-07-21 01:22 UTC
Commit: 1365b8f135582c1d429d734519b1b54bbfa7e418
Parent: 5050096
17 files changed, +480 insertions, -756 deletions
M bento/daemon/Cargo.lock +105 -182
@@ -128,7 +128,7 @@ dependencies = [
128 128 "serde_json",
129 129 "serde_path_to_error",
130 130 "serde_urlencoded",
131 - "sha1",
131 + "sha1 0.10.6",
132 132 "sync_wrapper",
133 133 "tokio",
134 134 "tokio-tungstenite",
@@ -175,12 +175,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
175 175 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
176 176
177 177 [[package]]
178 - name = "base64ct"
179 - version = "1.8.3"
180 - source = "registry+https://github.com/rust-lang/crates.io-index"
181 - checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
182 -
183 - [[package]]
184 178 name = "bento-daemon"
185 179 version = "0.1.0"
186 180 dependencies = [
@@ -227,6 +221,15 @@ dependencies = [
227 221 ]
228 222
229 223 [[package]]
224 + name = "block-buffer"
225 + version = "0.12.1"
226 + source = "registry+https://github.com/rust-lang/crates.io-index"
227 + checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
228 + dependencies = [
229 + "hybrid-array",
230 + ]
231 +
232 + [[package]]
230 233 name = "bumpalo"
231 234 version = "3.20.3"
232 235 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -269,6 +272,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
269 272 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
270 273
271 274 [[package]]
275 + name = "chacha20"
276 + version = "0.10.1"
277 + source = "registry+https://github.com/rust-lang/crates.io-index"
278 + checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
279 + dependencies = [
280 + "cfg-if",
281 + "cpufeatures 0.3.0",
282 + "rand_core 0.10.1",
283 + ]
284 +
285 + [[package]]
272 286 name = "chrono"
273 287 version = "0.4.45"
274 288 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -292,6 +306,12 @@ dependencies = [
292 306 ]
293 307
294 308 [[package]]
309 + name = "cmov"
310 + version = "0.5.4"
311 + source = "registry+https://github.com/rust-lang/crates.io-index"
312 + checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
313 +
314 + [[package]]
295 315 name = "combine"
296 316 version = "4.6.7"
297 317 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -311,12 +331,6 @@ dependencies = [
311 331 ]
312 332
313 333 [[package]]
314 - name = "const-oid"
315 - version = "0.9.6"
316 - source = "registry+https://github.com/rust-lang/crates.io-index"
317 - checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
318 -
319 - [[package]]
320 334 name = "const-random"
321 335 version = "0.1.18"
322 336 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -362,6 +376,15 @@ dependencies = [
362 376 ]
363 377
364 378 [[package]]
379 + name = "cpufeatures"
380 + version = "0.3.0"
381 + source = "registry+https://github.com/rust-lang/crates.io-index"
382 + checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
383 + dependencies = [
384 + "libc",
385 + ]
386 +
387 + [[package]]
365 388 name = "crc"
366 389 version = "3.4.0"
367 390 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -417,32 +440,48 @@ dependencies = [
417 440 ]
418 441
419 442 [[package]]
443 + name = "crypto-common"
444 + version = "0.2.2"
445 + source = "registry+https://github.com/rust-lang/crates.io-index"
446 + checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
447 + dependencies = [
448 + "hybrid-array",
449 + ]
450 +
451 + [[package]]
452 + name = "ctutils"
453 + version = "0.4.2"
454 + source = "registry+https://github.com/rust-lang/crates.io-index"
455 + checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
456 + dependencies = [
457 + "cmov",
458 + ]
459 +
460 + [[package]]
420 461 name = "data-encoding"
421 462 version = "2.11.0"
422 463 source = "registry+https://github.com/rust-lang/crates.io-index"
423 464 checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
424 465
425 466 [[package]]
426 - name = "der"
427 - version = "0.7.10"
467 + name = "digest"
468 + version = "0.10.7"
428 469 source = "registry+https://github.com/rust-lang/crates.io-index"
429 - checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
470 + checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
430 471 dependencies = [
431 - "const-oid",
432 - "pem-rfc7468",
433 - "zeroize",
472 + "block-buffer 0.10.4",
473 + "crypto-common 0.1.7",
434 474 ]
435 475
436 476 [[package]]
437 477 name = "digest"
438 - version = "0.10.7"
478 + version = "0.11.3"
439 479 source = "registry+https://github.com/rust-lang/crates.io-index"
440 - checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
480 + checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
441 481 dependencies = [
442 - "block-buffer",
443 - "const-oid",
444 - "crypto-common",
445 - "subtle",
482 + "block-buffer 0.12.1",
483 + "crypto-common 0.2.2",
484 + "ctutils",
446 485 ]
447 486
448 487 [[package]]
@@ -495,13 +534,12 @@ dependencies = [
495 534
496 535 [[package]]
497 536 name = "etcetera"
498 - version = "0.8.0"
537 + version = "0.11.0"
499 538 source = "registry+https://github.com/rust-lang/crates.io-index"
500 - checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
539 + checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
501 540 dependencies = [
502 541 "cfg-if",
503 - "home",
504 - "windows-sys 0.48.0",
542 + "windows-sys 0.61.2",
505 543 ]
506 544
507 545 [[package]]
@@ -540,9 +578,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
540 578
541 579 [[package]]
542 580 name = "flume"
543 - version = "0.11.1"
581 + version = "0.12.0"
544 582 source = "registry+https://github.com/rust-lang/crates.io-index"
545 - checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
583 + checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
546 584 dependencies = [
547 585 "futures-core",
548 586 "futures-sink",
@@ -720,6 +758,7 @@ dependencies = [
720 758 "cfg-if",
721 759 "libc",
722 760 "r-efi 6.0.0",
761 + "rand_core 0.10.1",
723 762 "wasip2",
724 763 "wasip3",
725 764 ]
@@ -742,8 +781,6 @@ version = "0.15.5"
742 781 source = "registry+https://github.com/rust-lang/crates.io-index"
743 782 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
744 783 dependencies = [
745 - "allocator-api2",
746 - "equivalent",
747 784 "foldhash 0.1.5",
748 785 ]
749 786
@@ -753,6 +790,8 @@ version = "0.16.1"
753 790 source = "registry+https://github.com/rust-lang/crates.io-index"
754 791 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
755 792 dependencies = [
793 + "allocator-api2",
794 + "equivalent",
756 795 "foldhash 0.2.0",
757 796 ]
758 797
@@ -764,11 +803,11 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
764 803
765 804 [[package]]
766 805 name = "hashlink"
767 - version = "0.10.0"
806 + version = "0.11.1"
768 807 source = "registry+https://github.com/rust-lang/crates.io-index"
769 - checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
808 + checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
770 809 dependencies = [
771 - "hashbrown 0.15.5",
810 + "hashbrown 0.16.1",
772 811 ]
773 812
774 813 [[package]]
@@ -785,29 +824,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
785 824
786 825 [[package]]
787 826 name = "hkdf"
788 - version = "0.12.4"
827 + version = "0.13.0"
789 828 source = "registry+https://github.com/rust-lang/crates.io-index"
790 - checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
829 + checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018"
791 830 dependencies = [
792 831 "hmac",
793 832 ]
794 833
795 834 [[package]]
796 835 name = "hmac"
797 - version = "0.12.1"
836 + version = "0.13.0"
798 837 source = "registry+https://github.com/rust-lang/crates.io-index"
799 - checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
838 + checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
800 839 dependencies = [
801 - "digest",
802 - ]
803 -
804 - [[package]]
805 - name = "home"
806 - version = "0.5.12"
807 - source = "registry+https://github.com/rust-lang/crates.io-index"
808 - checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
809 - dependencies = [
810 - "windows-sys 0.61.2",
840 + "digest 0.11.3",
811 841 ]
812 842
813 843 [[package]]
@@ -856,6 +886,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
856 886 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
857 887
858 888 [[package]]
889 + name = "hybrid-array"
890 + version = "0.4.13"
891 + source = "registry+https://github.com/rust-lang/crates.io-index"
892 + checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
893 + dependencies = [
894 + "typenum",
895 + ]
896 +
897 + [[package]]
859 898 name = "hyper"
860 899 version = "1.10.1"
861 900 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1147,9 +1186,6 @@ name = "lazy_static"
1147 1186 version = "1.5.0"
1148 1187 source = "registry+https://github.com/rust-lang/crates.io-index"
1149 1188 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
1150 - dependencies = [
1151 - "spin 0.9.8",
1152 - ]
1153 1189
1154 1190 [[package]]
1155 1191 name = "leb128fmt"
@@ -1175,24 +1211,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1175 1211 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
1176 1212
1177 1213 [[package]]
1178 - name = "libm"
1179 - version = "0.2.16"
1180 - source = "registry+https://github.com/rust-lang/crates.io-index"
1181 - checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
1182 -
1183 - [[package]]
1184 - name = "libredox"
1185 - version = "0.1.17"
1186 - source = "registry+https://github.com/rust-lang/crates.io-index"
1187 - checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
1188 - dependencies = [
1189 - "bitflags",
1190 - "libc",
1191 - "plain",
1192 - "redox_syscall 0.8.1",
1193 - ]
1194 -
1195 - [[package]]
1196 1214 name = "libsqlite3-sys"
1197 1215 version = "0.30.1"
1198 1216 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1266,12 +1284,12 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
1266 1284
1267 1285 [[package]]
1268 1286 name = "md-5"
1269 - version = "0.10.6"
1287 + version = "0.11.0"
1270 1288 source = "registry+https://github.com/rust-lang/crates.io-index"
1271 - checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
1289 + checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
1272 1290 dependencies = [
1273 1291 "cfg-if",
1274 - "digest",
1292 + "digest 0.11.3",
1275 1293 ]
1276 1294
1277 1295 [[package]]
@@ -1358,49 +1376,12 @@ dependencies = [
1358 1376 ]
1359 1377
1360 1378 [[package]]
1361 - name = "num-bigint-dig"
1362 - version = "0.8.6"
1363 - source = "registry+https://github.com/rust-lang/crates.io-index"
1364 - checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
1365 - dependencies = [
1366 - "lazy_static",
1367 - "libm",
1368 - "num-integer",
1369 - "num-iter",
1370 - "num-traits",
1371 - "rand 0.8.6",
1372 - "smallvec",
1373 - "zeroize",
1374 - ]
1375 -
1376 - [[package]]
1377 - name = "num-integer"
1378 - version = "0.1.46"
1379 - source = "registry+https://github.com/rust-lang/crates.io-index"
1380 - checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
1381 - dependencies = [
1382 - "num-traits",
1383 - ]
1384 -
1385 - [[package]]
1386 - name = "num-iter"
1387 - version = "0.1.45"
1388 - source = "registry+https://github.com/rust-lang/crates.io-index"
1389 - checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
1390 - dependencies = [
1391 - "autocfg",
1392 - "num-integer",
1393 - "num-traits",
1394 - ]
1395 -
1396 - [[package]]
1397 1379 name = "num-traits"
1398 1380 version = "0.2.19"
1399 1381 source = "registry+https://github.com/rust-lang/crates.io-index"
1400 1382 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
1401 1383 dependencies = [
1402 1384 "autocfg",
1403 - "libm",
1404 1385 ]
1405 1386
1406 1387 [[package]]
@@ -1472,21 +1453,12 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
1472 1453 dependencies = [
1473 1454 "cfg-if",
1474 1455 "libc",
1475 - "redox_syscall 0.5.18",
1456 + "redox_syscall",
1476 1457 "smallvec",
1477 1458 "windows-link",
1478 1459 ]
1479 1460
1480 1461 [[package]]
1481 - name = "pem-rfc7468"
1482 - version = "0.7.0"
1483 - source = "registry+https://github.com/rust-lang/crates.io-index"
1484 - checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
1485 - dependencies = [
1486 - "base64ct",
1487 - ]
1488 -
1489 - [[package]]
1490 1462 name = "percent-encoding"
1491 1463 version = "2.3.2"
1492 1464 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1499,39 +1471,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1499 1471 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
1500 1472
1501 1473 [[package]]
1502 - name = "pkcs1"
1503 - version = "0.7.5"
1504 - source = "registry+https://github.com/rust-lang/crates.io-index"
1505 - checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
1506 - dependencies = [
1507 - "der",
1508 - "pkcs8",
1509 - "spki",
1510 - ]
1511 -
1512 - [[package]]
1513 - name = "pkcs8"
1514 - version = "0.10.2"
1515 - source = "registry+https://github.com/rust-lang/crates.io-index"
1516 - checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
1517 - dependencies = [
1518 - "der",
1519 - "spki",
1520 - ]
1521 -
1522 - [[package]]
1523 1474 name = "pkg-config"
1524 1475 version = "0.3.33"
1525 1476 source = "registry+https://github.com/rust-lang/crates.io-index"
1526 1477 checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
1527 1478
1528 1479 [[package]]
1529 - name = "plain"
1530 - version = "0.2.3"
1531 - source = "registry+https://github.com/rust-lang/crates.io-index"
1532 - checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
1533 -
1534 - [[package]]
1535 1480 name = "portable-atomic"
1536 1481 version = "1.13.1"
1537 1482 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1668,33 +1613,23 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
1668 1613
1669 1614 [[package]]
1670 1615 name = "rand"
1671 - version = "0.8.6"
1672 - source = "registry+https://github.com/rust-lang/crates.io-index"
1673 - checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
1674 - dependencies = [
1675 - "libc",
1676 - "rand_chacha 0.3.1",
1677 - "rand_core 0.6.4",
1678 - ]
1679 -
1680 - [[package]]
1681 - name = "rand"
1682 1616 version = "0.9.4"
1683 1617 source = "registry+https://github.com/rust-lang/crates.io-index"
1684 1618 checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
1685 1619 dependencies = [
1686 - "rand_chacha 0.9.0",
1620 + "rand_chacha",
1687 1621 "rand_core 0.9.5",
1688 1622 ]
1689 1623
1690 1624 [[package]]
1691 - name = "rand_chacha"
1692 - version = "0.3.1"
1625 + name = "rand"
1626 + version = "0.10.2"
1693 1627 source = "registry+https://github.com/rust-lang/crates.io-index"
1694 - checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
1628 + checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
1695 1629 dependencies = [
1696 - "ppv-lite86",
1697 - "rand_core 0.6.4",
1630 + "chacha20",
1631 + "getrandom 0.4.2",
1632 + "rand_core 0.10.1",
1698 1633 ]
1699 1634
1700 1635 [[package]]
@@ -1709,21 +1644,18 @@ dependencies = [
1709 1644
1710 1645 [[package]]
1711 1646 name = "rand_core"
1712 - version = "0.6.4"
1647 + version = "0.9.5"
1713 1648 source = "registry+https://github.com/rust-lang/crates.io-index"
1714 - checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
1649 + checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
1715 1650 dependencies = [
1716 - "getrandom 0.2.17",
1651 + "getrandom 0.3.4",
1717 1652 ]
1718 1653
1719 1654 [[package]]
1720 1655 name = "rand_core"
1721 - version = "0.9.5"
1656 + version = "0.10.1"
1722 1657 source = "registry+https://github.com/rust-lang/crates.io-index"
1723 - checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
1724 - dependencies = [
1725 - "getrandom 0.3.4",
1726 - ]
1658 + checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
1727 1659
1728 1660 [[package]]
1729 1661 name = "rand_xoshiro"
@@ -1762,15 +1694,6 @@ dependencies = [
1762 1694 ]
1763 1695
1764 1696 [[package]]
1765 - name = "redox_syscall"
1766 - version = "0.8.1"
1767 - source = "registry+https://github.com/rust-lang/crates.io-index"
1768 - checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
1769 - dependencies = [
1770 - "bitflags",
1771 - ]
1772 -
1773 - [[package]]
Lines truncated
M bento/daemon/Cargo.toml +1 -1
@@ -17,7 +17,7 @@ tokio-stream = "0.1"
17 17 serde = { version = "1.0.228", features = ["derive"] }
18 18 serde_json = "1"
19 19 toml = "1.1"
20 - sqlx = { version = "0.8.6", features = ["runtime-tokio", "sqlite", "chrono", "migrate"] }
20 + sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "chrono", "migrate"] }
21 21 rhai = { version = "1.20", features = ["sync"] }
22 22 tracing = "0.1.44"
23 23 tracing-subscriber = { version = "0.3.22", features = ["env-filter", "json"] }
M pom/Cargo.lock +115 -162
@@ -266,12 +266,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
266 266 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
267 267
268 268 [[package]]
269 - name = "base64ct"
270 - version = "1.8.3"
271 - source = "registry+https://github.com/rust-lang/crates.io-index"
272 - checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
273 -
274 - [[package]]
275 269 name = "bitflags"
276 270 version = "2.11.0"
277 271 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -290,6 +284,15 @@ dependencies = [
290 284 ]
291 285
292 286 [[package]]
287 + name = "block-buffer"
288 + version = "0.12.1"
289 + source = "registry+https://github.com/rust-lang/crates.io-index"
290 + checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
291 + dependencies = [
292 + "hybrid-array",
293 + ]
294 +
295 + [[package]]
293 296 name = "bumpalo"
294 297 version = "3.20.2"
295 298 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -332,6 +335,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
332 335 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
333 336
334 337 [[package]]
338 + name = "chacha20"
339 + version = "0.10.1"
340 + source = "registry+https://github.com/rust-lang/crates.io-index"
341 + checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
342 + dependencies = [
343 + "cfg-if",
344 + "cpufeatures 0.3.0",
345 + "rand_core 0.10.1",
346 + ]
347 +
348 + [[package]]
335 349 name = "chrono"
336 350 version = "0.4.44"
337 351 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -395,6 +409,12 @@ dependencies = [
395 409 ]
396 410
397 411 [[package]]
412 + name = "cmov"
413 + version = "0.5.4"
414 + source = "registry+https://github.com/rust-lang/crates.io-index"
415 + checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
416 +
417 + [[package]]
398 418 name = "colorchoice"
399 419 version = "1.0.4"
400 420 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -420,12 +440,6 @@ dependencies = [
420 440 ]
421 441
422 442 [[package]]
423 - name = "const-oid"
424 - version = "0.9.6"
425 - source = "registry+https://github.com/rust-lang/crates.io-index"
426 - checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
427 -
428 - [[package]]
429 443 name = "core-foundation"
430 444 version = "0.10.1"
431 445 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -451,6 +465,15 @@ dependencies = [
451 465 ]
452 466
453 467 [[package]]
468 + name = "cpufeatures"
469 + version = "0.3.0"
470 + source = "registry+https://github.com/rust-lang/crates.io-index"
471 + checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
472 + dependencies = [
473 + "libc",
474 + ]
475 +
476 + [[package]]
454 477 name = "crc"
455 478 version = "3.4.0"
456 479 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -515,23 +538,30 @@ dependencies = [
515 538 ]
516 539
517 540 [[package]]
518 - name = "data-encoding"
519 - version = "2.10.0"
541 + name = "crypto-common"
542 + version = "0.2.2"
520 543 source = "registry+https://github.com/rust-lang/crates.io-index"
521 - checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
544 + checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
545 + dependencies = [
546 + "hybrid-array",
547 + ]
522 548
523 549 [[package]]
524 - name = "der"
525 - version = "0.7.10"
550 + name = "ctutils"
551 + version = "0.4.2"
526 552 source = "registry+https://github.com/rust-lang/crates.io-index"
527 - checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
553 + checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
528 554 dependencies = [
529 - "const-oid",
530 - "pem-rfc7468",
531 - "zeroize",
555 + "cmov",
532 556 ]
533 557
534 558 [[package]]
559 + name = "data-encoding"
560 + version = "2.10.0"
561 + source = "registry+https://github.com/rust-lang/crates.io-index"
562 + checksum = "d7a1e2f27636f116493b8b860f5546edb47c8d8f8ea73e1d2a20be88e28d1fea"
563 +
564 + [[package]]
535 565 name = "der-parser"
536 566 version = "9.0.0"
537 567 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -574,10 +604,19 @@ version = "0.10.7"
574 604 source = "registry+https://github.com/rust-lang/crates.io-index"
575 605 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
576 606 dependencies = [
577 - "block-buffer",
578 - "const-oid",
579 - "crypto-common",
580 - "subtle",
607 + "block-buffer 0.10.4",
608 + "crypto-common 0.1.7",
609 + ]
610 +
611 + [[package]]
612 + name = "digest"
613 + version = "0.11.3"
614 + source = "registry+https://github.com/rust-lang/crates.io-index"
615 + checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
616 + dependencies = [
617 + "block-buffer 0.12.1",
618 + "crypto-common 0.2.2",
619 + "ctutils",
581 620 ]
582 621
583 622 [[package]]
@@ -669,13 +708,12 @@ dependencies = [
669 708
670 709 [[package]]
671 710 name = "etcetera"
672 - version = "0.8.0"
711 + version = "0.11.0"
673 712 source = "registry+https://github.com/rust-lang/crates.io-index"
674 - checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
713 + checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
675 714 dependencies = [
676 715 "cfg-if",
677 - "home",
678 - "windows-sys 0.48.0",
716 + "windows-sys 0.61.2",
679 717 ]
680 718
681 719 [[package]]
@@ -697,9 +735,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
697 735
698 736 [[package]]
699 737 name = "flume"
700 - version = "0.11.1"
738 + version = "0.12.0"
701 739 source = "registry+https://github.com/rust-lang/crates.io-index"
702 - checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
740 + checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
703 741 dependencies = [
704 742 "futures-core",
705 743 "futures-sink",
@@ -713,6 +751,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
713 751 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
714 752
715 753 [[package]]
754 + name = "foldhash"
755 + version = "0.2.0"
756 + source = "registry+https://github.com/rust-lang/crates.io-index"
757 + checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
758 +
759 + [[package]]
716 760 name = "form_urlencoded"
717 761 version = "1.2.2"
718 762 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -872,6 +916,7 @@ dependencies = [
872 916 "cfg-if",
873 917 "libc",
874 918 "r-efi 6.0.0",
919 + "rand_core 0.10.1",
875 920 "wasip2",
876 921 "wasip3",
877 922 ]
@@ -882,9 +927,7 @@ version = "0.15.5"
882 927 source = "registry+https://github.com/rust-lang/crates.io-index"
883 928 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
884 929 dependencies = [
885 - "allocator-api2",
886 - "equivalent",
887 - "foldhash",
930 + "foldhash 0.1.5",
888 931 ]
889 932
890 933 [[package]]
@@ -892,14 +935,19 @@ name = "hashbrown"
892 935 version = "0.16.1"
893 936 source = "registry+https://github.com/rust-lang/crates.io-index"
894 937 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
938 + dependencies = [
939 + "allocator-api2",
940 + "equivalent",
941 + "foldhash 0.2.0",
942 + ]
895 943
896 944 [[package]]
897 945 name = "hashlink"
898 - version = "0.10.0"
946 + version = "0.11.1"
899 947 source = "registry+https://github.com/rust-lang/crates.io-index"
900 - checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
948 + checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
901 949 dependencies = [
902 - "hashbrown 0.15.5",
950 + "hashbrown 0.16.1",
903 951 ]
904 952
905 953 [[package]]
@@ -962,29 +1010,20 @@ dependencies = [
962 1010
963 1011 [[package]]
964 1012 name = "hkdf"
965 - version = "0.12.4"
1013 + version = "0.13.0"
966 1014 source = "registry+https://github.com/rust-lang/crates.io-index"
967 - checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
1015 + checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018"
968 1016 dependencies = [
969 1017 "hmac",
970 1018 ]
971 1019
972 1020 [[package]]
973 1021 name = "hmac"
974 - version = "0.12.1"
1022 + version = "0.13.0"
975 1023 source = "registry+https://github.com/rust-lang/crates.io-index"
976 - checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
1024 + checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
977 1025 dependencies = [
978 - "digest",
979 - ]
980 -
981 - [[package]]
982 - name = "home"
983 - version = "0.5.12"
984 - source = "registry+https://github.com/rust-lang/crates.io-index"
985 - checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
986 - dependencies = [
987 - "windows-sys 0.61.2",
1026 + "digest 0.11.3",
988 1027 ]
989 1028
990 1029 [[package]]
@@ -1044,6 +1083,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1044 1083 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
1045 1084
1046 1085 [[package]]
1086 + name = "hybrid-array"
1087 + version = "0.4.13"
1088 + source = "registry+https://github.com/rust-lang/crates.io-index"
1089 + checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
1090 + dependencies = [
1091 + "typenum",
1092 + ]
1093 +
1094 + [[package]]
1047 1095 name = "hyper"
1048 1096 version = "1.8.1"
1049 1097 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1362,9 +1410,6 @@ name = "lazy_static"
1362 1410 version = "1.5.0"
1363 1411 source = "registry+https://github.com/rust-lang/crates.io-index"
1364 1412 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
1365 - dependencies = [
1366 - "spin",
1367 - ]
1368 1413
1369 1414 [[package]]
1370 1415 name = "leb128fmt"
@@ -1379,21 +1424,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1379 1424 checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
1380 1425
1381 1426 [[package]]
1382 - name = "libm"
1383 - version = "0.2.16"
1384 - source = "registry+https://github.com/rust-lang/crates.io-index"
1385 - checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
1386 -
1387 - [[package]]
1388 1427 name = "libredox"
1389 1428 version = "0.1.14"
1390 1429 source = "registry+https://github.com/rust-lang/crates.io-index"
1391 1430 checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a"
1392 1431 dependencies = [
1393 - "bitflags",
1394 1432 "libc",
1395 - "plain",
1396 - "redox_syscall 0.7.3",
1397 1433 ]
1398 1434
1399 1435 [[package]]
@@ -1451,12 +1487,12 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
1451 1487
1452 1488 [[package]]
1453 1489 name = "md-5"
1454 - version = "0.10.6"
1490 + version = "0.11.0"
1455 1491 source = "registry+https://github.com/rust-lang/crates.io-index"
1456 - checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
1492 + checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
1457 1493 dependencies = [
1458 1494 "cfg-if",
1459 - "digest",
1495 + "digest 0.11.3",
1460 1496 ]
1461 1497
1462 1498 [[package]]
@@ -1535,22 +1571,6 @@ dependencies = [
1535 1571 ]
1536 1572
1537 1573 [[package]]
1538 - name = "num-bigint-dig"
1539 - version = "0.8.6"
1540 - source = "registry+https://github.com/rust-lang/crates.io-index"
1541 - checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
1542 - dependencies = [
1543 - "lazy_static",
1544 - "libm",
1545 - "num-integer",
1546 - "num-iter",
1547 - "num-traits",
1548 - "rand 0.8.5",
1549 - "smallvec",
1550 - "zeroize",
1551 - ]
1552 -
1553 - [[package]]
1554 1574 name = "num-conv"
1555 1575 version = "0.2.0"
1556 1576 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1566,24 +1586,12 @@ dependencies = [
1566 1586 ]
1567 1587
1568 1588 [[package]]
1569 - name = "num-iter"
1570 - version = "0.1.45"
1571 - source = "registry+https://github.com/rust-lang/crates.io-index"
1572 - checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
1573 - dependencies = [
1574 - "autocfg",
1575 - "num-integer",
1576 - "num-traits",
1577 - ]
1578 -
1579 - [[package]]
1580 1589 name = "num-traits"
1581 1590 version = "0.2.19"
1582 1591 source = "registry+https://github.com/rust-lang/crates.io-index"
1583 1592 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
1584 1593 dependencies = [
1585 1594 "autocfg",
1586 - "libm",
1587 1595 ]
1588 1596
1589 1597 [[package]]
@@ -1656,7 +1664,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
1656 1664 dependencies = [
1657 1665 "cfg-if",
1658 1666 "libc",
1659 - "redox_syscall 0.5.18",
1667 + "redox_syscall",
1660 1668 "smallvec",
1661 1669 "windows-link",
1662 1670 ]
@@ -1678,15 +1686,6 @@ dependencies = [
1678 1686 ]
1679 1687
1680 1688 [[package]]
1681 - name = "pem-rfc7468"
1682 - version = "0.7.0"
1683 - source = "registry+https://github.com/rust-lang/crates.io-index"
1684 - checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
1685 - dependencies = [
1686 - "base64ct",
1687 - ]
1688 -
1689 - [[package]]
1690 1689 name = "percent-encoding"
1691 1690 version = "2.3.2"
1692 1691 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1705,39 +1704,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1705 1704 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
1706 1705
1707 1706 [[package]]
1708 - name = "pkcs1"
1709 - version = "0.7.5"
1710 - source = "registry+https://github.com/rust-lang/crates.io-index"
1711 - checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
1712 - dependencies = [
1713 - "der",
1714 - "pkcs8",
1715 - "spki",
1716 - ]
1717 -
1718 - [[package]]
1719 - name = "pkcs8"
1720 - version = "0.10.2"
1721 - source = "registry+https://github.com/rust-lang/crates.io-index"
1722 - checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
1723 - dependencies = [
1724 - "der",
1725 - "spki",
1726 - ]
1727 -
1728 - [[package]]
1729 1707 name = "pkg-config"
1730 1708 version = "0.3.32"
1731 1709 source = "registry+https://github.com/rust-lang/crates.io-index"
1732 1710 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
1733 1711
1734 1712 [[package]]
1735 - name = "plain"
1736 - version = "0.2.3"
1737 - source = "registry+https://github.com/rust-lang/crates.io-index"
1738 - checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
1739 -
1740 - [[package]]
1741 1713 name = "pom"
1742 1714 version = "0.3.5"
1743 1715 dependencies = [
@@ -1898,33 +1870,23 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
1898 1870
1899 1871 [[package]]
1900 1872 name = "rand"
1901 - version = "0.8.5"
1902 - source = "registry+https://github.com/rust-lang/crates.io-index"
1903 - checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
1904 - dependencies = [
1905 - "libc",
1906 - "rand_chacha 0.3.1",
1907 - "rand_core 0.6.4",
1908 - ]
1909 -
1910 - [[package]]
1911 - name = "rand"
1912 1873 version = "0.9.2"
1913 1874 source = "registry+https://github.com/rust-lang/crates.io-index"
1914 1875 checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
1915 1876 dependencies = [
1916 - "rand_chacha 0.9.0",
1877 + "rand_chacha",
1917 1878 "rand_core 0.9.5",
1918 1879 ]
1919 1880
1920 1881 [[package]]
1921 - name = "rand_chacha"
1922 - version = "0.3.1"
1882 + name = "rand"
1883 + version = "0.10.2"
1923 1884 source = "registry+https://github.com/rust-lang/crates.io-index"
1924 - checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
1885 + checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
1925 1886 dependencies = [
1926 - "ppv-lite86",
1927 - "rand_core 0.6.4",
1887 + "chacha20",
1888 + "getrandom 0.4.2",
1889 + "rand_core 0.10.1",
1928 1890 ]
1929 1891
1930 1892 [[package]]
@@ -1939,21 +1901,18 @@ dependencies = [
1939 1901
1940 1902 [[package]]
1941 1903 name = "rand_core"
1942 - version = "0.6.4"
1904 + version = "0.9.5"
1943 1905 source = "registry+https://github.com/rust-lang/crates.io-index"
1944 - checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
1906 + checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
1945 1907 dependencies = [
1946 - "getrandom 0.2.17",
1908 + "getrandom 0.3.4",
1947 1909 ]
1948 1910
1949 1911 [[package]]
1950 1912 name = "rand_core"
1951 - version = "0.9.5"
1913 + version = "0.10.1"
1952 1914 source = "registry+https://github.com/rust-lang/crates.io-index"
1953 - checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
1954 - dependencies = [
1955 - "getrandom 0.3.4",
1956 - ]
1915 + checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
1957 1916
1958 1917 [[package]]
1959 1918 name = "rcgen"
@@ -1979,15 +1938,6 @@ dependencies = [
1979 1938 ]
1980 1939
1981 1940 [[package]]
1982 - name = "redox_syscall"
1983 - version = "0.7.3"
1984 - source = "registry+https://github.com/rust-lang/crates.io-index"
1985 - checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16"
1986 - dependencies = [
1987 - "bitflags",
Lines truncated
M pom/Cargo.toml +1 -1
@@ -29,7 +29,7 @@ reqwest = { version = "0.13", default-features = false, features = ["json", "rus
29 29 axum = { version = "0.8", default-features = false, features = ["json", "tokio", "http1", "query"] }
30 30
31 31 # Database
32 - sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
32 + sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite"] }
33 33
34 34 # Serialization
35 35 serde = { version = "1", features = ["derive"] }
M pom/src/db/dns.rs +1 -1
@@ -85,7 +85,7 @@ pub async fn prune_stale_dns(
85 85 "DELETE FROM dns_checks WHERE target = ? AND NOT ({})",
86 86 conditions.join(" OR ")
87 87 );
88 - let mut query = sqlx::query(&sql).bind(target);
88 + let mut query = sqlx::query(sqlx::AssertSqlSafe(sql)).bind(target);
89 89 for (name, record_type) in expected_dns {
90 90 query = query.bind(name).bind(record_type);
91 91 }
M pom/src/db/migrations.rs +1 -1
@@ -296,7 +296,7 @@ async fn run_one_migration(
296 296 // literal (fuzz-2026-07-06 migration split trap); today's migrations have
297 297 // none, but this makes the first such migration safe rather than a startup
298 298 // failure.
299 - sqlx::raw_sql(sql).execute(&mut *tx).await?;
299 + sqlx::raw_sql(sqlx::AssertSqlSafe(sql)).execute(&mut *tx).await?;
300 300
301 301 // Record the version inside the same transaction
302 302 let now = chrono::Utc::now().to_rfc3339();
M pom/src/db/routes.rs +1 -1
@@ -76,7 +76,7 @@ pub async fn prune_stale_routes(
76 76 "DELETE FROM route_checks WHERE target = ? AND path NOT IN ({})",
77 77 placeholders.join(", ")
78 78 );
79 - let mut query = sqlx::query(&sql).bind(target);
79 + let mut query = sqlx::query(sqlx::AssertSqlSafe(sql)).bind(target);
80 80 for route in expected_routes {
81 81 query = query.bind(route);
82 82 }
M sando/Cargo.lock +120 -177
@@ -114,7 +114,7 @@ dependencies = [
114 114 "serde_json",
115 115 "serde_path_to_error",
116 116 "serde_urlencoded",
117 - "sha1",
117 + "sha1 0.10.6",
118 118 "sync_wrapper",
119 119 "tokio",
120 120 "tokio-tungstenite 0.29.0",
@@ -161,12 +161,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
161 161 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
162 162
163 163 [[package]]
164 - name = "base64ct"
165 - version = "1.8.3"
166 - source = "registry+https://github.com/rust-lang/crates.io-index"
167 - checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
168 -
169 - [[package]]
170 164 name = "bitflags"
171 165 version = "2.13.0"
172 166 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -185,6 +179,15 @@ dependencies = [
185 179 ]
186 180
187 181 [[package]]
182 + name = "block-buffer"
183 + version = "0.12.1"
184 + source = "registry+https://github.com/rust-lang/crates.io-index"
185 + checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
186 + dependencies = [
187 + "hybrid-array",
188 + ]
189 +
190 + [[package]]
188 191 name = "bumpalo"
189 192 version = "3.20.3"
190 193 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -242,6 +245,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
242 245 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
243 246
244 247 [[package]]
248 + name = "chacha20"
249 + version = "0.10.1"
250 + source = "registry+https://github.com/rust-lang/crates.io-index"
251 + checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
252 + dependencies = [
253 + "cfg-if",
254 + "cpufeatures 0.3.0",
255 + "rand_core 0.10.1",
256 + ]
257 +
258 + [[package]]
245 259 name = "chrono"
246 260 version = "0.4.45"
247 261 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -265,6 +279,12 @@ dependencies = [
265 279 ]
266 280
267 281 [[package]]
282 + name = "cmov"
283 + version = "0.5.4"
284 + source = "registry+https://github.com/rust-lang/crates.io-index"
285 + checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
286 +
287 + [[package]]
268 288 name = "combine"
269 289 version = "4.6.7"
270 290 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -298,12 +318,6 @@ dependencies = [
298 318 ]
299 319
300 320 [[package]]
301 - name = "const-oid"
302 - version = "0.9.6"
303 - source = "registry+https://github.com/rust-lang/crates.io-index"
304 - checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
305 -
306 - [[package]]
307 321 name = "core-foundation"
308 322 version = "0.10.1"
309 323 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -329,6 +343,15 @@ dependencies = [
329 343 ]
330 344
331 345 [[package]]
346 + name = "cpufeatures"
347 + version = "0.3.0"
348 + source = "registry+https://github.com/rust-lang/crates.io-index"
349 + checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
350 + dependencies = [
351 + "libc",
352 + ]
353 +
354 + [[package]]
332 355 name = "crc"
333 356 version = "3.4.0"
334 357 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -403,6 +426,24 @@ dependencies = [
403 426 ]
404 427
405 428 [[package]]
429 + name = "crypto-common"
430 + version = "0.2.2"
431 + source = "registry+https://github.com/rust-lang/crates.io-index"
432 + checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
433 + dependencies = [
434 + "hybrid-array",
435 + ]
436 +
437 + [[package]]
438 + name = "ctutils"
439 + version = "0.4.2"
440 + source = "registry+https://github.com/rust-lang/crates.io-index"
441 + checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
442 + dependencies = [
443 + "cmov",
444 + ]
445 +
446 + [[package]]
406 447 name = "darling"
407 448 version = "0.23.0"
408 449 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -443,26 +484,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
443 484 checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
444 485
445 486 [[package]]
446 - name = "der"
447 - version = "0.7.10"
487 + name = "digest"
488 + version = "0.10.7"
448 489 source = "registry+https://github.com/rust-lang/crates.io-index"
449 - checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
490 + checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
450 491 dependencies = [
451 - "const-oid",
452 - "pem-rfc7468",
453 - "zeroize",
492 + "block-buffer 0.10.4",
493 + "crypto-common 0.1.7",
454 494 ]
455 495
456 496 [[package]]
457 497 name = "digest"
458 - version = "0.10.7"
498 + version = "0.11.3"
459 499 source = "registry+https://github.com/rust-lang/crates.io-index"
460 - checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
500 + checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
461 501 dependencies = [
462 - "block-buffer",
463 - "const-oid",
464 - "crypto-common",
465 - "subtle",
502 + "block-buffer 0.12.1",
503 + "crypto-common 0.2.2",
504 + "ctutils",
466 505 ]
467 506
468 507 [[package]]
@@ -515,13 +554,12 @@ dependencies = [
515 554
516 555 [[package]]
517 556 name = "etcetera"
518 - version = "0.8.0"
557 + version = "0.11.0"
519 558 source = "registry+https://github.com/rust-lang/crates.io-index"
520 - checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
559 + checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
521 560 dependencies = [
522 561 "cfg-if",
523 - "home",
524 - "windows-sys 0.48.0",
562 + "windows-sys 0.61.2",
525 563 ]
526 564
527 565 [[package]]
@@ -560,9 +598,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
560 598
561 599 [[package]]
562 600 name = "flume"
563 - version = "0.11.1"
601 + version = "0.12.0"
564 602 source = "registry+https://github.com/rust-lang/crates.io-index"
565 - checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
603 + checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
566 604 dependencies = [
567 605 "futures-core",
568 606 "futures-sink",
@@ -728,6 +766,7 @@ dependencies = [
728 766 "cfg-if",
729 767 "libc",
730 768 "r-efi 6.0.0",
769 + "rand_core 0.10.1",
731 770 ]
732 771
733 772 [[package]]
@@ -759,6 +798,8 @@ version = "0.16.1"
759 798 source = "registry+https://github.com/rust-lang/crates.io-index"
760 799 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
761 800 dependencies = [
801 + "allocator-api2",
802 + "equivalent",
762 803 "foldhash 0.2.0",
763 804 ]
764 805
@@ -770,11 +811,11 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
770 811
771 812 [[package]]
772 813 name = "hashlink"
773 - version = "0.10.0"
814 + version = "0.11.1"
774 815 source = "registry+https://github.com/rust-lang/crates.io-index"
775 - checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
816 + checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
776 817 dependencies = [
777 - "hashbrown 0.15.5",
818 + "hashbrown 0.16.1",
778 819 ]
779 820
780 821 [[package]]
@@ -791,29 +832,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
791 832
792 833 [[package]]
793 834 name = "hkdf"
794 - version = "0.12.4"
835 + version = "0.13.0"
795 836 source = "registry+https://github.com/rust-lang/crates.io-index"
796 - checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
837 + checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018"
797 838 dependencies = [
798 839 "hmac",
799 840 ]
800 841
801 842 [[package]]
802 843 name = "hmac"
803 - version = "0.12.1"
804 - source = "registry+https://github.com/rust-lang/crates.io-index"
805 - checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
806 - dependencies = [
807 - "digest",
808 - ]
809 -
810 - [[package]]
811 - name = "home"
812 - version = "0.5.12"
844 + version = "0.13.0"
813 845 source = "registry+https://github.com/rust-lang/crates.io-index"
814 - checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
846 + checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
815 847 dependencies = [
816 - "windows-sys 0.61.2",
848 + "digest 0.11.3",
817 849 ]
818 850
819 851 [[package]]
@@ -862,6 +894,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
862 894 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
863 895
864 896 [[package]]
897 + name = "hybrid-array"
898 + version = "0.4.13"
899 + source = "registry+https://github.com/rust-lang/crates.io-index"
900 + checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
901 + dependencies = [
902 + "typenum",
903 + ]
904 +
905 + [[package]]
865 906 name = "hyper"
866 907 version = "1.10.1"
867 908 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1181,9 +1222,6 @@ name = "lazy_static"
1181 1222 version = "1.5.0"
1182 1223 source = "registry+https://github.com/rust-lang/crates.io-index"
1183 1224 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
1184 - dependencies = [
1185 - "spin",
1186 - ]
1187 1225
1188 1226 [[package]]
1189 1227 name = "left-right"
@@ -1203,24 +1241,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1203 1241 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
1204 1242
1205 1243 [[package]]
1206 - name = "libm"
1207 - version = "0.2.16"
1208 - source = "registry+https://github.com/rust-lang/crates.io-index"
1209 - checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
1210 -
1211 - [[package]]
1212 - name = "libredox"
1213 - version = "0.1.17"
1214 - source = "registry+https://github.com/rust-lang/crates.io-index"
1215 - checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
1216 - dependencies = [
1217 - "bitflags",
1218 - "libc",
1219 - "plain",
1220 - "redox_syscall 0.8.1",
1221 - ]
1222 -
1223 - [[package]]
1224 1244 name = "libsqlite3-sys"
1225 1245 version = "0.30.1"
1226 1246 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1309,12 +1329,12 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
1309 1329
1310 1330 [[package]]
1311 1331 name = "md-5"
1312 - version = "0.10.6"
1332 + version = "0.11.0"
1313 1333 source = "registry+https://github.com/rust-lang/crates.io-index"
1314 - checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
1334 + checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
1315 1335 dependencies = [
1316 1336 "cfg-if",
1317 - "digest",
1337 + "digest 0.11.3",
1318 1338 ]
1319 1339
1320 1340 [[package]]
@@ -1393,49 +1413,12 @@ dependencies = [
1393 1413 ]
1394 1414
1395 1415 [[package]]
1396 - name = "num-bigint-dig"
1397 - version = "0.8.6"
1398 - source = "registry+https://github.com/rust-lang/crates.io-index"
1399 - checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
1400 - dependencies = [
1401 - "lazy_static",
1402 - "libm",
1403 - "num-integer",
1404 - "num-iter",
1405 - "num-traits",
1406 - "rand 0.8.6",
1407 - "smallvec",
1408 - "zeroize",
1409 - ]
1410 -
1411 - [[package]]
1412 - name = "num-integer"
1413 - version = "0.1.46"
1414 - source = "registry+https://github.com/rust-lang/crates.io-index"
1415 - checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
1416 - dependencies = [
1417 - "num-traits",
1418 - ]
1419 -
1420 - [[package]]
1421 - name = "num-iter"
1422 - version = "0.1.45"
1423 - source = "registry+https://github.com/rust-lang/crates.io-index"
1424 - checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
1425 - dependencies = [
1426 - "autocfg",
1427 - "num-integer",
1428 - "num-traits",
1429 - ]
1430 -
1431 - [[package]]
1432 1416 name = "num-traits"
1433 1417 version = "0.2.19"
1434 1418 source = "registry+https://github.com/rust-lang/crates.io-index"
1435 1419 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
1436 1420 dependencies = [
1437 1421 "autocfg",
1438 - "libm",
1439 1422 ]
1440 1423
1441 1424 [[package]]
@@ -1501,7 +1484,7 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
1501 1484 dependencies = [
1502 1485 "cfg-if",
1503 1486 "libc",
1504 - "redox_syscall 0.5.18",
1487 + "redox_syscall",
1505 1488 "smallvec",
1506 1489 "windows-link",
1507 1490 ]
@@ -1513,15 +1496,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1513 1496 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
1514 1497
1515 1498 [[package]]
1516 - name = "pem-rfc7468"
1517 - version = "0.7.0"
1518 - source = "registry+https://github.com/rust-lang/crates.io-index"
1519 - checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
1520 - dependencies = [
1521 - "base64ct",
1522 - ]
1523 -
1524 - [[package]]
1525 1499 name = "percent-encoding"
1526 1500 version = "2.3.2"
1527 1501 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1534,39 +1508,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1534 1508 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
1535 1509
1536 1510 [[package]]
1537 - name = "pkcs1"
1538 - version = "0.7.5"
1539 - source = "registry+https://github.com/rust-lang/crates.io-index"
1540 - checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
1541 - dependencies = [
1542 - "der",
1543 - "pkcs8",
1544 - "spki",
1545 - ]
1546 -
1547 - [[package]]
1548 - name = "pkcs8"
1549 - version = "0.10.2"
1550 - source = "registry+https://github.com/rust-lang/crates.io-index"
1551 - checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
1552 - dependencies = [
1553 - "der",
1554 - "spki",
1555 - ]
1556 -
1557 - [[package]]
1558 1511 name = "pkg-config"
1559 1512 version = "0.3.33"
1560 1513 source = "registry+https://github.com/rust-lang/crates.io-index"
1561 1514 checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
1562 1515
1563 1516 [[package]]
1564 - name = "plain"
1565 - version = "0.2.3"
1566 - source = "registry+https://github.com/rust-lang/crates.io-index"
1567 - checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
1568 -
1569 - [[package]]
1570 1517 name = "portable-atomic"
1571 1518 version = "1.13.1"
1572 1519 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1713,6 +1660,17 @@ dependencies = [
1713 1660 ]
1714 1661
1715 1662 [[package]]
1663 + name = "rand"
1664 + version = "0.10.2"
1665 + source = "registry+https://github.com/rust-lang/crates.io-index"
1666 + checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
1667 + dependencies = [
1668 + "chacha20",
1669 + "getrandom 0.4.3",
1670 + "rand_core 0.10.1",
1671 + ]
1672 +
1673 + [[package]]
1716 1674 name = "rand_chacha"
1717 1675 version = "0.3.1"
1718 1676 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1751,6 +1709,12 @@ dependencies = [
1751 1709 ]
1752 1710
1753 1711 [[package]]
1712 + name = "rand_core"
1713 + version = "0.10.1"
1714 + source = "registry+https://github.com/rust-lang/crates.io-index"
1715 + checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
1716 +
1717 + [[package]]
1754 1718 name = "rand_xoshiro"
1755 1719 version = "0.7.0"
1756 1720 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1808,15 +1772,6 @@ dependencies = [
1808 1772 ]
1809 1773
1810 1774 [[package]]
1811 - name = "redox_syscall"
1812 - version = "0.8.1"
1813 - source = "registry+https://github.com/rust-lang/crates.io-index"
1814 - checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
1815 - dependencies = [
1816 - "bitflags",
1817 - ]
1818 -
1819 - [[package]]
1820 1775 name = "regex-automata"
1821 1776 version = "0.4.14"
1822 1777 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1885,26 +1840,6 @@ dependencies = [
1885 1840 ]
1886 1841
1887 1842 [[package]]
1888 - name = "rsa"
1889 - version = "0.9.10"
1890 - source = "registry+https://github.com/rust-lang/crates.io-index"
1891 - checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d"
1892 - dependencies = [
1893 - "const-oid",
1894 - "digest",
1895 - "num-bigint-dig",
1896 - "num-integer",
1897 - "num-traits",
1898 - "pkcs1",
1899 - "pkcs8",
1900 - "rand_core 0.6.4",
1901 - "signature",
1902 - "spki",
1903 - "subtle",
1904 - "zeroize",
1905 - ]
1906 -
1907 - [[package]]
1908 1843 name = "rustc-hash"
1909 1844 version = "2.1.2"
1910 1845 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2221,8 +2156,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
2221 2156 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
2222 2157 dependencies = [
2223 2158 "cfg-if",
2224 - "cpufeatures",
2225 - "digest",
2159 + "cpufeatures 0.2.17",
2160 + "digest 0.10.7",
2161 + ]
2162 +
2163 + [[package]]
2164 + name = "sha1"
2165 + version = "0.11.0"
2166 + source = "registry+https://github.com/rust-lang/crates.io-index"
2167 + checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214"
2168 + dependencies = [
Lines truncated
M sando/daemon/Cargo.toml +1 -1
@@ -17,7 +17,7 @@ async-trait = "0.1.83"
17 17 serde = { version = "1.0.228", features = ["derive"] }
18 18 serde_json = "1"
19 19 toml = "1.1"
20 - sqlx = { version = "0.8.6", features = ["runtime-tokio", "sqlite", "postgres", "chrono", "migrate"] }
20 + sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite", "postgres", "chrono", "migrate"] }
21 21 tracing = "0.1.44"
22 22 tracing-subscriber = { version = "0.3.22", features = ["env-filter", "json"] }
23 23 metrics = "0.24"
M sando/daemon/src/domain.rs +3 -3
@@ -139,7 +139,7 @@ impl sqlx::Type<Sqlite> for Version {
139 139 impl<'q> sqlx::Encode<'q, Sqlite> for Version {
140 140 fn encode_by_ref(
141 141 &self,
142 - buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
142 + buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
143 143 ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
144 144 <String as sqlx::Encode<Sqlite>>::encode(self.0.to_string(), buf)
145 145 }
@@ -209,7 +209,7 @@ impl sqlx::Type<Sqlite> for GitSha {
209 209 impl<'q> sqlx::Encode<'q, Sqlite> for GitSha {
210 210 fn encode_by_ref(
211 211 &self,
212 - buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
212 + buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
213 213 ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
214 214 <String as sqlx::Encode<Sqlite>>::encode(self.0.clone(), buf)
215 215 }
@@ -301,7 +301,7 @@ impl sqlx::Type<Sqlite> for GateKind {
301 301 impl<'q> sqlx::Encode<'q, Sqlite> for GateKind {
302 302 fn encode_by_ref(
303 303 &self,
304 - buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
304 + buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
305 305 ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
306 306 <String as sqlx::Encode<Sqlite>>::encode(self.as_str().to_owned(), buf)
307 307 }
M sando/daemon/src/gates.rs +7 -7
@@ -401,7 +401,7 @@ pub(crate) async fn reset_scratch(db_url: &str, owner_role: &str) -> Result<()>
401 401 END $$;
402 402 "#
403 403 );
404 - pool.execute(sql.as_str()).await?;
404 + pool.execute(sqlx::raw_sql(sqlx::AssertSqlSafe(sql))).await?;
405 405 pool.close().await;
406 406 Ok(())
407 407 }
@@ -494,7 +494,7 @@ async fn clean_stale_test_dbs(db_url: &str) {
494 494 for (name,) in names {
495 495 // `name` comes straight from pg_database; quoting it is sufficient.
496 496 if let Err(e) = pool
497 - .execute(format!("DROP DATABASE IF EXISTS \"{name}\" WITH (FORCE)").as_str())
497 + .execute(sqlx::raw_sql(sqlx::AssertSqlSafe(format!("DROP DATABASE IF EXISTS \"{name}\" WITH (FORCE)"))))
498 498 .await
499 499 {
500 500 tracing::warn!(error = %e, db = %name, "stale test-db cleanup: drop failed");
@@ -921,8 +921,8 @@ async fn pg_create_db(maintenance_url: &str, dbname: &str) -> Result<()> {
921 921 use sqlx::postgres::PgPoolOptions;
922 922 use sqlx::Executor;
923 923 let pool = PgPoolOptions::new().max_connections(1).connect(maintenance_url).await?;
924 - pool.execute(format!("DROP DATABASE IF EXISTS \"{dbname}\" WITH (FORCE)").as_str()).await?;
925 - pool.execute(format!("CREATE DATABASE \"{dbname}\"").as_str()).await?;
924 + pool.execute(sqlx::raw_sql(sqlx::AssertSqlSafe(format!("DROP DATABASE IF EXISTS \"{dbname}\" WITH (FORCE)")))).await?;
925 + pool.execute(sqlx::raw_sql(sqlx::AssertSqlSafe(format!("CREATE DATABASE \"{dbname}\"")))).await?;
926 926 pool.close().await;
927 927 Ok(())
928 928 }
@@ -933,7 +933,7 @@ async fn pg_drop_db(maintenance_url: &str, dbname: &str) -> Result<()> {
933 933 use sqlx::postgres::PgPoolOptions;
934 934 use sqlx::Executor;
935 935 let pool = PgPoolOptions::new().max_connections(1).connect(maintenance_url).await?;
936 - pool.execute(format!("DROP DATABASE IF EXISTS \"{dbname}\" WITH (FORCE)").as_str()).await?;
936 + pool.execute(sqlx::raw_sql(sqlx::AssertSqlSafe(format!("DROP DATABASE IF EXISTS \"{dbname}\" WITH (FORCE)")))).await?;
937 937 pool.close().await;
938 938 Ok(())
939 939 }
@@ -1523,7 +1523,7 @@ mod tests {
1523 1523 );
1524 1524
1525 1525 let pool = PgPoolOptions::new().max_connections(1).connect(&url).await.unwrap();
1526 - pool.execute(drop_role.as_str()).await.unwrap();
1526 + pool.execute(sqlx::raw_sql(sqlx::AssertSqlSafe(drop_role))).await.unwrap();
1527 1527 pool.close().await;
1528 1528
1529 1529 reset_scratch(&url, role).await.expect("reset_scratch creates the owner role");
@@ -1555,7 +1555,7 @@ mod tests {
1555 1555 reset_scratch(&url, role).await.expect("reset_scratch is idempotent");
1556 1556
1557 1557 let pool = PgPoolOptions::new().max_connections(1).connect(&url).await.unwrap();
1558 - pool.execute(drop_role.as_str()).await.unwrap();
1558 + pool.execute(sqlx::raw_sql(sqlx::AssertSqlSafe(drop_role))).await.unwrap();
1559 1559 pool.close().await;
1560 1560 }
1561 1561
M shared/ops-core/Cargo.lock +107 -190
@@ -56,12 +56,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
56 56 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
57 57
58 58 [[package]]
59 - name = "base64ct"
60 - version = "1.8.3"
61 - source = "registry+https://github.com/rust-lang/crates.io-index"
62 - checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
63 -
64 - [[package]]
65 59 name = "bitflags"
66 60 version = "2.13.0"
67 61 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -80,6 +74,15 @@ dependencies = [
80 74 ]
81 75
82 76 [[package]]
77 + name = "block-buffer"
78 + version = "0.12.1"
79 + source = "registry+https://github.com/rust-lang/crates.io-index"
80 + checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
81 + dependencies = [
82 + "hybrid-array",
83 + ]
84 +
85 + [[package]]
83 86 name = "bumpalo"
84 87 version = "3.20.3"
85 88 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -114,6 +117,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
114 117 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
115 118
116 119 [[package]]
120 + name = "chacha20"
121 + version = "0.10.1"
122 + source = "registry+https://github.com/rust-lang/crates.io-index"
123 + checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
124 + dependencies = [
125 + "cfg-if",
126 + "cpufeatures 0.3.0",
127 + "rand_core",
128 + ]
129 +
130 + [[package]]
117 131 name = "chrono"
118 132 version = "0.4.45"
119 133 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -128,6 +142,12 @@ dependencies = [
128 142 ]
129 143
130 144 [[package]]
145 + name = "cmov"
146 + version = "0.5.4"
147 + source = "registry+https://github.com/rust-lang/crates.io-index"
148 + checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a"
149 +
150 + [[package]]
131 151 name = "concurrent-queue"
132 152 version = "2.5.0"
133 153 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -137,12 +157,6 @@ dependencies = [
137 157 ]
138 158
139 159 [[package]]
140 - name = "const-oid"
141 - version = "0.9.6"
142 - source = "registry+https://github.com/rust-lang/crates.io-index"
143 - checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
144 -
145 - [[package]]
146 160 name = "core-foundation-sys"
147 161 version = "0.8.7"
148 162 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -158,6 +172,15 @@ dependencies = [
158 172 ]
159 173
160 174 [[package]]
175 + name = "cpufeatures"
176 + version = "0.3.0"
177 + source = "registry+https://github.com/rust-lang/crates.io-index"
178 + checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
179 + dependencies = [
180 + "libc",
181 + ]
182 +
183 + [[package]]
161 184 name = "crc"
162 185 version = "3.4.0"
163 186 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -198,14 +221,21 @@ dependencies = [
198 221 ]
199 222
200 223 [[package]]
201 - name = "der"
202 - version = "0.7.10"
224 + name = "crypto-common"
225 + version = "0.2.2"
226 + source = "registry+https://github.com/rust-lang/crates.io-index"
227 + checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453"
228 + dependencies = [
229 + "hybrid-array",
230 + ]
231 +
232 + [[package]]
233 + name = "ctutils"
234 + version = "0.4.2"
203 235 source = "registry+https://github.com/rust-lang/crates.io-index"
204 - checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
236 + checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e"
205 237 dependencies = [
206 - "const-oid",
207 - "pem-rfc7468",
208 - "zeroize",
238 + "cmov",
209 239 ]
210 240
211 241 [[package]]
@@ -214,10 +244,19 @@ version = "0.10.7"
214 244 source = "registry+https://github.com/rust-lang/crates.io-index"
215 245 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
216 246 dependencies = [
217 - "block-buffer",
218 - "const-oid",
219 - "crypto-common",
220 - "subtle",
247 + "block-buffer 0.10.4",
248 + "crypto-common 0.1.7",
249 + ]
250 +
251 + [[package]]
252 + name = "digest"
253 + version = "0.11.3"
254 + source = "registry+https://github.com/rust-lang/crates.io-index"
255 + checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
256 + dependencies = [
257 + "block-buffer 0.12.1",
258 + "crypto-common 0.2.2",
259 + "ctutils",
221 260 ]
222 261
223 262 [[package]]
@@ -259,18 +298,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
259 298 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
260 299 dependencies = [
261 300 "libc",
262 - "windows-sys 0.61.2",
301 + "windows-sys",
263 302 ]
264 303
265 304 [[package]]
266 305 name = "etcetera"
267 - version = "0.8.0"
306 + version = "0.11.0"
268 307 source = "registry+https://github.com/rust-lang/crates.io-index"
269 - checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
308 + checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
270 309 dependencies = [
271 310 "cfg-if",
272 - "home",
273 - "windows-sys 0.48.0",
311 + "windows-sys",
274 312 ]
275 313
276 314 [[package]]
@@ -298,9 +336,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
298 336
299 337 [[package]]
300 338 name = "flume"
301 - version = "0.11.1"
339 + version = "0.12.0"
302 340 source = "registry+https://github.com/rust-lang/crates.io-index"
303 - checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
341 + checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be"
304 342 dependencies = [
305 343 "futures-core",
306 344 "futures-sink",
@@ -314,6 +352,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
314 352 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
315 353
316 354 [[package]]
355 + name = "foldhash"
356 + version = "0.2.0"
357 + source = "registry+https://github.com/rust-lang/crates.io-index"
358 + checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
359 +
360 + [[package]]
317 361 name = "form_urlencoded"
318 362 version = "1.2.2"
319 363 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -405,17 +449,6 @@ dependencies = [
405 449
406 450 [[package]]
407 451 name = "getrandom"
408 - version = "0.2.17"
409 - source = "registry+https://github.com/rust-lang/crates.io-index"
410 - checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
411 - dependencies = [
412 - "cfg-if",
413 - "libc",
414 - "wasi",
415 - ]
416 -
417 - [[package]]
418 - name = "getrandom"
419 452 version = "0.4.2"
420 453 source = "registry+https://github.com/rust-lang/crates.io-index"
421 454 checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
@@ -423,6 +456,7 @@ dependencies = [
423 456 "cfg-if",
424 457 "libc",
425 458 "r-efi",
459 + "rand_core",
426 460 "wasip2",
427 461 "wasip3",
428 462 ]
@@ -439,9 +473,18 @@ version = "0.15.5"
439 473 source = "registry+https://github.com/rust-lang/crates.io-index"
440 474 checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
441 475 dependencies = [
476 + "foldhash 0.1.5",
477 + ]
478 +
479 + [[package]]
480 + name = "hashbrown"
481 + version = "0.16.1"
482 + source = "registry+https://github.com/rust-lang/crates.io-index"
483 + checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
484 + dependencies = [
442 485 "allocator-api2",
443 486 "equivalent",
444 - "foldhash",
487 + "foldhash 0.2.0",
445 488 ]
446 489
447 490 [[package]]
@@ -452,11 +495,11 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
452 495
453 496 [[package]]
454 497 name = "hashlink"
455 - version = "0.10.0"
498 + version = "0.11.1"
456 499 source = "registry+https://github.com/rust-lang/crates.io-index"
457 - checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
500 + checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
458 501 dependencies = [
459 - "hashbrown 0.15.5",
502 + "hashbrown 0.16.1",
460 503 ]
461 504
462 505 [[package]]
@@ -473,29 +516,29 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
473 516
474 517 [[package]]
475 518 name = "hkdf"
476 - version = "0.12.4"
519 + version = "0.13.0"
477 520 source = "registry+https://github.com/rust-lang/crates.io-index"
478 - checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
521 + checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018"
479 522 dependencies = [
480 523 "hmac",
481 524 ]
482 525
483 526 [[package]]
484 527 name = "hmac"
485 - version = "0.12.1"
528 + version = "0.13.0"
486 529 source = "registry+https://github.com/rust-lang/crates.io-index"
487 - checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
530 + checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f"
488 531 dependencies = [
489 - "digest",
532 + "digest 0.11.3",
490 533 ]
491 534
492 535 [[package]]
493 - name = "home"
494 - version = "0.5.12"
536 + name = "hybrid-array"
537 + version = "0.4.13"
495 538 source = "registry+https://github.com/rust-lang/crates.io-index"
496 - checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
539 + checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c"
497 540 dependencies = [
498 - "windows-sys 0.61.2",
541 + "typenum",
499 542 ]
500 543
501 544 [[package]]
@@ -662,15 +705,6 @@ dependencies = [
662 705 ]
663 706
664 707 [[package]]
665 - name = "lazy_static"
666 - version = "1.5.0"
667 - source = "registry+https://github.com/rust-lang/crates.io-index"
668 - checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
669 - dependencies = [
670 - "spin",
671 - ]
672 -
673 - [[package]]
674 708 name = "leb128fmt"
675 709 version = "0.1.0"
676 710 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -683,24 +717,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
683 717 checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
684 718
685 719 [[package]]
686 - name = "libm"
687 - version = "0.2.16"
688 - source = "registry+https://github.com/rust-lang/crates.io-index"
689 - checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
690 -
691 - [[package]]
692 - name = "libredox"
693 - version = "0.1.17"
694 - source = "registry+https://github.com/rust-lang/crates.io-index"
695 - checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
696 - dependencies = [
697 - "bitflags",
698 - "libc",
699 - "plain",
700 - "redox_syscall 0.8.1",
701 - ]
702 -
703 - [[package]]
704 720 name = "libsqlite3-sys"
705 721 version = "0.30.1"
706 722 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -740,12 +756,12 @@ checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
740 756
741 757 [[package]]
742 758 name = "md-5"
743 - version = "0.10.6"
759 + version = "0.11.0"
744 760 source = "registry+https://github.com/rust-lang/crates.io-index"
745 - checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
761 + checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98"
746 762 dependencies = [
747 763 "cfg-if",
748 - "digest",
764 + "digest 0.11.3",
749 765 ]
750 766
751 767 [[package]]
@@ -762,43 +778,7 @@ checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
762 778 dependencies = [
763 779 "libc",
764 780 "wasi",
765 - "windows-sys 0.61.2",
766 - ]
767 -
768 - [[package]]
769 - name = "num-bigint-dig"
770 - version = "0.8.6"
771 - source = "registry+https://github.com/rust-lang/crates.io-index"
772 - checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7"
773 - dependencies = [
774 - "lazy_static",
775 - "libm",
776 - "num-integer",
777 - "num-iter",
778 - "num-traits",
779 - "rand",
780 - "smallvec",
781 - "zeroize",
782 - ]
783 -
784 - [[package]]
785 - name = "num-integer"
786 - version = "0.1.46"
787 - source = "registry+https://github.com/rust-lang/crates.io-index"
788 - checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
789 - dependencies = [
790 - "num-traits",
791 - ]
792 -
793 - [[package]]
794 - name = "num-iter"
795 - version = "0.1.45"
796 - source = "registry+https://github.com/rust-lang/crates.io-index"
797 - checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
798 - dependencies = [
799 - "autocfg",
800 - "num-integer",
801 - "num-traits",
781 + "windows-sys",
802 782 ]
803 783
804 784 [[package]]
@@ -808,7 +788,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
808 788 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
809 789 dependencies = [
810 790 "autocfg",
811 - "libm",
812 791 ]
813 792
814 793 [[package]]
@@ -870,21 +849,12 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
870 849 dependencies = [
871 850 "cfg-if",
872 851 "libc",
873 - "redox_syscall 0.5.18",
852 + "redox_syscall",
874 853 "smallvec",
875 854 "windows-link",
876 855 ]
877 856
878 857 [[package]]
879 - name = "pem-rfc7468"
880 - version = "0.7.0"
881 - source = "registry+https://github.com/rust-lang/crates.io-index"
882 - checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
883 - dependencies = [
884 - "base64ct",
885 - ]
886 -
887 - [[package]]
888 858 name = "percent-encoding"
889 859 version = "2.3.2"
890 860 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -897,39 +867,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
897 867 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
898 868
899 869 [[package]]
900 - name = "pkcs1"
901 - version = "0.7.5"
902 - source = "registry+https://github.com/rust-lang/crates.io-index"
903 - checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
904 - dependencies = [
905 - "der",
906 - "pkcs8",
907 - "spki",
908 - ]
909 -
910 - [[package]]
911 - name = "pkcs8"
912 - version = "0.10.2"
913 - source = "registry+https://github.com/rust-lang/crates.io-index"
914 - checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
915 - dependencies = [
916 - "der",
917 - "spki",
918 - ]
919 -
920 - [[package]]
921 870 name = "pkg-config"
922 871 version = "0.3.33"
923 872 source = "registry+https://github.com/rust-lang/crates.io-index"
924 873 checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
925 874
926 875 [[package]]
927 - name = "plain"
928 - version = "0.2.3"
929 - source = "registry+https://github.com/rust-lang/crates.io-index"
930 - checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
931 -
932 - [[package]]
933 876 name = "potential_utf"
934 877 version = "0.1.5"
935 878 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -939,15 +882,6 @@ dependencies = [
939 882 ]
940 883
941 884 [[package]]
942 - name = "ppv-lite86"
943 - version = "0.2.21"
944 - source = "registry+https://github.com/rust-lang/crates.io-index"
945 - checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
946 - dependencies = [
947 - "zerocopy",
948 - ]
949 -
950 - [[package]]
951 885 name = "prettyplease"
952 886 version = "0.2.37"
953 887 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -983,33 +917,20 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
983 917
984 918 [[package]]
985 919 name = "rand"
986 - version = "0.8.6"
987 - source = "registry+https://github.com/rust-lang/crates.io-index"
988 - checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
989 - dependencies = [
990 - "libc",
991 - "rand_chacha",
992 - "rand_core",
993 - ]
994 -
995 - [[package]]
996 - name = "rand_chacha"
997 - version = "0.3.1"
920 + version = "0.10.2"
998 921 source = "registry+https://github.com/rust-lang/crates.io-index"
999 - checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
922 + checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
1000 923 dependencies = [
1001 - "ppv-lite86",
924 + "chacha20",
925 + "getrandom",
1002 926 "rand_core",
1003 927 ]
1004 928
1005 929 [[package]]
1006 930 name = "rand_core"
1007 - version = "0.6.4"
931 + version = "0.10.1"
1008 932 source = "registry+https://github.com/rust-lang/crates.io-index"
1009 - checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
1010 - dependencies = [
1011 - "getrandom 0.2.17",
1012 - ]
933 + checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
1013 934
1014 935 [[package]]
1015 936 name = "redox_syscall"
@@ -1021,35 +942,6 @@ dependencies = [
1021 942 ]
1022 943
1023 944 [[package]]
1024 - name = "redox_syscall"
1025 - version = "0.8.1"
1026 - source = "registry+https://github.com/rust-lang/crates.io-index"
1027 - checksum = "5b44b894f2a6e36457d665d1e08c3866add6ed5e70050c1b4ba8a8ddedb02ce7"
Lines truncated
M shared/ops-core/Cargo.toml +1 -1
@@ -13,7 +13,7 @@ chrono = { version = "0.4", features = ["serde"] }
13 13 anyhow = "1.0.102"
14 14 async-trait = "0.1.83"
15 15 tracing = "0.1.44"
16 - sqlx = { version = "0.8.6", features = ["runtime-tokio", "sqlite"] }
16 + sqlx = { version = "0.9", features = ["runtime-tokio", "sqlite"] }
17 17
18 18 [dev-dependencies]
19 19 tempfile = "3.20"
M shared/synckit-client/Cargo.lock +7 -16
@@ -873,21 +873,12 @@ dependencies = [
873 873 ]
874 874
875 875 [[package]]
876 - name = "hashbrown"
877 - version = "0.17.1"
878 - source = "registry+https://github.com/rust-lang/crates.io-index"
879 - checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
880 - dependencies = [
881 - "foldhash 0.2.0",
882 - ]
883 -
884 - [[package]]
885 876 name = "hashlink"
886 - version = "0.12.1"
877 + version = "0.11.1"
887 878 source = "registry+https://github.com/rust-lang/crates.io-index"
888 - checksum = "32069d97bb81e38fa67eab65e3393bf804bb85969f2bc06bf13f64aef5aba248"
879 + checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
889 880 dependencies = [
890 - "hashbrown 0.17.1",
881 + "hashbrown 0.16.1",
891 882 ]
892 883
893 884 [[package]]
@@ -1337,9 +1328,9 @@ checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
1337 1328
1338 1329 [[package]]
1339 1330 name = "libsqlite3-sys"
1340 - version = "0.38.1"
1331 + version = "0.37.0"
1341 1332 source = "registry+https://github.com/rust-lang/crates.io-index"
1342 - checksum = "f6c19a05435c21ac299d71b6a9c13db3e3f47c520517d58990a462a1397a61db"
1333 + checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
1343 1334 dependencies = [
1344 1335 "cc",
1345 1336 "pkg-config",
@@ -1931,9 +1922,9 @@ dependencies = [
1931 1922
1932 1923 [[package]]
1933 1924 name = "rusqlite"
1934 - version = "0.40.1"
1925 + version = "0.39.0"
1935 1926 source = "registry+https://github.com/rust-lang/crates.io-index"
1936 - checksum = "11438310b19e3109b6446c33d1ed5e889428cf2e278407bc7896bc4aaea43323"
1927 + checksum = "a0d2b0146dd9661bf67bb107c0bb2a55064d556eeb3fc314151b957f313bcd4e"
1937 1928 dependencies = [
1938 1929 "bitflags",
1939 1930 "fallible-iterator",
M shared/synckit-client/Cargo.toml +1 -1
@@ -60,7 +60,7 @@ tracing = "0.1"
60 60
61 61 # SyncStore engine (feature = "store"). Owns the app's SQLite connection. Bundled
62 62 # so no system libsqlite is needed; `functions` to register the `hash_row_id` UDF.
63 - rusqlite = { version = "0.40", features = ["bundled", "functions"], optional = true }
63 + rusqlite = { version = "0.39", features = ["bundled", "functions"], optional = true }
64 64
65 65 [dev-dependencies]
66 66 wiremock = "0.6"
M wam/Cargo.lock +7 -10
@@ -667,17 +667,14 @@ name = "hashbrown"
667 667 version = "0.17.0"
668 668 source = "registry+https://github.com/rust-lang/crates.io-index"
669 669 checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
670 - dependencies = [
671 - "foldhash 0.2.0",
672 - ]
673 670
674 671 [[package]]
675 672 name = "hashlink"
676 - version = "0.12.1"
673 + version = "0.11.1"
677 674 source = "registry+https://github.com/rust-lang/crates.io-index"
678 - checksum = "32069d97bb81e38fa67eab65e3393bf804bb85969f2bc06bf13f64aef5aba248"
675 + checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f"
679 676 dependencies = [
680 - "hashbrown 0.17.0",
677 + "hashbrown 0.16.1",
681 678 ]
682 679
683 680 [[package]]
@@ -1106,9 +1103,9 @@ dependencies = [
1106 1103
1107 1104 [[package]]
1108 1105 name = "libsqlite3-sys"
1109 - version = "0.38.1"
1106 + version = "0.37.0"
1110 1107 source = "registry+https://github.com/rust-lang/crates.io-index"
1111 - checksum = "f6c19a05435c21ac299d71b6a9c13db3e3f47c520517d58990a462a1397a61db"
1108 + checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1"
1112 1109 dependencies = [
1113 1110 "cc",
1114 1111 "pkg-config",
@@ -1538,9 +1535,9 @@ dependencies = [
1538 1535
1539 1536 [[package]]
1540 1537 name = "rusqlite"
1541 - version = "0.40.1"
1538 + version = "0.39.0"
1542 1539 source = "registry+https://github.com/rust-lang/crates.io-index"
1543 - checksum = "11438310b19e3109b6446c33d1ed5e889428cf2e278407bc7896bc4aaea43323"
1540 + checksum = "a0d2b0146dd9661bf67bb107c0bb2a55064d556eeb3fc314151b957f313bcd4e"
1544 1541 dependencies = [
1545 1542 "bitflags",
1546 1543 "fallible-iterator",
M wam/Cargo.toml +1 -1
@@ -16,7 +16,7 @@ color-eyre = "0.6"
16 16 crossterm = "0.28"
17 17 directories = "6"
18 18 ratatui = "0.29"
19 - rusqlite = { version = "0.40", features = ["bundled"] }
19 + rusqlite = { version = "0.39", features = ["bundled"] }
20 20 serde = { version = "1", features = ["derive"] }
21 21 serde_json = "1"
22 22 reqwest = { version = "0.13", default-features = false, features = ["json", "rustls"] }