cli: update dev tunnels (microsoft#195183)

membrane-io · Oct 9, 2023 · e0502b5 · e0502b5
1 parent 717ddc2
commit e0502b5
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 63 deletions.
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -15,7 +15,7 @@ name = "code"
 futures = "0.3.28"
 clap = { version = "4.3.0", features = ["derive", "env"] }
 open = "4.1.0"
-reqwest = { version = "0.11.18", default-features = false, features = ["json", "stream", "native-tls"] }
+reqwest = { version = "0.11.22", default-features = false, features = ["json", "stream", "native-tls"] }
 tokio = { version = "1.28.2", features = ["full"] }
 tokio-util = { version = "0.7.8", features = ["compat", "codec"] }
 flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
@@ -26,15 +26,15 @@ sysinfo = { version = "0.29.0", default-features = false }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 rmp-serde = "1.1.1"
-uuid = { version = "1.3.3", features = ["serde", "v4"] }
+uuid = { version = "1.4", features = ["serde", "v4"] }
 dirs = "5.0.1"
 rand = "0.8.5"
 opentelemetry = { version = "0.19.0", features = ["rt-tokio"] }
 serde_bytes = "0.11.9"
 chrono = { version = "0.4.26", features = ["serde", "std", "clock"], default-features = false }
 gethostname = "0.4.3"
 libc = "0.2.144"
-tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "3141ad7be00e18c4231f7c4fb6c11f9219ac49af", default-features = false, features = ["connections"] }
+tunnels = { git = "https://github.com/microsoft/dev-tunnels", rev = "97233d20448e1c3cb0e0fd9114acf68c7e5c0249", default-features = false, features = ["connections"] }
 keyring = { version = "2.0.3", default-features = false, features = ["linux-secret-service-rt-tokio-crypto-openssl"] }
 dialoguer = "0.10.4"
 hyper = { version = "0.14.26", features = ["server", "http1", "runtime"] }

diff --git a/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs
@@ -1190,6 +1190,7 @@ fn privacy_to_tunnel_acl(privacy: PortPrivacy) -> TunnelAccessControl {
 				is_deny: false,
 				is_inverse: false,
 				organization: None,
+				expiration: None,
 				subjects: vec![],
 				scopes: vec![TUNNEL_ACCESS_SCOPES_CONNECT.to_string()],
 			});

diff --git a/cli/src/tunnels/nosleep_windows.rs b/cli/src/tunnels/nosleep_windows.rs
@@ -24,11 +24,11 @@ struct Request(*mut c_void);
 
 impl Request {
 	pub fn new() -> io::Result<Self> {
-		let mut reason: Vec<u16> = TUNNEL_ACTIVITY_NAME.encode_utf16().collect();
+		let mut reason: Vec<u16> = TUNNEL_ACTIVITY_NAME.encode_utf16().chain([0u16]).collect();
 		let mut context = REASON_CONTEXT {
 			Version: POWER_REQUEST_CONTEXT_VERSION,
 			Flags: POWER_REQUEST_CONTEXT_SIMPLE_STRING,
-			..Default::default()
+			Reason: unsafe { std::mem::zeroed() },
 		};
 		unsafe { *context.Reason.SimpleReasonString_mut() = reason.as_mut_ptr() };