Skip to content

chore: remove certificate validator #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsanchezgavier merged 4 commits into from
Oct 2, 2025
Merged

chore: remove certificate validator #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe44a5d
chore: remove signature validation using pub key from certificate
gsanchezgavier Sep 29, 2025
969f5c4
docs
gsanchezgavier Sep 29, 2025
23152e4
e2e test
gsanchezgavier Sep 29, 2025
f893c04
integration test
gsanchezgavier Oct 1, 2025
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
21 changes: 0 additions & 21 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions THIRD_PARTY_NOTICES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2552,12 +2552,6 @@ Distributed under the following license(s):
* MIT
* Apache-2.0

## webpki <https://crates.io/crates/webpki>

Distributed under the following license(s):

* ISC

## webpki-roots <https://crates.io/crates/webpki-roots>

Distributed under the following license(s):
Expand Down
2 changes: 0 additions & 2 deletions agent-control/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ opentelemetry-semantic-conventions = { version = "0.30.0", features = [
http-serde = "2.1.1"
config = { version = "0.15.18", features = ["yaml"] }
rustls = { version = "0.23.32", features = ["ring"] }
webpki = { version = "0.22.4", features = ["alloc"] }
x509-parser = "0.18.0"
ring = "0.17.14"
bytes = "1.10.1"
Expand Down Expand Up @@ -97,7 +96,6 @@ httpmock = { version = "0.8.0", features = ["proxy"] }
serial_test = "3.2.0"
futures = "0.3.31"
rcgen = { version = "0.14.5", features = ["crypto"] }
rustls-pemfile = { version = "2.2.0" }
rstest = "0.26.1"
tokio-stream = { version = "0.1.17", features = ["net"] }

Expand Down
2 changes: 1 addition & 1 deletion agent-control/src/agent_control/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ impl<'de> Deserialize<'de> for OpAMPClientConfig {
#[serde(default)]
fleet_id: String,
#[serde(default)]
pub signature_validation: SignatureValidatorConfig,
signature_validation: SignatureValidatorConfig,
}

let mut intermediate_spec = IntermediateOpAMPClientConfig::deserialize(deserializer)?;
Expand Down
8 changes: 3 additions & 5 deletions agent-control/src/agent_control/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ use crate::http::config::ProxyConfig;
use crate::opamp::auth::token_retriever::TokenRetrieverImpl;
use crate::opamp::client_builder::PollInterval;
use crate::opamp::http::builder::OpAMPHttpClientBuilder;
use crate::opamp::remote_config::validators::signature::validator::{
SignatureValidator, build_signature_validator,
};
use crate::opamp::remote_config::validators::signature::validator::SignatureValidator;
use std::error::Error;
use std::fmt::{self, Display, Formatter};
use std::path::PathBuf;
Expand Down Expand Up @@ -160,10 +158,10 @@ impl AgentControlRunner {
let signature_validator = config
.opamp
.map(|fleet_config| {
build_signature_validator(fleet_config.signature_validation, config.proxy)
SignatureValidator::new(fleet_config.signature_validation, config.proxy)
})
.transpose()?
.unwrap_or(SignatureValidator::Noop);
.unwrap_or(SignatureValidator::new_noop());
Comment on lines +161 to +164
Copy link
Contributor

@sigilioso sigilioso Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also need the the Noop thing here because we need to build a signature validator even if OpAMP is disabled, right? 🙃

Someday we will take care of the whole let Some(opamp) else thing...

Copy link
Contributor Author

@gsanchezgavier gsanchezgavier Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes and in this case the warn message doesn't make sense, it only appears whenver opamp is enabled and sig verificatino is disabled


Ok(AgentControlRunner {
http_server_runner,
Expand Down
Loading
Loading