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

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

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

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

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

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

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

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

3 changes: 3 additions & 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 @@ -45,6 +45,7 @@ chrono = { version = "0.4", default-features = false, features = [
] }
claims = "0.8"
clap = { version = "4.5", features = ["derive", "env"] }
futures = "0.3"
humantime = "2.1"
# match version used by sqlx
ipnetwork = "0.20"
Expand Down
18 changes: 14 additions & 4 deletions crates/defguard/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ use defguard_common::{
},
},
messages::peer_stats_update::PeerStatsUpdate,
types::proxy::ProxyControlMessage,
};
use defguard_core::{
auth::failed_login::FailedLoginMap,
Expand Down Expand Up @@ -42,7 +43,10 @@ use defguard_mail::{Mail, run_mail_handler};
use defguard_proxy_manager::{ProxyManager, ProxyTxSet};
use defguard_session_manager::run_session_manager;
use secrecy::ExposeSecret;
use tokio::sync::{broadcast, mpsc::unbounded_channel};
use tokio::sync::{
broadcast,
mpsc::{channel, unbounded_channel},
};

#[macro_use]
extern crate tracing;
Expand Down Expand Up @@ -133,7 +137,7 @@ async fn main() -> Result<(), anyhow::Error> {
"No gRPC TLS certificate or key found in settings, generating self-signed certificate for gRPC server."
);

let ca = defguard_certs::CertificateAuthority::new()?;
let ca = defguard_certs::CertificateAuthority::new("Defguard", "", 10)?;

let (cert_der, key_der) = (ca.cert_der().to_vec(), ca.key_pair_der().to_vec());

Expand Down Expand Up @@ -173,9 +177,14 @@ async fn main() -> Result<(), anyhow::Error> {
}
}

let (proxy_control_tx, proxy_control_rx) = channel::<ProxyControlMessage>(100);
let proxy_tx = ProxyTxSet::new(wireguard_tx.clone(), mail_tx.clone(), bidi_event_tx.clone());
let proxy_manager =
ProxyManager::new(pool.clone(), proxy_tx, Arc::clone(&incompatible_components));
let proxy_manager = ProxyManager::new(
pool.clone(),
proxy_tx,
Arc::clone(&incompatible_components),
proxy_control_rx,
);

// run services
tokio::select! {
Expand Down Expand Up @@ -205,6 +214,7 @@ async fn main() -> Result<(), anyhow::Error> {
failed_logins,
api_event_tx,
incompatible_components,
proxy_control_tx
) => error!("Web server returned early: {res:?}"),
res = run_mail_handler(mail_rx) => error!("Mail handler returned early: {res:?}"),
res = run_periodic_peer_disconnect(
Expand Down
1 change: 1 addition & 0 deletions crates/defguard_certs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ serde.workspace = true
sqlx.workspace = true
thiserror.workspace = true
rustls-pki-types.workspace = true
chrono.workspace = true
time = "0.3"
x509-parser = "0.18"
Loading
Loading