diff --git a/boltconn/src/app.rs b/boltconn/src/app.rs index b83bafd..0b8e727 100644 --- a/boltconn/src/app.rs +++ b/boltconn/src/app.rs @@ -459,7 +459,7 @@ async fn initialize_dns( fn start_instrument_services(bus: Arc, config: Option<&RawInstrumentConfig>) { if let Some(config) = config { - let web_server = InstrumentServer::new(config.api_key.clone(), bus.clone()); + let web_server = InstrumentServer::new(config.secret.clone(), bus.clone()); let addr = config.api_addr.as_socket_addr(default_inbound_ip_addr); let cors_allowed_list = config.cors_allowed_list.clone(); tokio::spawn(async move { web_server.run(addr, cors_allowed_list.as_slice()).await }); diff --git a/boltconn/src/config/config.rs b/boltconn/src/config/config.rs index a2d625e..36aebaf 100644 --- a/boltconn/src/config/config.rs +++ b/boltconn/src/config/config.rs @@ -98,11 +98,11 @@ pub struct RawWebControllerConfig { } #[derive(Serialize, Deserialize, Debug, Clone)] +#[serde(deny_unknown_fields)] pub struct RawInstrumentConfig { #[serde(alias = "api-port", alias = "api-addr")] pub api_addr: PortOrSocketAddr, - #[serde(alias = "api-key")] - pub api_key: Option, + pub secret: Option, #[serde(alias = "cors-allowed-list", default = "default_str_vec")] pub cors_allowed_list: Vec, } diff --git a/boltconn/src/external/instrument_server.rs b/boltconn/src/external/instrument_server.rs index aa59994..a6222a6 100644 --- a/boltconn/src/external/instrument_server.rs +++ b/boltconn/src/external/instrument_server.rs @@ -31,7 +31,7 @@ impl InstrumentServer { listen_addr: SocketAddr, cors_allowed_list: &[String], ) -> Result<(), RuntimeError> { - let secret = Arc::new(self.secret.clone()); + let secret = Arc::new(None); // We verify the secret in the subscribe parameters let cors_vec = parse_cors_allow(cors_allowed_list); let auth_wrapper = move |r| web_auth(secret.clone(), r, cors_vec.clone());