diff --git a/Cargo.lock b/Cargo.lock index 273f3dbb96..1d627f6cb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -916,31 +916,7 @@ dependencies = [ "hmac 0.12.1", "http-types", "hyper 0.14.28", - "hyper-tls 0.5.0", - "serde", - "serde_json", - "serde_path_to_error", - "serde_qs 0.10.1", - "sha2 0.10.8", - "smart-default 0.6.0", - "smol_str 0.1.24", - "thiserror 1.0.63", - "tokio", -] - -[[package]] -name = "async-stripe" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecbddf002ad7a13d2041eadf1b234cb3f57653ffdd901a01bc3f1c65aa77440" -dependencies = [ - "chrono", - "futures-util", - "hex", - "hmac 0.12.1", - "http-types", - "hyper 0.14.28", - "hyper-tls 0.5.0", + "hyper-rustls 0.24.2", "serde", "serde_json", "serde_path_to_error", @@ -963,7 +939,7 @@ dependencies = [ "bytes 1.10.1", "http-body-util", "hyper 1.6.0", - "hyper-tls 0.6.0", + "hyper-rustls 0.27.3", "hyper-util", "miniserde", "thiserror 2.0.12", @@ -5273,7 +5249,9 @@ dependencies = [ "futures-util", "http 0.2.11", "hyper 0.14.28", + "log", "rustls 0.21.12", + "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", ] @@ -5288,8 +5266,9 @@ dependencies = [ "http 1.3.1", "hyper 1.6.0", "hyper-util", + "log", "rustls 0.23.13", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -5309,19 +5288,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.10.1", - "hyper 0.14.28", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -9169,7 +9135,7 @@ dependencies = [ "http-body-util", "hyper 1.6.0", "hyper-rustls 0.27.3", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "js-sys", "log", @@ -9180,7 +9146,7 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.13", - "rustls-native-certs", + "rustls-native-certs 0.8.0", "rustls-pki-types", "serde", "serde_json", @@ -9543,6 +9509,7 @@ version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ + "log", "once_cell", "ring", "rustls-pki-types", @@ -9551,6 +9518,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile 1.0.4", + "schannel", + "security-framework", +] + [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -10860,7 +10839,6 @@ dependencies = [ "anyhow", "artcraft_api_defs", "async-stripe 0.26.0", - "async-stripe 0.41.0", "async-trait", "base64 0.22.1", "billing_artcraft_component", @@ -14122,7 +14100,7 @@ dependencies = [ "hyper 0.14.28", "hyper 1.6.0", "hyper-rustls 0.27.3", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "idna 1.0.3", "indexmap 1.9.3", diff --git a/crates/service/plugins/billing/Cargo.toml b/crates/service/plugins/billing/Cargo.toml index 709f946e28..ceae58cd08 100644 --- a/crates/service/plugins/billing/Cargo.toml +++ b/crates/service/plugins/billing/Cargo.toml @@ -45,7 +45,7 @@ serde_derive = { workspace = true } serde_json = { workspace = true } # Money -async-stripe = { version = "0.26.0", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } +async-stripe = { version = "0.26.0", default-features = false, features = ["runtime-tokio-hyper-rustls", "connect", "billing", "checkout", "webhook-events"] } # Async traits # NB: note: `async` trait functions are not currently supported diff --git a/crates/service/plugins/billing_artcraft/Cargo.toml b/crates/service/plugins/billing_artcraft/Cargo.toml index b1e56ad52a..abcd05b5f6 100644 --- a/crates/service/plugins/billing_artcraft/Cargo.toml +++ b/crates/service/plugins/billing_artcraft/Cargo.toml @@ -44,7 +44,7 @@ serde_json.workspace = true sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } # Money -async-stripe = { version = "1.0.0-alpha.2", features = [] } +async-stripe = { version = "1.0.0-alpha.2", default-features = false, features = ["rustls-tls-native"] } async-stripe-checkout = { version = "1.0.0-alpha.2", features = ["checkout_session"] } async-stripe-core = { version = "1.0.0-alpha.2", features = ["customer"] } async-stripe-shared= { version = "1.0.0-alpha.2", features = [] } diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index b3c136b153..eb74d1e665 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -101,13 +101,8 @@ strum_macros = "0.26.4" time = "0.3.30" url.workspace = true -# Stripe for ArtCraft -async_stripe_artcraft = { package = "async-stripe", version = "0.41.0", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } -#async_stripe_artcraft = { git = "https://github.com/arlyon/async-stripe", branch = "openapi-1720743905", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } -#async_stripe_artcraft = { git = "https://github.com/arlyon/async-stripe", branch = "next", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } - # Money -async-stripe = { version = "0.26.0", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } +async-stripe = { version = "0.26.0", default-features = false, features = ["runtime-tokio-hyper-rustls", "connect", "billing", "checkout", "webhook-events"] } # Language tag parsing # TODO: Move to language support crate diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index dea71b8c90..29cf3859a0 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -82,7 +82,7 @@ use crate::http_server::web_utils::handle_multipart_error::handle_multipart_erro use crate::http_server::web_utils::scoped_temp_dir_creator::ScopedTempDirCreator; use crate::state::certs::google_sign_in_cert::GoogleSignInCert; use crate::state::memory_cache::model_token_to_info_cache::ModelTokenToInfoCache; -use crate::state::server_state::{DurableInMemoryCaches, EnvConfig, EphemeralInMemoryCaches, FalData, InMemoryCaches, OpenAiData, ServerInfo, ServerState, StaticFeatureFlags, StripeArtcraftSettings, StripeSettings, TrollBans}; +use crate::state::server_state::{DurableInMemoryCaches, EnvConfig, EphemeralInMemoryCaches, FalData, InMemoryCaches, OpenAiData, ServerInfo, ServerState, StaticFeatureFlags, StripeSettings, TrollBans}; use crate::threads::db_health_checker_thread::db_health_check_status::HealthCheckStatus; use crate::threads::db_health_checker_thread::db_health_checker_thread::db_health_checker_thread; use crate::threads::poll_ip_banlist_thread::poll_ip_bans; diff --git a/crates/service/web/storyteller_web/src/state/server_state.rs b/crates/service/web/storyteller_web/src/state/server_state.rs index a1cf4c2028..07412551bd 100644 --- a/crates/service/web/storyteller_web/src/state/server_state.rs +++ b/crates/service/web/storyteller_web/src/state/server_state.rs @@ -227,15 +227,6 @@ pub struct StripeSettings { pub client: stripe::Client, } -#[derive(Clone)] -pub struct StripeArtcraftSettings { - pub secret_key: String, - pub secret_webhook_signing_key: String, - pub checkout_success_url: String, - pub checkout_cancel_url: String, - pub client: async_stripe_artcraft::Client, -} - /// Flags set at service startup #[derive(Clone)] pub struct StaticFeatureFlags {