-4

CHANGELOG.md

··· 2 2 3 3 ## [Unreleased] - _TBD_ 4 4 5 5 - ### Added 6 6 - 7 7 - - User management 8 8 - 9 5 ## [v0.4.0] - 2024-03-19 10 6 11 7 ### Added

+394 -414

Cargo.lock

··· 4 4 5 5 [[package]] 6 6 name = "addr2line" 7 7 - version = "0.21.0" 7 7 + version = "0.22.0" 8 8 source = "registry+https://github.com/rust-lang/crates.io-index" 9 9 - checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" 9 9 + checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" 10 10 dependencies = [ 11 11 "gimli", 12 12 ] ··· 28 28 29 29 [[package]] 30 30 name = "anstream" 31 31 - version = "0.6.13" 31 31 + version = "0.6.15" 32 32 source = "registry+https://github.com/rust-lang/crates.io-index" 33 33 - checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" 33 33 + checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" 34 34 dependencies = [ 35 35 "anstyle", 36 36 "anstyle-parse", 37 37 "anstyle-query", 38 38 "anstyle-wincon", 39 39 "colorchoice", 40 40 + "is_terminal_polyfill", 40 41 "utf8parse", 41 42 ] 42 43 43 44 [[package]] 44 45 name = "anstyle" 45 45 - version = "1.0.6" 46 46 + version = "1.0.8" 46 47 source = "registry+https://github.com/rust-lang/crates.io-index" 47 47 - checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" 48 48 + checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" 48 49 49 50 [[package]] 50 51 name = "anstyle-parse" 51 51 - version = "0.2.3" 52 52 + version = "0.2.5" 52 53 source = "registry+https://github.com/rust-lang/crates.io-index" 53 53 - checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" 54 54 + checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" 54 55 dependencies = [ 55 56 "utf8parse", 56 57 ] 57 58 58 59 [[package]] 59 60 name = "anstyle-query" 60 60 - version = "1.0.2" 61 61 + version = "1.1.1" 61 62 source = "registry+https://github.com/rust-lang/crates.io-index" 62 62 - checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" 63 63 + checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" 63 64 dependencies = [ 64 65 "windows-sys 0.52.0", 65 66 ] 66 67 67 68 [[package]] 68 69 name = "anstyle-wincon" 69 69 - version = "3.0.2" 70 70 + version = "3.0.4" 70 71 source = "registry+https://github.com/rust-lang/crates.io-index" 71 71 - checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" 72 72 + checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" 72 73 dependencies = [ 73 74 "anstyle", 74 75 "windows-sys 0.52.0", ··· 76 77 77 78 [[package]] 78 79 name = "anyhow" 79 79 - version = "1.0.81" 80 80 + version = "1.0.86" 80 81 source = "registry+https://github.com/rust-lang/crates.io-index" 81 81 - checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" 82 82 + checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" 82 83 83 84 [[package]] 84 85 name = "async-trait" 85 85 - version = "0.1.78" 86 86 + version = "0.1.81" 86 87 source = "registry+https://github.com/rust-lang/crates.io-index" 87 87 - checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" 88 88 + checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" 88 89 dependencies = [ 89 90 "proc-macro2", 90 91 "quote", ··· 93 94 94 95 [[package]] 95 96 name = "autocfg" 96 96 - version = "1.1.0" 97 97 + version = "1.3.0" 97 98 source = "registry+https://github.com/rust-lang/crates.io-index" 98 98 - checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" 99 99 + checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" 99 100 100 101 [[package]] 101 102 name = "backtrace" 102 102 - version = "0.3.70" 103 103 + version = "0.3.73" 103 104 source = "registry+https://github.com/rust-lang/crates.io-index" 104 104 - checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c" 105 105 + checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" 105 106 dependencies = [ 106 107 "addr2line", 107 108 "cc", ··· 119 120 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" 120 121 121 122 [[package]] 123 123 + name = "base64" 124 124 + version = "0.22.1" 125 125 + source = "registry+https://github.com/rust-lang/crates.io-index" 126 126 + checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" 127 127 + 128 128 + [[package]] 122 129 name = "bb8" 123 123 - version = "0.8.3" 130 130 + version = "0.8.5" 124 131 source = "registry+https://github.com/rust-lang/crates.io-index" 125 125 - checksum = "df7c2093d15d6a1d33b1f972e1c5ea3177748742b97a5f392aa83a65262c6780" 132 132 + checksum = "b10cf871f3ff2ce56432fddc2615ac7acc3aa22ca321f8fea800846fbb32f188" 126 133 dependencies = [ 127 134 "async-trait", 128 128 - "futures-channel", 129 135 "futures-util", 130 136 "parking_lot", 131 137 "tokio", ··· 145 151 146 152 [[package]] 147 153 name = "bitflags" 148 148 - version = "2.5.0" 154 154 + version = "2.6.0" 149 155 source = "registry+https://github.com/rust-lang/crates.io-index" 150 150 - checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" 156 156 + checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" 151 157 152 158 [[package]] 153 159 name = "block-buffer" ··· 160 166 161 167 [[package]] 162 168 name = "bumpalo" 163 163 - version = "3.15.4" 169 169 + version = "3.16.0" 164 170 source = "registry+https://github.com/rust-lang/crates.io-index" 165 165 - checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" 171 171 + checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" 166 172 167 173 [[package]] 168 174 name = "byteorder" ··· 172 178 173 179 [[package]] 174 180 name = "bytes" 175 175 - version = "1.5.0" 181 181 + version = "1.7.1" 176 182 source = "registry+https://github.com/rust-lang/crates.io-index" 177 177 - checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" 183 183 + checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" 178 184 179 185 [[package]] 180 186 name = "cc" 181 181 - version = "1.0.90" 187 187 + version = "1.1.10" 182 188 source = "registry+https://github.com/rust-lang/crates.io-index" 183 183 - checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" 189 189 + checksum = "e9e8aabfac534be767c909e0690571677d49f41bd8465ae876fe043d52ba5292" 184 190 185 191 [[package]] 186 192 name = "cfg-if" ··· 190 196 191 197 [[package]] 192 198 name = "clap" 193 193 - version = "4.5.3" 199 199 + version = "4.5.15" 194 200 source = "registry+https://github.com/rust-lang/crates.io-index" 195 195 - checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" 201 201 + checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" 196 202 dependencies = [ 197 203 "clap_builder", 198 204 ] 199 205 200 206 [[package]] 201 207 name = "clap_builder" 202 202 - version = "4.5.2" 208 208 + version = "4.5.15" 203 209 source = "registry+https://github.com/rust-lang/crates.io-index" 204 204 - checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" 210 210 + checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" 205 211 dependencies = [ 206 212 "anstream", 207 213 "anstyle", ··· 211 217 212 218 [[package]] 213 219 name = "clap_lex" 214 214 - version = "0.7.0" 220 220 + version = "0.7.2" 215 221 source = "registry+https://github.com/rust-lang/crates.io-index" 216 216 - checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" 222 222 + checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" 217 223 218 224 [[package]] 219 225 name = "colorchoice" 220 220 - version = "1.0.0" 226 226 + version = "1.0.2" 221 227 source = "registry+https://github.com/rust-lang/crates.io-index" 222 222 - checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" 228 228 + checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" 223 229 224 230 [[package]] 225 231 name = "common" ··· 232 238 "futures-util", 233 239 "log", 234 240 "native-tls", 235 235 - "pbkdf2", 236 241 "postgres-native-tls", 237 242 "prometheus-client", 238 238 - "rand", 239 243 "serde", 240 240 - "sha2", 241 244 "time", 242 245 "tokio", 243 246 "tokio-postgres", ··· 257 260 258 261 [[package]] 259 262 name = "core-foundation-sys" 260 260 - version = "0.8.6" 263 263 + version = "0.8.7" 261 264 source = "registry+https://github.com/rust-lang/crates.io-index" 262 262 - checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" 265 265 + checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" 263 266 264 267 [[package]] 265 268 name = "cpufeatures" 266 266 - version = "0.2.12" 269 269 + version = "0.2.13" 267 270 source = "registry+https://github.com/rust-lang/crates.io-index" 268 268 - checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" 271 271 + checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" 269 272 dependencies = [ 270 273 "libc", 271 274 ] ··· 281 284 ] 282 285 283 286 [[package]] 287 287 + name = "darling" 288 288 + version = "0.20.10" 289 289 + source = "registry+https://github.com/rust-lang/crates.io-index" 290 290 + checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" 291 291 + dependencies = [ 292 292 + "darling_core", 293 293 + "darling_macro", 294 294 + ] 295 295 + 296 296 + [[package]] 297 297 + name = "darling_core" 298 298 + version = "0.20.10" 299 299 + source = "registry+https://github.com/rust-lang/crates.io-index" 300 300 + checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" 301 301 + dependencies = [ 302 302 + "fnv", 303 303 + "ident_case", 304 304 + "proc-macro2", 305 305 + "quote", 306 306 + "strsim", 307 307 + "syn", 308 308 + ] 309 309 + 310 310 + [[package]] 311 311 + name = "darling_macro" 312 312 + version = "0.20.10" 313 313 + source = "registry+https://github.com/rust-lang/crates.io-index" 314 314 + checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" 315 315 + dependencies = [ 316 316 + "darling_core", 317 317 + "quote", 318 318 + "syn", 319 319 + ] 320 320 + 321 321 + [[package]] 284 322 name = "data-encoding" 285 285 - version = "2.5.0" 323 323 + version = "2.6.0" 286 324 source = "registry+https://github.com/rust-lang/crates.io-index" 287 287 - checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" 325 325 + checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" 288 326 289 327 [[package]] 290 328 name = "deranged" ··· 297 335 298 336 [[package]] 299 337 name = "diesel" 300 300 - version = "2.1.5" 338 338 + version = "2.2.2" 301 339 source = "registry+https://github.com/rust-lang/crates.io-index" 302 302 - checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559" 340 340 + checksum = "bf97ee7261bb708fa3402fa9c17a54b70e90e3cb98afb3dc8999d5512cb03f94" 303 341 dependencies = [ 304 304 - "bitflags 2.5.0", 342 342 + "bitflags 2.6.0", 305 343 "byteorder", 306 344 "diesel_derives", 307 345 "itoa", ··· 310 348 311 349 [[package]] 312 350 name = "diesel-async" 313 313 - version = "0.4.1" 351 351 + version = "0.5.0" 314 352 source = "registry+https://github.com/rust-lang/crates.io-index" 315 315 - checksum = "acada1517534c92d3f382217b485db8a8638f111b0e3f2a2a8e26165050f77be" 353 353 + checksum = "fcb799bb6f8ca6a794462125d7b8983b0c86e6c93a33a9c55934a4a5de4409d3" 316 354 dependencies = [ 317 355 "async-trait", 318 356 "bb8", ··· 325 363 326 364 [[package]] 327 365 name = "diesel_derives" 328 328 - version = "2.1.3" 366 366 + version = "2.2.2" 329 367 source = "registry+https://github.com/rust-lang/crates.io-index" 330 330 - checksum = "5d02eecb814ae714ffe61ddc2db2dd03e6c49a42e269b5001355500d431cce0c" 368 368 + checksum = "d6ff2be1e7312c858b2ef974f5c7089833ae57b5311b334b30923af58e5718d8" 331 369 dependencies = [ 332 370 "diesel_table_macro_syntax", 371 371 + "dsl_auto_type", 333 372 "proc-macro2", 334 373 "quote", 335 374 "syn", ··· 337 376 338 377 [[package]] 339 378 name = "diesel_table_macro_syntax" 340 340 - version = "0.1.0" 379 379 + version = "0.2.0" 341 380 source = "registry+https://github.com/rust-lang/crates.io-index" 342 342 - checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" 381 381 + checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25" 343 382 dependencies = [ 344 383 "syn", 345 384 ] ··· 356 395 ] 357 396 358 397 [[package]] 398 398 + name = "dsl_auto_type" 399 399 + version = "0.1.2" 400 400 + source = "registry+https://github.com/rust-lang/crates.io-index" 401 401 + checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607" 402 402 + dependencies = [ 403 403 + "darling", 404 404 + "either", 405 405 + "heck", 406 406 + "proc-macro2", 407 407 + "quote", 408 408 + "syn", 409 409 + ] 410 410 + 411 411 + [[package]] 359 412 name = "dtoa" 360 413 version = "1.0.9" 361 414 source = "registry+https://github.com/rust-lang/crates.io-index" 362 415 checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" 363 416 364 417 [[package]] 418 418 + name = "either" 419 419 + version = "1.13.0" 420 420 + source = "registry+https://github.com/rust-lang/crates.io-index" 421 421 + checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" 422 422 + 423 423 + [[package]] 365 424 name = "encoding_rs" 366 366 - version = "0.8.33" 425 425 + version = "0.8.34" 367 426 source = "registry+https://github.com/rust-lang/crates.io-index" 368 368 - checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" 427 427 + checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" 369 428 dependencies = [ 370 429 "cfg-if", 371 430 ] ··· 391 450 392 451 [[package]] 393 452 name = "errno" 394 394 - version = "0.3.8" 453 453 + version = "0.3.9" 395 454 source = "registry+https://github.com/rust-lang/crates.io-index" 396 396 - checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" 455 455 + checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" 397 456 dependencies = [ 398 457 "libc", 399 458 "windows-sys 0.52.0", ··· 407 466 408 467 [[package]] 409 468 name = "fastrand" 410 410 - version = "2.0.1" 469 469 + version = "2.1.0" 411 470 source = "registry+https://github.com/rust-lang/crates.io-index" 412 412 - checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" 413 413 - 414 414 - [[package]] 415 415 - name = "finl_unicode" 416 416 - version = "1.2.0" 417 417 - source = "registry+https://github.com/rust-lang/crates.io-index" 418 418 - checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" 471 471 + checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" 419 472 420 473 [[package]] 421 474 name = "fnv" ··· 548 601 549 602 [[package]] 550 603 name = "getrandom" 551 551 - version = "0.2.12" 604 604 + version = "0.2.15" 552 605 source = "registry+https://github.com/rust-lang/crates.io-index" 553 553 - checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" 606 606 + checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" 554 607 dependencies = [ 555 608 "cfg-if", 556 609 "libc", ··· 559 612 560 613 [[package]] 561 614 name = "gimli" 562 562 - version = "0.28.1" 615 615 + version = "0.29.0" 563 616 source = "registry+https://github.com/rust-lang/crates.io-index" 564 564 - checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" 617 617 + checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" 565 618 566 619 [[package]] 567 620 name = "h2" 568 568 - version = "0.3.25" 621 621 + version = "0.3.26" 569 622 source = "registry+https://github.com/rust-lang/crates.io-index" 570 570 - checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" 623 623 + checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" 571 624 dependencies = [ 572 625 "bytes", 573 626 "fnv", 574 627 "futures-core", 575 628 "futures-sink", 576 629 "futures-util", 577 577 - "http", 630 630 + "http 0.2.12", 578 631 "indexmap", 579 632 "slab", 580 633 "tokio", ··· 584 637 585 638 [[package]] 586 639 name = "hashbrown" 587 587 - version = "0.14.3" 640 640 + version = "0.14.5" 588 641 source = "registry+https://github.com/rust-lang/crates.io-index" 589 589 - checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" 642 642 + checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" 590 643 591 644 [[package]] 592 645 name = "headers" ··· 594 647 source = "registry+https://github.com/rust-lang/crates.io-index" 595 648 checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" 596 649 dependencies = [ 597 597 - "base64", 650 650 + "base64 0.21.7", 598 651 "bytes", 599 652 "headers-core", 600 600 - "http", 653 653 + "http 0.2.12", 601 654 "httpdate", 602 655 "mime", 603 656 "sha1", ··· 609 662 source = "registry+https://github.com/rust-lang/crates.io-index" 610 663 checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" 611 664 dependencies = [ 612 612 - "http", 665 665 + "http 0.2.12", 613 666 ] 614 667 615 668 [[package]] 669 669 + name = "heck" 670 670 + version = "0.5.0" 671 671 + source = "registry+https://github.com/rust-lang/crates.io-index" 672 672 + checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" 673 673 + 674 674 + [[package]] 616 675 name = "hermit-abi" 617 676 version = "0.3.9" 618 677 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 639 698 ] 640 699 641 700 [[package]] 701 701 + name = "http" 702 702 + version = "1.1.0" 703 703 + source = "registry+https://github.com/rust-lang/crates.io-index" 704 704 + checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" 705 705 + dependencies = [ 706 706 + "bytes", 707 707 + "fnv", 708 708 + "itoa", 709 709 + ] 710 710 + 711 711 + [[package]] 642 712 name = "http-body" 643 713 version = "0.4.6" 644 714 source = "registry+https://github.com/rust-lang/crates.io-index" 645 715 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" 646 716 dependencies = [ 647 717 "bytes", 648 648 - "http", 718 718 + "http 0.2.12", 649 719 "pin-project-lite", 650 720 ] 651 721 652 722 [[package]] 653 723 name = "httparse" 654 654 - version = "1.8.0" 724 724 + version = "1.9.4" 655 725 source = "registry+https://github.com/rust-lang/crates.io-index" 656 656 - checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" 726 726 + checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" 657 727 658 728 [[package]] 659 729 name = "httpdate" ··· 669 739 670 740 [[package]] 671 741 name = "hyper" 672 672 - version = "0.14.28" 742 742 + version = "0.14.30" 673 743 source = "registry+https://github.com/rust-lang/crates.io-index" 674 674 - checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" 744 744 + checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" 675 745 dependencies = [ 676 746 "bytes", 677 747 "futures-channel", 678 748 "futures-core", 679 749 "futures-util", 680 750 "h2", 681 681 - "http", 751 751 + "http 0.2.12", 682 752 "http-body", 683 753 "httparse", 684 754 "httpdate", ··· 692 762 ] 693 763 694 764 [[package]] 765 765 + name = "ident_case" 766 766 + version = "1.0.1" 767 767 + source = "registry+https://github.com/rust-lang/crates.io-index" 768 768 + checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" 769 769 + 770 770 + [[package]] 695 771 name = "idna" 696 772 version = "0.5.0" 697 773 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 703 779 704 780 [[package]] 705 781 name = "indexmap" 706 706 - version = "2.2.5" 782 782 + version = "2.3.0" 707 783 source = "registry+https://github.com/rust-lang/crates.io-index" 708 708 - checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" 784 784 + checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" 709 785 dependencies = [ 710 786 "equivalent", 711 787 "hashbrown", ··· 723 799 ] 724 800 725 801 [[package]] 802 802 + name = "is_terminal_polyfill" 803 803 + version = "1.70.1" 804 804 + source = "registry+https://github.com/rust-lang/crates.io-index" 805 805 + checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" 806 806 + 807 807 + [[package]] 726 808 name = "itoa" 727 727 - version = "1.0.10" 809 809 + version = "1.0.11" 728 810 source = "registry+https://github.com/rust-lang/crates.io-index" 729 729 - checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" 811 811 + checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" 730 812 731 813 [[package]] 732 814 name = "js-sys" 733 733 - version = "0.3.69" 815 815 + version = "0.3.70" 734 816 source = "registry+https://github.com/rust-lang/crates.io-index" 735 735 - checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" 817 817 + checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" 736 818 dependencies = [ 737 819 "wasm-bindgen", 738 820 ] 739 821 740 822 [[package]] 741 741 - name = "lazy_static" 742 742 - version = "1.4.0" 743 743 - source = "registry+https://github.com/rust-lang/crates.io-index" 744 744 - checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" 745 745 - 746 746 - [[package]] 747 823 name = "libc" 748 748 - version = "0.2.153" 824 824 + version = "0.2.155" 749 825 source = "registry+https://github.com/rust-lang/crates.io-index" 750 750 - checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" 826 826 + checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" 751 827 752 828 [[package]] 753 829 name = "linux-raw-sys" 754 754 - version = "0.4.13" 830 830 + version = "0.4.14" 755 831 source = "registry+https://github.com/rust-lang/crates.io-index" 756 756 - checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" 832 832 + checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" 757 833 758 834 [[package]] 759 835 name = "lock_api" 760 760 - version = "0.4.11" 836 836 + version = "0.4.12" 761 837 source = "registry+https://github.com/rust-lang/crates.io-index" 762 762 - checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" 838 838 + checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" 763 839 dependencies = [ 764 840 "autocfg", 765 841 "scopeguard", ··· 767 843 768 844 [[package]] 769 845 name = "log" 770 770 - version = "0.4.21" 846 846 + version = "0.4.22" 771 847 source = "registry+https://github.com/rust-lang/crates.io-index" 772 772 - checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" 848 848 + checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" 773 849 774 850 [[package]] 775 851 name = "lumen" ··· 781 857 "native-tls", 782 858 "pretty_env_logger", 783 859 "prometheus-client", 784 784 - "rpassword", 785 860 "tokio", 786 861 "tokio-native-tls", 787 862 "warp", ··· 799 874 800 875 [[package]] 801 876 name = "memchr" 802 802 - version = "2.7.1" 877 877 + version = "2.7.4" 803 878 source = "registry+https://github.com/rust-lang/crates.io-index" 804 804 - checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" 879 879 + checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" 805 880 806 881 [[package]] 807 882 name = "mime" ··· 811 886 812 887 [[package]] 813 888 name = "mime_guess" 814 814 - version = "2.0.4" 889 889 + version = "2.0.5" 815 890 source = "registry+https://github.com/rust-lang/crates.io-index" 816 816 - checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" 891 891 + checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" 817 892 dependencies = [ 818 893 "mime", 819 894 "unicase", ··· 821 896 822 897 [[package]] 823 898 name = "miniz_oxide" 824 824 - version = "0.7.2" 899 899 + version = "0.7.4" 825 900 source = "registry+https://github.com/rust-lang/crates.io-index" 826 826 - checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" 901 901 + checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" 827 902 dependencies = [ 828 903 "adler", 829 904 ] 830 905 831 906 [[package]] 832 907 name = "mio" 833 833 - version = "0.8.11" 908 908 + version = "1.0.2" 834 909 source = "registry+https://github.com/rust-lang/crates.io-index" 835 835 - checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" 910 910 + checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" 836 911 dependencies = [ 912 912 + "hermit-abi", 837 913 "libc", 838 914 "wasi", 839 839 - "windows-sys 0.48.0", 915 915 + "windows-sys 0.52.0", 840 916 ] 841 917 842 918 [[package]] ··· 848 924 "bytes", 849 925 "encoding_rs", 850 926 "futures-util", 851 851 - "http", 927 927 + "http 0.2.12", 852 928 "httparse", 853 929 "log", 854 930 "memchr", ··· 859 935 860 936 [[package]] 861 937 name = "native-tls" 862 862 - version = "0.2.11" 938 938 + version = "0.2.12" 863 939 source = "registry+https://github.com/rust-lang/crates.io-index" 864 864 - checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" 940 940 + checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" 865 941 dependencies = [ 866 866 - "lazy_static", 867 942 "libc", 868 943 "log", 869 944 "openssl", ··· 882 957 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" 883 958 884 959 [[package]] 885 885 - name = "num_cpus" 886 886 - version = "1.16.0" 887 887 - source = "registry+https://github.com/rust-lang/crates.io-index" 888 888 - checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" 889 889 - dependencies = [ 890 890 - "hermit-abi", 891 891 - "libc", 892 892 - ] 893 893 - 894 894 - [[package]] 895 960 name = "object" 896 896 - version = "0.32.2" 961 961 + version = "0.36.3" 897 962 source = "registry+https://github.com/rust-lang/crates.io-index" 898 898 - checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" 963 963 + checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" 899 964 dependencies = [ 900 965 "memchr", 901 966 ] ··· 908 973 909 974 [[package]] 910 975 name = "openssl" 911 911 - version = "0.10.64" 976 976 + version = "0.10.66" 912 977 source = "registry+https://github.com/rust-lang/crates.io-index" 913 913 - checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" 978 978 + checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" 914 979 dependencies = [ 915 915 - "bitflags 2.5.0", 980 980 + "bitflags 2.6.0", 916 981 "cfg-if", 917 982 "foreign-types", 918 983 "libc", ··· 940 1005 941 1006 [[package]] 942 1007 name = "openssl-sys" 943 943 - version = "0.9.101" 1008 1008 + version = "0.9.103" 944 1009 source = "registry+https://github.com/rust-lang/crates.io-index" 945 945 - checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" 1010 1010 + checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" 946 1011 dependencies = [ 947 1012 "cc", 948 1013 "libc", ··· 952 1017 953 1018 [[package]] 954 1019 name = "parking_lot" 955 955 - version = "0.12.1" 1020 1020 + version = "0.12.3" 956 1021 source = "registry+https://github.com/rust-lang/crates.io-index" 957 957 - checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" 1022 1022 + checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" 958 1023 dependencies = [ 959 1024 "lock_api", 960 1025 "parking_lot_core", ··· 962 1027 963 1028 [[package]] 964 1029 name = "parking_lot_core" 965 965 - version = "0.9.9" 1030 1030 + version = "0.9.10" 966 1031 source = "registry+https://github.com/rust-lang/crates.io-index" 967 967 - checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" 1032 1032 + checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" 968 1033 dependencies = [ 969 1034 "cfg-if", 970 1035 "libc", 971 971 - "redox_syscall", 1036 1036 + "redox_syscall 0.5.3", 972 1037 "smallvec", 973 973 - "windows-targets 0.48.5", 974 974 - ] 975 975 - 976 976 - [[package]] 977 977 - name = "pbkdf2" 978 978 - version = "0.12.2" 979 979 - source = "registry+https://github.com/rust-lang/crates.io-index" 980 980 - checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" 981 981 - dependencies = [ 982 982 - "digest", 983 983 - "hmac", 1038 1038 + "windows-targets", 984 1039 ] 985 1040 986 1041 [[package]] ··· 1029 1084 1030 1085 [[package]] 1031 1086 name = "pin-project-lite" 1032 1032 - version = "0.2.13" 1087 1087 + version = "0.2.14" 1033 1088 source = "registry+https://github.com/rust-lang/crates.io-index" 1034 1034 - checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" 1089 1089 + checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" 1035 1090 1036 1091 [[package]] 1037 1092 name = "pin-utils" ··· 1060 1115 1061 1116 [[package]] 1062 1117 name = "postgres-protocol" 1063 1063 - version = "0.6.6" 1118 1118 + version = "0.6.7" 1064 1119 source = "registry+https://github.com/rust-lang/crates.io-index" 1065 1065 - checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" 1120 1120 + checksum = "acda0ebdebc28befa84bee35e651e4c5f09073d668c7aed4cf7e23c3cda84b23" 1066 1121 dependencies = [ 1067 1067 - "base64", 1122 1122 + "base64 0.22.1", 1068 1123 "byteorder", 1069 1124 "bytes", 1070 1125 "fallible-iterator", ··· 1078 1133 1079 1134 [[package]] 1080 1135 name = "postgres-types" 1081 1081 - version = "0.2.6" 1136 1136 + version = "0.2.7" 1082 1137 source = "registry+https://github.com/rust-lang/crates.io-index" 1083 1083 - checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" 1138 1138 + checksum = "02048d9e032fb3cc3413bbf7b83a15d84a5d419778e2628751896d856498eee9" 1084 1139 dependencies = [ 1085 1140 "bytes", 1086 1141 "fallible-iterator", ··· 1095 1150 1096 1151 [[package]] 1097 1152 name = "ppv-lite86" 1098 1098 - version = "0.2.17" 1153 1153 + version = "0.2.20" 1099 1154 source = "registry+https://github.com/rust-lang/crates.io-index" 1100 1100 - checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" 1155 1155 + checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" 1156 1156 + dependencies = [ 1157 1157 + "zerocopy", 1158 1158 + ] 1101 1159 1102 1160 [[package]] 1103 1161 name = "pretty_env_logger" ··· 1111 1169 1112 1170 [[package]] 1113 1171 name = "proc-macro2" 1114 1114 - version = "1.0.79" 1172 1172 + version = "1.0.86" 1115 1173 source = "registry+https://github.com/rust-lang/crates.io-index" 1116 1116 - checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" 1174 1174 + checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" 1117 1175 dependencies = [ 1118 1176 "unicode-ident", 1119 1177 ] 1120 1178 1121 1179 [[package]] 1122 1180 name = "prometheus-client" 1123 1123 - version = "0.22.2" 1181 1181 + version = "0.22.3" 1124 1182 source = "registry+https://github.com/rust-lang/crates.io-index" 1125 1125 - checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" 1183 1183 + checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" 1126 1184 dependencies = [ 1127 1185 "dtoa", 1128 1186 "itoa", ··· 1143 1201 1144 1202 [[package]] 1145 1203 name = "quote" 1146 1146 - version = "1.0.35" 1204 1204 + version = "1.0.36" 1147 1205 source = "registry+https://github.com/rust-lang/crates.io-index" 1148 1148 - checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" 1206 1206 + checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" 1149 1207 dependencies = [ 1150 1208 "proc-macro2", 1151 1209 ] ··· 1190 1248 ] 1191 1249 1192 1250 [[package]] 1251 1251 + name = "redox_syscall" 1252 1252 + version = "0.5.3" 1253 1253 + source = "registry+https://github.com/rust-lang/crates.io-index" 1254 1254 + checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" 1255 1255 + dependencies = [ 1256 1256 + "bitflags 2.6.0", 1257 1257 + ] 1258 1258 + 1259 1259 + [[package]] 1193 1260 name = "regex" 1194 1194 - version = "1.10.3" 1261 1261 + version = "1.10.6" 1195 1262 source = "registry+https://github.com/rust-lang/crates.io-index" 1196 1196 - checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" 1263 1263 + checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" 1197 1264 dependencies = [ 1198 1265 "aho-corasick", 1199 1266 "memchr", ··· 1203 1270 1204 1271 [[package]] 1205 1272 name = "regex-automata" 1206 1206 - version = "0.4.6" 1273 1273 + version = "0.4.7" 1207 1274 source = "registry+https://github.com/rust-lang/crates.io-index" 1208 1208 - checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" 1275 1275 + checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" 1209 1276 dependencies = [ 1210 1277 "aho-corasick", 1211 1278 "memchr", ··· 1214 1281 1215 1282 [[package]] 1216 1283 name = "regex-syntax" 1217 1217 - version = "0.8.2" 1218 1218 - source = "registry+https://github.com/rust-lang/crates.io-index" 1219 1219 - checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" 1220 1220 - 1221 1221 - [[package]] 1222 1222 - name = "rpassword" 1223 1223 - version = "7.3.1" 1284 1284 + version = "0.8.4" 1224 1285 source = "registry+https://github.com/rust-lang/crates.io-index" 1225 1225 - checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" 1226 1226 - dependencies = [ 1227 1227 - "libc", 1228 1228 - "rtoolbox", 1229 1229 - "windows-sys 0.48.0", 1230 1230 - ] 1231 1231 - 1232 1232 - [[package]] 1233 1233 - name = "rtoolbox" 1234 1234 - version = "0.0.2" 1235 1235 - source = "registry+https://github.com/rust-lang/crates.io-index" 1236 1236 - checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" 1237 1237 - dependencies = [ 1238 1238 - "libc", 1239 1239 - "windows-sys 0.48.0", 1240 1240 - ] 1286 1286 + checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" 1241 1287 1242 1288 [[package]] 1243 1289 name = "rustc-demangle" 1244 1244 - version = "0.1.23" 1290 1290 + version = "0.1.24" 1245 1291 source = "registry+https://github.com/rust-lang/crates.io-index" 1246 1246 - checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" 1292 1292 + checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" 1247 1293 1248 1294 [[package]] 1249 1295 name = "rustix" 1250 1250 - version = "0.38.32" 1296 1296 + version = "0.38.34" 1251 1297 source = "registry+https://github.com/rust-lang/crates.io-index" 1252 1252 - checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" 1298 1298 + checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" 1253 1299 dependencies = [ 1254 1254 - "bitflags 2.5.0", 1300 1300 + "bitflags 2.6.0", 1255 1301 "errno", 1256 1302 "libc", 1257 1303 "linux-raw-sys", ··· 1259 1305 ] 1260 1306 1261 1307 [[package]] 1262 1262 - name = "rustls-pemfile" 1263 1263 - version = "1.0.4" 1264 1264 - source = "registry+https://github.com/rust-lang/crates.io-index" 1265 1265 - checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" 1266 1266 - dependencies = [ 1267 1267 - "base64", 1268 1268 - ] 1269 1269 - 1270 1270 - [[package]] 1271 1308 name = "ryu" 1272 1272 - version = "1.0.17" 1309 1309 + version = "1.0.18" 1273 1310 source = "registry+https://github.com/rust-lang/crates.io-index" 1274 1274 - checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" 1311 1311 + checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" 1275 1312 1276 1313 [[package]] 1277 1314 name = "schannel" ··· 1306 1343 1307 1344 [[package]] 1308 1345 name = "security-framework" 1309 1309 - version = "2.9.2" 1346 1346 + version = "2.11.1" 1310 1347 source = "registry+https://github.com/rust-lang/crates.io-index" 1311 1311 - checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" 1348 1348 + checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" 1312 1349 dependencies = [ 1313 1313 - "bitflags 1.3.2", 1350 1350 + "bitflags 2.6.0", 1314 1351 "core-foundation", 1315 1352 "core-foundation-sys", 1316 1353 "libc", ··· 1319 1356 1320 1357 [[package]] 1321 1358 name = "security-framework-sys" 1322 1322 - version = "2.9.1" 1359 1359 + version = "2.11.1" 1323 1360 source = "registry+https://github.com/rust-lang/crates.io-index" 1324 1324 - checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" 1361 1361 + checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" 1325 1362 dependencies = [ 1326 1363 "core-foundation-sys", 1327 1364 "libc", ··· 1329 1366 1330 1367 [[package]] 1331 1368 name = "serde" 1332 1332 - version = "1.0.197" 1369 1369 + version = "1.0.207" 1333 1370 source = "registry+https://github.com/rust-lang/crates.io-index" 1334 1334 - checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" 1371 1371 + checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" 1335 1372 dependencies = [ 1336 1373 "serde_derive", 1337 1374 ] 1338 1375 1339 1376 [[package]] 1340 1377 name = "serde_derive" 1341 1341 - version = "1.0.197" 1378 1378 + version = "1.0.207" 1342 1379 source = "registry+https://github.com/rust-lang/crates.io-index" 1343 1343 - checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" 1380 1380 + checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" 1344 1381 dependencies = [ 1345 1382 "proc-macro2", 1346 1383 "quote", ··· 1349 1386 1350 1387 [[package]] 1351 1388 name = "serde_json" 1352 1352 - version = "1.0.114" 1389 1389 + version = "1.0.124" 1353 1390 source = "registry+https://github.com/rust-lang/crates.io-index" 1354 1354 - checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" 1391 1391 + checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" 1355 1392 dependencies = [ 1356 1393 "itoa", 1394 1394 + "memchr", 1357 1395 "ryu", 1358 1396 "serde", 1359 1397 ] 1360 1398 1361 1399 [[package]] 1362 1400 name = "serde_spanned" 1363 1363 - version = "0.6.5" 1401 1401 + version = "0.6.7" 1364 1402 source = "registry+https://github.com/rust-lang/crates.io-index" 1365 1365 - checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" 1403 1403 + checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" 1366 1404 dependencies = [ 1367 1405 "serde", 1368 1406 ] ··· 1403 1441 1404 1442 [[package]] 1405 1443 name = "signal-hook-registry" 1406 1406 - version = "1.4.1" 1444 1444 + version = "1.4.2" 1407 1445 source = "registry+https://github.com/rust-lang/crates.io-index" 1408 1408 - checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" 1446 1446 + checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" 1409 1447 dependencies = [ 1410 1448 "libc", 1411 1449 ] ··· 1433 1471 1434 1472 [[package]] 1435 1473 name = "socket2" 1436 1436 - version = "0.5.6" 1474 1474 + version = "0.5.7" 1437 1475 source = "registry+https://github.com/rust-lang/crates.io-index" 1438 1438 - checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" 1476 1476 + checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" 1439 1477 dependencies = [ 1440 1478 "libc", 1441 1479 "windows-sys 0.52.0", ··· 1449 1487 1450 1488 [[package]] 1451 1489 name = "stringprep" 1452 1452 - version = "0.1.4" 1490 1490 + version = "0.1.5" 1453 1491 source = "registry+https://github.com/rust-lang/crates.io-index" 1454 1454 - checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" 1492 1492 + checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" 1455 1493 dependencies = [ 1456 1456 - "finl_unicode", 1457 1494 "unicode-bidi", 1458 1495 "unicode-normalization", 1496 1496 + "unicode-properties", 1459 1497 ] 1460 1498 1461 1499 [[package]] 1462 1500 name = "strsim" 1463 1463 - version = "0.11.0" 1501 1501 + version = "0.11.1" 1464 1502 source = "registry+https://github.com/rust-lang/crates.io-index" 1465 1465 - checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" 1503 1503 + checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" 1466 1504 1467 1505 [[package]] 1468 1506 name = "subtle" 1469 1469 - version = "2.5.0" 1507 1507 + version = "2.6.1" 1470 1508 source = "registry+https://github.com/rust-lang/crates.io-index" 1471 1471 - checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" 1509 1509 + checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" 1472 1510 1473 1511 [[package]] 1474 1512 name = "syn" 1475 1475 - version = "2.0.53" 1513 1513 + version = "2.0.74" 1476 1514 source = "registry+https://github.com/rust-lang/crates.io-index" 1477 1477 - checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" 1515 1515 + checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" 1478 1516 dependencies = [ 1479 1517 "proc-macro2", 1480 1518 "quote", ··· 1483 1521 1484 1522 [[package]] 1485 1523 name = "tempfile" 1486 1486 - version = "3.10.1" 1524 1524 + version = "3.12.0" 1487 1525 source = "registry+https://github.com/rust-lang/crates.io-index" 1488 1488 - checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" 1526 1526 + checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" 1489 1527 dependencies = [ 1490 1528 "cfg-if", 1491 1529 "fastrand", 1530 1530 + "once_cell", 1492 1531 "rustix", 1493 1493 - "windows-sys 0.52.0", 1532 1532 + "windows-sys 0.59.0", 1494 1533 ] 1495 1534 1496 1535 [[package]] ··· 1504 1543 1505 1544 [[package]] 1506 1545 name = "thiserror" 1507 1507 - version = "1.0.58" 1546 1546 + version = "1.0.63" 1508 1547 source = "registry+https://github.com/rust-lang/crates.io-index" 1509 1509 - checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" 1548 1548 + checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" 1510 1549 dependencies = [ 1511 1550 "thiserror-impl", 1512 1551 ] 1513 1552 1514 1553 [[package]] 1515 1554 name = "thiserror-impl" 1516 1516 - version = "1.0.58" 1555 1555 + version = "1.0.63" 1517 1556 source = "registry+https://github.com/rust-lang/crates.io-index" 1518 1518 - checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" 1557 1557 + checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" 1519 1558 dependencies = [ 1520 1559 "proc-macro2", 1521 1560 "quote", ··· 1524 1563 1525 1564 [[package]] 1526 1565 name = "time" 1527 1527 - version = "0.3.34" 1566 1566 + version = "0.3.36" 1528 1567 source = "registry+https://github.com/rust-lang/crates.io-index" 1529 1529 - checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" 1568 1568 + checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" 1530 1569 dependencies = [ 1531 1570 "deranged", 1532 1571 "num-conv", ··· 1544 1583 1545 1584 [[package]] 1546 1585 name = "time-macros" 1547 1547 - version = "0.2.17" 1586 1586 + version = "0.2.18" 1548 1587 source = "registry+https://github.com/rust-lang/crates.io-index" 1549 1549 - checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" 1588 1588 + checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" 1550 1589 dependencies = [ 1551 1590 "num-conv", 1552 1591 "time-core", ··· 1554 1593 1555 1594 [[package]] 1556 1595 name = "tinyvec" 1557 1557 - version = "1.6.0" 1596 1596 + version = "1.8.0" 1558 1597 source = "registry+https://github.com/rust-lang/crates.io-index" 1559 1559 - checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" 1598 1598 + checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" 1560 1599 dependencies = [ 1561 1600 "tinyvec_macros", 1562 1601 ] ··· 1569 1608 1570 1609 [[package]] 1571 1610 name = "tokio" 1572 1572 - version = "1.36.0" 1611 1611 + version = "1.39.2" 1573 1612 source = "registry+https://github.com/rust-lang/crates.io-index" 1574 1574 - checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" 1613 1613 + checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" 1575 1614 dependencies = [ 1576 1615 "backtrace", 1577 1616 "bytes", 1578 1617 "libc", 1579 1618 "mio", 1580 1580 - "num_cpus", 1581 1619 "parking_lot", 1582 1620 "pin-project-lite", 1583 1621 "signal-hook-registry", 1584 1622 "socket2", 1585 1623 "tokio-macros", 1586 1586 - "windows-sys 0.48.0", 1624 1624 + "windows-sys 0.52.0", 1587 1625 ] 1588 1626 1589 1627 [[package]] 1590 1628 name = "tokio-macros" 1591 1591 - version = "2.2.0" 1629 1629 + version = "2.4.0" 1592 1630 source = "registry+https://github.com/rust-lang/crates.io-index" 1593 1593 - checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" 1631 1631 + checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" 1594 1632 dependencies = [ 1595 1633 "proc-macro2", 1596 1634 "quote", ··· 1609 1647 1610 1648 [[package]] 1611 1649 name = "tokio-postgres" 1612 1612 - version = "0.7.10" 1650 1650 + version = "0.7.11" 1613 1651 source = "registry+https://github.com/rust-lang/crates.io-index" 1614 1614 - checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" 1652 1652 + checksum = "03adcf0147e203b6032c0b2d30be1415ba03bc348901f3ff1cc0df6a733e60c3" 1615 1653 dependencies = [ 1616 1654 "async-trait", 1617 1655 "byteorder", ··· 1634 1672 ] 1635 1673 1636 1674 [[package]] 1637 1637 - name = "tokio-stream" 1638 1638 - version = "0.1.15" 1639 1639 - source = "registry+https://github.com/rust-lang/crates.io-index" 1640 1640 - checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" 1641 1641 - dependencies = [ 1642 1642 - "futures-core", 1643 1643 - "pin-project-lite", 1644 1644 - "tokio", 1645 1645 - ] 1646 1646 - 1647 1647 - [[package]] 1648 1675 name = "tokio-tungstenite" 1649 1649 - version = "0.20.1" 1676 1676 + version = "0.21.0" 1650 1677 source = "registry+https://github.com/rust-lang/crates.io-index" 1651 1651 - checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" 1678 1678 + checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" 1652 1679 dependencies = [ 1653 1680 "futures-util", 1654 1681 "log", ··· 1658 1685 1659 1686 [[package]] 1660 1687 name = "tokio-util" 1661 1661 - version = "0.7.10" 1688 1688 + version = "0.7.11" 1662 1689 source = "registry+https://github.com/rust-lang/crates.io-index" 1663 1663 - checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" 1690 1690 + checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" 1664 1691 dependencies = [ 1665 1692 "bytes", 1666 1693 "futures-core", 1667 1694 "futures-sink", 1668 1695 "pin-project-lite", 1669 1696 "tokio", 1670 1670 - "tracing", 1671 1697 ] 1672 1698 1673 1699 [[package]] 1674 1700 name = "toml" 1675 1675 - version = "0.8.12" 1701 1701 + version = "0.8.19" 1676 1702 source = "registry+https://github.com/rust-lang/crates.io-index" 1677 1677 - checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" 1703 1703 + checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" 1678 1704 dependencies = [ 1679 1705 "serde", 1680 1706 "serde_spanned", ··· 1684 1710 1685 1711 [[package]] 1686 1712 name = "toml_datetime" 1687 1687 - version = "0.6.5" 1713 1713 + version = "0.6.8" 1688 1714 source = "registry+https://github.com/rust-lang/crates.io-index" 1689 1689 - checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" 1715 1715 + checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" 1690 1716 dependencies = [ 1691 1717 "serde", 1692 1718 ] 1693 1719 1694 1720 [[package]] 1695 1721 name = "toml_edit" 1696 1696 - version = "0.22.9" 1722 1722 + version = "0.22.20" 1697 1723 source = "registry+https://github.com/rust-lang/crates.io-index" 1698 1698 - checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" 1724 1724 + checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" 1699 1725 dependencies = [ 1700 1726 "indexmap", 1701 1727 "serde", ··· 1738 1764 1739 1765 [[package]] 1740 1766 name = "tungstenite" 1741 1741 - version = "0.20.1" 1767 1767 + version = "0.21.0" 1742 1768 source = "registry+https://github.com/rust-lang/crates.io-index" 1743 1743 - checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" 1769 1769 + checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" 1744 1770 dependencies = [ 1745 1771 "byteorder", 1746 1772 "bytes", 1747 1773 "data-encoding", 1748 1748 - "http", 1774 1774 + "http 1.1.0", 1749 1775 "httparse", 1750 1776 "log", 1751 1777 "rand", ··· 1792 1818 ] 1793 1819 1794 1820 [[package]] 1821 1821 + name = "unicode-properties" 1822 1822 + version = "0.1.1" 1823 1823 + source = "registry+https://github.com/rust-lang/crates.io-index" 1824 1824 + checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" 1825 1825 + 1826 1826 + [[package]] 1795 1827 name = "url" 1796 1796 - version = "2.5.0" 1828 1828 + version = "2.5.2" 1797 1829 source = "registry+https://github.com/rust-lang/crates.io-index" 1798 1798 - checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" 1830 1830 + checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" 1799 1831 dependencies = [ 1800 1832 "form_urlencoded", 1801 1833 "idna", ··· 1810 1842 1811 1843 [[package]] 1812 1844 name = "utf8parse" 1813 1813 - version = "0.2.1" 1845 1845 + version = "0.2.2" 1814 1846 source = "registry+https://github.com/rust-lang/crates.io-index" 1815 1815 - checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" 1847 1847 + checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" 1816 1848 1817 1849 [[package]] 1818 1850 name = "vcpkg" ··· 1822 1854 1823 1855 [[package]] 1824 1856 name = "version_check" 1825 1825 - version = "0.9.4" 1857 1857 + version = "0.9.5" 1826 1858 source = "registry+https://github.com/rust-lang/crates.io-index" 1827 1827 - checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 1859 1859 + checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" 1828 1860 1829 1861 [[package]] 1830 1862 name = "want" ··· 1837 1869 1838 1870 [[package]] 1839 1871 name = "warp" 1840 1840 - version = "0.3.6" 1872 1872 + version = "0.3.7" 1841 1873 source = "registry+https://github.com/rust-lang/crates.io-index" 1842 1842 - checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" 1874 1874 + checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" 1843 1875 dependencies = [ 1844 1876 "bytes", 1845 1877 "futures-channel", 1846 1878 "futures-util", 1847 1879 "headers", 1848 1848 - "http", 1880 1880 + "http 0.2.12", 1849 1881 "hyper", 1850 1882 "log", 1851 1883 "mime", ··· 1853 1885 "multer", 1854 1886 "percent-encoding", 1855 1887 "pin-project", 1856 1856 - "rustls-pemfile", 1857 1888 "scoped-tls", 1858 1889 "serde", 1859 1890 "serde_json", 1860 1891 "serde_urlencoded", 1861 1892 "tokio", 1862 1862 - "tokio-stream", 1863 1893 "tokio-tungstenite", 1864 1894 "tokio-util", 1865 1895 "tower-service", ··· 1880 1910 1881 1911 [[package]] 1882 1912 name = "wasm-bindgen" 1883 1883 - version = "0.2.92" 1913 1913 + version = "0.2.93" 1884 1914 source = "registry+https://github.com/rust-lang/crates.io-index" 1885 1885 - checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" 1915 1915 + checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" 1886 1916 dependencies = [ 1887 1917 "cfg-if", 1918 1918 + "once_cell", 1888 1919 "wasm-bindgen-macro", 1889 1920 ] 1890 1921 1891 1922 [[package]] 1892 1923 name = "wasm-bindgen-backend" 1893 1893 - version = "0.2.92" 1924 1924 + version = "0.2.93" 1894 1925 source = "registry+https://github.com/rust-lang/crates.io-index" 1895 1895 - checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" 1926 1926 + checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" 1896 1927 dependencies = [ 1897 1928 "bumpalo", 1898 1929 "log", ··· 1905 1936 1906 1937 [[package]] 1907 1938 name = "wasm-bindgen-macro" 1908 1908 - version = "0.2.92" 1939 1939 + version = "0.2.93" 1909 1940 source = "registry+https://github.com/rust-lang/crates.io-index" 1910 1910 - checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" 1941 1941 + checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" 1911 1942 dependencies = [ 1912 1943 "quote", 1913 1944 "wasm-bindgen-macro-support", ··· 1915 1946 1916 1947 [[package]] 1917 1948 name = "wasm-bindgen-macro-support" 1918 1918 - version = "0.2.92" 1949 1949 + version = "0.2.93" 1919 1950 source = "registry+https://github.com/rust-lang/crates.io-index" 1920 1920 - checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" 1951 1951 + checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" 1921 1952 dependencies = [ 1922 1953 "proc-macro2", 1923 1954 "quote", ··· 1928 1959 1929 1960 [[package]] 1930 1961 name = "wasm-bindgen-shared" 1931 1931 - version = "0.2.92" 1962 1962 + version = "0.2.93" 1932 1963 source = "registry+https://github.com/rust-lang/crates.io-index" 1933 1933 - checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" 1964 1964 + checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" 1934 1965 1935 1966 [[package]] 1936 1967 name = "web-sys" 1937 1937 - version = "0.3.69" 1968 1968 + version = "0.3.70" 1938 1969 source = "registry+https://github.com/rust-lang/crates.io-index" 1939 1939 - checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" 1970 1970 + checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" 1940 1971 dependencies = [ 1941 1972 "js-sys", 1942 1973 "wasm-bindgen", ··· 1948 1979 source = "registry+https://github.com/rust-lang/crates.io-index" 1949 1980 checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" 1950 1981 dependencies = [ 1951 1951 - "redox_syscall", 1982 1982 + "redox_syscall 0.4.1", 1952 1983 "wasite", 1953 1984 "web-sys", 1954 1985 ] 1955 1986 1956 1987 [[package]] 1957 1957 - name = "winapi" 1958 1958 - version = "0.3.9" 1959 1959 - source = "registry+https://github.com/rust-lang/crates.io-index" 1960 1960 - checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" 1961 1961 - dependencies = [ 1962 1962 - "winapi-i686-pc-windows-gnu", 1963 1963 - "winapi-x86_64-pc-windows-gnu", 1964 1964 - ] 1965 1965 - 1966 1966 - [[package]] 1967 1967 - name = "winapi-i686-pc-windows-gnu" 1968 1968 - version = "0.4.0" 1969 1969 - source = "registry+https://github.com/rust-lang/crates.io-index" 1970 1970 - checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" 1971 1971 - 1972 1972 - [[package]] 1973 1988 name = "winapi-util" 1974 1974 - version = "0.1.6" 1989 1989 + version = "0.1.9" 1975 1990 source = "registry+https://github.com/rust-lang/crates.io-index" 1976 1976 - checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" 1977 1977 - dependencies = [ 1978 1978 - "winapi", 1979 1979 - ] 1980 1980 - 1981 1981 - [[package]] 1982 1982 - name = "winapi-x86_64-pc-windows-gnu" 1983 1983 - version = "0.4.0" 1984 1984 - source = "registry+https://github.com/rust-lang/crates.io-index" 1985 1985 - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" 1986 1986 - 1987 1987 - [[package]] 1988 1988 - name = "windows-sys" 1989 1989 - version = "0.48.0" 1990 1990 - source = "registry+https://github.com/rust-lang/crates.io-index" 1991 1991 - checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" 1991 1991 + checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" 1992 1992 dependencies = [ 1993 1993 - "windows-targets 0.48.5", 1993 1993 + "windows-sys 0.59.0", 1994 1994 ] 1995 1995 1996 1996 [[package]] ··· 1999 1999 source = "registry+https://github.com/rust-lang/crates.io-index" 2000 2000 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" 2001 2001 dependencies = [ 2002 2002 - "windows-targets 0.52.4", 2002 2002 + "windows-targets", 2003 2003 ] 2004 2004 2005 2005 [[package]] 2006 2006 - name = "windows-targets" 2007 2007 - version = "0.48.5" 2006 2006 + name = "windows-sys" 2007 2007 + version = "0.59.0" 2008 2008 source = "registry+https://github.com/rust-lang/crates.io-index" 2009 2009 - checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 2009 2009 + checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" 2010 2010 dependencies = [ 2011 2011 - "windows_aarch64_gnullvm 0.48.5", 2012 2012 - "windows_aarch64_msvc 0.48.5", 2013 2013 - "windows_i686_gnu 0.48.5", 2014 2014 - "windows_i686_msvc 0.48.5", 2015 2015 - "windows_x86_64_gnu 0.48.5", 2016 2016 - "windows_x86_64_gnullvm 0.48.5", 2017 2017 - "windows_x86_64_msvc 0.48.5", 2011 2011 + "windows-targets", 2018 2012 ] 2019 2013 2020 2014 [[package]] 2021 2015 name = "windows-targets" 2022 2022 - version = "0.52.4" 2016 2016 + version = "0.52.6" 2023 2017 source = "registry+https://github.com/rust-lang/crates.io-index" 2024 2024 - checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" 2018 2018 + checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" 2025 2019 dependencies = [ 2026 2026 - "windows_aarch64_gnullvm 0.52.4", 2027 2027 - "windows_aarch64_msvc 0.52.4", 2028 2028 - "windows_i686_gnu 0.52.4", 2029 2029 - "windows_i686_msvc 0.52.4", 2030 2030 - "windows_x86_64_gnu 0.52.4", 2031 2031 - "windows_x86_64_gnullvm 0.52.4", 2032 2032 - "windows_x86_64_msvc 0.52.4", 2020 2020 + "windows_aarch64_gnullvm", 2021 2021 + "windows_aarch64_msvc", 2022 2022 + "windows_i686_gnu", 2023 2023 + "windows_i686_gnullvm", 2024 2024 + "windows_i686_msvc", 2025 2025 + "windows_x86_64_gnu", 2026 2026 + "windows_x86_64_gnullvm", 2027 2027 + "windows_x86_64_msvc", 2033 2028 ] 2034 2029 2035 2030 [[package]] 2036 2031 name = "windows_aarch64_gnullvm" 2037 2037 - version = "0.48.5" 2032 2032 + version = "0.52.6" 2038 2033 source = "registry+https://github.com/rust-lang/crates.io-index" 2039 2039 - checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" 2040 2040 - 2041 2041 - [[package]] 2042 2042 - name = "windows_aarch64_gnullvm" 2043 2043 - version = "0.52.4" 2044 2044 - source = "registry+https://github.com/rust-lang/crates.io-index" 2045 2045 - checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" 2034 2034 + checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" 2046 2035 2047 2036 [[package]] 2048 2037 name = "windows_aarch64_msvc" 2049 2049 - version = "0.48.5" 2038 2038 + version = "0.52.6" 2050 2039 source = "registry+https://github.com/rust-lang/crates.io-index" 2051 2051 - checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" 2052 2052 - 2053 2053 - [[package]] 2054 2054 - name = "windows_aarch64_msvc" 2055 2055 - version = "0.52.4" 2056 2056 - source = "registry+https://github.com/rust-lang/crates.io-index" 2057 2057 - checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" 2040 2040 + checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" 2058 2041 2059 2042 [[package]] 2060 2043 name = "windows_i686_gnu" 2061 2061 - version = "0.48.5" 2044 2044 + version = "0.52.6" 2062 2045 source = "registry+https://github.com/rust-lang/crates.io-index" 2063 2063 - checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" 2046 2046 + checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" 2064 2047 2065 2048 [[package]] 2066 2066 - name = "windows_i686_gnu" 2067 2067 - version = "0.52.4" 2049 2049 + name = "windows_i686_gnullvm" 2050 2050 + version = "0.52.6" 2068 2051 source = "registry+https://github.com/rust-lang/crates.io-index" 2069 2069 - checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" 2052 2052 + checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" 2070 2053 2071 2054 [[package]] 2072 2055 name = "windows_i686_msvc" 2073 2073 - version = "0.48.5" 2056 2056 + version = "0.52.6" 2074 2057 source = "registry+https://github.com/rust-lang/crates.io-index" 2075 2075 - checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" 2076 2076 - 2077 2077 - [[package]] 2078 2078 - name = "windows_i686_msvc" 2079 2079 - version = "0.52.4" 2080 2080 - source = "registry+https://github.com/rust-lang/crates.io-index" 2081 2081 - checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" 2058 2058 + checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" 2082 2059 2083 2060 [[package]] 2084 2061 name = "windows_x86_64_gnu" 2085 2085 - version = "0.48.5" 2062 2062 + version = "0.52.6" 2086 2063 source = "registry+https://github.com/rust-lang/crates.io-index" 2087 2087 - checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" 2088 2088 - 2089 2089 - [[package]] 2090 2090 - name = "windows_x86_64_gnu" 2091 2091 - version = "0.52.4" 2092 2092 - source = "registry+https://github.com/rust-lang/crates.io-index" 2093 2093 - checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" 2064 2064 + checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" 2094 2065 2095 2066 [[package]] 2096 2067 name = "windows_x86_64_gnullvm" 2097 2097 - version = "0.48.5" 2068 2068 + version = "0.52.6" 2098 2069 source = "registry+https://github.com/rust-lang/crates.io-index" 2099 2099 - checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" 2070 2070 + checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" 2100 2071 2101 2072 [[package]] 2102 2102 - name = "windows_x86_64_gnullvm" 2103 2103 - version = "0.52.4" 2073 2073 + name = "windows_x86_64_msvc" 2074 2074 + version = "0.52.6" 2104 2075 source = "registry+https://github.com/rust-lang/crates.io-index" 2105 2105 - checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" 2076 2076 + checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" 2106 2077 2107 2078 [[package]] 2108 2108 - name = "windows_x86_64_msvc" 2109 2109 - version = "0.48.5" 2079 2079 + name = "winnow" 2080 2080 + version = "0.6.18" 2110 2081 source = "registry+https://github.com/rust-lang/crates.io-index" 2111 2111 - checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" 2082 2082 + checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" 2083 2083 + dependencies = [ 2084 2084 + "memchr", 2085 2085 + ] 2112 2086 2113 2087 [[package]] 2114 2114 - name = "windows_x86_64_msvc" 2115 2115 - version = "0.52.4" 2088 2088 + name = "zerocopy" 2089 2089 + version = "0.7.35" 2116 2090 source = "registry+https://github.com/rust-lang/crates.io-index" 2117 2117 - checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" 2091 2091 + checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" 2092 2092 + dependencies = [ 2093 2093 + "byteorder", 2094 2094 + "zerocopy-derive", 2095 2095 + ] 2118 2096 2119 2097 [[package]] 2120 2120 - name = "winnow" 2121 2121 - version = "0.6.5" 2098 2098 + name = "zerocopy-derive" 2099 2099 + version = "0.7.35" 2122 2100 source = "registry+https://github.com/rust-lang/crates.io-index" 2123 2123 - checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" 2101 2101 + checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" 2124 2102 dependencies = [ 2125 2125 - "memchr", 2103 2103 + "proc-macro2", 2104 2104 + "quote", 2105 2105 + "syn", 2126 2106 ]

+4 -4

Dockerfile

··· 1 1 - FROM rust:1.74.1-slim-buster 1 1 + FROM rust:1.80.1-slim 2 2 ARG DEBIAN_FRONTEND=noninteractive 3 3 RUN apt-get update && apt-get install -y --no-install-recommends --no-install-suggests ca-certificates pkg-config libssl-dev libpq-dev 4 4 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse 5 5 6 6 RUN --mount=type=cache,target=$CARGO_HOME/registry \ 7 7 - cargo install diesel_cli --version 2.1.1 --no-default-features --features postgres 7 7 + cargo install diesel_cli --version 2.2.1 --no-default-features --features postgres 8 8 9 9 COPY common /lumen/common 10 10 COPY lumen /lumen/lumen 11 11 COPY Cargo.toml /lumen/ 12 12 RUN --mount=type=cache,target=$CARGO_HOME/registry,target=/lumen/target \ 13 13 - cd /lumen && cargo build --release && cp /lumen/target/release/lumen /root/ 13 13 + cd /lumen && cargo build --release && cp /lumen/target/release/lumen /root/ 14 14 15 15 FROM debian:buster-slim 16 16 ARG DEBIAN_FRONTEND=noninteractive 17 17 RUN apt-get update && apt-get install -y --no-install-recommends --no-install-suggests openssl libpq5 && \ 18 18 - sed -i -e 's,\[ v3_req \],\[ v3_req \]\nextendedKeyUsage = serverAuth,' /etc/ssl/openssl.cnf 18 18 + sed -i -e 's,\[ v3_req \],\[ v3_req \]\nextendedKeyUsage = serverAuth,' /etc/ssl/openssl.cnf 19 19 RUN mkdir /usr/lib/lumen/ 20 20 21 21 COPY --from=0 /usr/local/cargo/bin/diesel /usr/bin/diesel

+26 -15

common/Cargo.toml

··· 7 7 publish = false 8 8 9 9 [dependencies] 10 10 - tokio = {version = "1.32", features = ["full"], optional = true} 11 11 - log = {version = "0.4", features = ["release_max_level_debug"]} 12 12 - serde = {version = "1.0", features = ["derive"]} 13 13 - postgres-native-tls = {version = "0.5", optional = true} 14 14 - native-tls = {version = "0.2", optional = true} 10 10 + tokio = { version = "1.39", features = ["full"], optional = true } 11 11 + log = { version = "0.4", features = ["release_max_level_debug"] } 12 12 + serde = { version = "1.0", features = ["derive"] } 13 13 + postgres-native-tls = { version = "0.5", optional = true } 14 14 + native-tls = { version = "0.2", optional = true } 15 15 futures-util = "0.3" 16 16 toml = "0.8" 17 17 - warp = {version = "0.3", optional = true} 17 17 + warp = { version = "0.3", optional = true } 18 18 binascii = "0.1" 19 19 20 20 - tokio-postgres = {version = "0.7", default-features = false, optional = true} 21 21 - diesel = {version = "2.1", optional = true, default-features = false, features = ["postgres_backend", "time"]} 22 22 - time = {version = "0.3.31", optional = true} 23 23 - diesel-async = {version = "0.4.1", optional = true, features = ["postgres", "bb8"]} 20 20 + tokio-postgres = { version = "0.7", default-features = false, optional = true } 21 21 + diesel = { version = "2.2", optional = true, default-features = false, features = [ 22 22 + "postgres_backend", 23 23 + "time", 24 24 + ] } 25 25 + time = { version = "0.3.36", optional = true } 26 26 + diesel-async = { version = "0.5", optional = true, features = [ 27 27 + "postgres", 28 28 + "bb8", 29 29 + ] } 24 30 anyhow = "1.0" 25 25 - prometheus-client = "0.22.0" 26 26 - pbkdf2 = { version = "0.12.2" } 27 27 - sha2 = "0.10.8" 28 28 - rand = "0.8.5" 31 31 + prometheus-client = "0.22" 29 32 30 33 [features] 31 34 default = ["web", "db"] 32 35 web = ["warp"] 33 33 - db = ["tokio", "postgres-native-tls", "native-tls", "diesel", "diesel-async", "tokio-postgres", "time"] 36 36 + db = [ 37 37 + "tokio", 38 38 + "postgres-native-tls", 39 39 + "native-tls", 40 40 + "diesel", 41 41 + "diesel-async", 42 42 + "tokio-postgres", 43 43 + "time", 44 44 + ]

-21

common/migrations/2024-01-20-215809_users/down.sql

··· 1 1 - -- don't allow table to be modified until we're done... 2 2 - LOCK TABLE users; 3 3 - 4 4 - -- delete funcs that belong to users 5 5 - DELETE FROM funcs USING dbs, users 6 6 - WHERE dbs.id=funcs.db_id 7 7 - AND users.id=dbs.user_id 8 8 - AND users.cred_id IS NOT NULL; 9 9 - 10 10 - -- delete dbs that belong to users 11 11 - DELETE FROM dbs USING users WHERE dbs.user_id=users.id AND users.cred_id IS NOT NULL; 12 12 - 13 13 - -- delete all users with creds... 14 14 - DELETE FROM users WHERE cred_id is NOT NULL; 15 15 - DROP TABLE creds CASCADE; 16 16 - 17 17 - CREATE UNIQUE INDEX IF NOT EXISTS user_rec ON users(lic_id,lic_data,hostname); 18 18 - CREATE UNIQUE INDEX IF NOT EXISTS user_hn_null ON users (lic_id,lic_data, (hostname IS NULL)) WHERE hostname is NULL; 19 19 - DROP INDEX user_cred_idx; 20 20 - 21 21 - ALTER TABLE users DROP COLUMN cred_id;

-22

common/migrations/2024-01-20-215809_users/up.sql

··· 1 1 - CREATE TABLE creds ( 2 2 - id SERIAL PRIMARY KEY, 3 3 - 4 4 - username VARCHAR(256) UNIQUE NOT NULL, 5 5 - email VARCHAR(256) UNIQUE NOT NULL, 6 6 - 7 7 - passwd_salt bytea, 8 8 - passwd_iters INTEGER NOT NULL DEFAULT 10000, 9 9 - passwd_hash bytea, 10 10 - 11 11 - last_active TIMESTAMPTZ, 12 12 - creation_dt TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP NOT NULL, 13 13 - 14 14 - is_admin BOOLEAN NOT NULL DEFAULT FALSE, 15 15 - is_enabled BOOLEAN NOT NULL DEFAULT TRUE 16 16 - ); 17 17 - 18 18 - ALTER TABLE users ADD COLUMN cred_id INTEGER REFERENCES creds(id) ON DELETE CASCADE; 19 19 - 20 20 - CREATE UNIQUE INDEX user_cred_idx ON users(lic_id,lic_data,hostname,cred_id) NULLS NOT DISTINCT; 21 21 - DROP INDEX user_hn_null; 22 22 - DROP INDEX user_rec;

+3 -36

common/src/config.rs

··· 1 1 use serde::Deserialize; 2 2 - use std::num::NonZeroU32; 3 2 use std::time::Duration; 4 3 use std::{net::SocketAddr, path::PathBuf}; 5 4 use toml::from_str; ··· 10 9 } 11 10 12 11 #[derive(Deserialize)] 13 13 - #[serde(default)] 14 12 pub struct LuminaServer { 15 13 pub bind_addr: SocketAddr, 16 16 - pub use_tls: bool, 14 14 + pub use_tls: Option<bool>, 17 15 pub tls: Option<TlsIdentity>, 18 16 pub server_name: Option<String>, 19 19 - pub allow_deletes: bool, 17 17 + pub allow_deletes: Option<bool>, 20 18 21 19 /// limit of function histories to return per function. 22 20 /// `None`, or `Some(0)` will disable the feature on the server. 23 23 - pub get_history_limit: NonZeroU32, 24 24 - } 25 25 - impl Default for LuminaServer { 26 26 - fn default() -> Self { 27 27 - Self { 28 28 - bind_addr: "0.0.0.0:1234".parse().unwrap(), 29 29 - use_tls: false, 30 30 - tls: None, 31 31 - server_name: None, 32 32 - allow_deletes: false, 33 33 - get_history_limit: NonZeroU32::new(50).unwrap(), 34 34 - } 35 35 - } 21 21 + pub get_history_limit: Option<u32>, 36 22 } 37 23 38 24 #[derive(Deserialize)] ··· 77 63 } 78 64 79 65 #[derive(Deserialize)] 80 80 - #[serde(default)] 81 81 - pub struct Users { 82 82 - /// Sets if guests are allowed to login. required for IDA<8.1 83 83 - pub allow_guests: bool, 84 84 - 85 85 - /// PBKDF2 iterations for newly set passwords. 86 86 - pub pbkdf2_iterations: NonZeroU32, 87 87 - } 88 88 - 89 89 - impl Default for Users { 90 90 - fn default() -> Self { 91 91 - Self { allow_guests: true, pbkdf2_iterations: NonZeroU32::new(120_000).unwrap() } 92 92 - } 93 93 - } 94 94 - 95 95 - #[derive(Deserialize)] 96 66 pub struct Config { 97 67 pub lumina: LuminaServer, 98 68 pub api_server: Option<WebServer>, ··· 100 70 101 71 #[serde(default)] 102 72 pub limits: Limits, 103 103 - 104 104 - #[serde(default)] 105 105 - pub users: Users, 106 73 } 107 74 108 75 pub trait HasConfig {

+17 -131

common/src/db/mod.rs

··· 1 1 - use crate::{ 2 2 - async_drop::{AsyncDropGuard, AsyncDropper}, 3 3 - db::schema::Creds, 4 4 - }; 1 1 + use crate::async_drop::{AsyncDropGuard, AsyncDropper}; 5 2 use log::*; 6 3 use postgres_native_tls::MakeTlsConnector; 7 4 use serde::Serialize; ··· 15 12 query_builder::{Query, QueryFragment}, 16 13 sql_types::{Array, Binary, Integer, VarChar}, 17 14 upsert::excluded, 18 18 - ExpressionMethods, NullableExpressionMethods, QueryDsl, SelectableHelper, 15 15 + ExpressionMethods, NullableExpressionMethods, QueryDsl, 19 16 }; 20 17 use diesel_async::{pooled_connection::ManagerConfig, RunQueryDsl}; 21 21 - 22 22 - use self::schema::creds; 23 18 24 19 pub type DynConfig = dyn crate::config::HasConfig + Send + Sync; 25 20 ··· 140 135 } 141 136 142 137 pub async fn get_funcs( 143 143 - &self, funcs: &[crate::rpc::PatternId<'_>], 138 138 + &self, funcs: &[crate::rpc::PullMetadataFunc<'_>], 144 139 ) -> Result<Vec<Option<FunctionInfo>>, anyhow::Error> { 145 145 - let chksums: Vec<&[u8]> = funcs.iter().map(|v| v.data).collect(); 140 140 + let chksums: Vec<&[u8]> = funcs.iter().map(|v| v.mb_hash).collect(); 146 141 147 142 let rows: Vec<(String, i32, Vec<u8>, Vec<u8>)> = { 148 143 let conn = &mut self.diesel.get().await?; ··· 174 169 } 175 170 176 171 pub async fn get_or_create_user<'a>( 177 177 - &self, user: &'a crate::rpc::RpcHello<'a>, cred_id: Option<i32>, hostname: &str, 172 172 + &self, user: &'a crate::rpc::RpcHello<'a>, hostname: &str, 178 173 ) -> Result<i32, anyhow::Error> { 179 174 use schema::users; 180 175 ··· 184 179 let lic_data = user.license_data; 185 180 186 181 let get_user = || { 187 187 - let query = users::table 188 188 - .into_boxed() 182 182 + users::table 189 183 .select(users::id) 190 184 .filter(users::lic_data.eq(lic_data)) 191 185 .filter(users::lic_id.eq(lic_id)) 192 192 - .filter(users::hostname.eq(hostname)); 193 193 - 194 194 - if let Some(cred_id) = cred_id { 195 195 - query.filter(users::cred_id.eq(cred_id)) 196 196 - } else { 197 197 - query.filter(users::cred_id.is_null()) 198 198 - } 186 186 + .filter(users::hostname.eq(hostname)) 199 187 }; 200 188 201 189 match get_user().get_result::<i32>(conn).await { ··· 209 197 users::lic_id.eq(lic_id), 210 198 users::lic_data.eq(lic_data), 211 199 users::hostname.eq(hostname), 212 212 - users::cred_id.eq(cred_id), 213 200 )]) 214 201 .returning(users::id) // xmax = 0 if the row is new 215 202 .get_result::<i32>(conn) ··· 231 218 ) -> Result<i32, anyhow::Error> { 232 219 use schema::files::{chksum, id, table as files}; 233 220 234 234 - let hash = &funcs.input_md5[..]; 221 221 + let hash = &funcs.md5[..]; 235 222 236 223 let conn = &mut self.diesel.get().await?; 237 224 ··· 260 247 } 261 248 262 249 async fn get_or_create_db<'a>( 263 263 - &self, user: &'a crate::rpc::RpcHello<'a>, cred_id: Option<i32>, 264 264 - funcs: &'a crate::rpc::PushMetadata<'a>, 250 250 + &self, user: &'a crate::rpc::RpcHello<'a>, funcs: &'a crate::rpc::PushMetadata<'a>, 265 251 ) -> Result<i32, anyhow::Error> { 266 252 use schema::dbs::{ 267 253 file_id as db_file_id, file_path, id as db_id, idb_path, table as dbs, ··· 269 255 }; 270 256 271 257 let file_id = self.get_or_create_file(funcs); 272 272 - let user_id = self.get_or_create_user(user, cred_id, funcs.hostname); 258 258 + let user_id = self.get_or_create_user(user, funcs.hostname); 273 259 274 260 let (file_id, user_id): (i32, i32) = futures_util::try_join!(file_id, user_id)?; 275 261 ··· 279 265 dbs.select(db_id) 280 266 .filter(db_user.eq(user_id)) 281 267 .filter(db_file_id.eq(file_id)) 282 282 - .filter(file_path.eq(funcs.input_path)) 268 268 + .filter(file_path.eq(funcs.file_path)) 283 269 .filter(idb_path.eq(funcs.idb_path)) 284 270 }; 285 271 ··· 293 279 .values(vec![( 294 280 db_user.eq(user_id), 295 281 db_file_id.eq(file_id), 296 296 - file_path.eq(funcs.input_path), 282 282 + file_path.eq(funcs.file_path), 297 283 idb_path.eq(funcs.idb_path), 298 284 )]) 299 285 .returning(db_id) ··· 311 297 } 312 298 313 299 pub async fn push_funcs<'a, 'b>( 314 314 - &'b self, user: &'a crate::rpc::RpcHello<'a>, cred_id: Option<i32>, 315 315 - funcs: &'a crate::rpc::PushMetadata<'a>, scores: &[u32], 300 300 + &'b self, user: &'a crate::rpc::RpcHello<'a>, funcs: &'a crate::rpc::PushMetadata<'a>, 301 301 + scores: &[u32], 316 302 ) -> Result<Vec<bool>, anyhow::Error> { 317 303 use futures_util::TryStreamExt; 318 304 319 305 // postgres has a limitation of binding per statement (i16::MAX). Split large push requests into smaller chunks. 320 306 const PUSH_FUNC_CHUNK_SIZE: usize = 3000; 321 307 322 322 - let db_id = self.get_or_create_db(user, cred_id, funcs).await?; 308 308 + let db_id = self.get_or_create_db(user, funcs).await?; 323 309 324 310 let mut rows = Vec::with_capacity(funcs.funcs.len().min(PUSH_FUNC_CHUNK_SIZE)); 325 311 let mut is_new = Vec::with_capacity(funcs.funcs.len()); ··· 329 315 for (idx, (func, &score)) in funcs.funcs.iter().zip(scores.iter()).enumerate() { 330 316 let name = func.name; 331 317 let len = func.func_len as i32; 332 332 - let chksum = func.pattern_id.data; 318 318 + let chksum = func.hash; 333 319 let md = func.func_data; 334 320 let score = score as i32; 335 321 ··· 432 418 ) -> Result<(), anyhow::Error> { 433 419 use schema::funcs::{chksum, table as funcs}; 434 420 435 435 - let chksums = req.calcrel_hashes.iter().map(|v| v.as_slice()).collect::<Vec<_>>(); 421 421 + let chksums = req.funcs.iter().map(|v| v.as_slice()).collect::<Vec<_>>(); 436 422 437 423 let conn = &mut self.diesel.get().await?; 438 424 let rows_modified = ··· 459 445 .get_results::<(time::OffsetDateTime, String, Vec<u8>)>(conn) 460 446 .await?; 461 447 Ok(rows) 462 462 - } 463 463 - 464 464 - pub async fn get_users(&self) -> Result<Vec<(i32, String, String, bool, bool)>, anyhow::Error> { 465 465 - let db = &mut self.diesel.get().await?; 466 466 - 467 467 - creds::table 468 468 - .select(( 469 469 - creds::id, 470 470 - creds::username, 471 471 - creds::email, 472 472 - creds::is_admin, 473 473 - creds::passwd_hash.is_not_null(), 474 474 - )) 475 475 - .get_results::<(i32, String, String, bool, bool)>(db) 476 476 - .await 477 477 - .map_err(|v| v.into()) 478 478 - } 479 479 - 480 480 - pub async fn delete_user(&self, username: &str) -> Result<(), anyhow::Error> { 481 481 - let db = &mut self.diesel.get().await?; 482 482 - 483 483 - let changes = 484 484 - diesel::delete(creds::table.filter(creds::username.eq(username))).execute(db).await?; 485 485 - if changes != 1 { 486 486 - return Err(anyhow::anyhow!("expected a single row deletion, got {changes}")); 487 487 - } 488 488 - Ok(()) 489 489 - } 490 490 - 491 491 - pub async fn set_password( 492 492 - &self, username: &str, password: String, iters: u32, 493 493 - ) -> Result<(), anyhow::Error> { 494 494 - let (salt, hash) = 495 495 - tokio::task::spawn_blocking(move || Creds::generate_creds(&password, iters)).await?; 496 496 - 497 497 - let db = &mut self.diesel.get().await?; 498 498 - let rows = diesel::update(creds::table) 499 499 - .filter(creds::username.eq(username)) 500 500 - .set(( 501 501 - creds::passwd_iters.eq(iters as i32), 502 502 - creds::passwd_salt.eq(&salt[..]), 503 503 - creds::passwd_hash.eq(&hash[..]), 504 504 - )) 505 505 - .execute(db) 506 506 - .await?; 507 507 - if rows != 1 { 508 508 - return Err(anyhow::anyhow!("updated {rows} rows, expected to update 1")); 509 509 - } 510 510 - Ok(()) 511 511 - } 512 512 - 513 513 - pub async fn add_user( 514 514 - &self, username: &str, email: &str, is_admin: bool, 515 515 - ) -> Result<u32, anyhow::Error> { 516 516 - let db = &mut self.diesel.get().await?; 517 517 - 518 518 - diesel::insert_into(creds::table) 519 519 - .values(&Creds { 520 520 - username: username.into(), 521 521 - email: email.into(), 522 522 - passwd_salt: None, 523 523 - passwd_iters: 10_000, 524 524 - passwd_hash: None, 525 525 - last_active: None, 526 526 - is_enabled: true, 527 527 - is_admin, 528 528 - }) 529 529 - .returning(creds::id) 530 530 - .get_result::<i32>(db) 531 531 - .await 532 532 - .map_err(|v| v.into()) 533 533 - .map(|v| v as u32) 534 534 - } 535 535 - 536 536 - pub async fn get_user_by_username( 537 537 - &self, username: &str, 538 538 - ) -> Result<(i32, Creds), anyhow::Error> { 539 539 - let db = &mut self.diesel.get().await?; 540 540 - 541 541 - Ok(creds::table 542 542 - .select((creds::id, Creds::as_select())) 543 543 - .filter(creds::username.eq(username)) 544 544 - .get_result::<(i32, Creds)>(db) 545 545 - .await?) 546 546 - } 547 547 - 548 548 - pub async fn get_user_by_id(&self, id: i32) -> Result<Creds, anyhow::Error> { 549 549 - let db = &mut self.diesel.get().await?; 550 550 - 551 551 - Ok(creds::table.select(Creds::as_select()).filter(creds::id.eq(id)).get_result(db).await?) 552 552 - } 553 553 - 554 554 - pub async fn update_last_active(&self, user_id: i32) -> Result<(), anyhow::Error> { 555 555 - let mut db = self.diesel.get().await?; 556 556 - diesel::update(schema::creds::table) 557 557 - .filter(schema::creds::id.eq(user_id)) 558 558 - .set((schema::creds::last_active.eq(time::OffsetDateTime::now_utc()),)) 559 559 - .execute(&mut db) 560 560 - .await?; 561 561 - Ok(()) 562 448 } 563 449 } 564 450

-78

common/src/db/schema.rs

··· 1 1 - use std::borrow::Cow; 2 2 - 3 3 - use diesel::{Insertable, Queryable, Selectable}; 4 4 - use log::error; 5 5 - use pbkdf2::{hmac::Hmac, pbkdf2}; 6 6 - use sha2::Sha256; 7 7 - 8 1 pub use super::schema_auto::*; 9 2 10 3 diesel::table! { ··· 22 15 } 23 16 24 17 diesel::joinable!(func_ranks -> dbs (id)); 25 25 - 26 26 - #[derive(Insertable, Queryable, Selectable, Default)] 27 27 - #[diesel(table_name = creds)] 28 28 - pub struct Creds<'a> { 29 29 - pub username: Cow<'a, str>, 30 30 - pub email: Cow<'a, str>, 31 31 - 32 32 - pub passwd_salt: Option<Cow<'a, [u8]>>, 33 33 - pub passwd_iters: i32, 34 34 - pub passwd_hash: Option<Cow<'a, [u8]>>, 35 35 - 36 36 - pub last_active: Option<time::OffsetDateTime>, 37 37 - 38 38 - pub is_admin: bool, 39 39 - pub is_enabled: bool, 40 40 - } 41 41 - 42 42 - impl<'a> Creds<'a> { 43 43 - pub fn verify_password(&self, password: &str) -> bool { 44 44 - let salt = if let Some(v) = self.passwd_salt.as_ref() { 45 45 - v 46 46 - } else { 47 47 - return false; 48 48 - }; 49 49 - let current_hash = if let Some(v) = self.passwd_hash.as_ref() { 50 50 - v 51 51 - } else { 52 52 - return false; 53 53 - }; 54 54 - if self.passwd_iters <= 0 { 55 55 - return false; 56 56 - } 57 57 - 58 58 - let mut hash = vec![0u8; 32]; 59 59 - if pbkdf2::<Hmac<Sha256>>(password.as_bytes(), salt, self.passwd_iters as u32, &mut hash) 60 60 - .is_err() 61 61 - { 62 62 - error!("invalid output digest length"); 63 63 - return false; 64 64 - } 65 65 - 66 66 - hash == current_hash.as_ref() 67 67 - } 68 68 - 69 69 - pub(crate) fn generate_creds(password: &str, iters: u32) -> ([u8; 4], [u8; 32]) { 70 70 - let salt: [u8; 4] = rand::random(); 71 71 - let mut res = [0u8; 32]; 72 72 - pbkdf2::pbkdf2::<Hmac<Sha256>>(password.as_bytes(), &salt, iters, &mut res) 73 73 - .expect("failed to perform pbkdf2_hmac_sha256"); 74 74 - (salt, res) 75 75 - } 76 76 - } 77 77 - 78 78 - #[cfg(test)] 79 79 - mod tests { 80 80 - use super::*; 81 81 - 82 82 - #[test] 83 83 - fn generate_and_verify_password() { 84 84 - let password = "MyPassword1$"; 85 85 - let iters = 10_000; 86 86 - let (salt, hash) = Creds::generate_creds(password, iters); 87 87 - let creds = Creds { 88 88 - passwd_hash: Some((&hash[..]).into()), 89 89 - passwd_salt: Some((&salt[..]).into()), 90 90 - passwd_iters: iters as i32, 91 91 - ..Default::default() 92 92 - }; 93 93 - assert!(creds.verify_password(password), "failed to verify password"); 94 94 - } 95 95 - }

+1 -29

common/src/db/schema_auto.rs

··· 1 1 // @generated automatically by Diesel CLI. 2 2 3 3 diesel::table! { 4 4 - creds (id) { 5 5 - id -> Int4, 6 6 - #[max_length = 256] 7 7 - username -> Varchar, 8 8 - #[max_length = 256] 9 9 - email -> Varchar, 10 10 - passwd_salt -> Nullable<Bytea>, 11 11 - passwd_iters -> Int4, 12 12 - passwd_hash -> Nullable<Bytea>, 13 13 - last_active -> Nullable<Timestamptz>, 14 14 - creation_dt -> Timestamptz, 15 15 - is_admin -> Bool, 16 16 - is_enabled -> Bool, 17 17 - } 18 18 - } 19 19 - 20 20 - diesel::table! { 21 4 dbs (id) { 22 5 id -> Int4, 23 23 - #[max_length = 260] 24 6 file_path -> Nullable<Varchar>, 25 25 - #[max_length = 260] 26 7 idb_path -> Nullable<Varchar>, 27 8 file_id -> Nullable<Int4>, 28 9 user_id -> Nullable<Int4>, ··· 55 36 id -> Int4, 56 37 lic_id -> Nullable<Bytea>, 57 38 lic_data -> Nullable<Bytea>, 58 58 - #[max_length = 260] 59 39 hostname -> Nullable<Varchar>, 60 40 first_seen -> Nullable<Timestamptz>, 61 61 - cred_id -> Nullable<Int4>, 62 41 } 63 42 } 64 43 65 44 diesel::joinable!(dbs -> files (file_id)); 66 45 diesel::joinable!(dbs -> users (user_id)); 67 46 diesel::joinable!(funcs -> dbs (db_id)); 68 68 - diesel::joinable!(users -> creds (cred_id)); 69 47 70 70 - diesel::allow_tables_to_appear_in_same_query!( 71 71 - creds, 72 72 - dbs, 73 73 - files, 74 74 - funcs, 75 75 - users, 76 76 - ); 48 48 + diesel::allow_tables_to_appear_in_same_query!(dbs, files, funcs, users,);

+38 -35

common/src/rpc/messages.rs

··· 3 3 4 4 #[derive(Deserialize, Serialize)] 5 5 pub struct RpcFail<'a> { 6 6 - pub result: u32, 7 7 - pub error: &'a str, 6 6 + pub code: u32, 7 7 + pub message: &'a str, 8 8 } 9 9 10 10 #[derive(Serialize, Deserialize)] 11 11 pub struct RpcNotify<'a> { 12 12 - pub ty: u32, 13 13 - pub text: &'a str, 12 12 + pub code: u32, 13 13 + pub msg: &'a str, 14 14 } 15 15 16 16 #[derive(Serialize, Deserialize, Debug)] ··· 21 21 22 22 #[derive(Serialize, Deserialize)] 23 23 pub struct RpcHello<'a> { 24 24 - pub client_version: u32, 24 24 + pub protocol_version: u32, 25 25 pub license_data: &'a [u8], 26 26 pub lic_number: [u8; 6], 27 27 - pub record_conv: u32, 27 27 + pub unk2: u32, 28 28 } 29 29 30 30 #[derive(Debug, Deserialize, Serialize, Clone)] 31 31 - pub struct PatternId<'a> { 32 32 - pub ty: u32, 33 33 - pub data: &'a [u8], 31 31 + pub struct PullMetadataFunc<'a> { 32 32 + pub unk0: u32, 33 33 + pub mb_hash: &'a [u8], 34 34 } 35 35 36 36 #[derive(Deserialize, Serialize)] 37 37 pub struct PullMetadata<'a> { 38 38 - pub flags: u32, 39 39 - pub keys: Cow<'a, [u32]>, 38 38 + pub unk0: u32, 39 39 + pub unk1: Cow<'a, [u32]>, 40 40 41 41 #[serde(borrow)] 42 42 - pub pattern_ids: Cow<'a, [PatternId<'a>]>, 42 42 + pub funcs: Cow<'a, [PullMetadataFunc<'a>]>, 43 43 } 44 44 45 45 #[derive(Deserialize, Serialize, Clone)] ··· 52 52 53 53 #[derive(Deserialize, Serialize)] 54 54 pub struct PullMetadataResult<'a> { 55 55 - pub codes: Cow<'a, [u32]>, 55 55 + pub unk0: Cow<'a, [u32]>, 56 56 #[serde(borrow)] 57 57 pub funcs: Cow<'a, [PullMetadataResultFunc<'a>]>, 58 58 } ··· 62 62 pub name: &'a str, 63 63 pub func_len: u32, 64 64 pub func_data: &'a [u8], 65 65 - pub pattern_id: PatternId<'a>, 65 65 + 66 66 + // PullMetadata's fields (tuple 'unk2') are similar to these two 67 67 + pub unk2: u32, 68 68 + pub hash: &'a [u8], 66 69 } 67 70 68 71 #[derive(Deserialize, Serialize)] 69 72 pub struct PushMetadata<'a> { 70 70 - pub flags: u32, 73 73 + pub unk0: u32, 71 74 pub idb_path: &'a str, 72 72 - pub input_path: &'a str, 73 73 - pub input_md5: [u8; 16], 75 75 + pub file_path: &'a str, 76 76 + pub md5: [u8; 16], 74 77 pub hostname: &'a str, 75 78 pub funcs: Cow<'a, [PushMetadataFunc<'a>]>, 76 76 - pub ea64s: Cow<'a, [u64]>, 79 79 + pub unk1: Cow<'a, [u64]>, 77 80 } 78 81 79 82 #[derive(Deserialize, Serialize)] ··· 84 87 85 88 #[derive(Debug, Deserialize, Serialize)] 86 89 pub struct DelHistory<'a> { 87 87 - pub flags: u32, // =0x08 88 88 - pub license_ids: Cow<'a, [Cow<'a, str>]>, 89 89 - pub time_ranges: Cow<'a, [[u64; 2]]>, 90 90 - pub history_id_ranges: Cow<'a, [[u64; 2]]>, 91 91 - pub idbs: Cow<'a, [Cow<'a, str>]>, 92 92 - pub inputs: Cow<'a, [Cow<'a, str>]>, 93 93 - pub funcs: Cow<'a, [Cow<'a, str>]>, // funcs 94 94 - pub usernames: Cow<'a, [Cow<'a, str>]>, 95 95 - pub input_hashes: Cow<'a, [Cow<'a, [u8; 16]>]>, 96 96 - pub calcrel_hashes: Cow<'a, [Cow<'a, [u8; 16]>]>, 97 97 - pub push_id_ranges: Cow<'a, [[u64; 2]]>, 98 98 - pub max_entries: u64, 90 90 + pub unk0: u32, // =0x08 91 91 + pub unk1: Cow<'a, [Cow<'a, str>]>, 92 92 + pub unk2: Cow<'a, [[u64; 2]]>, 93 93 + pub unk3: Cow<'a, [[u64; 2]]>, 94 94 + pub unk4: Cow<'a, [Cow<'a, str>]>, 95 95 + pub unk5: Cow<'a, [Cow<'a, str>]>, 96 96 + pub unk6: Cow<'a, [Cow<'a, str>]>, 97 97 + pub unk7: Cow<'a, [Cow<'a, str>]>, 98 98 + pub unk8: Cow<'a, [Cow<'a, [u8; 16]>]>, 99 99 + pub funcs: Cow<'a, [Cow<'a, [u8; 16]>]>, 100 100 + pub unk10: Cow<'a, [[u64; 2]]>, 101 101 + pub unk11: u64, 99 102 } 100 103 101 104 #[derive(Deserialize, Serialize)] 102 105 pub struct DelHistoryResult { 103 103 - pub ndeleted: u32, 106 106 + pub deleted_mds: u32, 104 107 } 105 108 106 109 #[derive(Debug, Deserialize, Serialize, Default)] ··· 122 125 #[derive(Debug, Deserialize, Serialize)] 123 126 pub struct GetFuncHistories<'a> { 124 127 #[serde(borrow)] 125 125 - pub funcs: Cow<'a, [PatternId<'a>]>, 126 126 - pub flags: u32, 128 128 + pub funcs: Cow<'a, [PullMetadataFunc<'a>]>, 129 129 + pub unk0: u32, 127 130 } 128 131 129 132 #[derive(Debug, Deserialize, Serialize, Clone)] ··· 148 151 pub status: Cow<'a, [u32]>, 149 152 #[serde(borrow)] 150 153 pub funcs: Cow<'a, [FunctionHistories<'a>]>, 151 151 - pub authors: Cow<'a, [Cow<'a, str>]>, 152 152 - pub idb_paths: Cow<'a, [Cow<'a, str>]>, 154 154 + pub users: Cow<'a, [Cow<'a, str>]>, 155 155 + pub dbs: Cow<'a, [Cow<'a, str>]>, 153 156 }

+21 -45

common/src/rpc/mod.rs

··· 63 63 } 64 64 } 65 65 66 66 - pub struct PacketHeader { 67 67 - code: u8, 68 68 - size: usize, 69 69 - } 70 70 - 71 71 - pub async fn read_packet_header<R: AsyncRead + Unpin>( 72 72 - mut reader: R, 73 73 - ) -> Result<PacketHeader, Error> { 66 66 + pub async fn read_packet<R: AsyncRead + Unpin>(mut reader: R) -> Result<Vec<u8>, Error> { 74 67 let mut head = [0u8; 5]; 75 68 match reader.read_exact(&mut head).await { 76 69 Ok(_) => {}, ··· 90 83 .into()); 91 84 } 92 85 93 93 - Ok(PacketHeader { code, size: buf_len }) 94 94 - } 95 95 - 96 96 - impl PacketHeader { 97 97 - pub async fn read<R: AsyncRead + Unpin>(self, mut reader: R) -> Result<Vec<u8>, Error> { 98 98 - trace!("expecting {} bytes...", self.size); 99 99 - let buf_len = self.size + 1; 100 100 - 101 101 - let max_len = get_code_maxlen(self.code); 102 102 - if self.size > max_len { 103 103 - info!("maxium size exceeded: code={}: max={}; req={}", self.code, max_len, self.size); 104 104 - return Err(std::io::Error::new( 105 105 - std::io::ErrorKind::InvalidData, 106 106 - "request length exceeded maximum limit", 107 107 - ) 108 108 - .into()); 109 109 - } 110 110 - 111 111 - let mut data = Vec::new(); 112 112 - data.try_reserve_exact(buf_len)?; 113 113 - data.resize(buf_len, 0); 114 114 - data[0] = self.code; 115 115 - reader.read_exact(&mut data[1..]).await?; 86 86 + let max_len = get_code_maxlen(code); 116 87 117 117 - Ok(data) 88 88 + if buf_len > max_len { 89 89 + info!("maxium size exceeded: code={}: max={}; req={}", code, max_len, buf_len); 90 90 + return Err(std::io::Error::new( 91 91 + std::io::ErrorKind::InvalidData, 92 92 + "request length exceeded maximum limit", 93 93 + ) 94 94 + .into()); 118 95 } 119 96 120 120 - // returns true if this could be an http request. 121 121 - pub fn is_http(&self) -> bool { 122 122 - let mut sz = (self.size as u32).to_be_bytes(); 123 123 - sz.make_ascii_uppercase(); 124 124 - let sz = &sz[..]; 97 97 + // the additional byte is for the RPC code 98 98 + trace!("expecting {} bytes...", buf_len); 99 99 + let buf_len = buf_len + 1; 100 100 + 101 101 + let mut data = Vec::new(); 102 102 + data.try_reserve_exact(buf_len)?; 103 103 + data.resize(buf_len, 0); 104 104 + data[0] = code; 105 105 + reader.read_exact(&mut data[1..]).await?; 125 106 126 126 - match sz { 127 127 - b"GET " | b"PUT " if self.code == b'/' => true, 128 128 - b"POST" | b"HEAD" if self.code == b' ' => true, 129 129 - _ => false, 130 130 - } 131 131 - } 107 107 + Ok(data) 132 108 } 133 109 134 110 async fn write_packet<W: AsyncWrite + Unpin>(mut w: W, data: &[u8]) -> Result<(), std::io::Error> { ··· 217 193 0x0c => RpcMessage::Notify(Self::deserialize_check(payload)?), 218 194 0x0d => { 219 195 let (hello, consumed) = de::from_slice::<messages::RpcHello>(payload)?; 220 220 - let creds = if payload.len() > consumed && hello.client_version > 2 { 196 196 + let creds = if payload.len() > consumed && hello.protocol_version > 2 { 221 197 let payload = &payload[consumed..]; 222 198 let (creds, consumed) = de::from_slice::<Creds>(payload)?; 223 199 if payload.len() != consumed { ··· 225 201 } 226 202 Some(creds) 227 203 } else { 228 228 - if hello.client_version > 2 || payload.len() != consumed { 204 204 + if hello.protocol_version > 2 || payload.len() != consumed { 229 205 trace!("Unexpected Hello msg: {payload:02x?}"); 230 206 } 231 207 None

+1 -1

common/src/web/api.rs

··· 111 111 in_files: &'a [Md5], 112 112 } 113 113 114 114 - let funcs = [crate::rpc::PatternId { ty: 1, data: &md5.0 }]; 114 114 + let funcs = [crate::rpc::PullMetadataFunc { unk0: 1, mb_hash: &md5.0 }]; 115 115 116 116 let files_with = state.db.get_files_with_func(&md5.0[..]); 117 117 let files_info = state.db.get_funcs(&funcs);

+2 -8

config-example.toml

··· 7 7 server_name = "lumen" 8 8 9 9 # Allow clients to delete metadata from the database? 10 10 - allow_deletes = true 10 10 + allow_deletes = false 11 11 # How many function histories should we return? 0=Disabled. 12 12 get_history_limit = 50 13 13 14 14 - [users] 15 15 - # Enable guest accounts? disabling this will only allow IDA 8.1+ to connect. 16 16 - allow_guests = true 17 17 - # sets the amount of PBKDF2 iterations for storing passwords. 18 18 - pbkdf2_iterations = 120000 19 19 - 20 14 # only required when `use_tls` is set to true. 21 15 [lumina.tls] 22 22 - # Specify the server's certificate. 16 16 + # Specify the server's certificate. 23 17 # Clients connecting to the server must match this certificate. 24 18 # If the certificate is password protected, the password can be specified in the `PKCSPASSWD` environment variable. 25 19 server_cert = "path/to/server_crt"

+3 -4

lumen/Cargo.toml

··· 8 8 9 9 [dependencies] 10 10 common = { path = "../common" } 11 11 - tokio = { version = "1.32", features = ["full"] } 11 11 + tokio = { version = "1.39", features = ["full"] } 12 12 log = { version = "0.4", features = ["release_max_level_debug"] } 13 13 pretty_env_logger = "0.5" 14 14 - clap = "4.3" 14 14 + clap = "4.5" 15 15 tokio-native-tls = "0.3" 16 16 native-tls = { version = "0.2" } 17 17 warp = "0.3" 18 18 - prometheus-client = "0.22.0" 19 19 - rpassword = "7.3.1" 18 18 + prometheus-client = "0.22"

+6 -62

lumen/src/main.rs

··· 4 4 #![warn(unused_crate_dependencies)] 5 5 #![deny(clippy::all)] 6 6 7 7 - use clap::{builder::BoolishValueParser, Arg, Command}; 7 7 + use clap::Arg; 8 8 use log::*; 9 9 use server::do_lumen; 10 10 use std::sync::Arc; 11 11 - use users::UserMgmt; 12 11 13 12 mod server; 14 14 - mod users; 15 13 mod web; 16 14 15 15 + use common::config; 16 16 + 17 17 fn setup_logger() { 18 18 if std::env::var("RUST_LOG").is_err() { 19 19 std::env::set_var("RUST_LOG", concat!(env!("CARGO_PKG_NAME"), "=info")); ··· 23 23 24 24 #[tokio::main] 25 25 async fn main() { 26 26 + setup_logger(); 26 27 let matches = clap::Command::new("lumen") 27 28 .version(env!("CARGO_PKG_VERSION")) 28 29 .about("lumen is a private Lumina server for IDA.\nVisit https://github.com/naim94a/lumen/ for updates.") ··· 33 34 .default_value("config.toml") 34 35 .help("Configuration file path") 35 36 ) 36 36 - .subcommand( 37 37 - Command::new("users") 38 38 - .about("User Management") 39 39 - .subcommand( 40 40 - Command::new("add") 41 41 - .about("Adds a user") 42 42 - .arg( 43 43 - Arg::new("username") 44 44 - .required(true) 45 45 - ) 46 46 - .arg( 47 47 - Arg::new("email") 48 48 - .required(true) 49 49 - ) 50 50 - .arg( 51 51 - Arg::new("is_admin") 52 52 - .required(false) 53 53 - .default_value("no") 54 54 - .value_parser(BoolishValueParser::new()) 55 55 - ) 56 56 - ) 57 57 - .subcommand( 58 58 - Command::new("del") 59 59 - .about("Deletes a user") 60 60 - .arg(Arg::new("username")) 61 61 - ) 62 62 - ) 63 63 - .subcommand(Command::new("passwd").about("Set user password").arg(Arg::new("username").required(true))) 64 37 .get_matches(); 65 38 66 39 let config = { 67 67 - common::config::load_config( 40 40 + config::load_config( 68 41 std::fs::File::open(matches.get_one::<String>("config").unwrap()) 69 42 .expect("failed to read config"), 70 43 ) 71 44 }; 72 45 let config = Arc::new(config); 73 46 74 74 - match matches.subcommand() { 75 75 - Some(("users", m)) => { 76 76 - let users = UserMgmt::new(&config).await; 77 77 - match m.subcommand() { 78 78 - None => users.list_users().await, 79 79 - Some(("add", m)) => { 80 80 - let username = m.get_one::<String>("username").unwrap(); 81 81 - let email = m.get_one::<String>("email").unwrap(); 82 82 - let is_admin = *m.get_one::<bool>("is_admin").unwrap_or(&false); 83 83 - users.add_user(username, email, is_admin).await; 84 84 - }, 85 85 - Some(("del", m)) => { 86 86 - let username = m.get_one::<String>("username").unwrap(); 87 87 - users.delete_user(username).await; 88 88 - }, 89 89 - _ => unreachable!(), 90 90 - }; 91 91 - }, 92 92 - Some(("passwd", m)) => { 93 93 - let username = m.get_one::<String>("username").unwrap(); 94 94 - let password = rpassword::prompt_password("New Password: ").unwrap(); 95 95 - let users = UserMgmt::new(&config).await; 96 96 - users.set_password(username, &password).await; 97 97 - }, 98 98 - Some(_) => unreachable!(), 99 99 - None => { 100 100 - setup_logger(); 101 101 - do_lumen(config).await 102 102 - }, 103 103 - }; 47 47 + do_lumen(config).await; 104 48 }

+61 -199

lumen/src/server.rs

··· 10 10 use common::{ 11 11 async_drop::AsyncDropper, 12 12 config::Config, 13 13 - db::{self, Database}, 13 13 + db::Database, 14 14 make_pretty_hex, md, 15 15 metrics::LuminaVersion, 16 16 - rpc::{self, Creds, Error, HelloResult, RpcFail, RpcHello, RpcMessage}, 16 16 + rpc::{self, Error, HelloResult, RpcFail, RpcHello, RpcMessage}, 17 17 SharedState, SharedState_, 18 18 }; 19 19 use log::{debug, error, info, trace, warn}; ··· 26 26 27 27 use crate::web; 28 28 29 29 - struct Session<'a> { 30 30 - state: &'a SharedState_, 31 31 - hello_msg: RpcHello<'a>, 32 32 - _creds: db::schema::Creds<'a>, 33 33 - creds_id: Option<i32>, 34 34 - last_cred_check: Instant, 35 35 - } 36 36 - impl<'a> Session<'a> { 37 37 - /// Check if the user changed in the database. 38 38 - pub async fn is_valid(&mut self) -> bool { 39 39 - let db = &self.state.db; 40 40 - if let Some(cred_id) = self.creds_id { 41 41 - if self.last_cred_check.elapsed() > Duration::from_secs(60 * 5) { 42 42 - match db.get_user_by_id(cred_id).await { 43 43 - Ok(v) => { 44 44 - if !v.is_enabled 45 45 - || v.is_admin != self._creds.is_admin 46 46 - || v.passwd_salt != self._creds.passwd_salt 47 47 - { 48 48 - // user changed, force them to login again. 49 49 - return false; 50 50 - } 51 51 - self.last_cred_check = Instant::now(); 52 52 - return true; 53 53 - }, 54 54 - Err(err) => { 55 55 - error!("db error: {err}"); 56 56 - return false; 57 57 - }, 58 58 - } 59 59 - } 60 60 - } 61 61 - true 62 62 - } 63 63 - } 64 64 - 65 29 async fn handle_transaction<'a, S: AsyncRead + AsyncWrite + Unpin>( 66 66 - session: &mut Session<'a>, mut stream: S, 30 30 + state: &SharedState, user: &'a RpcHello<'a>, mut stream: S, 67 31 ) -> Result<(), Error> { 68 68 - let state = session.state; 69 32 let db = &state.db; 70 33 let server_name = state.server_name.as_str(); 71 34 72 35 trace!("waiting for command.."); 73 73 - let rpkt = async { 74 74 - let hdr = rpc::read_packet_header(&mut stream).await?; 75 75 - // we don't want to read a whole request just to find out the user was revoked... 76 76 - if !session.is_valid().await { 77 77 - return Err(Error::Timeout); 78 78 - } 79 79 - hdr.read(&mut stream).await 80 80 - }; 81 81 - let req = match timeout(Duration::from_secs(3600), rpkt).await { 36 36 + let req = match timeout(Duration::from_secs(3600), rpc::read_packet(&mut stream)).await { 82 37 Ok(res) => match res { 83 38 Ok(v) => v, 84 39 Err(e) => return Err(e), 85 40 }, 86 41 Err(_) => { 87 42 _ = RpcMessage::Fail(RpcFail { 88 88 - result: 0, 89 89 - error: &format!("{server_name} client idle for too long.\n"), 43 43 + code: 0, 44 44 + message: &format!("{server_name} client idle for too long.\n"), 90 45 }) 91 46 .async_write(&mut stream) 92 47 .await; ··· 94 49 }, 95 50 }; 96 51 trace!("got command!"); 97 97 - 98 98 - if !session.is_valid().await { 99 99 - return Err(Error::Timeout); 100 100 - } 101 101 - 102 52 let req = match RpcMessage::deserialize(&req) { 103 53 Ok(v) => v, 104 54 Err(err) => { 105 55 warn!("bad message: \n{}\n", make_pretty_hex(&req)); 106 56 error!("failed to process rpc message: {}", err); 107 57 let resp = rpc::RpcFail { 108 108 - result: 0, 109 109 - error: &format!("{server_name}: error: invalid data.\n"), 58 58 + code: 0, 59 59 + message: &format!("{server_name}: error: invalid data.\n"), 110 60 }; 111 61 let resp = RpcMessage::Fail(resp); 112 62 resp.async_write(&mut stream).await?; ··· 117 67 match req { 118 68 RpcMessage::PullMetadata(md) => { 119 69 let start = Instant::now(); 120 120 - let funcs = match timeout(Duration::from_secs(4 * 60), db.get_funcs(&md.pattern_ids)) 121 121 - .await 122 122 - { 70 70 + let funcs = match timeout(Duration::from_secs(4 * 60), db.get_funcs(&md.funcs)).await { 123 71 Ok(r) => match r { 124 72 Ok(v) => v, 125 73 Err(e) => { 126 74 error!("pull failed, db: {}", e); 127 75 rpc::RpcMessage::Fail(rpc::RpcFail { 128 128 - result: 0, 129 129 - error: &format!("{server_name}: db error; please try again later..\n"), 76 76 + code: 0, 77 77 + message: &format!( 78 78 + "{server_name}: db error; please try again later..\n" 79 79 + ), 130 80 }) 131 81 .async_write(&mut stream) 132 82 .await?; ··· 135 85 }, 136 86 Err(_) => { 137 87 RpcMessage::Fail(RpcFail { 138 138 - result: 0, 139 139 - error: &format!("{server_name}: query took too long to execute.\n"), 88 88 + code: 0, 89 89 + message: &format!("{server_name}: query took too long to execute.\n"), 140 90 }) 141 91 .async_write(&mut stream) 142 92 .await?; ··· 146 96 }; 147 97 let pulled_funcs = funcs.iter().filter(|v| v.is_some()).count(); 148 98 state.metrics.pulls.inc_by(pulled_funcs as _); 149 149 - state.metrics.queried_funcs.inc_by(md.pattern_ids.len() as _); 99 99 + state.metrics.queried_funcs.inc_by(md.funcs.len() as _); 150 100 debug!( 151 101 "pull {pulled_funcs}/{} funcs ended after {:?}", 152 152 - md.pattern_ids.len(), 102 102 + md.funcs.len(), 153 103 start.elapsed() 154 104 ); 155 105 ··· 166 116 .collect(); 167 117 168 118 RpcMessage::PullMetadataResult(rpc::PullMetadataResult { 169 169 - codes: Cow::Owned(statuses), 119 119 + unk0: Cow::Owned(statuses), 170 120 funcs: Cow::Owned(found), 171 121 }) 172 122 .async_write(&mut stream) ··· 177 127 let start = Instant::now(); 178 128 let scores: Vec<u32> = mds.funcs.iter().map(md::get_score).collect(); 179 129 180 180 - let status = 181 181 - match db.push_funcs(&session.hello_msg, session.creds_id, &mds, &scores).await { 182 182 - Ok(v) => v.into_iter().map(u32::from).collect::<Vec<u32>>(), 183 183 - Err(err) => { 184 184 - log::error!("push failed, db: {}", err); 185 185 - rpc::RpcMessage::Fail(rpc::RpcFail { 186 186 - result: 0, 187 187 - error: &format!("{server_name}: db error; please try again later.\n"), 188 188 - }) 189 189 - .async_write(&mut stream) 190 190 - .await?; 191 191 - return Ok(()); 192 192 - }, 193 193 - }; 130 130 + let status = match db.push_funcs(user, &mds, &scores).await { 131 131 + Ok(v) => v.into_iter().map(u32::from).collect::<Vec<u32>>(), 132 132 + Err(err) => { 133 133 + log::error!("push failed, db: {}", err); 134 134 + rpc::RpcMessage::Fail(rpc::RpcFail { 135 135 + code: 0, 136 136 + message: &format!("{server_name}: db error; please try again later.\n"), 137 137 + }) 138 138 + .async_write(&mut stream) 139 139 + .await?; 140 140 + return Ok(()); 141 141 + }, 142 142 + }; 194 143 state.metrics.pushes.inc_by(status.len() as _); 195 144 let new_funcs = 196 145 status.iter().fold(0u64, |counter, &v| if v > 0 { counter + 1 } else { counter }); ··· 209 158 let is_delete_allowed = state.config.lumina.allow_deletes.unwrap_or(false); 210 159 if !is_delete_allowed { 211 160 RpcMessage::Fail(rpc::RpcFail { 212 212 - result: 2, 213 213 - error: &format!("{server_name}: Delete command is disabled on this server."), 161 161 + code: 2, 162 162 + message: &format!("{server_name}: Delete command is disabled on this server."), 214 163 }) 215 164 .async_write(&mut stream) 216 165 .await?; ··· 218 167 if let Err(err) = db.delete_metadata(&req).await { 219 168 error!("delete failed. db: {err}"); 220 169 RpcMessage::Fail(rpc::RpcFail { 221 221 - result: 3, 222 222 - error: &format!("{server_name}: db error, please try again later."), 170 170 + code: 3, 171 171 + message: &format!("{server_name}: db error, please try again later."), 223 172 }) 224 173 .async_write(&mut stream) 225 174 .await?; 226 175 return Ok(()); 227 176 } 228 177 RpcMessage::DelHistoryResult(rpc::DelHistoryResult { 229 229 - ndeleted: req.calcrel_hashes.len() as u32, 178 178 + deleted_mds: req.funcs.len() as u32, 230 179 }) 231 180 .async_write(&mut stream) 232 181 .await?; ··· 237 186 238 187 if limit == 0 { 239 188 RpcMessage::Fail(rpc::RpcFail { 240 240 - result: 4, 241 241 - error: &format!( 189 189 + code: 4, 190 190 + message: &format!( 242 191 "{server_name}: function histories are disabled on this server." 243 192 ), 244 193 }) ··· 249 198 250 199 let mut statuses = vec![]; 251 200 let mut res = vec![]; 252 252 - for chksum in req.funcs.iter().map(|v| v.data) { 201 201 + for chksum in req.funcs.iter().map(|v| v.mb_hash) { 253 202 let history = match db.get_func_histories(chksum, limit).await { 254 203 Ok(v) => v, 255 204 Err(err) => { 256 205 error!("failed to get function histories: {err:?}"); 257 206 RpcMessage::Fail(rpc::RpcFail { 258 258 - result: 3, 259 259 - error: &format!("{server_name}: db error, please try again later."), 207 207 + code: 3, 208 208 + message: &format!("{server_name}: db error, please try again later."), 260 209 }) 261 210 .async_write(&mut stream) 262 211 .await?; ··· 288 237 RpcMessage::GetFuncHistoriesResult(rpc::GetFuncHistoriesResult { 289 238 status: statuses.into(), 290 239 funcs: Cow::Owned(res), 291 291 - authors: vec![].into(), 292 292 - idb_paths: vec![].into(), 240 240 + users: vec![].into(), 241 241 + dbs: vec![].into(), 293 242 }) 294 243 .async_write(&mut stream) 295 244 .await?; 296 245 }, 297 246 _ => { 298 247 RpcMessage::Fail(rpc::RpcFail { 299 299 - result: 0, 300 300 - error: &format!("{server_name}: invalid data.\n"), 248 248 + code: 0, 249 249 + message: &format!("{server_name}: invalid data.\n"), 301 250 }) 302 251 .async_write(&mut stream) 303 252 .await?; ··· 306 255 Ok(()) 307 256 } 308 257 309 309 - async fn http_reply<W: AsyncRead + AsyncWrite + Unpin>(mut stream: W) { 310 310 - use tokio::io::AsyncWriteExt; 311 311 - 312 312 - const HTTP_REPLY: &str = concat!( 313 313 - "HTTP/1.1 400 bad request\r\n", 314 314 - "Refresh: 2; URL=https://github.com/naim94a/lumen\r\n", 315 315 - "Server: lumen\r\n", 316 316 - "Connection: close\r\n", 317 317 - "Content-Type: text/html\r\n", 318 318 - "", 319 319 - "\r\n", 320 320 - "<pre>This is not an HTTP server. <br />Redirecting to <a href=\"https://github.com/naim94a/lumen\">lumen</a> ...</pre>\n", 321 321 - ); 322 322 - 323 323 - let _ = stream.write_all(HTTP_REPLY.as_bytes()).await; 324 324 - } 325 325 - 326 258 async fn handle_client<S: AsyncRead + AsyncWrite + Unpin>( 327 259 state: &SharedState, mut stream: S, 328 260 ) -> Result<(), rpc::Error> { 329 261 let server_name = &state.server_name; 330 330 - let rpkt = async { 331 331 - let hdr = rpc::read_packet_header(&mut stream).await?; 332 332 - if hdr.is_http() { 333 333 - // looks like someone is using a browser instead of IDA, what a fool. 334 334 - debug!("ignoring http request..."); 335 335 - http_reply(&mut stream).await; 336 336 - return Err(Error::Eof); 337 337 - } 338 338 - hdr.read(&mut stream).await 339 339 - }; 340 340 - let hello = match timeout(Duration::from_secs(15), rpkt).await { 262 262 + let hello = match timeout(Duration::from_secs(15), rpc::read_packet(&mut stream)).await { 341 263 Ok(v) => v?, 342 264 Err(_) => { 343 265 debug!("didn't get hello in time."); ··· 347 269 348 270 let (hello, creds) = match RpcMessage::deserialize(&hello) { 349 271 Ok(RpcMessage::Hello(v, creds)) => { 350 350 - debug!("hello protocol={}, login creds: {creds:?}", v.client_version); 272 272 + debug!("hello protocol={}, login creds: {creds:?}", v.protocol_version); 351 273 (v, creds) 352 274 }, 353 275 _ => { 354 276 // send error 355 277 error!("got bad hello message"); 356 278 357 357 - let resp = rpc::RpcFail { result: 0, error: &format!("{server_name}: bad sequence.") }; 279 279 + let resp = rpc::RpcFail { code: 0, message: &format!("{server_name}: bad sequence.") }; 358 280 let resp = rpc::RpcMessage::Fail(resp); 359 281 resp.async_write(&mut stream).await?; 360 282 ··· 364 286 state 365 287 .metrics 366 288 .lumina_version 367 367 - .get_or_create(&LuminaVersion { protocol_version: hello.client_version }) 289 289 + .get_or_create(&LuminaVersion { protocol_version: hello.protocol_version }) 368 290 .inc(); 369 291 370 370 - let creds = creds.unwrap_or(Creds { username: "guest", password: "guest" }); 371 371 - 372 372 - let user = if creds.username != "guest" { 373 373 - match state.db.get_user_by_username(creds.username).await { 374 374 - Ok((user_id, db_creds)) if db_creds.verify_password(creds.password) => { 375 375 - let _ = state.db.update_last_active(user_id).await; 376 376 - info!("{} logged in successfully.", db_creds.username); 377 377 - (user_id, db_creds) 378 378 - }, 379 379 - Ok(_) => { 380 380 - rpc::RpcMessage::Fail(rpc::RpcFail { 381 381 - result: 1, 382 382 - error: &format!("{server_name}: invalid username or password."), 383 383 - }) 384 384 - .async_write(&mut stream) 385 385 - .await?; 386 386 - return Ok(()); 387 387 - }, 388 388 - Err(err) => { 389 389 - error!("error while fetching user information: {err}"); 390 390 - rpc::RpcMessage::Fail(rpc::RpcFail { 391 391 - result: 1, 392 392 - error: &format!("{server_name}: internal error, please try again later."), 393 393 - }) 394 394 - .async_write(&mut stream) 395 395 - .await?; 396 396 - return Ok(()); 397 397 - }, 292 292 + if let Some(ref creds) = creds { 293 293 + if creds.username != "guest" { 294 294 + // Only allow "guest" to connect for now. 295 295 + rpc::RpcMessage::Fail(rpc::RpcFail { 296 296 + code: 1, 297 297 + message: &format!("{server_name}: invalid username or password. Try logging in with `guest` instead."), 298 298 + }).async_write(&mut stream).await?; 299 299 + return Ok(()); 398 300 } 399 399 - } else { 400 400 - ( 401 401 - -1, 402 402 - db::schema::Creds { 403 403 - username: creds.username.into(), 404 404 - is_enabled: state.config.users.allow_guests, 405 405 - ..Default::default() 406 406 - }, 407 407 - ) 408 408 - }; 409 409 - 410 410 - if !user.1.is_enabled { 411 411 - info!("attempt to login to disabled account [{}].", user.1.username); 412 412 - rpc::RpcMessage::Fail(rpc::RpcFail { 413 413 - result: 1, 414 414 - error: &format!("{server_name}: account disabled."), 415 415 - }) 416 416 - .async_write(&mut stream) 417 417 - .await?; 418 418 - return Ok(()); 419 301 } 420 302 421 421 - let resp = match hello.client_version { 303 303 + let resp = match hello.protocol_version { 422 304 0..=4 => rpc::RpcMessage::Ok(()), 423 305 424 306 // starting IDA 8.3 425 307 5.. => { 426 308 let mut features = 0; 427 309 428 428 - if user.1.is_admin { 429 429 - features |= 0x01; 430 430 - } 431 431 - 432 432 - if user.0 != -1 && state.config.lumina.allow_deletes.unwrap_or(false) { 310 310 + if state.config.lumina.allow_deletes.unwrap_or(false) { 433 311 features |= 0x02; 434 312 } 435 313 436 436 - let last_active = user.1.last_active.map_or(0, |v| v.unix_timestamp() as u64); 437 437 - 438 438 - rpc::RpcMessage::HelloResult(HelloResult { 439 439 - username: Cow::Borrowed(&user.1.username), 440 440 - last_active, 441 441 - features, 442 442 - ..Default::default() 443 443 - }) 314 314 + rpc::RpcMessage::HelloResult(HelloResult { features, ..Default::default() }) 444 315 }, 445 316 }; 446 317 resp.async_write(&mut stream).await?; 447 318 448 448 - let creds_id = if user.0 == -1 { None } else { Some(user.0) }; 449 449 - let mut session = Session { 450 450 - state, 451 451 - hello_msg: hello, 452 452 - _creds: user.1, 453 453 - creds_id, 454 454 - last_cred_check: Instant::now(), 455 455 - }; 456 456 - 457 319 loop { 458 458 - handle_transaction(&mut session, &mut stream).await?; 320 320 + handle_transaction(state, &hello, &mut stream).await?; 459 321 } 460 322 } 461 323

-43

lumen/src/users.rs

··· 1 1 - use std::process::exit; 2 2 - 3 3 - use common::{config::Config, db::Database}; 4 4 - 5 5 - pub struct UserMgmt { 6 6 - db: Database, 7 7 - pbkd2_iters: u32, 8 8 - } 9 9 - 10 10 - impl UserMgmt { 11 11 - pub async fn new(cfg: &Config) -> Self { 12 12 - let db = match Database::open(&cfg.database).await { 13 13 - Ok(v) => v, 14 14 - Err(err) => { 15 15 - eprintln!("failed to open database: {}", err); 16 16 - exit(1); 17 17 - }, 18 18 - }; 19 19 - 20 20 - Self { db, pbkd2_iters: cfg.users.pbkdf2_iterations.get() } 21 21 - } 22 22 - 23 23 - pub async fn list_users(&self) { 24 24 - let users = self.db.get_users().await.expect("failed to retreive users from database"); 25 25 - println!("{users:?}"); 26 26 - } 27 27 - 28 28 - pub async fn set_password(&self, username: &str, password: &str) { 29 29 - self.db 30 30 - .set_password(username, password.to_owned(), self.pbkd2_iters) 31 31 - .await 32 32 - .expect("failed to set user's password") 33 33 - } 34 34 - 35 35 - pub async fn add_user(&self, username: &str, email: &str, is_admin: bool) { 36 36 - let id = self.db.add_user(username, email, is_admin).await.expect("failed to add user"); 37 37 - println!("{username}'s id is {id}.") 38 38 - } 39 39 - 40 40 - pub async fn delete_user(&self, username: &str) { 41 41 - self.db.delete_user(username).await.expect("failed to delete user"); 42 42 - } 43 43 - }