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.

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

fix: hide private keys in logs #42

Merged
merged 4 commits into from
Dec 19, 2023
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
18 changes: 9 additions & 9 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "defguard_wireguard_rs"
version = "0.3.1"
version = "0.3.2"
edition = "2021"
description = "A unified multi-platform high-level API for managing WireGuard interfaces"
license = "Apache-2.0"
Expand Down
3 changes: 2 additions & 1 deletion examples/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
port: 12345,
peers: vec![peer],
};
println!("Prepared interface configuration: {interface_config:?}");

// apply initial interface configuration
wgapi.configure_interface(&interface_config)?;

// read current interface status
let host = wgapi.read_interface_data()?;
println!("WireGuard interface initial config: {host:#?}");
println!("WireGuard interface after configuration: {host:#?}");

// add more WireGuard clients
for peer_id in 3..13 {
Expand Down
14 changes: 13 additions & 1 deletion src/host.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use std::{
collections::HashMap,
fmt::{Debug, Formatter},
io::{self, BufRead, BufReader, Read},
net::SocketAddr,
str::FromStr,
Expand Down Expand Up @@ -164,14 +165,25 @@ impl Peer {
}

/// WireGuard host representation.
#[derive(Debug, Default, Clone, Serialize, Deserialize)]
#[derive(Default, Clone, Serialize, Deserialize)]
pub struct Host {
pub listen_port: u16,
pub private_key: Option<Key>,
pub(super) fwmark: Option<u32>,
pub peers: HashMap<Key, Peer>,
}

// implement manually to avoid exposing private keys
impl Debug for Host {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.debug_struct("Host")
.field("listen_port", &self.listen_port)
.field("fwmark", &self.fwmark)
.field("peers", &self.peers)
.finish()
}
}

impl Host {
/// Create new `Host` with a given `listen_port` and `private_key`.
#[must_use]
Expand Down
19 changes: 17 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ mod wireguard_interface;
extern crate log;

use serde::{Deserialize, Serialize};
use std::process::Output;
use std::{
fmt::{Debug, Formatter},
process::Output,
};

use self::{
error::WireguardInterfaceError,
Expand All @@ -92,7 +95,7 @@ pub use wgapi_userspace::WireguardApiUserspace;
pub use wireguard_interface::WireguardInterfaceApi;

/// Host WireGuard interface configuration
#[derive(Debug, Clone, Serialize, Deserialize)]
#[derive(Clone, Serialize, Deserialize)]
pub struct InterfaceConfiguration {
pub name: String,
pub prvkey: String,
Expand All @@ -101,6 +104,18 @@ pub struct InterfaceConfiguration {
pub peers: Vec<Peer>,
}

// implement manually to avoid exposing private keys
impl Debug for InterfaceConfiguration {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
f.debug_struct("InterfaceConfiguration")
.field("name", &self.name)
.field("address", &self.address)
.field("port", &self.port)
.field("peers", &self.peers)
.finish()
}
}

impl TryFrom<&InterfaceConfiguration> for Host {
type Error = WireguardInterfaceError;

Expand Down