feat: read proxy origin from QubesDB when available; otherwise environment

.github/workflows/build.yml

@@ -37,7 +37,6 @@ jobs:
           PKG_DIR=../client make -C securedrop-builder requirements
           PKG_DIR=../export make -C securedrop-builder requirements
           PKG_DIR=../log make -C securedrop-builder requirements
-          PKG_DIR=../proxy make -C securedrop-builder requirements
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
           git diff --ignore-matching-lines=# --exit-code
 

.github/workflows/sdk.yml

@@ -29,6 +29,9 @@ jobs:
           wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz &&
           tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz &&
           rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+      - name: Build proxy
+        run: |
+          cargo build
       - name: Run tests without VCR cassettes
         run: |
           # Start the server in the background
@@ -38,5 +41,4 @@ jobs:
           # Wait for server to come up
           dockerize -wait http://127.0.0.1:8080 -timeout 5m
           # Run tests
-          rm client/tests/sdk/data/*.yml
-          make -C client test-sdk
+          make -C client regenerate-sdk-cassettes

.github/workflows/test.yml

@@ -22,18 +22,18 @@ jobs:
         debian_version:
           - bullseye
           - bookworm
-        # bookworm jobs are failing and will be
-        # replaced with proxy v2 shortly, so skip
-        # https://github.com/freedomofpress/securedrop-client/issues/1681
-        exclude:
-          - component: proxy
-            debian_version: bookworm
     runs-on: ubuntu-latest
     container: debian:${{ matrix.debian_version }}
     steps:
       - run: |
           apt-get update && apt-get install --yes git make gnupg
+      - name: Install Rust-specific dependencies
+        run: apt-get install --yes build-essential curl libssl-dev pkg-config
+        if: ${{ matrix.component == 'proxy' }}
       - uses: actions/checkout@v4
+      # Install Rust 1.74.1, keep in sync with rust-toolchain.toml
+      - uses: dtolnay/rust-toolchain@aec8960fc037f3ba5dd7773fd5b938a0ab22c50f
+        if: ${{ matrix.component == 'proxy' }}
       - name: Install dependencies
         run: |
           source /etc/os-release