use rustls platform verifier

Author: lamb

.github/workflows/build.yaml

@@ -67,23 +67,23 @@ jobs:
       #   APPLE_CODESIGN_KEY: '${{ secrets.APPLE_CODESIGN_KEY }}'
       #   APPLE_CODESIGN_PASSWORD: '${{ secrets.APPLE_CODESIGN_PASSWORD }}'
       # echo Key is $(echo $APPLE_CODESIGN_KEY | base64 -d | wc -c) bytes
-      # rcodesign sign target/release/fan --code-signature-flags=runtime --p12-password=$APPLE_CODESIGN_PASSWORD --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
+      # rcodesign sign target/release/basjoofan --code-signature-flags=runtime --p12-password=$APPLE_CODESIGN_PASSWORD --p12-file=<(echo $APPLE_CODESIGN_KEY | base64 -d) --entitlements-xml-file=cli/entitlements.plist
       - name: Compress Archive (darwin or linux)
         if: contains(matrix.target, 'darwin') || contains(matrix.target, 'linux')
-        run: zip -rj target/${{ matrix.target }}/release/fan-${{ matrix.target }}.zip target/${{ matrix.target }}/release/fan
+        run: zip -rj target/${{ matrix.target }}/release/basjoofan-${{ matrix.target }}.zip target/${{ matrix.target }}/release/basjoofan
       - name: Compress Archive (windows)
         if: contains(matrix.target, 'windows')
-        run: Compress-Archive -CompressionLevel Optimal -Force -Path target/${{ matrix.target }}/release/fan.exe -DestinationPath target/${{ matrix.target }}/release/fan-${{ matrix.target }}.zip
+        run: Compress-Archive -CompressionLevel Optimal -Force -Path target/${{ matrix.target }}/release/basjoofan.exe -DestinationPath target/${{ matrix.target }}/release/basjoofan-${{ matrix.target }}.zip
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: fan-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/fan${{ contains(matrix.target, 'windows') && '.exe' || '' }}
+          name: basjoofan-${{ matrix.target }}
+          path: target/${{ matrix.target }}/release/basjoofan${{ contains(matrix.target, 'windows') && '.exe' || '' }}
       - name: Release Version
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          files: target/${{ matrix.target }}/release/fan-${{ matrix.target }}.zip
+          files: target/${{ matrix.target }}/release/basjoofan-${{ matrix.target }}.zip
           draft: true

.github/workflows/image.yaml

@@ -27,7 +27,7 @@ jobs:
           tags: ${{ github.repository }}:test
       - name: Test Image
         run: |
-          docker run --rm ${{ github.repository }}:test fan eval 'println("🍀 Hello Basjoofan!");'
+          docker run --rm ${{ github.repository }}:test basjoofan eval 'println("🍀 Hello Basjoofan!");'
       - name: Echo Tag
         run: |
           tag=${{ startsWith(github.ref, 'refs/tags/')  && github.ref_name || github.sha }}

Dockerfile

@@ -6,4 +6,4 @@ RUN cargo build --release
 # runtime stage use alpine as base image
 FROM alpine:3.20.2
 # copy compiled file from build stage
-COPY --from=builder ./target/release/fan /usr/bin
+COPY --from=builder ./target/release/basjoofan /usr/bin

cmd/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.0.1"
 description = "basjoofan command"
 repository = "https://github.com/basjoofan/lib"
 license = "MIT OR Apache-2.0"
-authors = ["Lamb <lamb@basjoo.fan>"]
+authors = ["Lamb <lamb@basjoofan.com>"]
 keywords = ["continuous", "test", "http"]
 edition = "2021"
 
@@ -14,10 +14,10 @@ path = "src/main.rs"
 
 [dependencies]
 lib = { path = "../lib" }
-clap = { version = "4.5.23", features = ["derive"] }
+clap = { version = "4.5.28", features = ["derive"] }
 ctrlc = { version = "3.4.5"}
 
 [dev-dependencies]
-assert_cmd = "2.0"
-assert_fs = "1.0"
-predicates = "3.0"
+assert_cmd = "2.0.16"
+assert_fs = "1.1.2"
+predicates = "3.1.3"

lib/Cargo.toml

@@ -4,21 +4,17 @@ version = "0.0.1"
 description = "basjoofan library"
 repository = "https://github.com/basjoofan/lib"
 license = "MIT OR Apache-2.0"
-authors = ["Lamb <lamb@basjoo.fan>"]
+authors = ["Lamb <lamb@basjoofan.com>"]
 keywords = ["continuous", "test", "http"]
 edition = "2021"
 
-[features]
-default = ["http"]
-http = ["rustls", "webpki-roots", "form_urlencoded", "multipart"]
-
 [dependencies]
-form_urlencoded = { version = "1.2.1", optional = true }
-multipart = { version = "0.18.0", optional = true, default-features = false, features = ["client"]  }
-rustls = { version = "0.23.20", optional = true, default-features = false, features = ["tls12", "std", "ring"]  }
-webpki-roots = { version = "0.26.7", optional = true }
-#uuid = { version = "1.8.0", features = ["v7"] }
-regex = "1.11.1"
+form_urlencoded = { version = "1.2.1" }
+multipart = { version = "0.18.0", default-features = false, features = ["client"]  }
+rustls = { version = "0.23.22", default-features = false, features = ["tls12", "std", "ring"]  }
+rustls-platform-verifier = { version = "0.5.0"}
+#uuid = { version = "1.13.1", default-features = false, features = ["v7"] }
+regex = { version = "1.11.1" }
 
 [dev-dependencies]
-avro = { version = "0.16", package = "apache-avro" }
+avro = { version = "0.17.0", package = "apache-avro" }

lib/src/http/stream.rs

@@ -125,10 +125,8 @@ impl Stream {
     }
 
     fn connect_tls(host: &str, port: u16, connect_tiomeout: Option<Duration>, read_tiomeout: Option<Duration>) -> Result<Self, Error> {
-        let store = rustls::RootCertStore {
-            roots: webpki_roots::TLS_SERVER_ROOTS.into(),
-        };
-        let config = Arc::new(rustls::ClientConfig::builder().with_root_certificates(store).with_no_client_auth());
+        use rustls_platform_verifier::BuilderVerifierExt;
+        let config = Arc::new(rustls::ClientConfig::builder().with_platform_verifier().with_no_client_auth());
         let name = host.to_owned().try_into().map_err(|_e| Error::InvalidUrlHost)?;
         let attach = Box::new(rustls::ClientConnection::new(config, name).map_err(|_e| Error::TlsHandshakeFailed)?);
         let (stream, resolve) = Self::connect_tcp(host, port, connect_tiomeout, read_tiomeout)?;