Merge pull request #6 from ErikWegner/axum-0.8

Upgrade axum 0.8

Author: 0xCoder0000

.devcontainer/docker-compose.yml

@@ -5,6 +5,7 @@ services:
     ports:
       # Publish keycloak here, because network stack is shared
       - "8101:8101"
+      - "3000:3000"
     volumes:
       # Mount the root folder that contains .git
       - ..:/workspace:cached
@@ -17,7 +18,7 @@ services:
     image: erikwegner/rsecho:release-1.0.0
 
   keycloak:
-    image: quay.io/keycloak/keycloak:26.0.0
+    image: quay.io/keycloak/keycloak:26.1.0
     command:
       - start-dev
       - --import-realm

.env.e2e-ci

@@ -0,0 +1,41 @@
+#
+# Required options
+#
+
+RIDSER_BIND_PORT=3000
+RIDSER_BIND_ADDRESS="::"
+RUST_LOG=ridser=trace
+# Target for authenticated requests
+RIDSER_PROXY_TARGET=http://echo:3000/
+# Deny refresh requests as long as the session is valid for longer than this threshold
+RIDSER_SESSION_REFRESH_THRESHOLD=15
+# OpenID Connect Issuer
+RIDSER_OIDC_ISSUER_URL=http://localhost:8101/realms/multcorp
+# Client with user data access
+RIDSER_OIDC_CLIENT_ID=ridser
+# Secret for client with user data access
+RIDSER_OIDC_CLIENT_SECRET=8d476311-2577-4104-b9e4-7dc2cc381be8
+# Single sign on logout endpoint
+RIDSER_LOGOUT_SSO_URI=http://localhost:8101/realms/multcorp/protocol/openid-connect/logout
+# Redis cache configuration
+RIDSER_REDIS_URL=redis://redis:6379
+# Session secret, length in bytes: 64
+RIDSER_SESSION_SECRET=iIdh4cBut27H6Y5MCk9782bE3Nk56JVsahla1vhILE3tizmX5nP5riOhV8IgorzI
+# Disable secure cookies for webkit tests
+RIDSER_SESSION_SECURE_COOKIE_DISABLED=true
+
+#
+# Optional
+
+# Override authorization endpoint
+RIDSER_OIDC_AUTH_URL=http://localhost:8101/realms/multcorp/protocol/openid-connect/auth
+# Override cookie name for session cookie. Default name is "ridser.sid"
+RIDSER_SESSION_COOKIE_NAME=ridser.sid
+
+# Comma separated list of allowed redirect uris after successful login. A trailing asterisk is allowed for wildcard matches.
+RIDSER_LOGIN_REDIRECT_APP_URIS=http://localhost:4800/*,http://localhost:4700/*,http://ridser.localhost/,http://localhost:3000/*
+# Comma separated list of allowed redirect uris after successful logout. Only exact matches are allowed.
+RIDSER_LOGOUT_REDIRECT_APP_URIS=http://localhost:4800/,http://localhost:3000/exampleapp/
+RIDSER_PROXY_TARGET_RULE_A=/num=>http://echo:3000/rule/a
+RIDSER_PROXY_TARGET_RULE_FOO=/foo=>http://echo:3000/foo-rule/abc
+RIDSER_PROXY_TARGET_RULE_BAR=/bar/me/no=>http://echo:3000/bar/bar/bar

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ jobs:
   check:
     name: Check
     runs-on: ubuntu-latest
-    container: rust:1.82.0
+    container: rust:1.84.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -21,7 +21,7 @@ jobs:
   test:
     name: Test Suite
     runs-on: ubuntu-latest
-    container: rust:1.82.0
+    container: rust:1.84.0
     services:
       # Label used to access the service container
       redis:
@@ -47,7 +47,7 @@ jobs:
   fmt:
     name: Rustfmt
     runs-on: ubuntu-latest
-    container: rust:1.82.0
+    container: rust:1.84.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -64,7 +64,7 @@ jobs:
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
-    container: rust:1.82.0
+    container: rust:1.84.0
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1

.github/workflows/playwright.yml

@@ -0,0 +1,42 @@
+name: Playwright Tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+jobs:
+  test:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run devcontainers, build binary
+        run: |
+          docker compose -f .devcontainer/docker-compose.yml up -d
+          docker compose -f .devcontainer/docker-compose.yml exec ridser /bin/bash -c "rustup update stable"
+          docker exec -i --user ${UID}:${GID} --workdir /workspace devcontainer-ridser-1 /bin/bash -c "cargo build"
+      - uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+      - name: Install dependencies
+        working-directory: ./tests
+        run: npm ci
+      - name: Install Playwright Browsers
+        working-directory: ./tests
+        run: npx playwright install --with-deps
+      - name: Run Playwright tests
+        working-directory: ./tests
+        run: |
+          docker exec -id --user ${UID}:${GID} --workdir /workspace devcontainer-ridser-1 /bin/bash -c "cp .env.default .env ; cargo run"
+          export PLAYWRIGHT_HTML_OUTPUT_DIR=playwright-report/firefox_chromium/
+          npx playwright test --project firefox --project chromium
+          docker exec -id --user ${UID}:${GID} --workdir /workspace devcontainer-ridser-1 /bin/bash -c "killall ridser"
+          docker exec -id --user ${UID}:${GID} --workdir /workspace devcontainer-ridser-1 /bin/bash -c "cp .env.e2e-ci .env ; cargo run"
+          export PLAYWRIGHT_HTML_OUTPUT_DIR=playwright-report/webkit/
+          npx playwright test --project webkit
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: playwright-report
+          path: tests/playwright-report/
+          retention-days: 30