Merge pull request #153 from dfinity/igor/rl-token-new-custom-domains

fix(BOUN-1501): Pass ratelimit bypass token to new custom domains

Author: blind-oracle

Cargo.lock

@@ -38,8 +38,8 @@ cloudflare = { version = "0.14.0", default-features = false, features = [
 ] }
 console-subscriber = { version = "0.4.1", optional = true }
 ctrlc = { version = "3.4.5", features = ["termination"] }
-custom-domains-backend = { package = "backend", git = "https://github.com/dfinity/custom-domains", rev = "c839322dccaaa36a4991cba142435d12cdba4c93" }
-custom-domains-base = { package = "base", git = "https://github.com/dfinity/custom-domains", rev = "c839322dccaaa36a4991cba142435d12cdba4c93" }
+custom-domains-backend = { package = "backend", git = "https://github.com/dfinity/custom-domains", rev = "d672fec312348373eff59cdef06705487bb1da18" }
+custom-domains-base = { package = "base", git = "https://github.com/dfinity/custom-domains", rev = "d672fec312348373eff59cdef06705487bb1da18" }
 derive-new = "0.7.0"
 fqdn = { version = "0.4.1", features = ["serde"] }
 futures = "0.3.31"
@@ -128,9 +128,6 @@ wat = "1.228.0"
 [patch.crates-io]
 # v0.3.3 breaks backwards compatibility, do not remove unless you want to deal with it.
 ic-management-canister-types = { git = "https://github.com/dfinity/cdk-rs", rev = "19fdcd4c928b71d010aa124e2bb7f874290edac9" }
-# Temporary use fixed branch until new version is released.
-# See https://github.com/programatik29/axum-server/issues/170
-axum-server = { git = "https://github.com/AlvaroParker/axum-server", branch = "fix-trait-bound" }
 
 [profile.release]
 strip = "symbols"

Cargo.toml

@@ -191,6 +191,7 @@ pub async fn main(
             &mut tasks,
             &mut certificate_providers,
             &mut custom_domain_providers,
+            cli.rate_limit.rate_limit_bypass_token.clone(),
         )
         .await
         .context("unable to setup Custom Domains")?;
@@ -382,6 +383,7 @@ async fn setup_custom_domains(
     tasks: &mut TaskManager,
     certificate_providers: &mut Vec<Arc<dyn ProvidesCertificates>>,
     custom_domain_providers: &mut Vec<Arc<dyn ProvidesCustomDomains>>,
+    rate_limiter_bypass_token: Option<String>,
 ) -> Result<Router, Error> {
     let token = tasks.token();
     let (workers, router, client) = setup(
@@ -390,6 +392,7 @@ async fn setup_custom_domains(
         token,
         HOSTNAME.get().unwrap(),
         metrics_registry.clone(),
+        rate_limiter_bypass_token,
     )
     .await?;