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: security audits #232

Merged
merged 3 commits into from
Nov 30, 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
94 changes: 25 additions & 69 deletions Cargo.lock

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

13 changes: 4 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_bson = "0.0.1"

# Env Vars
dotenv = "0.15"
dotenvy = "0.15"
envy = "0.4"

# Metrics & Traces
Expand All @@ -37,7 +37,6 @@ tracing-subscriber = { version = "0.3", features = [
] }
tracing-appender = "0.2"
tracing-opentelemetry = "0.19"
atty = "0.2"


# Analytics
Expand All @@ -60,7 +59,7 @@ thiserror = "1.0"
async-trait = "0.1"
tokio-stream = "0.1.11"
regex = "1.7.1"
tungstenite = { version = "0.18.0", features = ["native-tls"] }
tungstenite = { version = "0.20", features = ["native-tls"] }
url = "2.3.1"
sha256 = "1.1.1"
chacha20poly1305 = "0.10.1"
Expand All @@ -73,14 +72,10 @@ data-encoding = "2.3.3"
chrono = { version = "0.4.23", features = ["serde"] }
derive_more = "0.99.17"
futures = "0.3.26"
async-tungstenite = { version = "0.20.0", features = [
"tokio",
"tokio-native-tls",
] }
dashmap = "5.4.0"

relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", rev = "54ce4be", features = ["cacao"] }
relay_client = { git = "https://github.com/WalletConnect/WalletConnectRust.git", rev = "54ce4be" }
relay_rpc = { git = "https://github.com/WalletConnect/WalletConnectRust.git", tag = "v0.23.2", features = ["cacao"] }
relay_client = { git = "https://github.com/WalletConnect/WalletConnectRust.git", tag = "v0.23.2" }
x25519-dalek = { version = "2.0.0", features = ["static_secrets"] }
hkdf = "0.12.3"
sha2 = "0.10.6"
Expand Down
4 changes: 2 additions & 2 deletions src/config/local.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use {
super::Configuration,
crate::error::Result,
dotenv::dotenv,
dotenvy::dotenv,
relay_rpc::domain::ProjectId,
serde::Deserialize,
std::net::{IpAddr, Ipv4Addr, SocketAddr},
Expand Down Expand Up @@ -98,7 +98,7 @@ pub fn get_configuration() -> Result<Configuration> {
Ok(config)
}

fn load_dot_env() -> dotenv::Result<()> {
fn load_dot_env() -> dotenvy::Result<()> {
match dotenv() {
Ok(_) => Ok(()),
Err(e) if e.not_found() => Ok(()),
Expand Down
2 changes: 1 addition & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub type Result<T> = std::result::Result<T, Error>;
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("Failed to load .env {0}")]
DotEnv(#[from] dotenv::Error),
DotEnvy(#[from] dotenvy::Error),

#[error("Failed to load configuration from environment {0}")]
EnvConfiguration(#[from] envy::Error),
Expand Down
Loading