Define all cable-tunnel-server dependencies in the workspace, and sha…

…re those with other components.
kanidm · Mar 29, 2023 · fcbaeab · fcbaeab
1 parent fb0e79a
commit fcbaeab
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 62 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,3 +33,22 @@ members = [
 exclude = [
     "compat_tester/webauthn-rs-demo-wasm",
 ]
+
+[workspace.dependencies]
+cable-tunnel-server-common = { path = "./cable-tunnel-server/common" }
+
+clap = { version = "^3.2", features = ["derive", "env"] }
+futures = "^0.3.25"
+hex = { version = "0.4.3" }
+http = "^0.2.9"
+http-body = "=1.0.0-rc.2"
+http-body-util = "=0.1.0-rc.2"
+hyper = { version = "=1.0.0-rc.3", default-features = false, features = ["http1"] }
+openssl = "^0.10.41"
+thiserror = "^1.0.37"
+tokio = { version = "1.22.0", features = ["sync", "test-util", "macros", "rt-multi-thread", "time"] }
+tokio-native-tls = "^0.3.1"
+tokio-tungstenite = { version = "^0.18.0", features = ["native-tls"] }
+tracing = "^0.1.35"
+tracing-subscriber = { version = "0.3", features = ["env-filter", "std", "fmt"] }
+tungstenite = { version = "^0.18.0", default-features = false, features = ["handshake"] }
diff --git a/cable-tunnel-server/backend/Cargo.toml b/cable-tunnel-server/backend/Cargo.toml
@@ -5,18 +5,18 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-cable-tunnel-server-common = { path = "../common" }
+cable-tunnel-server-common.workspace = true
 
-clap = { version = "^3.2", features = ["derive", "env"] }
-futures = "0.3.25"
-hex = "0.4.3"
-http-body = "=1.0.0-rc.2"
-http-body-util = "=0.1.0-rc.2"
-hyper = { version = "=1.0.0-rc.3", default-features = false, features = ["http1", "server"] }
-thiserror = "^1.0.37"
-tokio = { version = "1.22.0", features = ["sync", "test-util", "macros", "rt-multi-thread", "time"] }
-tokio-native-tls = "^0.3.1"
-tokio-tungstenite = { version = "^0.18.0", features = ["native-tls"] }
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "std", "fmt"] }
-tungstenite = { version = "^0.18.0", default-features = false }
+clap.workspace = true
+futures.workspace = true
+hex.workspace = true
+http-body.workspace = true
+http-body-util.workspace = true
+hyper = { workspace = true, features = ["server"] }
+thiserror.workspace = true
+tokio.workspace = true
+tokio-native-tls.workspace = true
+tokio-tungstenite.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+tungstenite.workspace = true
diff --git a/cable-tunnel-server/common/Cargo.toml b/cable-tunnel-server/common/Cargo.toml
@@ -5,16 +5,16 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "std", "fmt"] }
+tracing.workspace = true
+tracing-subscriber.workspace = true
 
-clap = { version = "^3.2", features = ["derive", "env"] }
-hex = { version = "0.4.3" }
-http-body = "=1.0.0-rc.2"
-http-body-util = "=0.1.0-rc.2"
-hyper = { version = "=1.0.0-rc.3", default-features = false, features = ["http1", "server"] }
-thiserror = "^1.0.37"
-tokio = { version = "1.22.0", features = ["sync", "test-util", "macros", "rt-multi-thread", "time"] }
-tokio-native-tls = "^0.3.1"
-tokio-tungstenite = { version = "^0.18.0", features = ["native-tls"] }
-tungstenite = { version = "^0.18.0", default-features = false, features = ["handshake"] }
+clap.workspace = true
+hex.workspace = true
+http-body.workspace = true
+http-body-util.workspace = true
+hyper = { workspace = true, features = ["server"] }
+thiserror.workspace = true
+tokio.workspace = true
+tokio-native-tls.workspace = true
+tokio-tungstenite.workspace = true
+tungstenite.workspace = true
diff --git a/cable-tunnel-server/frontend/Cargo.toml b/cable-tunnel-server/frontend/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 license = "MPL-2.0"
 
 [dependencies]
-cable-tunnel-server-common = { path = "../common" }
+cable-tunnel-server-common.workspace = true
 
-clap = { version = "^3.2", features = ["derive", "env"] }
-hex = "0.4.3"
-http-body-util = "=0.1.0-rc.2"
-hyper = { version = "=1.0.0-rc.3", default-features = false, features = ["client", "http1", "server"] }
-tokio = { version = "1.22.0", features = ["sync", "test-util", "macros", "rt-multi-thread", "time"] }
-tokio-native-tls = "^0.3.1"
-tokio-tungstenite = { version = "^0.18.0", features = ["native-tls"] }
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "std", "fmt"] }
-tungstenite = { version = "^0.18.0", default-features = false }
+clap.workspace = true
+hex.workspace = true
+http-body-util.workspace = true
+hyper = { workspace = true, features = ["client", "server"] }
+tokio.workspace = true
+tokio-native-tls.workspace = true
+tokio-tungstenite.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+tungstenite.workspace = true
diff --git a/compat_tester/webauthn-rs-demo/Cargo.toml b/compat_tester/webauthn-rs-demo/Cargo.toml
@@ -17,11 +17,11 @@ webauthn-rs = { path = "../../webauthn-rs", features = ["resident-key-support",
 tide = "0.16"
 tide-rustls = "0.3"
 async-std = { version = "1.6", features = ["attributes"] }
-openssl = "0.10"
+openssl.workspace = true
 structopt = { version = "0.3", default-features = false }
 rustls = "0.19.0"
-tracing = "0.1"
-tracing-subscriber = "0.3"
+tracing.workspace = true
+tracing-subscriber.workspace = true
 rand = "0.8"
 url = { version = "2", features = ["serde"] }
 

diff --git a/fido-mds-tool/Cargo.toml b/fido-mds-tool/Cargo.toml
@@ -13,10 +13,9 @@ license = "MPL-2.0"
 [dependencies]
 fido-mds = { version = "0.5.0-dev", path = "../fido-mds" }
 
-clap = { version = "^3.2", features = ["derive", "env"] }
-
-tracing = "^0.1.35"
-tracing-subscriber = { version = "^0.3.14", features = ["env-filter", "fmt"] }
+clap.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
 uuid = "1"
 
 
diff --git a/fido-mds/Cargo.toml b/fido-mds/Cargo.toml
@@ -15,10 +15,10 @@ license = "MPL-2.0"
 [dependencies]
 base64 = "0.21"
 compact_jwt = "^0.2.3"
+openssl.workspace = true
 peg = "0.8.1"
-openssl = { version = "0.10" }
 serde = { version = "^1.0.141", features = ["derive"] }
 serde_json = "^1.0.79"
-tracing = "^0.1.35"
+tracing.workspace = true
 uuid = { version = "1", features = ["v4", "serde"] }
 
diff --git a/webauthn-authenticator-rs/Cargo.toml b/webauthn-authenticator-rs/Cargo.toml
@@ -33,13 +33,13 @@ base64urlsafedata = { version = "0.1", path = "../base64urlsafedata" }
 webauthn-rs-proto = { version = "0.5.0-dev", path = "../webauthn-rs-proto" }
 webauthn-rs-core = { path = "../webauthn-rs-core" }
 
-tracing = "0.1"
+tracing.workspace = true
 url = "2"
 uuid = "1"
 serde_json = "1.0"
 nom = "7.1"
 serde_cbor = { version = "0.12.0-dev", package = "serde_cbor_2" }
-openssl = "0.10.41"
+openssl.workspace = true
 rpassword = "5.0"
 
 # authenticator = { path = "../../../authenticator-rs", optional = true, default-features = false, features = ["crypto_openssl"], package = "authenticator-ctap2-2021" }
@@ -56,21 +56,21 @@ unicode-normalization = "0.1.22"
 num-traits = "0.2"
 num-derive = "0.3"
 async-trait = "0.1.58"
-futures = "0.3.25"
-http = {version = "0.2.9", optional = true }
+futures.workspace = true
+http = { workspace = true, optional = true }
 
 qrcode = { version = "^0.12.0", optional = true }
 # btleplug pinned due to https://github.com/deviceplug/btleplug/issues/289
 # Advertisements for the same device get dropped by bluez (Linux).
 btleplug = { git = "https://github.com/deviceplug/btleplug.git", rev = "bb3212df36cfd00a1d5788de790240858847a5f1", optional = true }
-tokio = { version = "1.22.0", features = ["sync", "test-util", "macros", "rt-multi-thread", "time"], optional = true }
-tokio-tungstenite = { version = "0.18.0", features = ["native-tls"], optional = true }
-hex = { version = "0.4.3", optional = true }
+tokio = { workspace = true, optional = true }
+tokio-tungstenite = { workspace = true, optional = true }
+hex = { workspace = true, optional = true }
 
 [dev-dependencies]
-tracing-subscriber = { version = "0.3", features = ["env-filter", "std", "fmt"] }
-clap = { version = "^3.2", features = ["derive", "env"] }
-tokio = { version = "1.22.0", features = ["sync", "test-util", "macros", "rt-multi-thread", "time"] }
+tracing-subscriber.workspace = true
+clap.workspace = true
+tokio.workspace = true
 tempfile = { version = "3.3.0" }
 
 # cable_tunnel - used for connecting to Bluetooth HCI controller over serial
@@ -81,4 +81,4 @@ bardecoder = "=0.4.1"
 image = "=0.23.14"
 
 [build-dependencies]
-openssl = "0.10"
+openssl.workspace = true
diff --git a/webauthn-rs-core/Cargo.toml b/webauthn-rs-core/Cargo.toml
@@ -24,9 +24,9 @@ serde_cbor = { version = "0.12.0-dev", package = "serde_cbor_2" }
 serde_json = "1.0"
 nom = "7.1"
 base64 = "0.21"
-thiserror = "1.0"
-tracing = "0.1"
-openssl = "0.10.41"
+thiserror.workspace = true
+tracing.workspace = true
+openssl.workspace = true
 # We could consider replacing this with openssl rand.
 rand = { version = "0.8" }
 url = { version = "2", features = ["serde"] }
@@ -37,4 +37,4 @@ uuid = { version = "1", features = ["serde"] }
 
 [dev-dependencies]
 hex-literal = "0.3"
-tracing-subscriber = { version = "0.3", features = ["env-filter", "std", "fmt"] }
+tracing-subscriber.workspace = true
diff --git a/webauthn-rs/Cargo.toml b/webauthn-rs/Cargo.toml
@@ -25,6 +25,6 @@ danger-user-presence-only-security-keys = []
 base64urlsafedata = { version = "0.1", path = "../base64urlsafedata" }
 webauthn-rs-core = { version = "0.5.0-dev", path = "../webauthn-rs-core" }
 url = { version = "2", features = ["serde"] }
-tracing = "0.1"
+tracing.workspace = true
 serde = { version = "1", features = ["derive"] }
 uuid = { version = "1", features = ["v4", "serde"] }