feat: Windows support #44

blazej-teonite · 2024-01-04T22:06:50Z

No description provided.

moubctez · 2024-01-10T11:33:44Z

src/wgapi_windows.rs

+        let file_path = path.join(&file_name).display().to_string();
+
+        debug!(
+            "Creating WireGuard configuration file {} in: {}",


Suggested change

"Creating WireGuard configuration file {} in: {}",

"Creating WireGuard configuration file {file_name} in: {file_path}",

moubctez · 2024-01-10T11:34:38Z

src/wgapi_windows.rs

+        // Interface is created here so that there is no need to pass private key only for Windows
+        let file_name = format!("{}.conf", &self.ifname);
+        let path = env::current_dir()?;
+        let file_path = path.join(&file_name).display().to_string();


Suggested change

let file_path = path.join(&file_name).display().to_string();

let file_path = path.join(&file_name).to_str().unwrap_or_default();

moubctez · 2024-01-10T11:36:19Z

src/wgapi_windows.rs

+            config.prvkey, config.address
+        );
+
+        if !dns_addresses.is_empty() {


Suggested change

if !dns_addresses.is_empty() {

if !dns.is_empty() {

let dns_addresses = // from above

moubctez · 2024-01-10T11:38:34Z

src/wgapi_windows.rs

+        }
+
+        info!(
+            "Prepared WireGuard configuration: {}",


Suggested change

"Prepared WireGuard configuration: {}",

"Prepared WireGuard configuration: {wireguard_configuration}",

moubctez · 2024-01-10T11:39:46Z

src/wgapi_windows.rs

+            })?;
+
+        info!(
+            "Service installation output: {:?}",


Suggested change

"Service installation output: {:?}",

"Service installation output: {service_installation_output:?}",

moubctez · 2024-01-10T11:40:24Z

src/wgapi_windows.rs

+            }
+        }
+
+        debug!("Read interface data: {:?}", host);


Suggested change

debug!("Read interface data: {:?}", host);

debug!("Read interface data: {host:?}");

moubctez · 2024-01-11T10:42:32Z

Cargo.toml

@@ -17,6 +17,7 @@ serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"

 [dev-dependencies]
+env_logger = "0.10.1"


Suggested change

env_logger = "0.10.1"

env_logger = "0.10"

moubctez · 2024-01-11T10:43:38Z

examples/client.rs

    wgapi.configure_interface(&interface_config)?;
+    #[cfg(windows)]
+    wgapi.configure_interface(&interface_config, &Vec::new())?;


Suggested change

wgapi.configure_interface(&interface_config, &Vec::new())?;

wgapi.configure_interface(&interface_config, &[])?;

moubctez · 2024-01-11T10:43:49Z

examples/server.rs

    wgapi.configure_interface(&interface_config)?;
+    #[cfg(windows)]
+    wgapi.configure_interface(&interface_config, &Vec::new())?;


Suggested change

wgapi.configure_interface(&interface_config, &Vec::new())?;

wgapi.configure_interface(&interface_config, &[])?;

moubctez · 2024-01-11T10:44:05Z

examples/userspace.rs

    api.configure_interface(&interface_config)?;
+    #[cfg(windows)]
+    api.configure_interface(&interface_config, &Vec::new())?;


Suggested change

api.configure_interface(&interface_config, &Vec::new())?;

api.configure_interface(&interface_config, &[])?;

moubctez · 2024-01-11T10:45:31Z

src/wgapi.rs

+            return Ok(Self(Box::new(WireguardApiUserspace::new(ifname)?)));
+
+            #[cfg(not(target_family = "unix"))]
+            return Err(WireguardInterfaceError::UserspaceNotSupported);


Suggested change

return Err(WireguardInterfaceError::UserspaceNotSupported);

Err(WireguardInterfaceError::UserspaceNotSupported)

moubctez · 2024-01-11T10:48:45Z

src/wgapi_windows.rs

+
+        if !dns.is_empty() {
+            let dns_addresses = format!(
+                "{}",


Suggested change

"{}",

"\nDNS ={}",

moubctez · 2024-01-11T10:49:04Z

src/wgapi_windows.rs

+                    .collect::<Vec<String>>()
+                    .join(",")
+            );
+            wireguard_configuration.push_str(format!("\nDNS = {}", dns_addresses).as_str());


Suggested change

wireguard_configuration.push_str(format!("\nDNS = {}", dns_addresses).as_str());

wireguard_configuration.push_str(dns_addresses.as_str());

moubctez · 2024-01-11T10:49:51Z

src/wgapi_windows.rs

+        }
+
+        for peer in &config.peers {
+            wireguard_configuration.push_str("\n[Peer]");


Suggested change

wireguard_configuration.push_str("\n[Peer]");

// wireguard_configuration.push_str("\n[Peer]");

moubctez · 2024-01-11T10:50:03Z

src/wgapi_windows.rs

+        for peer in &config.peers {
+            wireguard_configuration.push_str("\n[Peer]");
+            wireguard_configuration
+                .push_str(format!("\nPublicKey = {}", peer.public_key.to_string()).as_str());


Suggested change

.push_str(format!("\nPublicKey = {}", peer.public_key.to_string()).as_str());

.push_str(format!("\n[Peer]\nPublicKey = {}", peer.public_key.to_string()).as_str());

moubctez · 2024-01-11T10:50:29Z

src/wgapi_windows.rs

+            }
+
+            let allowed_ips = format!(
+                "{}",


Suggested change

"{}",

"\nAllowedIPs = {}",

moubctez · 2024-01-11T10:50:49Z

src/wgapi_windows.rs

+                    .collect::<Vec<String>>()
+                    .join(",")
+            );
+            wireguard_configuration.push_str(format!("\nAllowedIPs = {}", allowed_ips).as_str());


Suggested change

wireguard_configuration.push_str(format!("\nAllowedIPs = {}", allowed_ips).as_str());

wireguard_configuration.push_str(allowed_ips.as_str());

kchudy and others added 30 commits December 14, 2023 12:53

Fixed conditional formatting for windows

8a21b5c

Added adapter configuration

1a406fd

Brought adapter up after creating

48465d2

Integrate WireGuard

d135a53

Update wgapi_windows.rs

0ea2433

Update wgapi_windows.rs

15c2f24

Parse WireGuard config to read interface on Windows

8ec4ef9

Update wgapi_windows.rs

93e4459

Update wgapi_windows.rs

829c0b1

Update wgapi_windows.rs

7144140

Update wgapi_windows.rs

81f9e19

Update wgapi_windows.rs

c129edd

Update wgapi_windows.rs

2ca88ae

Update wgapi_windows.rs

e8d6d1b

Update wgapi_windows.rs

7cd1f22

Update wgapi_windows.rs

bd1b95f

Update wgapi_windows.rs

e2af636

Update wgapi_windows.rs

1dac93b

Update wgapi_windows.rs

9d18945

Update wgapi_windows.rs

e1bedbf

Update utils.rs

381ce49

Update wgapi_windows.rs

fa92260

Update utils.rs

b6858d9

Update utils.rs

5b2185d

Update utils.rs

2f8828c

Update utils.rs

affcde2

Update utils.rs

bf2b5bf

Remove interface

81da8ba

Update wgapi_windows.rs

e6db2d9

Updated interface data fetch

e98c1be

bgasztka added 3 commits January 10, 2024 10:05

cleanup

dc3c6e5

cleanup

f7e5c13

cleanup

643659c

moubctez reviewed Jan 10, 2024

View reviewed changes

blazej-teonite added 4 commits January 11, 2024 01:48

cleanup

96a0916

Update wgapi.rs

948fa02

userspace available for unix

ad9e4a8

cleanup

679274a

moubctez reviewed Jan 11, 2024

View reviewed changes

src/wgapi_windows.rs Outdated

if !dns.is_empty() {

let dns_addresses = format!(

"{}",

Copy link

Contributor

moubctez Jan 11, 2024

Choose a reason for hiding this comment

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

Suggested change

"{}",

"\nDNS ={}",

moubctez reviewed Jan 11, 2024

View reviewed changes

src/wgapi_windows.rs Outdated

}

let allowed_ips = format!(

"{}",

Copy link

Contributor

moubctez Jan 11, 2024

Choose a reason for hiding this comment

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

Suggested change

"{}",

"\nAllowedIPs = {}",

moubctez reviewed Jan 11, 2024

View reviewed changes

moubctez approved these changes Jan 11, 2024

View reviewed changes

blazej-teonite marked this pull request as ready for review January 11, 2024 11:28

blazej-teonite merged commit a5b21a5 into main Jan 11, 2024
1 check passed

blazej-teonite deleted the 8-add-windows-support-for-defguard-client branch January 11, 2024 11:31

wojcik91 added the enhancement New feature or request label Jan 23, 2024

wojcik91 changed the title ~~8 add windows support for defguard client~~ feat: Windows support Jan 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Windows support #44

feat: Windows support #44

blazej-teonite commented Jan 4, 2024

moubctez Jan 10, 2024

moubctez Jan 10, 2024

moubctez Jan 10, 2024

moubctez Jan 10, 2024

moubctez Jan 10, 2024

moubctez Jan 10, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

moubctez Jan 11, 2024

	"Creating WireGuard configuration file {} in: {}",
	"Creating WireGuard configuration file {file_name} in: {file_path}",

	let file_path = path.join(&file_name).display().to_string();
	let file_path = path.join(&file_name).to_str().unwrap_or_default();

	if !dns_addresses.is_empty() {
	if !dns.is_empty() {
	let dns_addresses = // from above

	"Prepared WireGuard configuration: {}",
	"Prepared WireGuard configuration: {wireguard_configuration}",

	"Service installation output: {:?}",
	"Service installation output: {service_installation_output:?}",

	debug!("Read interface data: {:?}", host);
	debug!("Read interface data: {host:?}");

	wgapi.configure_interface(&interface_config, &Vec::new())?;
	wgapi.configure_interface(&interface_config, &[])?;

	api.configure_interface(&interface_config, &Vec::new())?;
	api.configure_interface(&interface_config, &[])?;

	return Err(WireguardInterfaceError::UserspaceNotSupported);
	Err(WireguardInterfaceError::UserspaceNotSupported)

	wireguard_configuration.push_str(format!("\nDNS = {}", dns_addresses).as_str());
	wireguard_configuration.push_str(dns_addresses.as_str());

	wireguard_configuration.push_str("\n[Peer]");
	// wireguard_configuration.push_str("\n[Peer]");

	.push_str(format!("\nPublicKey = {}", peer.public_key.to_string()).as_str());
	.push_str(format!("\n[Peer]\nPublicKey = {}", peer.public_key.to_string()).as_str());

	wireguard_configuration.push_str(format!("\nAllowedIPs = {}", allowed_ips).as_str());
	wireguard_configuration.push_str(allowed_ips.as_str());

feat: Windows support #44

feat: Windows support #44

Conversation

blazej-teonite commented Jan 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment