Skip to content

fix: detect tls keys/certs are empty #15

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
merged 4 commits into from
Nov 14, 2025
Merged

fix: detect tls keys/certs are empty #15

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
a07ab02
fix: detect tls keys/certs are empty
0x416e746f6e Nov 13, 2025
ecffc1e
chore: bump version
0x416e746f6e Nov 13, 2025
a600646
fix: correct the copy-typo
0x416e746f6e Nov 14, 2025
8f444d1
chore: update readme
0x416e746f6e Nov 14, 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
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion crates/rproxy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "rproxy"
version = "0.0.6"
version = "0.0.7"
edition = "2024"
default-run = "rproxy"

Expand Down
2 changes: 1 addition & 1 deletion crates/rproxy/src/server/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ impl Metrics {

this.registry.register_with_unit(
"ws_latency_client",
"round-trip-time of websocket pings to backend divided by 2",
"round-trip-time of websocket pings to client divided by 2",
Unit::Other(String::from("nanoseconds")),
this.ws_latency_client.clone(),
);
Expand Down
23 changes: 17 additions & 6 deletions crates/rproxy/src/server/proxy/config/tls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ impl ConfigTls {
let mut errs: Vec<ConfigTlsError> = vec![];

let mut cert: Option<Vec<CertificateDer>> = None;
let key: Option<PrivateKeyDer> = None;
let mut key: Option<PrivateKeyDer> = None;

// certificate
{
Expand Down Expand Up @@ -93,6 +93,12 @@ impl ConfigTls {
}

Ok(res) => {
if res.is_empty() {
errs.push(ConfigTlsError::InvalidCertificate {
path: self.certificate.clone(),
err: String::from("the certificate is missing"),
});
}
cert = Some(res);
}
}
Expand Down Expand Up @@ -134,8 +140,7 @@ impl ConfigTls {

let mut reader = Cursor::new(raw);

match rustls_pemfile::certs(&mut reader).collect::<Result<Vec<_>, _>>()
{
match rustls_pemfile::private_key(&mut reader) {
Err(err) => {
errs.push(ConfigTlsError::InvalidKey {
path: self.certificate.clone(),
Expand All @@ -144,7 +149,13 @@ impl ConfigTls {
}

Ok(res) => {
cert = Some(res);
if res.is_none() {
errs.push(ConfigTlsError::InvalidKey {
path: self.certificate.clone(),
err: String::from("the key is missing"),
});
}
key = res;
}
}
}
Expand Down Expand Up @@ -222,7 +233,7 @@ impl ConfigTls {

#[derive(Debug, Clone, Error)]
pub(crate) enum ConfigTlsError {
#[error("invalid tls certificate at '{path}': {err}")]
#[error("invalid tls certificate in '{path}': {err}")]
InvalidCertificate { path: String, err: String },

#[error("invalid tls certificate file '{path}': {err}")]
Expand All @@ -231,7 +242,7 @@ pub(crate) enum ConfigTlsError {
#[error("path to tls certificate is missing")]
MissingCertificate,

#[error("invalid tls key at '{path}': {err}")]
#[error("invalid tls key in '{path}': {err}")]
InvalidKey { path: String, err: String },

#[error("invalid tls key file '{path}': {err}")]
Expand Down
2 changes: 1 addition & 1 deletion crates/rproxy/src/server/proxy/ws/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ where
.ws_latency_client
.get_or_create(&LabelsProxyWs {
proxy: P::name(),
destination: WS_LABEL_BKND,
destination: WS_LABEL_CLNT,
})
.record(
(1000000.0 * (timestamp - pong.timestamp).as_seconds_f64() /
Expand Down
2 changes: 1 addition & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ tls:
# TYPE rproxy_ws_latency_backend_nanoseconds gauge
# UNIT rproxy_ws_latency_backend_nanoseconds nanoseconds

# HELP rproxy_ws_latency_client_nanoseconds round-trip-time of websocket pings to backend divided by 2.
# HELP rproxy_ws_latency_client_nanoseconds round-trip-time of websocket pings to client divided by 2.
# TYPE rproxy_ws_latency_client_nanoseconds gauge
# UNIT rproxy_ws_latency_client_nanoseconds nanoseconds

Expand Down