diff --git a/Cargo.lock b/Cargo.lock index b2ae95046..398aa7ed0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,9 +234,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "aws-config" -version = "1.8.14" +version = "1.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a8fc176d53d6fe85017f230405e3255cedb4a02221cb55ed6d76dccbbb099b2" +checksum = "11493b0bad143270fb8ad284a096dd529ba91924c5409adeac856cc1bf047dbc" dependencies = [ "aws-credential-types", "aws-runtime", @@ -254,7 +254,7 @@ dependencies = [ "fastrand", "hex", "http 1.4.0", - "ring", + "sha1", "time", "tokio", "tracing", @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.13" +version = "1.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d203b0bf2626dcba8665f5cd0871d7c2c0930223d6b6be9097592fea21242d0" +checksum = "8f20799b373a1be121fe3005fba0c2090af9411573878f224df44b42727fcaf7" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -299,9 +299,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ede2ddc593e6c8acc6ce3358c28d6677a6dc49b65ba4b37a2befe14a11297e75" +checksum = "5fc0651c57e384202e47153c1260b84a9936e19803d747615edf199dc3b98d17" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -324,9 +324,9 @@ dependencies = [ [[package]] name = "aws-sdk-ec2" -version = "1.214.0" +version = "1.216.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5011a07318505db9ffe5a03e667653b44ee85d392f0e5f36ebd1fff2f2cbfa8" +checksum = "0bcafb17cfb3978dbf5b5a637d101a6212bc080cb33b5881da65f87967aedf67" dependencies = [ "aws-credential-types", "aws-runtime", @@ -349,9 +349,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.95.0" +version = "1.96.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c5ff27c6ba2cbd95e6e26e2e736676fdf6bcf96495b187733f521cfe4ce448" +checksum = "f64a6eded248c6b453966e915d32aeddb48ea63ad17932682774eb026fbef5b1" dependencies = [ "aws-credential-types", "aws-runtime", @@ -373,9 +373,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.97.0" +version = "1.98.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d186f1e5a3694a188e5a0640b3115ccc6e084d104e16fd6ba968dca072ffef8" +checksum = "db96d720d3c622fcbe08bae1c4b04a72ce6257d8b0584cb5418da00ae20a344f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -397,9 +397,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.99.0" +version = "1.100.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acba7c62f3d4e2408fa998a3a8caacd8b9a5b5549cf36e2372fbdae329d5449" +checksum = "fafbdda43b93f57f699c5dfe8328db590b967b8a820a13ccdd6687355dfcc7ca" dependencies = [ "aws-credential-types", "aws-runtime", @@ -422,9 +422,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37411f8e0f4bea0c3ca0958ce7f18f6439db24d555dbd809787262cd00926aa9" +checksum = "b0b660013a6683ab23797778e21f1f854744fdf05f68204b4cca4c8c04b5d1f4" dependencies = [ "aws-credential-types", "aws-smithy-http", @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.2.13" +version = "1.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc50d0f63e714784b84223abd7abbc8577de8c35d699e0edd19f0a88a08ae13" +checksum = "2ffcaf626bdda484571968400c326a244598634dc75fd451325a54ad1a59acfc" dependencies = [ "futures-util", "pin-project-lite", @@ -455,9 +455,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.63.5" +version = "0.63.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d619373d490ad70966994801bc126846afaa0d1ee920697a031f0cf63f2568e7" +checksum = "ba1ab2dc1c2c3749ead27180d333c42f11be8b0e934058fb4b2258ee8dbe5231" dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", @@ -476,9 +476,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-client" -version = "1.1.11" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ccbb08c10f6bcf912f398188e42ee2eab5f1767ce215a02a73bc5df1bbdd95" +checksum = "6a2f165a7feee6f263028b899d0a181987f4fa7179a6411a32a439fba7c5f769" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -506,27 +506,27 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.62.4" +version = "0.62.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b3a779093e18cad88bbae08dc4261e1d95018c4c5b9356a52bcae7c0b6e9bb" +checksum = "9648b0bb82a2eedd844052c6ad2a1a822d1f8e3adee5fbf668366717e428856a" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-observability" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3f39d5bb871aaf461d59144557f16d5927a5248a983a40654d9cf3b9ba183b" +checksum = "a06c2315d173edbf1920da8ba3a7189695827002e4c0fc961973ab1c54abca9c" dependencies = [ "aws-smithy-runtime-api", ] [[package]] name = "aws-smithy-query" -version = "0.60.14" +version = "0.60.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f76a580e3d8f8961e5d48763214025a2af65c2fa4cd1fb7f270a0e107a71b0" +checksum = "1a56d79744fb3edb5d722ef79d86081e121d3b9422cb209eb03aea6aa4f21ebd" dependencies = [ "aws-smithy-types", "urlencoding", @@ -534,9 +534,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ccf7f6eba8b2dcf8ce9b74806c6c185659c311665c4bf8d6e71ebd454db6bf" +checksum = "028999056d2d2fd58a697232f9eec4a643cf73a71cf327690a7edad1d2af2110" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -559,9 +559,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.11.5" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4af6e5def28be846479bbeac55aa4603d6f7986fc5da4601ba324dd5d377516" +checksum = "876ab3c9c29791ba4ba02b780a3049e21ec63dabda09268b175272c3733a79e6" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -576,9 +576,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca2734c16913a45343b37313605d84e7d8b34a4611598ce1d25b35860a2bed3" +checksum = "d2b1117b3b2bbe166d11199b540ceed0d0f7676e36e7b962b5a437a9971eac75" dependencies = [ "base64-simd", "bytes", @@ -602,18 +602,18 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.14" +version = "0.60.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b53543b4b86ed43f051644f704a98c7291b3618b67adf057ee77a366fa52fcaa" +checksum = "0ce02add1aa3677d022f8adf81dcbe3046a95f17a1b1e8979c145cd21d3d22b3" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "1.3.13" +version = "1.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0470cc047657c6e286346bdf10a8719d26efd6a91626992e0e64481e44323e96" +checksum = "47c8323699dd9b3c8d5b3c13051ae9cdef58fd179957c882f8374dd8725962d9" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -787,13 +787,13 @@ dependencies = [ [[package]] name = "bcrypt" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a0f5948f30df5f43ac29d310b7476793be97c50787e6ef4a63d960a0d0be827" +checksum = "523ab528ce3a7ada6597f8ccf5bd8d85ebe26d5edf311cad4d1d3cfb2d357ac6" dependencies = [ "base64 0.22.1", "blowfish", - "getrandom 0.3.4", + "getrandom 0.4.1", "subtle", "zeroize", ] @@ -2960,7 +2960,7 @@ dependencies = [ "svi", "tokio", "tokio-util", - "toml", + "toml 1.0.4+spec-1.1.0", "toml_pretty", "tracing", "transport", @@ -3224,9 +3224,9 @@ dependencies = [ [[package]] name = "mogh_auth_server" -version = "1.2.7" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0b5a9302bb66d461840957dccc9f94549df44c0ad4b8b53c3c7293364bf979" +checksum = "8714b33c513ae52d610a8178946d3bd8878b672a0c07699bcf7525b568ce90f1" dependencies = [ "anyhow", "arc-swap", @@ -3280,7 +3280,7 @@ dependencies = [ "serde_json", "serde_yaml_ng", "thiserror 2.0.18", - "toml", + "toml 0.9.11+spec-1.1.0", "wildcard", ] @@ -3392,9 +3392,9 @@ dependencies = [ [[package]] name = "mogh_server" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3292c49e7483691c6eef791fa96aa2120df97b69241514313e53207945c3d69" +checksum = "66ab833484ee2242003819a2b948421dc3469e7d153db71bd7579d5de2660b81" dependencies = [ "anyhow", "axum", @@ -4082,9 +4082,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -5406,9 +5406,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.38.2" +version = "0.38.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efc19935b4b66baa6f654ac7924c192f55b175c00a7ab72410fc24284dacda8" +checksum = "d03c61d2a49c649a15c407338afe7accafde9dac869995dccb73e5f7ef7d9034" dependencies = [ "libc", "memchr", @@ -5573,9 +5573,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -5670,7 +5670,22 @@ dependencies = [ "indexmap 2.13.0", "serde_core", "serde_spanned", - "toml_datetime", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow", +] + +[[package]] +name = "toml" +version = "1.0.4+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94c3321114413476740df133f0d8862c61d87c8d26f04c6841e033c8c80db47" +dependencies = [ + "indexmap 2.13.0", + "serde_core", + "serde_spanned", + "toml_datetime 1.0.0+spec-1.1.0", "toml_parser", "toml_writer", "winnow", @@ -5686,10 +5701,19 @@ dependencies = [ ] [[package]] -name = "toml_parser" -version = "1.0.6+spec-1.1.0" +name = "toml_datetime" +version = "1.0.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_parser" +version = "1.0.9+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" dependencies = [ "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index 94bbc4443..ad5a7aea7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ mogh_error = { version = "1.0.3", default-features = false } derive_default_builder = "0.1.8" async_timing_util = "1.1.0" mogh_auth_client = "1.2.2" -mogh_auth_server = "1.2.7" +mogh_auth_server = "1.2.8" mogh_secret_file = "1.0.1" mogh_validations = "1.0.1" mogh_rate_limit = "1.0.1" @@ -46,7 +46,7 @@ mongo_indexed = "2.0.2" mogh_resolver = "1.0.0" mogh_config = "1.0.2" mogh_logger = "1.3.1" -mogh_server = "1.4.4" +mogh_server = "1.4.5" toml_pretty = "2.0.0" mogh_cache = "1.1.1" mogh_pki = "1.1.0" @@ -55,10 +55,10 @@ svi = "1.2.0" # ASYNC reqwest = { version = "0.13.2", default-features = false, features = ["json", "stream", "form", "query", "rustls"] } -tokio = { version = "1.49.0", features = ["full"] } +tokio = { version = "1.50.0", features = ["full"] } tokio-util = { version = "0.7.18", features = ["io", "codec"] } tokio-stream = { version = "0.1.18", features = ["sync"] } -pin-project-lite = "0.2.16" +pin-project-lite = "0.2.17" futures-util = "0.3.32" arc-swap = "1.8.2" @@ -77,7 +77,7 @@ indexmap = { version = "2.13.0", features = ["serde"] } serde = { version = "1.0.227", features = ["derive"] } strum = { version = "0.28.0", features = ["derive"] } bson = { version = "2.15.0" } # must keep in sync with mongodb version -toml = "0.9.11" +toml = "1.0.4" serde_yaml_ng = "0.10.0" serde_json = "1.0.149" serde_qs = "1.0.0" @@ -100,7 +100,7 @@ uuid = { version = "1.21.0", features = ["v4", "fast-rng", "serde"] } rustls = { version = "0.23.37", features = ["aws-lc-rs"] } data-encoding = "2.10.0" urlencoding = "2.1.3" -bcrypt = "0.18.0" +bcrypt = "0.19.0" hmac = "0.12.1" sha1 = "0.10.6" sha2 = "0.10.9" @@ -113,13 +113,13 @@ portable-pty = "0.9.0" shell-escape = "0.1.5" crossterm = "0.29.0" bollard = "0.20.1" -sysinfo = "0.38.2" +sysinfo = "0.38.3" shlex = "1.3.0" # CLOUD -aws-config = "1.8.14" -aws-sdk-ec2 = "1.214.0" -aws-credential-types = "1.2.13" +aws-config = "1.8.15" +aws-sdk-ec2 = "1.216.0" +aws-credential-types = "1.2.14" ## CRON english-to-cron = "0.1.7" diff --git a/bin/core/src/connection/client.rs b/bin/core/src/connection/client.rs index 60ed747a5..a5be4ab09 100644 --- a/bin/core/src/connection/client.rs +++ b/bin/core/src/connection/client.rs @@ -71,10 +71,10 @@ impl PeripheryConnectionArgs<'_> { }; debug!( - id = connection.args.id, host = identifiers.host(), query = core_connection_query(), - sec_websocket_accept = format!("{accept:?}"), + sec_websocket_accept = accept.to_str().unwrap_or_default(), + resource_id = connection.args.id, "[PERIPHERY AUTH] Zero trust identifiers" ); diff --git a/bin/core/src/connection/server.rs b/bin/core/src/connection/server.rs index d03c71d89..9aab4df42 100644 --- a/bin/core/src/connection/server.rs +++ b/bin/core/src/connection/server.rs @@ -130,10 +130,10 @@ async fn existing_server_handler( }; debug!( - id = &server.id, - host = format!("{:?}", identifiers.host), + host = identifiers.host.to_str().unwrap_or_default(), query, - sec_websocket_accept = format!("{:?}", identifiers.accept), + sec_websocket_accept = identifiers.accept, + resource_id = &server.id, "[PERIPHERY AUTH] Zero trust identifiers" ); diff --git a/bin/periphery/src/connection/client.rs b/bin/periphery/src/connection/client.rs index 86cbf1e3e..c77167be0 100644 --- a/bin/periphery/src/connection/client.rs +++ b/bin/periphery/src/connection/client.rs @@ -97,7 +97,7 @@ pub async fn handler( debug!( host = identifiers.host(), query, - sec_websocket_accept = format!("{accept:?}"), + sec_websocket_accept = accept.to_str().unwrap_or_default(), "[CORE AUTH] Zero trust identifiers" ); diff --git a/bin/periphery/src/connection/server.rs b/bin/periphery/src/connection/server.rs index 4536e447e..e0a76a3be 100644 --- a/bin/periphery/src/connection/server.rs +++ b/bin/periphery/src/connection/server.rs @@ -110,9 +110,9 @@ async fn handler( let query = format!("core={}", urlencoding::encode(&core)); debug!( - host = format!("{:?}", identifiers.host), + host = identifiers.host.to_str().unwrap_or_default(), query, - sec_websocket_accept = format!("{:?}", identifiers.accept), + sec_websocket_accept = identifiers.accept, "[CORE AUTH] Zero trust identifiers" ); diff --git a/client/core/rs/src/entities/config/core.rs b/client/core/rs/src/entities/config/core.rs index 1c3ae1aa7..0a2c3980e 100644 --- a/client/core/rs/src/entities/config/core.rs +++ b/client/core/rs/src/entities/config/core.rs @@ -1049,7 +1049,7 @@ impl mogh_server::session::SessionConfig for &CoreConfig { "KOMODO_HOST" } fn expiry_seconds(&self) -> i64 { - 60 + 60 * 3 } fn allow_cross_site(&self) -> bool { self.session_allow_cross_site