Switched from aws-lc-sys to ring

.github/workflows/release.yml

@@ -235,15 +235,56 @@ jobs:
           name: artifacts-dist-manifest
           path: dist-manifest.json
 
+  publish-homebrew-formula:
+    needs:
+      - plan
+      - host
+    runs-on: "ubuntu-20.04"
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      PLAN: ${{ needs.plan.outputs.val }}
+      GITHUB_USER: "axo bot"
+      GITHUB_EMAIL: "[email protected]"
+    if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: "manforowicz/homebrew-tap"
+          token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
+      # So we have access to the formula
+      - name: Fetch homebrew formulae
+        uses: actions/download-artifact@v4
+        with:
+          pattern: artifacts-*
+          path: Formula/
+          merge-multiple: true
+      # This is extra complex because you can make your Formula name not match your app name
+      # so we need to find releases with a *.rb file, and publish with that filename.
+      - name: Commit formula files
+        run: |
+          git config --global user.name "${GITHUB_USER}"
+          git config --global user.email "${GITHUB_EMAIL}"
+
+          for release in $(echo "$PLAN" | jq --compact-output '.releases[] | select([.artifacts[] | endswith(".rb")] | any)'); do
+            filename=$(echo "$release" | jq '.artifacts[] | select(endswith(".rb"))' --raw-output)
+            name=$(echo "$filename" | sed "s/\.rb$//")
+            version=$(echo "$release" | jq .app_version --raw-output)
+
+            git add "Formula/${filename}"
+            git commit -m "${name} ${version}"
+          done
+          git push
+
   # Create a GitHub Release while uploading all files to it
   announce:
     needs:
       - plan
       - host
+      - publish-homebrew-formula
     # use "always() && ..." to allow us to wait for all publish jobs while
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
-    if: ${{ always() && needs.host.result == 'success' }}
+    if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
     runs-on: "ubuntu-20.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml → .github/workflows/test.yml

@@ -2,6 +2,8 @@ name: Cargo Build & Test
 
 on:
   push:
+    branches:
+      - main
   pull_request:
 
 env: 
@@ -14,9 +16,9 @@ jobs:
     strategy:
       matrix:
         toolchain:
-          - stable
+          # - stable
           - beta
-          - nightly
+          # - nightly
     steps:
       - uses: actions/checkout@v3
 

Cargo.toml

@@ -10,23 +10,12 @@ members = [
     "gday_file_transfer",
 ]
 
-# Config for 'cargo dist'
-# specifying build dependencies for aws-lc-sys
-[workspace.metadata.dist.dependencies.homebrew]
-llvm = '*'
-cmake = '*'
-
-
-[workspace.metadata.dist.dependencies.apt]
-clang = '*'
-build-essential = '*'
-cmake = '*'
-
-
-[workspace.metadata.dist.dependencies.chocolatey]
-clang = '*'
-cmake = '*'
-nasm = '*'
+# Keys that workspace packages will inherit
+[workspace.package]
+authors = ["Marcin Anforowicz"]
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/manforowicz/gday/"
 
 # Config for 'cargo dist'
 [workspace.metadata.dist]
@@ -35,13 +24,15 @@ cargo-dist-version = "0.15.1"
 # CI backends to support
 ci = "github"
 # The installers to generate for each app
-installers = []
+installers = ["homebrew"]
+# A GitHub repo to push Homebrew formulas to
+tap = "manforowicz/homebrew-tap"
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
 # Publish jobs to run in CI
+publish-jobs = ["homebrew"]
+# Publish jobs to run in CI
 pr-run-mode = "plan"
-# Whether to install an updater program
-install-updater = false
 
 # The profile that 'cargo dist' will build with
 [profile.dist]

gday/Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 name = "gday"
 version = "0.1.1"
-authors = ["Marcin Anforowicz"]
-edition = "2021"
 description = "Command line tool to send files easily, securely, and directly, without a relay or port forwarding."
-license = "MIT"
-repository = "https://github.com/manforowicz/gday/"
+homepage = "https://github.com/manforowicz/gday/gday/"
+
+# Inherit these keys from workspace toml
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -23,9 +26,4 @@ owo-colors = "4.0.0"
 postcard = "1.0.8"
 rand = "0.8.5"
 serde = { version = "1.0.203", features = ["serde_derive"] }
-thiserror = "1.0.61"
-
-[dev-dependencies]
-assert_cmd = "2.0.14"
-gday_server = { version = "0.1.1", path = "../gday_server" }
-tempfile = "3.10.1"
+thiserror = "1.0.61"

gday_contact_exchange_protocol/Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 name = "gday_contact_exchange_protocol"
 version = "0.1.1"
-authors = ["Marcin Anforowicz"]
-edition = "2021"
 description = "Protocol that peers can use to exchange their public and private socket addresses via a server."
-license = "MIT"
-repository = "https://github.com/manforowicz/gday/"
+homepage = "https://github.com/manforowicz/gday/gday_contact_exchange_protocol/"
+
+# Inherit these keys from workspace toml
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

gday_encryption/Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 name = "gday_encryption"
 version = "0.1.1"
-authors = ["Marcin Anforowicz"]
-edition = "2021"
 description = "A simple ChaCha20Poly1305 encryption wrapper around an IO stream."
-license = "MIT"
-repository = "https://github.com/manforowicz/gday/"
+homepage = "https://github.com/manforowicz/gday/gday_encryption/"
+
+# Inherit these keys from workspace toml
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

gday_file_transfer/Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 name = "gday_file_transfer"
 version = "0.1.1"
-authors = ["Marcin Anforowicz"]
-edition = "2021"
 description = "A minimal protocol to securely transfer files over an IO stream. Used by gday."
-license = "MIT"
-repository = "https://github.com/manforowicz/gday/"
+homepage = "https://github.com/manforowicz/gday/gday_file_transfer/"
+
+# Inherit these keys from workspace toml
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

gday_hole_punch/Cargo.toml

@@ -1,11 +1,14 @@
 [package]
 name = "gday_hole_punch"
 version = "0.1.1"
-authors = ["Marcin Anforowicz"]
-edition = "2021"
 description = "Establish an authenticated peer-to-peer internet connection using TCP hole-punching."
-license = "MIT"
-repository = "https://github.com/manforowicz/gday/"
+homepage = "https://github.com/manforowicz/gday/gday_hole_punch/"
+
+# Inherit these keys from workspace toml
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -14,9 +17,9 @@ blake3 = "1.5.1"
 gday_contact_exchange_protocol = { version = "0.1.1", path = "../gday_contact_exchange_protocol" }
 log = "0.4.21"
 rand = "0.8.5"
-rustls = "0.23.9"
+rustls = { version = "0.23.9", features = ["ring", "log", "logging", "std", "tls12"], default-features = false }
 serde = "1.0.203"
-socket2 = "0.5.7"
+socket2 = { version = "0.5.7", features = ["all"] }
 spake2 = { version = "0.4.0", features = ["std"] }
 thiserror = "1.0.61"
 tokio = { version = "1.38.0", features = ["net", "rt", "time"] }

gday_hole_punch/src/hole_puncher.rs

@@ -228,12 +228,14 @@ fn get_local_socket(local_addr: SocketAddr) -> std::io::Result<TcpSocket> {
     let sock = SockRef::from(&socket);
 
     let _ = sock.set_reuse_address(true);
+
+    // socket2 only supports this method on these systems
+    #[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
     let _ = sock.set_reuse_port(true);
 
     let keepalive = TcpKeepalive::new()
-        .with_time(Duration::from_secs(5))
-        .with_interval(Duration::from_secs(2))
-        .with_retries(5);
+        .with_time(Duration::from_secs(60))
+        .with_interval(Duration::from_secs(10));
     let _ = sock.set_tcp_keepalive(&keepalive);
 
     socket.bind(local_addr)?;

gday_hole_punch/src/server_connector.rs

@@ -85,13 +85,16 @@ impl ServerStream {
     /// So that this socket can be reused for
     /// hole-punching.
     fn enable_reuse(&self) {
-        let stream = match self {
+        let stream: &TcpStream = match self {
             Self::TCP(stream) => stream,
             Self::TLS(stream) => stream.get_ref(),
         };
 
         let sock = SockRef::from(stream);
         let _ = sock.set_reuse_address(true);
+
+        // socket2 only supports this method on these systems
+        #[cfg(all(unix, not(any(target_os = "solaris", target_os = "illumos"))))]
         let _ = sock.set_reuse_port(true);
     }
 }

gday_server/Cargo.toml

@@ -1,25 +1,28 @@
 [package]
 name = "gday_server"
 version = "0.1.1"
-authors = ["Marcin Anforowicz"]
-edition = "2021"
 description = "A server that lets 2 peers exchange their private and public addresses via the gday contact exchange protocol."
-license = "MIT"
-repository = "https://github.com/manforowicz/gday/"
+homepage = "https://github.com/manforowicz/gday/gday_server/"
+
+# Inherit these keys from workspace toml
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 clap = { version = "4.5.4", features = ["derive"] }
-socket2 = "0.5.7"
+socket2 = { version = "0.5.7", features = ["all"] }
 tokio = { version = "1.38.0", features = [
     "rt-multi-thread",
     "macros",
     "net",
     "time",
     "sync",
 ] }
-tokio-rustls = "0.26.0"
+tokio-rustls = { version = "0.26.0", features = ["ring", "logging", "tls12"], default-features = false }
 gday_contact_exchange_protocol = { path = "../gday_contact_exchange_protocol" }
 thiserror = "1.0.61"
 log = "0.4.21"

gday_server/src/main.rs

@@ -139,8 +139,7 @@ async fn get_tcp_listener(addr: impl ToSocketAddrs + Display) -> TcpListener {
     // sets the keepalive to 10 minutes
     let tcp_keepalive = TcpKeepalive::new()
         .with_time(Duration::from_secs(600))
-        .with_interval(Duration::from_secs(10))
-        .with_retries(3);
+        .with_interval(Duration::from_secs(10));
     let socket = SockRef::from(&listener);
     socket
         .set_tcp_keepalive(&tcp_keepalive)