diff --git a/Cargo.lock b/Cargo.lock index 79cea808..e667ade5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -58,7 +58,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2", + "h2 0.3.26", "http 0.2.12", "httparse", "httpdate", @@ -659,7 +659,7 @@ dependencies = [ "derive_more", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "itoa", "log", @@ -968,7 +968,7 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "http-body 1.0.1", @@ -1883,12 +1883,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1931,9 +1931,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "ff" @@ -2144,10 +2144,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -2171,8 +2169,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -2228,6 +2226,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -2413,7 +2430,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2429,13 +2446,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -2464,20 +2482,19 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.2", "hyper-util", "rustls 0.23.11", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", "tower-service", - "webpki-roots 0.26.7", ] [[package]] @@ -2493,6 +2510,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.5.2", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.10" @@ -2504,7 +2537,7 @@ dependencies = [ "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.2", "pin-project-lite", "socket2", "tokio", @@ -2561,7 +2594,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.9", "same-file", "walkdir", "winapi-util", @@ -2959,27 +2992,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.87", -] - [[package]] name = "object" version = "0.36.1" @@ -3050,10 +3062,10 @@ dependencies = [ "openubl-migration", "openubl-storage", "sea-orm", - "sea-query 0.31.1", + "sea-query", "serde", "serde_json", - "thiserror 1.0.63", + "thiserror 2.0.11", "xhandler", ] @@ -3109,7 +3121,7 @@ dependencies = [ "openubl-storage", "sea-orm", "serde", - "thiserror 1.0.63", + "thiserror 2.0.11", "utoipa", "utoipa-swagger-ui", "xhandler", @@ -3120,7 +3132,7 @@ name = "openubl-signature" version = "0.1.0" dependencies = [ "anyhow", - "thiserror 1.0.63", + "thiserror 2.0.11", ] [[package]] @@ -3134,13 +3146,13 @@ dependencies = [ "aws-smithy-runtime-api", "clap", "minio", - "reqwest 0.11.27", + "reqwest 0.12.12", "serde", "tempfile", - "thiserror 1.0.63", + "thiserror 2.0.11", "tokio", "uuid", - "zip 2.2.2", + "zip", ] [[package]] @@ -3482,7 +3494,6 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.109", "version_check", ] @@ -3570,58 +3581,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "quinn" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" -dependencies = [ - "bytes", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls 0.23.11", - "socket2", - "thiserror 2.0.11", - "tokio", - "tracing", -] - -[[package]] -name = "quinn-proto" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" -dependencies = [ - "bytes", - "getrandom", - "rand", - "ring 0.17.8", - "rustc-hash", - "rustls 0.23.11", - "rustls-pki-types", - "slab", - "thiserror 2.0.11", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.59.0", -] - [[package]] name = "quote" version = "1.0.36" @@ -3678,14 +3637,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", ] [[package]] @@ -3699,13 +3658,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -3722,9 +3681,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" @@ -3746,12 +3705,12 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.32", "hyper-rustls 0.24.2", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -3766,7 +3725,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -3789,39 +3748,39 @@ checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da" dependencies = [ "base64 0.22.1", "bytes", - "futures-channel", + "encoding_rs", "futures-core", "futures-util", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper 1.5.2", + "hyper-rustls 0.27.5", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "quinn", - "rustls 0.23.11", "rustls-pemfile 2.1.2", - "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", + "system-configuration 0.6.1", "tokio", - "tokio-rustls 0.26.0", + "tokio-native-tls", "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.26.7", "windows-registry", ] @@ -3982,12 +3941,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" - [[package]] name = "rustc_version" version = "0.4.1" @@ -3999,15 +3952,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4084,9 +4037,6 @@ name = "rustls-pki-types" version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" -dependencies = [ - "web-time", -] [[package]] name = "rustls-webpki" @@ -4192,7 +4142,7 @@ dependencies = [ "ouroboros", "rust_decimal", "sea-orm-macros", - "sea-query 0.32.1", + "sea-query", "sea-query-binder", "serde", "serde_json", @@ -4253,16 +4203,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "sea-query" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4fd043b8117af233e221f73e3ea8dfbc8e8c3c928017c474296db45c649105c" -dependencies = [ - "inherent", - "sea-query-derive", -] - [[package]] name = "sea-query" version = "0.32.1" @@ -4289,7 +4229,7 @@ dependencies = [ "bigdecimal", "chrono", "rust_decimal", - "sea-query 0.32.1", + "sea-query", "serde_json", "sqlx", "time", @@ -4317,7 +4257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ef5dd7848c993f3789d09a2616484c72c9330cae2b048df59d8c9b8c0343e95" dependencies = [ "futures", - "sea-query 0.32.1", + "sea-query", "sea-schema-derive", ] @@ -4446,9 +4386,9 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" dependencies = [ "futures", "log", @@ -4460,9 +4400,9 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" dependencies = [ "proc-macro2", "quote", @@ -4917,9 +4857,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ "futures-core", ] @@ -4932,7 +4872,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -4945,6 +4896,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -4953,14 +4914,16 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5104,9 +5067,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.39.2" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -5122,9 +5085,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -5251,7 +5214,7 @@ dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tokio", "tower-layer", "tower-service", @@ -5457,9 +5420,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utoipa" -version = "4.2.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5afb1a60e207dca502682537fefcfd9921e71d0b83e9576060f09abc6efab23" +checksum = "435c6f69ef38c9017b4b4eea965dfb91e71e53d869e896db40d1cf2441dd75c0" dependencies = [ "indexmap", "serde", @@ -5469,11 +5432,10 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.3.1" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c24e8ab68ff9ee746aad22d39b5535601e6416d1b0feeabf78be986a5c4392" +checksum = "a77d306bc75294fd52f3e99b13ece67c02c1a2789190a6f31d32f736624326f7" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", "regex", @@ -5482,27 +5444,27 @@ dependencies = [ [[package]] name = "utoipa-swagger-ui" -version = "7.1.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943e0ff606c6d57d410fd5663a4d7c074ab2c5f14ab903b9514565e59fa1189e" +checksum = "161166ec520c50144922a625d8bc4925cc801b2dda958ab69878527c0e5c5d61" dependencies = [ "actix-web", + "base64 0.22.1", "mime_guess", "regex", - "reqwest 0.12.12", "rust-embed", "serde", "serde_json", "url", "utoipa", - "zip 1.1.4", + "zip", ] [[package]] name = "uuid" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" dependencies = [ "getrandom", "serde", @@ -5652,16 +5614,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "webpki" version = "0.22.4" @@ -6053,16 +6005,16 @@ dependencies = [ "base64 0.22.1", "lazy_static", "regex", - "reqwest 0.11.27", + "reqwest 0.12.12", "serde", "serial_test", "sha2", "static-files", "tera", - "thiserror 1.0.63", + "thiserror 2.0.11", "tokio", "xml", - "zip 2.2.2", + "zip", ] [[package]] @@ -6076,7 +6028,7 @@ dependencies = [ "openssl", "quick-xml", "rsa", - "thiserror 1.0.63", + "thiserror 2.0.11", "x509-cert", "xml_c14n", ] @@ -6127,22 +6079,6 @@ dependencies = [ "syn 2.0.87", ] -[[package]] -name = "zip" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" -dependencies = [ - "arbitrary", - "crc32fast", - "crossbeam-utils", - "displaydoc", - "flate2", - "indexmap", - "num_enum", - "thiserror 1.0.63", -] - [[package]] name = "zip" version = "2.2.2" diff --git a/Cargo.toml b/Cargo.toml index 52caf51c..635e4e4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,31 +22,31 @@ publish = false license = "Apache-2.0" [workspace.dependencies] -chrono = { version = "0.4.31", features = ["serde"] } -regex = "1.10.6" -log = "0.4.20" -tera = "1.19.1" -static-files = "0.2.1" -lazy_static = "1.4.0" -serde = { version = "1.0.208", features = ["derive"] } +chrono = { version = "0.4", features = ["serde"] } +regex = "1.11" +log = "0.4" +tera = "1.20" +static-files = "0.2" +lazy_static = "1.5" +serde = { version = "1.0", features = ["derive"] } rust_decimal = { version = "1.36" } rust_decimal_macros = "1.36" -xml = "0.8.10" -zip = { version = "2.2.2" } -reqwest = "0.11" -base64 = "0.22.1" -thiserror = "1.0.53" -anyhow = "1.0.95" -sha2 = "0.10.8" -rsa = "0.9.6" -serial_test = "3.1.1" -tokio = "1.39.2" -libxml = "0.3.3" -quick-xml = "0.37.2" -x509-cert = "0.2.5" -der = { version = "0.7.6" } +xml = "0.8" +zip = { version = "2.2" } +reqwest = "0.12" +base64 = "0.22" +thiserror = "2.0" +anyhow = "1.0" +sha2 = "0.10" +rsa = "0.9" +serial_test = "3.2" +tokio = "1.43" +libxml = "0.3" +quick-xml = "0.37" +x509-cert = "0.2" +der = { version = "0.7" } openssl = "0.10" -xml_c14n = "0.3.0" +xml_c14n = "0.3" xhandler = { path = "./xhandler" } openubl-migration = { path = "./server/migration" } @@ -56,25 +56,25 @@ openubl-storage = { path = "./server/storage" } openubl-api = { path = "./server/api" } openubl-server = { path = "./server/server" } +sea-orm = "1" +sea-query = "0.32" async-std = { version = "1" } -sea-orm = "1.0.0" -sea-query = "0.31" -clap = "4.4.11" -minio = "0.1.0" -serde_json = "1.x" -uuid = "1.6.1" -tempfile = "3.9.0" -aws-sdk-s3 = "1.11.0" -aws-config = "1.1.1" -aws-smithy-runtime = "1.1.1" -aws-smithy-runtime-api = "1.1.1" -async-trait = "0.1.75" -actix-web = "4.4.1" -actix-web-httpauth = "0.8.1" -env_logger = "0.11.5" -utoipa = "4.1.0" -utoipa-swagger-ui = "7.1.0" -actix-4-jwt-auth = "1.2.0" -actix-multipart = "0.7.2" +clap = "4" +minio = "0.1" +serde_json = "1" +uuid = "1.12" +tempfile = "3.15" +aws-sdk-s3 = "1.69" +aws-config = "1.5" +aws-smithy-runtime = "1.7" +aws-smithy-runtime-api = "1.7" +async-trait = "0.1" +env_logger = "0.11" +utoipa = "5.3" +utoipa-swagger-ui = "9.0" +actix-web = "4.9" +actix-web-httpauth = "0.8" +actix-4-jwt-auth = "1.2" +actix-multipart = "0.7" [patch.crates-io] diff --git a/server/server/src/dto.rs b/server/server/src/dto.rs index 3f5c874c..18e8a2e1 100644 --- a/server/server/src/dto.rs +++ b/server/server/src/dto.rs @@ -1,5 +1,6 @@ use openubl_entity as entity; use serde::{Deserialize, Serialize}; +use utoipa::ToSchema; #[derive(Serialize, Deserialize)] pub struct DocumentDto { @@ -34,7 +35,7 @@ pub struct CredentialsDto { pub url_perception_retention: String, } -#[derive(Serialize, Deserialize)] +#[derive(Serialize, Deserialize, ToSchema)] pub struct NewCredentialsDto { pub name: String, pub description: Option, diff --git a/server/storage/src/lib.rs b/server/storage/src/lib.rs index 7441cc81..64a74dbe 100644 --- a/server/storage/src/lib.rs +++ b/server/storage/src/lib.rs @@ -5,6 +5,7 @@ use std::io::{Cursor, Read, Write}; use std::path::Path; use std::str::FromStr; +use crate::config::Storage; use aws_config::meta::region::RegionProviderChain; use aws_config::retry::RetryConfig; use aws_config::BehaviorVersion; @@ -22,8 +23,6 @@ use zip::result::{ZipError, ZipResult}; use zip::write::SimpleFileOptions; use zip::{ZipArchive, ZipWriter}; -use crate::config::Storage; - pub mod config; pub struct LocalDir { @@ -239,7 +238,13 @@ impl StorageSystem { StorageSystem::Local(_) => fs::read(file_id)?, StorageSystem::Minio(bucket, client) => { let object = GetObjectArgs::new(&bucket.name, file_id)?; - client.get_object(&object).await?.bytes().await?.to_vec() + client + .get_object(&object) + .await? + .bytes() + .await + .map_err(|e| StorageSystemErr::Any(anyhow!(e.to_string())))? + .to_vec() } StorageSystem::S3(buckets, client) => client .get_object()