🐛 load rustls config at daemon startup

XDSEC · Jul 28, 2024 · c822ce0 · c822ce0
1 parent 6cfdb28
commit c822ce0
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/cli.yaml b/.github/workflows/cli.yaml
@@ -13,7 +13,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.2.19"
+  APP_VERSION: "0.2.20"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs

diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml
@@ -18,7 +18,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.2.19"
+  APP_VERSION: "0.2.20"
   QT_VERSION: "6.7.1"
 
 #-------------------------------------------------------------------------------

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   APP_NAME: "WebSocketReflectorX"
-  APP_VERSION: "0.2.19"
+  APP_VERSION: "0.2.20"
   QT_VERSION: "6.7.1"
 
 #-------------------------------------------------------------------------------

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 19)
+set(VERSION_PATCH 20)
 
 execute_process(
   COMMAND git describe --always --dirty

diff --git a/deploy_linux.sh b/deploy_linux.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.2.19
+export APP_VERSION=0.2.20
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Linux x86_64) [v$APP_VERSION]"

diff --git a/deploy_macos.sh b/deploy_macos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.2.19
+export APP_VERSION=0.2.20
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (macOS x86_64) [v$APP_VERSION]"

diff --git a/deploy_windows.sh b/deploy_windows.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 export APP_NAME="WebSocketReflectorX"
-export APP_VERSION=0.2.19
+export APP_VERSION=0.2.20
 export GIT_VERSION=$(git rev-parse --short HEAD)
 
 echo "> $APP_NAME packager (Windows x86_64) [v$APP_VERSION]"

diff --git a/wsrx/Cargo.toml b/wsrx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wsrx"
-version = "0.2.19"
+version = "0.2.20"
 edition = "2021"
 authors = ["Reverier-Xu <[email protected]>"]
 description = "Controlled TCP-over-WebSocket forwarding tunnel."
@@ -37,6 +37,7 @@ required-features = ["binary"]
 
 [dependencies]
 tokio = { version = "1.39", features = ["full"] }
+rustls = { version = "0.23", features = ["ring"] }
 futures-util = { version = "0.3", features = ["sink"] }
 tokio-util = { version = "0.7", features = ["codec"] }
 thiserror = "1.0"

diff --git a/wsrx/src/main.rs b/wsrx/src/main.rs
@@ -1,4 +1,7 @@
 use clap::{command, Parser};
+use rustls::crypto;
+use std::process;
+use tracing::{error, info, warn};
 
 mod cli;
 
@@ -58,6 +61,22 @@ enum WsrxCli {
 #[tokio::main]
 async fn main() {
     let cli = WsrxCli::parse();
+    match crypto::aws_lc_rs::default_provider().install_default() {
+        Ok(_) => info!("using `AWS Libcrypto` as default crypto backend."),
+        Err(err) => {
+          error!("`AWS Libcrypto` is not available: {:?}", err);
+          warn!("try to use `ring` as default crypto backend.");
+          crypto::ring::default_provider()
+            .install_default()
+            .inspect_err(|err| {
+              error!("`ring` is not available: {:?}", err);
+              error!("All crypto backend are not available, exiting...");
+              process::exit(1);
+            })
+            .ok();
+          info!("using `ring` as default crypto backend.");
+        }
+      }
     match cli {
         WsrxCli::Daemon {
             host,