build: update dependencies

crates/devolutions-gateway-generators/Cargo.toml

@@ -7,6 +7,6 @@ publish = false
 
 [dependencies]
 devolutions-gateway = { path = "../../devolutions-gateway" }
-proptest = "1.0.0"
-uuid = "1.1.2"
-serde = { version = "1.0.143", features = ["derive"] }
+proptest = "1.1.0"
+uuid = "1.3.0"
+serde = { version = "1.0.152", features = ["derive"] }

crates/jet-proto/Cargo.toml

@@ -8,22 +8,22 @@ publish = false
 [dependencies]
 log = "0.4.17"
 byteorder = "1.4.3"
-uuid = { version = "1.1.2", features = ["v4"] }
-httparse = "1.7.1"
-http = "0.2.8"
+uuid = { version = "1.3.0", features = ["v4"] }
+httparse = "1.8.0"
+http = "0.2.9"
 
 [dev-dependencies]
 lazy_static = "1.4.0"
-bytes = "1.2.1"
-sspi = "0.3.2"
-ureq = { version = "2.5.0", features = ["json"] }
-url = "2.2.2"
+bytes = "1.4.0"
+sspi = "0.6.0"
+ureq = { version = "2.6.2", features = ["json"] }
+url = "2.3.1"
 x509-parser = "0.14.0"
 exitcode = "1.1.2"
 tempfile = "3.3.0"
 hex-literal = "0.3.4"
 ironrdp = { version = "0.4", git = "https://github.com/Devolutions/IronRDP", rev = "ca53209c84c55b41" }
 tokio-rustls = { version = "0.23.4", features = ["dangerous_configuration", "tls12"] }
-serde = "1.0.143"
-serde_derive = "1.0.143"
-serde_json = "1.0.83"
+serde = "1.0.152"
+serde_derive = "1.0.152"
+serde_json = "1.0.93"

crates/jmux-generators/Cargo.toml

@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 jmux-proto = { path = "../jmux-proto" }
-proptest = "1.0.0"
+proptest = "1.1.0"

crates/jmux-proto/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 publish = false
 
 [dependencies]
-bytes = "1.2.1"
-smol_str = "0.1.23"
+bytes = "1.4.0"
+smol_str = "0.1.24"
 
 [dev-dependencies]
-proptest = "1.0.0"
+proptest = "1.1.0"
 jmux-generators = { path = "../jmux-generators" }

crates/jmux-proxy/Cargo.toml

@@ -12,16 +12,16 @@ publish = false
 jmux-proto = { path = "../jmux-proto" }
 
 # async
-tokio = { version = "1.20.1", features = ["net", "rt", "io-util", "macros"] }
-tokio-util = { version = "0.7.3", features = ["codec"] }
-futures-util = { version = "0.3.21", features = ["sink"] }
+tokio = { version = "1.25.0", features = ["net", "rt", "io-util", "macros"] }
+tokio-util = { version = "0.7.7", features = ["codec"] }
+futures-util = { version = "0.3.26", features = ["sink"] }
 
 # error handling
-anyhow = "1.0.61"
+anyhow = "1.0.69"
 
 # logging
-tracing = "0.1.36"
+tracing = "0.1.37"
 
 # codec implementation
-bytes = "1.2.1"
+bytes = "1.4.0"
 bitvec = "1.0.1"

crates/mock-net/Cargo.toml

@@ -6,9 +6,9 @@ authors = ["Devolutions Inc. <infos@devolutions.net>"]
 publish = false
 
 [dependencies]
-tokio = { version = "1.20.1", features = ["io-util", "sync"] }
+tokio = { version = "1.25.0", features = ["io-util", "sync"] }
 loom = { version = "0.5.6", features = ["futures", "checkpoint"] }
 lazy_static = "1.4.0"
 
 [dev-dependencies]
-tokio = { version = "1.20.1", features = ["rt"] }
+tokio = { version = "1.25.0", features = ["rt"] }

crates/proxy-generators/Cargo.toml

@@ -7,4 +7,4 @@ publish = false
 
 [dependencies]
 proxy-types = { path = "../proxy-types" }
-proptest = "1.0.0"
+proptest = "1.1.0"

crates/proxy-http/Cargo.toml

@@ -8,10 +8,10 @@ publish = false
 
 [dependencies]
 proxy-types = { path = "../proxy-types" }
-tokio = { version = "1.20.1", features = ["io-util"] }
+tokio = { version = "1.25.0", features = ["io-util"] }
 pin-project-lite = "0.2.9"
-bytes = "1.2.1"
+bytes = "1.4.0"
 
 [dev-dependencies]
-proptest = "1.0.0"
+proptest = "1.1.0"
 proxy-generators = { path = "../proxy-generators" }

crates/proxy-server/Cargo.toml

@@ -9,4 +9,4 @@ publish = false
 proxy-socks = { path = "../proxy-socks" }
 proxy-http = { path = "../proxy-http" }
 proxy-types = { path = "../proxy-types" }
-tokio = { version = "1.20.1", features = ["rt", "net", "rt-multi-thread", "macros"] }
+tokio = { version = "1.25.0", features = ["rt", "net", "rt-multi-thread", "macros"] }

crates/proxy-socks/Cargo.toml

@@ -8,10 +8,10 @@ publish = false
 
 [dependencies]
 proxy-types = { path = "../proxy-types" }
-tokio = { version = "1.20.1", features = ["io-util"] }
+tokio = { version = "1.25.0", features = ["io-util"] }
 
 [dev-dependencies]
-tokio = { version = "1.20.1", features = ["rt", "macros"] }
+tokio = { version = "1.25.0", features = ["rt", "macros"] }
 tokio-test = "0.4.2"
-proptest = "1.0.0"
+proptest = "1.1.0"
 proxy-generators = { path = "../proxy-generators" }

crates/proxy-tester/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 publish = false
 
 [dependencies]
-tokio = { version = "1.20.1", features = ["rt", "net"] }
+tokio = { version = "1.25.0", features = ["rt", "net"] }
 proxy-http = { path = "../proxy-http" }
 proxy-socks = { path = "../proxy-socks" }

crates/test-utils/Cargo.toml

@@ -7,9 +7,9 @@ publish = false
 
 [dependencies]
 transport = { path = "../transport" }
-tokio = { version = "1.20.1", features = ["io-util"] }
-tokio-tungstenite = "0.17.2"
-futures-util = "0.3.21"
-proptest = "1.0.0"
-anyhow = "1.0.61"
+tokio = { version = "1.25.0", features = ["io-util"] }
+tokio-tungstenite = "0.18.0"
+futures-util = "0.3.26"
+proptest = "1.1.0"
+anyhow = "1.0.69"
 portpicker = "0.1.1"

crates/transport/Cargo.toml

@@ -8,18 +8,18 @@ publish = false
 [dependencies]
 
 # async
-tokio = "1.20.1"
-tokio-tungstenite = "0.17.2"
+tokio = "1.25.0"
+tokio-tungstenite = "0.18.0"
 tokio-rustls = "0.23.4"
-futures-util = "0.3.21"
+futures-util = "0.3.26"
 
 # error handling
-anyhow = "1.0.61"
+anyhow = "1.0.69"
 
 # Safe pin projection
 pin-project-lite = "0.2.9"
 
 [dev-dependencies]
 test-utils = { path = "../test-utils" }
-tokio = { version = "1.20.1", features = ["rt", "macros"] }
-proptest = "1.0.0"
+tokio = { version = "1.25.0", features = ["rt", "macros"] }
+proptest = "1.1.0"

devolutions-gateway/Cargo.toml

@@ -22,90 +22,90 @@ sogar-core = { version = "0.3", git = "https://github.com/Devolutions/sogar", br
 ironrdp = { version = "0.4.1", git = "https://github.com/Devolutions/IronRDP", rev = "aa85fe4869aad3a1e1827" }
 ironrdp-devolutions-gateway = { version = "0.1.0", git = "https://github.com/Devolutions/IronRDP", rev = "898fb8d40a3c84" }
 ceviche = "0.5.2"
-picky-krb = "0.3.1"
+picky-krb = "0.6.0"
 
 # serialization
-serde = "1.0.143"
-serde_derive = "1.0.143"
-serde_json = "1.0.83"
+serde = "1.0.152"
+serde_derive = "1.0.152"
+serde_json = "1.0.93"
 
 # utils, misc
 hostname = "0.3.1"
-camino = { version = "1.0.9", features = ["serde1"] }
-smol_str = "0.1.23"
-nonempty = "0.8.0"
+camino = { version = "1.1.2", features = ["serde1"] }
+smol_str = "0.1.24"
+nonempty = "0.8.1"
 tap = "1.0.1"
 byteorder = "1.4.3"
 lazy_static = "1.4.0"
-bytes = "1.3"
+bytes = "1.4"
 cfg-if = "1.0.0"
-url = { version = "2.2.2", features = ["serde"] }
+url = { version = "2.3.1", features = ["serde"] }
 tempfile = "3.3.0"
-indexmap = "1.9.1"
-uuid = { version = "1.1.2", features = ["v4", "serde"] }
-chrono = { version = "0.4.21", features = ["serde"] } # TODO: switch to `time`
+indexmap = "1.9.2"
+uuid = { version = "1.3.0", features = ["v4", "serde"] }
+chrono = { version = "0.4.23", features = ["serde"] } # TODO: switch to `time`
 parking_lot = "0.12.1"
-anyhow = "1.0.61"
-thiserror = "1.0.37"
-typed-builder = "0.10.0"
+anyhow = "1.0.69"
+thiserror = "1.0.38"
+typed-builder = "0.12.0"
 # Unicode case folding comparisons
-focaccia = "1.2.0"
+focaccia = "1.3.1"
 backoff = "0.4.0"
 
 # security, crypto…
 zeroize = { version = "1.5.7", features = ["derive"] }
 rust-argon2 = "1.0.0"
-picky = { version = "7.0.0-rc.3", default-features = false, features = ["jose", "x509"] }
-sspi = "0.3.2"
+picky = { version = "7.0.0-rc.4", default-features = false, features = ["jose", "x509"] }
+sspi = "0.6.0"
 # evaluate use of ring in our codebase
 ring = "0.16.20"
 # (unrequired if using `axum`)
-sha1 = "0.10.1"
+sha1 = "0.10.5"
 # (unrequired if using `axum`)
-base64 = "0.13.0"
-multihash = "0.16.3"
+base64 = "0.21.0"
+multihash = "0.18.0"
 multibase = "0.9.1"
 
 # logging
-tracing = "0.1.36"
-tracing-subscriber = { version = "0.3.15", features = ["env-filter", "parking_lot", "smallvec", "local-time", "tracing-log"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter", "parking_lot", "smallvec", "local-time", "tracing-log"] }
 tracing-appender = "0.2.2"
 # TODO: consider `tracing-error` crate
 
 # async, futures…
-tokio = { version = "1.20.1", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot"] }
-tokio-util = { version = "0.7.3", features = ["codec"] }
-tokio-tungstenite = "0.17.2"
+tokio = { version = "1.25.0", features = ["signal", "net", "io-util", "time", "rt", "rt-multi-thread", "sync", "macros", "parking_lot"] }
+tokio-util = { version = "0.7.7", features = ["codec"] }
+tokio-tungstenite = "0.18.0"
 tokio-rustls = { version = "0.23.4", features = ["dangerous_configuration", "tls12"] }
-futures = "0.3.21"
+futures = "0.3.26"
 
 # Safe pin projection
 pin-project-lite = "0.2.9"
 
 # http
-hyper = "0.14.20"
+hyper = "0.14.24"
 # NOTE: maybe directly use hyper (we already use hyper)
-reqwest = "0.11.11"
-http = "0.2.8"
+reqwest = "0.11.14"
+http = "0.2.9"
 # FIXME: update once next saphir version is published or use `axum`/`warp`
 saphir = { version = "2.8", default-features = false, features = ["json", "macro", "form", "operation", "file"], git = "https://github.com/CBenoit/saphir", branch = "hyper-update" }
 # for KDC proxy
 portpicker = "0.1.1"
 # OpenAPI generator
-utoipa = { version = "2.0.1", default-features = false, features = ["uuid", "chrono"], optional = true }
+utoipa = { version = "3.0.3", default-features = false, features = ["uuid", "chrono"], optional = true }
 
 # plugins
 dlopen = "0.1.8"
 dlopen_derive = "0.1.4"
 # Dependencies required for PCAP support (FIXME: should we keep that built-in?)
-pcap-file = "1.1.1"
+pcap-file = "2.0.0"
 packet = { git = "https://github.com/fdubois1/rust-packet.git" }
 
 [target.'cfg(windows)'.build-dependencies]
-embed-resource = "1.7.3"
+embed-resource = "1.8.0"
 
 [dev-dependencies]
 tokio-test = "0.4.2"
-proptest = "1.0.0"
-rstest = "0.15.0"
+proptest = "1.1.0"
+rstest = "0.16.0"
 devolutions-gateway-generators = { path = "../crates/devolutions-gateway-generators" }

devolutions-gateway/src/interceptor/pcap.rs

@@ -5,7 +5,7 @@ use packet::builder::Builder;
 use packet::ether::{Builder as BuildEthernet, Protocol};
 use packet::ip::v6::Builder as BuildV6;
 use packet::tcp::flag::Flags;
-use pcap_file::PcapWriter;
+use pcap_file::pcap::{PcapPacket, PcapWriter};
 use std::fs::File;
 use std::net::SocketAddr;
 use std::path::Path;
@@ -142,12 +142,9 @@ async fn writer_task(
                     .duration_since(std::time::UNIX_EPOCH)
                     .expect("Time went backwards");
 
-                if let Err(e) = pcap_writer.write(
-                    since_epoch.as_secs() as u32,
-                    since_epoch.subsec_micros(),
-                    &tcpip_packet,
-                    tcpip_packet.len() as u32,
-                ) {
+                let packet = PcapPacket::new(since_epoch, tcpip_packet.len() as u32, &tcpip_packet);
+
+                if let Err(e) = pcap_writer.write_packet(&packet) {
                     error!("Error writing pcap file: {}", e);
                 }
 

devolutions-gateway/src/rdp.rs

@@ -19,7 +19,7 @@ use crate::utils::{self, TargetAddr};
 use anyhow::Context;
 use bytes::BytesMut;
 use nonempty::NonEmpty;
-use sspi::internal::credssp;
+use sspi::credssp;
 use sspi::AuthIdentity;
 use std::io;
 use std::net::SocketAddr;

devolutions-gateway/src/rdp/sequence_future/nla.rs

@@ -7,7 +7,7 @@ use crate::utils;
 use bytes::{Buf, BytesMut};
 use futures::{ready, SinkExt, StreamExt};
 use ironrdp::nego;
-use sspi::internal::credssp::{
+use sspi::credssp::{
     self, CredSspClient, CredSspMode, CredSspServer, EarlyUserAuthResult, TsRequest, EARLY_USER_AUTH_RESULT_PDU_SIZE,
 };
 use sspi::AuthIdentity;
@@ -250,7 +250,7 @@ pub struct CredSspWithClientFuture {
 
 impl CredSspWithClientFuture {
     pub fn new(tls_proxy_pubkey: Vec<u8>, identity: RdpIdentity) -> io::Result<Self> {
-        let cred_ssp_server = CredSspServer::new(tls_proxy_pubkey, identity.clone())?;
+        let cred_ssp_server = CredSspServer::new(tls_proxy_pubkey, identity.clone(), credssp::ClientMode::Ntlm)?;
 
         Ok(Self {
             cred_ssp_server,
@@ -351,7 +351,13 @@ impl CredSspWithServerFuture {
         } else {
             CredSspMode::WithCredentials
         };
-        let cred_ssp_client = CredSspClient::new(public_key, target_credentials, cred_ssp_mode)?;
+        let cred_ssp_client = CredSspClient::new(
+            public_key,
+            target_credentials,
+            cred_ssp_mode,
+            credssp::ClientMode::Ntlm,
+            "unknown".to_owned(),
+        )?;
 
         Ok(Self {
             cred_ssp_client,

devolutions-gateway/src/transport/tsrequest.rs

@@ -1,5 +1,5 @@
 use bytes::{Buf, BytesMut};
-use sspi::internal::credssp::TsRequest;
+use sspi::credssp::TsRequest;
 use std::io;
 use tokio_util::codec::{Decoder, Encoder};