Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ regex = "1.12.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.149"
sha2 = "0.10.9"
subtle = "2.6"
temp-env = "0.3.6"
tokio = { version = "1.49", features = ["sync", "macros", "io-util", "rt", "time"] }
tokio-test = "0.4"
Expand Down
19 changes: 18 additions & 1 deletion crates/trusted-server-adapter-fastly/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ use trusted_server_core::constants::{
ENV_FASTLY_IS_STAGING, ENV_FASTLY_SERVICE_VERSION, HEADER_X_GEO_INFO_AVAILABLE,
HEADER_X_TS_ENV, HEADER_X_TS_VERSION,
};
use trusted_server_core::ec::admin::handle_register_partner;
use trusted_server_core::ec::partner::PartnerStore;
use trusted_server_core::error::TrustedServerError;
use trusted_server_core::geo::GeoInfo;
use trusted_server_core::http_util::sanitize_forwarded_headers;
Expand Down Expand Up @@ -105,10 +107,13 @@ async fn route_request(
// Signature verification endpoint
(Method::POST, "/verify-signature") => handle_verify_signature(settings, req),

// Key rotation admin endpoints
// Admin endpoints
// Keep in sync with Settings::ADMIN_ENDPOINTS in crates/trusted-server-core/src/settings.rs
(Method::POST, "/admin/keys/rotate") => handle_rotate_key(settings, req),
(Method::POST, "/admin/keys/deactivate") => handle_deactivate_key(settings, req),
(Method::POST, "/admin/partners/register") => {
require_partner_store(settings).and_then(|store| handle_register_partner(&store, req))
}

// Unified auction endpoint (returns creative HTML inline)
(Method::POST, "/auction") => handle_auction(settings, orchestrator, req).await,
Expand Down Expand Up @@ -209,3 +214,15 @@ fn init_logger() {
.apply()
.expect("should initialize logger");
}

/// Constructs a `PartnerStore` from settings, or returns 503 if the
/// `partner_store` config is not set.
fn require_partner_store(settings: &Settings) -> Result<PartnerStore, Report<TrustedServerError>> {
let store_name = settings.ec.partner_store.as_deref().ok_or_else(|| {
Report::new(TrustedServerError::KvStore {
store_name: "ec.partner_store".to_owned(),
message: "ec.partner_store is not configured".to_owned(),
})
})?;
Ok(PartnerStore::new(store_name))
}
1 change: 1 addition & 0 deletions crates/trusted-server-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ regex = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
sha2 = { workspace = true }
subtle = { workspace = true }
tokio = { workspace = true }
toml = { workspace = true }
trusted-server-js = { path = "../js" }
Expand Down
Loading
Loading