Skip to content
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

chore: fix release-plz don't found default cert #42

Merged
merged 1 commit into from
Aug 17, 2024
Merged

chore: fix release-plz don't found default cert #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions crates/agent/examples/benchmark_clients.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use atm0s_reverse_proxy_agent::{
use base64::{engine::general_purpose::URL_SAFE, Engine as _};
use clap::Parser;
use futures::{AsyncRead, AsyncWrite};
use protocol::DEFAULT_TUNNEL_CERT;
use protocol_ed25519::AgentLocalKey;
use rustls::pki_types::CertificateDer;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
Expand Down Expand Up @@ -87,8 +88,7 @@ async fn main() {
}

async fn connect(client: usize, args: Args, registry: Arc<dyn ServiceRegistry>) {
let default_tunnel_cert_buf = include_bytes!("../../../certs/tunnel.cert");
let default_tunnel_cert = CertificateDer::from(default_tunnel_cert_buf.to_vec());
let default_tunnel_cert = CertificateDer::from(DEFAULT_TUNNEL_CERT.to_vec());

let server_certs = if let Some(cert) = args.custom_quic_cert_base64 {
vec![CertificateDer::from(
Expand Down
6 changes: 2 additions & 4 deletions crates/agent/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use atm0s_reverse_proxy_agent::{
use base64::{engine::general_purpose::URL_SAFE, Engine as _};
use clap::Parser;
use futures::{AsyncRead, AsyncWrite};
use protocol::services::SERVICE_RTSP;
use protocol::{services::SERVICE_RTSP, DEFAULT_TUNNEL_CERT};
use protocol_ed25519::AgentLocalKey;
use rustls::pki_types::CertificateDer;
use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
Expand Down Expand Up @@ -60,8 +60,6 @@ struct Args {
#[async_std::main]
async fn main() {
let args = Args::parse();
let default_tunnel_cert_buf = include_bytes!("../../../certs/tunnel.cert");
let default_tunnel_cert = CertificateDer::from(default_tunnel_cert_buf.to_vec());

let server_certs = if let Some(cert) = args.custom_quic_cert_base64 {
vec![CertificateDer::from(
Expand All @@ -71,7 +69,7 @@ async fn main() {
.to_vec(),
)]
} else {
vec![default_tunnel_cert]
vec![CertificateDer::from(DEFAULT_TUNNEL_CERT.to_vec())]
};

rustls::crypto::ring::default_provider()
Expand Down
0 certs/cluster.cert → crates/protocol/certs/cluster.cert
View file
Open in desktop
File renamed without changes.
0 certs/cluster.key → crates/protocol/certs/cluster.key
View file
Open in desktop
File renamed without changes.
0 certs/tunnel.cert → crates/protocol/certs/tunnel.cert
View file
Open in desktop
File renamed without changes.
0 certs/tunnel.key → crates/protocol/certs/tunnel.key
View file
Open in desktop
File renamed without changes.
6 changes: 6 additions & 0 deletions crates/protocol/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
pub mod cluster;
pub mod key;
pub mod services;

pub const DEFAULT_TUNNEL_CERT: &[u8] = include_bytes!("../certs/tunnel.cert");
pub const DEFAULT_TUNNEL_KEY: &[u8] = include_bytes!("../certs/tunnel.key");

pub const DEFAULT_CLUSTER_CERT: &[u8] = include_bytes!("../certs/cluster.cert");
pub const DEFAULT_CLUSTER_KEY: &[u8] = include_bytes!("../certs/cluster.key");
17 changes: 8 additions & 9 deletions crates/relayer/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ use clap::Parser;
use metrics_dashboard::{build_dashboard_route, DashboardOptions};
#[cfg(feature = "expose-metrics")]
use poem::{listener::TcpListener, middleware::Tracing, EndpointExt as _, Route, Server};
use protocol::services::SERVICE_RTSP;
use protocol::{
services::SERVICE_RTSP, DEFAULT_CLUSTER_CERT, DEFAULT_CLUSTER_KEY, DEFAULT_TUNNEL_CERT,
DEFAULT_TUNNEL_KEY,
};
use rustls::pki_types::{CertificateDer, PrivatePkcs8KeyDer};
#[cfg(feature = "expose-metrics")]
use std::net::{Ipv4Addr, SocketAddrV4};
Expand Down Expand Up @@ -81,15 +84,11 @@ struct Args {

#[async_std::main]
async fn main() {
let default_tunnel_cert_buf = include_bytes!("../../../certs/tunnel.cert");
let default_tunnel_key_buf = include_bytes!("../../../certs/tunnel.key");
let default_tunnel_cert = CertificateDer::from(default_tunnel_cert_buf.to_vec());
let default_tunnel_key = PrivatePkcs8KeyDer::from(default_tunnel_key_buf.to_vec());
let default_tunnel_cert = CertificateDer::from(DEFAULT_TUNNEL_CERT.to_vec());
let default_tunnel_key = PrivatePkcs8KeyDer::from(DEFAULT_TUNNEL_KEY.to_vec());

let default_cluster_cert_buf = include_bytes!("../../../certs/cluster.cert");
let default_cluster_key_buf = include_bytes!("../../../certs/cluster.key");
let default_cluster_cert = CertificateDer::from(default_cluster_cert_buf.to_vec());
let default_cluster_key = PrivatePkcs8KeyDer::from(default_cluster_key_buf.to_vec());
let default_cluster_cert = CertificateDer::from(DEFAULT_CLUSTER_CERT.to_vec());
let default_cluster_key = PrivatePkcs8KeyDer::from(DEFAULT_CLUSTER_KEY.to_vec());

rustls::crypto::ring::default_provider()
.install_default()
Expand Down
Loading