fix: list objects trim common prefixes that match marker prefix

This checks to see if the common prefix is before the marker and
thus would have been returned in earlier list objects request.

The error case was aws cli listing multiple entries for the same
common prefix when the listing required multiple pagination
requests.

Fixes #778

.github/SECURITY.md

@@ -1,25 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-If you discover a security vulnerability in `versitygw`, we strongly encourage you to report it privately and responsibly.
-
-Please do **not** create public issues or pull requests that contain details about the vulnerability.
-
-Instead, report the issue using GitHub's private **Security Advisories** feature:
-
-- Go to [versitygw's Security Advisories page](https://github.com/versity/versitygw/security/advisories)
-- Click on **"Report a vulnerability"**
-
-We aim to respond within **2 business days** and work with you to quickly resolve the issue.
-
-## Supported Versions
-
-| Version         | Supported |
-| --------------- | --------- |
-| Latest (v1.x.x) | ✅        |
-| Older versions  | ❌        |
-
-## Responsible Disclosure
-
-We appreciate responsible disclosures and are committed to fixing vulnerabilities in a timely manner. Thank you for helping keep `versitygw` secure.

.github/dependabot.yml

@@ -12,7 +12,3 @@ updates:
       # Allow both direct and indirect updates for all packages
       - dependency-type: "all"
 
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/azurite.yml

@@ -1,37 +0,0 @@
-name: azurite functional tests
-permissions: {}
-on: pull_request
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-              
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 'stable'
-        id: go
-
-      - name: Set up Docker Compose
-        run: |
-          docker compose -f tests/docker-compose.yml --env-file .env.dev --project-directory . up -d azurite azuritegw
-
-      - name: Wait for Azurite to be ready
-        run: sleep 40
-
-      - name: Get Dependencies
-        run: |
-          go mod download
-  
-      - name: Build and Run
-        run: |
-          make
-          ./versitygw test -a user -s pass -e http://127.0.0.1:7070 full-flow --azure
-  
-      - name: Shut down services
-        run: |
-          docker compose -f tests/docker-compose.yml --env-file .env.dev --project-directory . down azurite azuritegw

.github/workflows/codeql.yml

@@ -1,108 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL Advanced"
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-  schedule:
-    - cron: '21 17 * * 2'
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    permissions:
-      # required for all workflows
-      security-events: write
-
-      # required to fetch internal or private CodeQL packs
-      packages: read
-
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - language: actions
-          build-mode: none
-        - language: go
-          build-mode: autobuild
-        - language: javascript-typescript
-          build-mode: none
-          paths-ignore:
-            # ignore embedded 3rd party assets
-            - 'webui/web/assets/**'
-        - language: python
-          build-mode: none
-        # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
-        # Use `c-cpp` to analyze code written in C, C++ or both
-        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v6
-
-    # Add any setup steps before running the `github/codeql-action/init` action.
-    # This includes steps like installing compilers or runtimes (`actions/setup-node`
-    # or others). This is typically only required for manual builds.
-    # - name: Setup runtime (example)
-    #   uses: actions/setup-example@v1
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    # If the analyze step fails for one of the languages you are analyzing with
-    # "We were unable to automatically build your code", modify the matrix above
-    # to set the build mode to "manual" for that language. Then modify this step
-    # to build your code.
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-    - name: Run manual build steps
-      if: matrix.build-mode == 'manual'
-      shell: bash
-      run: |
-        echo 'If you are using a "manual" build mode for one or more of the' \
-          'languages you are analyzing, replace this with the commands to build' \
-          'your code, for example:'
-        echo '  make bootstrap'
-        echo '  make release'
-        exit 1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/docker-bats.yaml

@@ -0,0 +1,28 @@
+name: docker bats tests
+
+on: pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build Docker Image
+        run: |
+          mv tests/.env.docker.default tests/.env.docker
+          mv tests/.secrets.default tests/.secrets
+          docker build --build-arg="GO_LIBRARY=go1.23.1.linux-amd64.tar.gz" \
+            --build-arg="AWS_CLI=awscli-exe-linux-x86_64.zip" --build-arg="MC_FOLDER=linux-amd64" \
+            --progress=plain -f tests/Dockerfile_test_bats -t bats_test .
+
+      - name: Set up Docker Compose
+        run: sudo apt-get install -y docker-compose
+
+      - name: Run Docker Container
+        run: docker-compose -f tests/docker-compose-bats.yml up --exit-code-from posix_backend posix_backend

.github/workflows/docker-bats.yml

@@ -1,28 +0,0 @@
-name: docker bats tests
-permissions: {}
-on: pull_request
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Build Docker Image
-        run: |
-          cp tests/.env.docker.default tests/.env.docker
-          cp tests/.secrets.default tests/.secrets
-          docker build \
-            --build-arg="GO_LIBRARY=go1.23.1.linux-amd64.tar.gz" \
-            --build-arg="AWS_CLI=awscli-exe-linux-x86_64.zip" \
-            --build-arg="MC_FOLDER=linux-amd64" \
-            --progress=plain \
-            -f tests/Dockerfile_test_bats \
-            -t bats_test .
-
-      - name: Run Docker Container
-        run: |
-          docker compose -f tests/docker-compose-bats.yml --project-directory . \
-          up --exit-code-from s3api_np_only s3api_np_only

.github/workflows/docker.yaml

@@ -1,4 +1,5 @@
 name: Publish Docker image
+
 on:
   release:
     types: [published]
@@ -12,7 +13,7 @@ jobs:
       contents: read
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -43,7 +44,7 @@ jobs:
             ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker images
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

.github/workflows/functional.yml

@@ -1,25 +1,24 @@
 name: functional tests
-permissions: {}
 on: pull_request
-
 jobs:
+
   build:
     name: RunTests
     runs-on: ubuntu-latest
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@v5
       with:
         go-version: 'stable'
       id: go
 
     - name: Get Dependencies
       run: |
-        go mod download
+        go get -v -t -d ./...
 
     - name: Build and Run
       run: |

.github/workflows/go.yml

@@ -1,18 +1,17 @@
 name: general
-permissions: {}
 on: pull_request
 jobs:
 
   build:
-    name: Go Basic Checks
+    name: Build
     runs-on: ubuntu-latest
     steps:
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@v5
       with:
         go-version: 'stable'
       id: go
@@ -24,6 +23,9 @@ jobs:
       run: |
         go get -v -t -d ./...
 
+    - name: Build
+      run: make
+
     - name: Test
       run: go test -coverprofile profile.txt -race -v -timeout 30s -tags=github ./...
 
@@ -33,26 +35,4 @@ jobs:
 
     - name: Run govulncheck
       run: govulncheck ./...
-      shell: bash
-
-  verify-build:
-    name: Verify Build Targets
-    needs: build
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [darwin, freebsd, linux]
-        arch: [amd64, arm64]
-    steps:
-
-      - name: Check out code
-        uses: actions/checkout@v6
-
-      - name: Set up Go
-        uses: actions/setup-go@v6
-        with:
-          go-version: 'stable'
-
-      - name: Build for ${{ matrix.os }}/${{ matrix.arch }}
-        run: |
-          GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }} go build -o versitygw-${{ matrix.os }}-${{ matrix.arch }} cmd/versitygw/*.go
+      shell: bash

.github/workflows/goreleaser.yml

@@ -1,18 +1,22 @@
 name: goreleaser
-permissions:
-  contents: write
+
 on:
   push:
     # run only against tags
     tags:
       - '*'
 
+permissions:
+  contents: write
+  # packages: write
+  # issues: write
+
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -20,15 +24,15 @@ jobs:
         run: git fetch --force --tags
 
       - name: Setup Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
           go-version: stable
 
       - name: Run Releaser
-        uses: goreleaser/goreleaser-action@v6
+        uses: goreleaser/goreleaser-action@v5
         with:
           distribution: goreleaser
-          version: '~> v2'
+          version: latest
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.TOKEN }}

.github/workflows/host-style-tests.yml

@@ -1,13 +0,0 @@
-name: host style tests
-permissions: {}
-on: pull_request
-
-jobs:
-  build-and-run:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: run host-style tests
-        run: make test-host-style

.github/workflows/shellcheck.yml

@@ -1,5 +1,4 @@
 name: shellcheck
-permissions: {}
 on: pull_request
 jobs:
 
@@ -9,7 +8,7 @@ jobs:
     steps:
 
     - name: Check out code
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
 
     - name: Run checks
       run: |

.github/workflows/skips.yml

@@ -1,84 +0,0 @@
-name: skips check
-permissions: {}
-on: workflow_dispatch
-jobs:
-  skip-ticket-check:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Fail if any skip descriptions are empty or point to closed issues/PRs
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          set -euo pipefail
-
-          # Find uncommented lines with "skip " (ignore lines whose first non-space char is #)
-          mapfile -t MATCHES < <(
-            git ls-files 'tests/test_*.sh' \
-              | xargs -r grep -nE '^[[:space:]]*[^#][[:space:]]*skip[[:space:]]*$' \
-              || true
-          )
-
-          if [ ${#MATCHES[@]} -ne 0 ]; then
-            echo "${#MATCHES[@]} skip(s) lack a description"
-            printf ' - %s\n' "${MATCHES[@]}"
-            exit 1
-          fi
-          
-          mapfile -t MATCHES < <(
-            git ls-files 'tests/test_*.sh' \
-              | xargs -r grep -nE '^[[:space:]]*[^#][[:space:]]*skip[[:space:]]*"https://github.com' \
-              || true
-          )
-
-          urls=()
-          for m in "${MATCHES[@]}"; do
-            # Extract first GitHub issue/PR URL on the line:
-            # supports /issues/123 and /pull/123 (with or without extra suffix)
-            url="$(echo "$m" | grep -oE 'https://github\.com/[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+/(issues|pull)/[0-9]+' | head -n1 || true)"
-            if [ -n "$url" ]; then
-              urls+=("$url")
-            fi
-          done
-
-          if [ ${#urls[@]} -eq 0 ]; then
-            echo "Found skip lines, but no recognizable GitHub issue/PR URLs."
-            exit 0
-          fi
-
-          echo "Found skip ticket URLs:"
-          printf ' - %s\n' "${urls[@]}"
-
-          closed=()
-
-          for url in "${urls[@]}"; do
-            # Parse owner/repo and number from URL
-            # url format: https://github.com/OWNER/REPO/issues/123 or /pull/123
-            path="${url#https://github.com/}"
-            owner="$(echo "$path" | cut -d/ -f1)"
-            repo="$(echo "$path"  | cut -d/ -f2)"
-            num="$(echo "$path"   | cut -d/ -f4)"
-
-            # Issues API works for both issues and PRs; state=open/closed
-            state="$(curl -fsSL \
-              -H "Authorization: Bearer $GH_TOKEN" \
-              -H "Accept: application/vnd.github+json" \
-              "https://api.github.com/repos/$owner/$repo/issues/$num" \
-              | python -c "import sys,json; print(json.load(sys.stdin).get('state',''))")"
-
-            echo "$url -> $state"
-            if [ "$state" = "closed" ]; then
-              closed+=("$url")
-            fi
-          done
-
-          if [ ${#closed[@]} -gt 0 ]; then
-            echo "::error::Closed tickets referenced by uncommented skip URLs:"
-            printf '::error:: - %s\n' "${closed[@]}"
-            exit 1
-          fi
-
-          echo "All referenced tickets are open. ✅"

.github/workflows/static.yml

@@ -1,5 +1,4 @@
 name: staticcheck
-permissions: {}
 on: pull_request
 jobs: 
 
@@ -9,12 +8,12 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
       with:
         fetch-depth: 1
 
     - name: Set up Go
-      uses: actions/setup-go@v6
+      uses: actions/setup-go@v5
       with:
         go-version: 'stable'
       id: go

.github/workflows/system.yml

@@ -1,37 +1,131 @@
 name: system tests
-permissions: {}
 on: pull_request
 jobs:
-  generate:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.make.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v6
-      - id: make
-        run: |
-          if ! matrix_output=$(tests/generate_matrix.sh 2>&1); then
-            echo "error generating matrix: $matrix_output"
-            exit 1
-          fi
-          MATRIX_JSON=$(echo -n "$matrix_output" | jq -c . )
-          echo "matrix=$MATRIX_JSON" >> "$GITHUB_OUTPUT"
-
   build:
     name: RunTests
-    needs: generate
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.generate.outputs.matrix) }}
+      matrix:
+        include:
+          - set: "s3cmd, posix"
+            LOCAL_FOLDER: /tmp/gw1
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-1
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-1
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam1
+            AWS_ENDPOINT_URL: https://127.0.0.1:7070
+            RUN_SET: "s3cmd"
+            RECREATE_BUCKETS: "true"
+            PORT: 7070
+            BACKEND: "posix"
+          - set: "s3, posix"
+            LOCAL_FOLDER: /tmp/gw2
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-2
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-2
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam2
+            AWS_ENDPOINT_URL: https://127.0.0.1:7071
+            RUN_SET: "s3"
+            RECREATE_BUCKETS: "true"
+            PORT: 7071
+            BACKEND: "posix"
+          - set: "s3api, posix"
+            LOCAL_FOLDER: /tmp/gw3
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-3
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-3
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam3
+            AWS_ENDPOINT_URL: https://127.0.0.1:7072
+            RUN_SET: "s3api"
+            RECREATE_BUCKETS: "true"
+            PORT: 7072
+            BACKEND: "posix"
+          - set: "mc, posix"
+            LOCAL_FOLDER: /tmp/gw4
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-4
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-4
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam4
+            AWS_ENDPOINT_URL: https://127.0.0.1:7073
+            RUN_SET: "mc"
+            RECREATE_BUCKETS: "true"
+            PORT: 7073
+            BACKEND: "posix"
+          - set: "s3api-user, posix, s3 IAM"
+            LOCAL_FOLDER: /tmp/gw5
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-5
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-5
+            IAM_TYPE: s3
+            USERS_BUCKET: versity-gwtest-iam
+            AWS_ENDPOINT_URL: https://127.0.0.1:7074
+            RUN_SET: "s3api-user"
+            RECREATE_BUCKETS: "true"
+            PORT: 7074
+            BACKEND: "posix"
+          - set: "s3api non-policy, static buckets"
+            LOCAL_FOLDER: /tmp/gw6
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-6
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-6
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam6
+            AWS_ENDPOINT_URL: https://127.0.0.1:7075
+            RUN_SET: "s3api-non-policy"
+            RECREATE_BUCKETS: "false"
+            PORT: 7075
+            BACKEND: "posix"
+          - set: "s3api, s3 backend"
+            LOCAL_FOLDER: /tmp/gw7
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-7
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-7
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam7
+            AWS_ENDPOINT_URL: https://127.0.0.1:7076
+            RUN_SET: "s3api"
+            RECREATE_BUCKETS: "true"
+            PORT: 7076
+            BACKEND: "s3"
+          - set: "REST, posix"
+            LOCAL_FOLDER: /tmp/gw8
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-7
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-7
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam8
+            AWS_ENDPOINT_URL: https://127.0.0.1:7077
+            RUN_SET: "rest"
+            RECREATE_BUCKETS: "true"
+            PORT: 7077
+            BACKEND: "posix"
+          - set: "s3api policy, static buckets"
+            LOCAL_FOLDER: /tmp/gw9
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-8
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-8
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam9
+            AWS_ENDPOINT_URL: https://127.0.0.1:7078
+            RUN_SET: "s3api-policy"
+            RECREATE_BUCKETS: "false"
+            PORT: 7078
+            BACKEND: "posix"
+          - set: "s3api user, static buckets"
+            LOCAL_FOLDER: /tmp/gw10
+            BUCKET_ONE_NAME: versity-gwtest-bucket-one-9
+            BUCKET_TWO_NAME: versity-gwtest-bucket-two-9
+            IAM_TYPE: folder
+            USERS_FOLDER: /tmp/iam10
+            AWS_ENDPOINT_URL: https://127.0.0.1:7079
+            RUN_SET: "s3api-user"
+            RECREATE_BUCKETS: "false"
+            PORT: 7079
+            BACKEND: "posix"
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v6
+        uses: actions/setup-go@v5
         with:
-          go-version: "stable"
+          go-version: 'stable'
         id: go
 
       - name: Get Dependencies
@@ -47,7 +141,6 @@ jobs:
 
       - name: Install s3cmd
         run: |
-          sudo apt-get update
           sudo apt-get install s3cmd
 
       - name: Install mc
@@ -55,63 +148,44 @@ jobs:
           curl https://dl.min.io/client/mc/release/linux-amd64/mc --create-dirs -o /usr/local/bin/mc
           chmod 755 /usr/local/bin/mc
 
-      - name: Install xml libraries (for rest)
+      - name: Install xmllint (for rest)
         run: |
-          sudo apt-get update
-          sudo apt-get install libxml2-utils xmlstarlet
+          sudo apt-get install libxml2-utils
 
-      # see https://github.com/versity/versitygw/issues/1034
-      - name: Install AWS cli
-        run: |
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.22.35.zip" -o "awscliv2.zip" 
-          unzip -o awscliv2.zip 
-          ./aws/install -i ${{ github.workspace }}/aws-cli -b ${{ github.workspace }}/bin
-          echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
-
-      - name: Build and run
+      - name: Build and run, posix backend
         env:
+          LOCAL_FOLDER: ${{ matrix.LOCAL_FOLDER }}
+          BUCKET_ONE_NAME: ${{ matrix.BUCKET_ONE_NAME }}
+          BUCKET_TWO_NAME: ${{ matrix.BUCKET_TWO_NAME }}
+          USERS_FOLDER: ${{ matrix.USERS_FOLDER }}
+          USERS_BUCKET: ${{ matrix.USERS_BUCKET }}
           IAM_TYPE: ${{ matrix.IAM_TYPE }}
+          AWS_ENDPOINT_URL: ${{ matrix.AWS_ENDPOINT_URL }}
           RUN_SET: ${{ matrix.RUN_SET }}
+          PORT: ${{ matrix.PORT }}
           AWS_PROFILE: versity
           VERSITY_EXE: ${{ github.workspace }}/versitygw
           RUN_VERSITYGW: true
           BACKEND: ${{ matrix.BACKEND }}
           RECREATE_BUCKETS: ${{ matrix.RECREATE_BUCKETS }}
-          DELETE_BUCKETS_AFTER_TEST: ${{ matrix.DELETE_BUCKETS_AFTER_TEST }}
           CERT: ${{ github.workspace }}/cert.pem
           KEY: ${{ github.workspace }}/versitygw.pem
-          LOCAL_FOLDER: /tmp/gw
-          BUCKET_ONE_NAME: versity-gwtest-bucket-one
-          BUCKET_TWO_NAME: versity-gwtest-bucket-two
-          USERS_FOLDER: /tmp/iam
-          USERS_BUCKET: versity-gwtest-iam
-          AWS_ENDPOINT_URL: https://127.0.0.1:7070
-          PORT: 7070
           S3CMD_CONFIG: tests/s3cfg.local.default
           MC_ALIAS: versity
           LOG_LEVEL: 4
           GOCOVERDIR: ${{ github.workspace }}/cover
-          USERNAME_ONE: HIJKLMN
+          USERNAME_ONE: ABCDEFG
           PASSWORD_ONE: 1234567
-          USERNAME_TWO: OPQRSTU
+          USERNAME_TWO: HIJKLMN
           PASSWORD_TWO: 8901234
           TEST_FILE_FOLDER: ${{ github.workspace }}/versity-gwtest-files
-          REMOVE_TEST_FILE_FOLDER: true
-          VERSIONING_DIR: ${{ github.workspace }}/versioning
-          COMMAND_LOG: command.log
-          TIME_LOG: time.log
-          PYTHON_ENV_FOLDER: ${{ github.workspace }}/env
-          AUTOGENERATE_USERS: true
-          USER_AUTOGENERATION_PREFIX: github-actions-test-
-          AWS_REGION: ${{ matrix.AWS_REGION }}
         run: |
           make testbin
           export AWS_ACCESS_KEY_ID=ABCDEFGHIJKLMNOPQRST
           export AWS_SECRET_ACCESS_KEY=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmn
-          export AWS_REGION=$AWS_REGION
+          export AWS_REGION=us-east-1
           export AWS_ACCESS_KEY_ID_TWO=user
           export AWS_SECRET_ACCESS_KEY_TWO=pass
-          export AWS_REQUEST_CHECKSUM_CALCULATION=WHEN_REQUIRED
           aws configure set aws_access_key_id $AWS_ACCESS_KEY_ID --profile versity
           aws configure set aws_secret_access_key $AWS_SECRET_ACCESS_KEY --profile versity
           aws configure set aws_region $AWS_REGION --profile versity
@@ -123,13 +197,7 @@ jobs:
           if [[ $RECREATE_BUCKETS == "false" ]]; then
             BYPASS_ENV_FILE=true ${{ github.workspace }}/tests/setup_static.sh
           fi
-          BYPASS_ENV_FILE=true $HOME/bin/bats ${{ github.workspace }}/$RUN_SET
-
-      - name: Time report
-        run: | 
-          if [ -e ${{ github.workspace }}/time.log ]; then
-            cat ${{ github.workspace }}/time.log
-          fi
+          BYPASS_ENV_FILE=true ${{ github.workspace }}/tests/run.sh $RUN_SET
 
       - name: Coverage report
         run: |

.gitignore

@@ -62,8 +62,4 @@ tests/!s3cfg.local.default
 *.patch
 
 # grafana's local database (kept on filesystem for survival between instantiations)
-metrics-exploration/grafana_data/**
-
-# bats tools
-/tests/bats-assert
-/tests/bats-support
+metrics-exploration/grafana_data/**

.goreleaser.yaml

@@ -1,5 +1,3 @@
-version: 2
-
 before:
   hooks:
     - go mod tidy
@@ -25,7 +23,7 @@ builds:
       - -X=main.Build={{.Commit}} -X=main.BuildTime={{.Date}} -X=main.Version={{.Version}}
 
 archives:
-  - formats: [ 'tar.gz' ]
+  - format: tar.gz
     # this name template makes the OS and Arch compatible with the results of uname.
     name_template: >-
       {{ .ProjectName }}_v{{ .Version }}_
@@ -45,7 +43,7 @@ archives:
     # use zip for windows archives
     format_overrides:
     - goos: windows
-      formats: [ 'zip' ]
+      format: zip
 
     # Additional files/globs you want to add to the archive.
     #
@@ -60,7 +58,7 @@ checksum:
   name_template: 'checksums.txt'
 
 snapshot:
-  version_template: "{{ incpatch .Version }}-{{.ShortCommit}}"
+  name_template: "{{ incpatch .Version }}-next"
 
 changelog:
   sort: asc
@@ -88,7 +86,7 @@ nfpms:
 
     license: Apache 2.0
 
-    ids:
+    builds:
       - versitygw
 
     formats:

Dockerfile

@@ -23,16 +23,13 @@ RUN go build -ldflags "-X=main.Build=${BUILD} -X=main.BuildTime=${TIME} -X=main.
 
 FROM alpine:latest
 
-# These arguments can be overridden when building the image
+# These arguments can be overriden when building the image
 ARG IAM_DIR=/tmp/vgw
 ARG SETUP_DIR=/tmp/vgw
 
 RUN mkdir -p $IAM_DIR
 RUN mkdir -p $SETUP_DIR
 
-COPY --from=0 /app/cmd/versitygw/versitygw /usr/local/bin/versitygw
+COPY --from=0 /app/cmd/versitygw/versitygw /app/versitygw
 
-COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh" ]
+ENTRYPOINT [ "/app/versitygw" ]

Makefile

@@ -18,10 +18,6 @@ GOBUILD=$(GOCMD) build
 GOCLEAN=$(GOCMD) clean
 GOTEST=$(GOCMD) test
 
-# docker-compose
-DCCMD=docker-compose
-DOCKERCOMPOSE=$(DCCMD) -f tests/docker-compose.yml --env-file .env.dev --project-directory .
-
 BIN=versitygw
 
 VERSION := $(shell if test -e VERSION; then cat VERSION; else git describe --abbrev=0 --tags HEAD; fi)
@@ -72,33 +68,22 @@ dist:
 	rm -f VERSION
 	gzip -f $(TARFILE)
 
-.PHONY: snapshot
-snapshot:
-# brew install goreleaser/tap/goreleaser
-	goreleaser release --snapshot --skip publish --clean
-
 # Creates and runs S3 gateway instance in a docker container
 .PHONY: up-posix
 up-posix:
-	$(DOCKERCOMPOSE) up posix
+	docker compose --env-file .env.dev up posix
 
 # Creates and runs S3 gateway proxy instance in a docker container
 .PHONY: up-proxy
 up-proxy:
-	$(DOCKERCOMPOSE) up proxy
+	docker compose --env-file .env.dev up proxy
 
 # Creates and runs S3 gateway to azurite instance in a docker container
 .PHONY: up-azurite
 up-azurite:
-	$(DOCKERCOMPOSE) up azurite azuritegw
+	docker compose --env-file .env.dev up azurite azuritegw
 
 # Creates and runs both S3 gateway and proxy server instances in docker containers
 .PHONY: up-app
 up-app:
-	$(DOCKERCOMPOSE) up
-
-# Run the host-style tests in docker containers
-.PHONY: test-host-style
-test-host-style:
-	docker compose -f tests/host-style-tests/docker-compose.yml up --build --abort-on-container-exit --exit-code-from test
-
+	docker compose --env-file .env.dev up

README.md

@@ -40,7 +40,7 @@ Versity Gateway, a simple to use tool for seamless inline translation between AW
 
 The server translates incoming S3 API requests and transforms them into equivalent operations to the backend service. By leveraging this gateway server, applications can interact with the S3-compatible API on top of already existing storage systems. This project enables leveraging existing infrastructure investments while seamlessly integrating with S3-compatible systems, offering increased flexibility and compatibility in managing data storage.
 
-The Versity Gateway is focused on performance, simplicity, and expandability. The Versity Gateway is designed with modularity in mind, enabling future extensions to support additional backend storage systems. At present, the Versity Gateway supports any generic POSIX file backend storage, Versity’s open source ScoutFS filesystem, Azure Blob Storage, and other S3 servers.  
+The Versity Gateway is focused on performance, simplicity, and expandability. The Versity Gateway is designed with modularity in mind, enabling future extensions to support additional backend storage systems. At present, the Versity Gateway supports any generic POSIX file backend storage and Versity’s open source ScoutFS filesystem.  
 
 The gateway is completely stateless. Multiple Versity Gateway instances may be deployed in a cluster to increase aggregate throughput. The Versity Gateway’s stateless architecture allows any request to be serviced by any gateway thereby distributing workloads and enhancing performance. Load balancers may be used to evenly distribute requests across the cluster of gateways for optimal performance. 
 
@@ -70,29 +70,6 @@ versitygw [global options] command [command options] [arguments...]
 ```
 The [global options](https://github.com/versity/versitygw/wiki/Global-Options) are specified before the backend type and the backend options are specified after.
 
-### Run the gateway in Docker
-
-Use the published image like the native binary by passing CLI arguments:
-
-```bash
-docker run --rm versity/versitygw:latest --version
-```
-
-When no command arguments are supplied, the container looks for `VGW_BACKEND` and optional `VGW_BACKEND_ARG`/`VGW_BACKEND_ARGS` environment variables to determine which backend to start. Backend-specific configuration continues to come from the existing environment flags (for example `ROOT_ACCESS_KEY`, `VGW_PORT`, and others).
-
-```bash
-docker run --rm \
-  -e ROOT_ACCESS_KEY=testuser \
-  -e ROOT_SECRET_KEY=secret \
-  -e VGW_BACKEND=posix \
-  -e VGW_BACKEND_ARG=/data \
-  -p 10000:7070 \
-  -v $(pwd)/data:/data \
-  versity/versitygw:latest
-```
-
-If you need to pass additional CLI options, set `VGW_ARGS` with a space-delimited list, or continue passing arguments directly to `docker run`.
-
 ***
 
 #### Versity gives you clarity and control over your archival storage, so you can allocate more resources to your core mission.

auth/access-control.go

@@ -1,189 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"strings"
-
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/s3err"
-)
-
-func VerifyObjectCopyAccess(ctx context.Context, be backend.Backend, copySource string, opts AccessOptions) error {
-	if opts.IsRoot {
-		return nil
-	}
-	if opts.Acc.Role == RoleAdmin {
-		return nil
-	}
-
-	// Verify destination bucket access
-	if err := VerifyAccess(ctx, be, opts); err != nil {
-		return err
-	}
-	// Verify source bucket access
-	srcBucket, srcObject, found := strings.Cut(copySource, "/")
-	if !found {
-		return s3err.GetAPIError(s3err.ErrInvalidCopySourceBucket)
-	}
-
-	// Get source bucket ACL
-	srcBucketACLBytes, err := be.GetBucketAcl(ctx, &s3.GetBucketAclInput{Bucket: &srcBucket})
-	if err != nil {
-		return err
-	}
-
-	var srcBucketAcl ACL
-	if err := json.Unmarshal(srcBucketACLBytes, &srcBucketAcl); err != nil {
-		return err
-	}
-
-	if err := VerifyAccess(ctx, be, AccessOptions{
-		Acl:           srcBucketAcl,
-		AclPermission: PermissionRead,
-		IsRoot:        opts.IsRoot,
-		Acc:           opts.Acc,
-		Bucket:        srcBucket,
-		Object:        srcObject,
-		Action:        GetObjectAction,
-	}); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type AccessOptions struct {
-	Acl             ACL
-	AclPermission   Permission
-	IsRoot          bool
-	Acc             Account
-	Bucket          string
-	Object          string
-	Action          Action
-	Readonly        bool
-	IsPublicRequest bool
-}
-
-func VerifyAccess(ctx context.Context, be backend.Backend, opts AccessOptions) error {
-	if opts.Readonly {
-		if opts.AclPermission == PermissionWrite || opts.AclPermission == PermissionWriteAcp {
-			return s3err.GetAPIError(s3err.ErrAccessDenied)
-		}
-	}
-	// Skip the access check for public bucket requests
-	if opts.IsPublicRequest {
-		return nil
-	}
-	if opts.IsRoot {
-		return nil
-	}
-	if opts.Acc.Role == RoleAdmin {
-		return nil
-	}
-
-	policy, policyErr := be.GetBucketPolicy(ctx, opts.Bucket)
-	if policyErr != nil {
-		if !errors.Is(policyErr, s3err.GetAPIError(s3err.ErrNoSuchBucketPolicy)) {
-			return policyErr
-		}
-	} else {
-		return VerifyBucketPolicy(policy, opts.Acc.Access, opts.Bucket, opts.Object, opts.Action)
-	}
-
-	if err := verifyACL(opts.Acl, opts.Acc.Access, opts.AclPermission); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Detects if the action is policy related
-// e.g.
-// 'GetBucketPolicy', 'PutBucketPolicy'
-func isPolicyAction(action Action) bool {
-	return action == GetBucketPolicyAction || action == PutBucketPolicyAction
-}
-
-// VerifyPublicAccess checks if the bucket is publically accessible by ACL or Policy
-func VerifyPublicAccess(ctx context.Context, be backend.Backend, action Action, permission Permission, bucket, object string) error {
-	// ACL disabled
-	policy, err := be.GetBucketPolicy(ctx, bucket)
-	if err != nil && !errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchBucketPolicy)) {
-		return err
-	}
-	if err == nil {
-		err = VerifyPublicBucketPolicy(policy, bucket, object, action)
-		if err == nil {
-			// if ACLs are disabled, and the bucket grants public access,
-			// policy actions should return 'MethodNotAllowed'
-			if isPolicyAction(action) {
-				return s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-			}
-
-			return nil
-		}
-	}
-
-	// if the action is not in the ACL whitelist the access is denied
-	_, ok := publicACLAllowedActions[action]
-	if !ok {
-		return s3err.GetAPIError(s3err.ErrAccessDenied)
-	}
-
-	err = VerifyPublicBucketACL(ctx, be, bucket, action, permission)
-	if err != nil {
-		return s3err.GetAPIError(s3err.ErrAccessDenied)
-	}
-
-	return nil
-}
-
-func IsAdminOrOwner(acct Account, isRoot bool, acl ACL) error {
-	// Owner check
-	if acct.Access == acl.Owner {
-		return nil
-	}
-
-	// Root user has access over almost everything
-	if isRoot {
-		return nil
-	}
-
-	// Admin user case
-	if acct.Role == RoleAdmin {
-		return nil
-	}
-
-	// Return access denied in all other cases
-	return s3err.GetAPIError(s3err.ErrAccessDenied)
-}
-
-type PublicACLAllowedActions map[Action]struct{}
-
-var publicACLAllowedActions PublicACLAllowedActions = PublicACLAllowedActions{
-	ListBucketAction:                 struct{}{},
-	PutObjectAction:                  struct{}{},
-	ListBucketMultipartUploadsAction: struct{}{},
-	DeleteObjectAction:               struct{}{},
-	ListBucketVersionsAction:         struct{}{},
-	GetObjectAction:                  struct{}{},
-	GetObjectAttributesAction:        struct{}{},
-	GetObjectAclAction:               struct{}{},
-}

auth/acl.go

@@ -17,7 +17,6 @@ package auth
 import (
 	"context"
 	"encoding/json"
-	"encoding/xml"
 	"errors"
 	"fmt"
 	"strings"
@@ -25,7 +24,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/debuglogger"
 	"github.com/versity/versitygw/s3err"
 )
 
@@ -34,25 +32,13 @@ type ACL struct {
 	Grantees []Grantee
 }
 
-// IsPublic specifies if the acl grants public read access
-func (acl *ACL) IsPublic(permission Permission) bool {
-	for _, grt := range acl.Grantees {
-		if grt.Permission == permission && grt.Type == types.TypeGroup && grt.Access == "all-users" {
-			return true
-		}
-	}
-
-	return false
-}
-
 type Grantee struct {
-	Permission Permission
+	Permission types.Permission
 	Access     string
 	Type       types.Type
 }
 
 type GetBucketAclOutput struct {
-	XMLName           xml.Name `xml:"http://s3.amazonaws.com/doc/2006-03-01/ AccessControlPolicy"`
 	Owner             *types.Owner
 	AccessControlList AccessControlList
 }
@@ -73,124 +59,20 @@ type AccessControlPolicy struct {
 	Owner             *types.Owner
 }
 
-func (acp *AccessControlPolicy) Validate() error {
-	if !acp.AccessControlList.isValid() {
-		return s3err.GetAPIError(s3err.ErrMalformedACL)
-	}
-
-	// The Owner can't be nil
-	if acp.Owner == nil {
-		return s3err.GetAPIError(s3err.ErrMalformedACL)
-	}
-
-	// The Owner ID can't be empty
-	if acp.Owner.ID == nil || *acp.Owner.ID == "" {
-		return s3err.GetAPIError(s3err.ErrMalformedACL)
-	}
-
-	return nil
-}
-
 type AccessControlList struct {
 	Grants []Grant `xml:"Grant"`
 }
 
-// Validates the AccessControlList
-func (acl *AccessControlList) isValid() bool {
-	for _, el := range acl.Grants {
-		if !el.isValid() {
-			return false
-		}
-	}
-
-	return true
-}
-
-type Permission string
-
-const (
-	PermissionFullControl Permission = "FULL_CONTROL"
-	PermissionWrite       Permission = "WRITE"
-	PermissionWriteAcp    Permission = "WRITE_ACP"
-	PermissionRead        Permission = "READ"
-	PermissionReadAcp     Permission = "READ_ACP"
-)
-
-// Check if the permission is valid
-func (p Permission) isValid() bool {
-	return p == PermissionFullControl ||
-		p == PermissionRead ||
-		p == PermissionReadAcp ||
-		p == PermissionWrite ||
-		p == PermissionWriteAcp
-}
-
 type Grant struct {
-	Grantee    *Grt       `xml:"Grantee"`
-	Permission Permission `xml:"Permission"`
-}
-
-// Checks if Grant is valid
-func (g *Grant) isValid() bool {
-	return g.Permission.isValid() && g.Grantee.isValid()
+	Grantee    *Grt
+	Permission types.Permission
 }
 
 type Grt struct {
-	XMLNS string     `xml:"xmlns:xsi,attr"`
-	Type  types.Type `xml:"xsi:type,attr"`
-	ID    string     `xml:"ID"`
-}
-
-// Custom Unmarshalling for Grt to parse xsi:type properly
-func (g *Grt) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
-	// Iterate through the XML tokens to process the attributes
-	for _, attr := range start.Attr {
-		// Check if the attribute is xsi:type and belongs to the xsi namespace
-		if attr.Name.Space == "http://www.w3.org/2001/XMLSchema-instance" && attr.Name.Local == "type" {
-			g.Type = types.Type(attr.Value)
-		}
-		// Handle xmlns:xsi
-		if attr.Name.Local == "xmlns:xsi" {
-			g.XMLNS = attr.Value
-		}
-	}
-
-	// Decode the inner XML elements like ID
-	for {
-		t, err := d.Token()
-		if err != nil {
-			return err
-		}
-
-		switch se := t.(type) {
-		case xml.StartElement:
-			if se.Name.Local == "ID" {
-				if err := d.DecodeElement(&g.ID, &se); err != nil {
-					return err
-				}
-			}
-		case xml.EndElement:
-			if se.Name.Local == start.Name.Local {
-				return nil
-			}
-		}
-	}
-}
-
-// Validates Grt
-func (g *Grt) isValid() bool {
-	// Validate the Type
-	// Only these 2 types are supported in the gateway
-	if g.Type != types.TypeCanonicalUser && g.Type != types.TypeGroup {
-		return false
-	}
-
-	// The ID prop shouldn't be empty
-	if g.ID == "" {
-		return false
-	}
-
-	return true
+	XMLNS  string     `xml:"xmlns:xsi,attr"`
+	XMLXSI types.Type `xml:"xsi:type,attr"`
+	Type   types.Type `xml:"Type"`
+	ID     string     `xml:"ID"`
 }
 
 func ParseACL(data []byte) (ACL, error) {
@@ -205,32 +87,22 @@ func ParseACL(data []byte) (ACL, error) {
 	return acl, nil
 }
 
-func ParseACLOutput(data []byte, owner string) (GetBucketAclOutput, error) {
-	grants := []Grant{}
-
-	if len(data) == 0 {
-		return GetBucketAclOutput{
-			Owner: &types.Owner{
-				ID: &owner,
-			},
-			AccessControlList: AccessControlList{
-				Grants: grants,
-			},
-		}, nil
-	}
-
+func ParseACLOutput(data []byte) (GetBucketAclOutput, error) {
 	var acl ACL
 	if err := json.Unmarshal(data, &acl); err != nil {
 		return GetBucketAclOutput{}, fmt.Errorf("parse acl: %w", err)
 	}
 
+	grants := []Grant{}
+
 	for _, elem := range acl.Grantees {
 		acs := elem.Access
 		grants = append(grants, Grant{
 			Grantee: &Grt{
-				XMLNS: "http://www.w3.org/2001/XMLSchema-instance",
-				ID:    acs,
-				Type:  elem.Type,
+				XMLNS:  "http://www.w3.org/2001/XMLSchema-instance",
+				XMLXSI: elem.Type,
+				ID:     acs,
+				Type:   elem.Type,
 			},
 			Permission: elem.Permission,
 		})
@@ -246,14 +118,14 @@ func ParseACLOutput(data []byte, owner string) (GetBucketAclOutput, error) {
 	}, nil
 }
 
-func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error) {
+func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService, isAdmin bool) ([]byte, error) {
 	if input == nil {
 		return nil, s3err.GetAPIError(s3err.ErrInvalidRequest)
 	}
 
 	defaultGrantees := []Grantee{
 		{
-			Permission: PermissionFullControl,
+			Permission: types.PermissionFullControl,
 			Access:     acl.Owner,
 			Type:       types.TypeCanonicalUser,
 		},
@@ -264,19 +136,19 @@ func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error
 		switch input.ACL {
 		case types.BucketCannedACLPublicRead:
 			defaultGrantees = append(defaultGrantees, Grantee{
-				Permission: PermissionRead,
+				Permission: types.PermissionRead,
 				Access:     "all-users",
 				Type:       types.TypeGroup,
 			})
 		case types.BucketCannedACLPublicReadWrite:
 			defaultGrantees = append(defaultGrantees, []Grantee{
 				{
-					Permission: PermissionRead,
+					Permission: types.PermissionRead,
 					Access:     "all-users",
 					Type:       types.TypeGroup,
 				},
 				{
-					Permission: PermissionWrite,
+					Permission: types.PermissionWrite,
 					Access:     "all-users",
 					Type:       types.TypeGroup,
 				},
@@ -293,7 +165,7 @@ func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error
 				for _, str := range fullControlList {
 					defaultGrantees = append(defaultGrantees, Grantee{
 						Access:     str,
-						Permission: PermissionFullControl,
+						Permission: types.PermissionFullControl,
 						Type:       types.TypeCanonicalUser,
 					})
 				}
@@ -303,7 +175,7 @@ func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error
 				for _, str := range readList {
 					defaultGrantees = append(defaultGrantees, Grantee{
 						Access:     str,
-						Permission: PermissionRead,
+						Permission: types.PermissionRead,
 						Type:       types.TypeCanonicalUser,
 					})
 				}
@@ -313,7 +185,7 @@ func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error
 				for _, str := range readACPList {
 					defaultGrantees = append(defaultGrantees, Grantee{
 						Access:     str,
-						Permission: PermissionReadAcp,
+						Permission: types.PermissionReadAcp,
 						Type:       types.TypeCanonicalUser,
 					})
 				}
@@ -323,7 +195,7 @@ func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error
 				for _, str := range writeList {
 					defaultGrantees = append(defaultGrantees, Grantee{
 						Access:     str,
-						Permission: PermissionWrite,
+						Permission: types.PermissionWrite,
 						Type:       types.TypeCanonicalUser,
 					})
 				}
@@ -333,7 +205,7 @@ func UpdateACL(input *PutBucketAclInput, acl ACL, iam IAMService) ([]byte, error
 				for _, str := range writeACPList {
 					defaultGrantees = append(defaultGrantees, Grantee{
 						Access:     str,
-						Permission: PermissionWriteAcp,
+						Permission: types.PermissionWriteAcp,
 						Type:       types.TypeCanonicalUser,
 					})
 				}
@@ -386,12 +258,12 @@ func CheckIfAccountsExist(accs []string, iam IAMService) ([]string, error) {
 	for _, acc := range accs {
 		_, err := iam.GetUserAccount(acc)
 		if err != nil {
-			if err == ErrNoSuchUser || err == s3err.GetAPIError(s3err.ErrAdminUserNotFound) {
+			if err == ErrNoSuchUser {
 				result = append(result, acc)
 				continue
 			}
-			if errors.Is(err, s3err.GetAPIError(s3err.ErrAdminMethodNotSupported)) {
-				return nil, err
+			if err == ErrNotSupported {
+				return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 			}
 			return nil, fmt.Errorf("check user account: %w", err)
 		}
@@ -414,7 +286,7 @@ func splitUnique(s, divider string) []string {
 	return result
 }
 
-func verifyACL(acl ACL, access string, permission Permission) error {
+func verifyACL(acl ACL, access string, permission types.Permission) error {
 	grantee := Grantee{
 		Access:     access,
 		Permission: permission,
@@ -422,7 +294,7 @@ func verifyACL(acl ACL, access string, permission Permission) error {
 	}
 	granteeFullCtrl := Grantee{
 		Access:     access,
-		Permission: PermissionFullControl,
+		Permission: types.PermissionFullControl,
 		Type:       types.TypeCanonicalUser,
 	}
 	granteeAllUsers := Grantee{
@@ -447,61 +319,118 @@ func verifyACL(acl ACL, access string, permission Permission) error {
 	return s3err.GetAPIError(s3err.ErrAccessDenied)
 }
 
-// Verifies if the bucket acl grants public access
-func VerifyPublicBucketACL(ctx context.Context, be backend.Backend, bucket string, action Action, permission Permission) error {
-	aclBytes, err := be.GetBucketAcl(ctx, &s3.GetBucketAclInput{
-		Bucket: &bucket,
-	})
-	if err != nil {
-		return err
+func MayCreateBucket(acct Account, isRoot bool) error {
+	if isRoot {
+		return nil
 	}
 
-	acl, err := ParseACL(aclBytes)
-	if err != nil {
-		return err
-	}
-
-	if !acl.IsPublic(permission) {
-		return ErrAccessDenied
+	if acct.Role == RoleUser {
+		return s3err.GetAPIError(s3err.ErrAccessDenied)
 	}
 
 	return nil
 }
 
-// UpdateBucketACLOwner sets default ACL with new owner and removes
-// any previous bucket policy that was in place
-func UpdateBucketACLOwner(ctx context.Context, be backend.Backend, bucket, newOwner string) error {
-	acl := ACL{
-		Owner: newOwner,
-		Grantees: []Grantee{
-			{
-				Permission: PermissionFullControl,
-				Access:     newOwner,
-				Type:       types.TypeCanonicalUser,
-			},
-		},
+func IsAdminOrOwner(acct Account, isRoot bool, acl ACL) error {
+	// Owner check
+	if acct.Access == acl.Owner {
+		return nil
 	}
 
-	result, err := json.Marshal(acl)
-	if err != nil {
-		return fmt.Errorf("marshal ACL: %w", err)
+	// Root user has access over almost everything
+	if isRoot {
+		return nil
 	}
 
-	err = be.PutBucketAcl(ctx, bucket, result)
+	// Admin user case
+	if acct.Role == RoleAdmin {
+		return nil
+	}
+
+	// Return access denied in all other cases
+	return s3err.GetAPIError(s3err.ErrAccessDenied)
+}
+
+type AccessOptions struct {
+	Acl           ACL
+	AclPermission types.Permission
+	IsRoot        bool
+	Acc           Account
+	Bucket        string
+	Object        string
+	Action        Action
+	Readonly      bool
+}
+
+func VerifyAccess(ctx context.Context, be backend.Backend, opts AccessOptions) error {
+	if opts.Readonly {
+		if opts.AclPermission == types.PermissionWrite || opts.AclPermission == types.PermissionWriteAcp {
+			return s3err.GetAPIError(s3err.ErrAccessDenied)
+		}
+	}
+	if opts.IsRoot {
+		return nil
+	}
+	if opts.Acc.Role == RoleAdmin {
+		return nil
+	}
+
+	policy, policyErr := be.GetBucketPolicy(ctx, opts.Bucket)
+	if policyErr != nil {
+		if !errors.Is(policyErr, s3err.GetAPIError(s3err.ErrNoSuchBucketPolicy)) {
+			return policyErr
+		}
+	} else {
+		return VerifyBucketPolicy(policy, opts.Acc.Access, opts.Bucket, opts.Object, opts.Action)
+	}
+
+	if err := verifyACL(opts.Acl, opts.Acc.Access, opts.AclPermission); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func VerifyObjectCopyAccess(ctx context.Context, be backend.Backend, copySource string, opts AccessOptions) error {
+	if opts.IsRoot {
+		return nil
+	}
+	if opts.Acc.Role == RoleAdmin {
+		return nil
+	}
+
+	// Verify destination bucket access
+	if err := VerifyAccess(ctx, be, opts); err != nil {
+		return err
+	}
+	// Verify source bucket access
+	srcBucket, srcObject, found := strings.Cut(copySource, "/")
+	if !found {
+		return s3err.GetAPIError(s3err.ErrInvalidCopySource)
+	}
+
+	// Get source bucket ACL
+	srcBucketACLBytes, err := be.GetBucketAcl(ctx, &s3.GetBucketAclInput{Bucket: &srcBucket})
 	if err != nil {
 		return err
 	}
 
-	return be.DeleteBucketPolicy(ctx, bucket)
-}
-
-// ValidateCannedACL validates bucket canned acl value
-func ValidateCannedACL(acl string) error {
-	switch types.BucketCannedACL(acl) {
-	case types.BucketCannedACLPrivate, types.BucketCannedACLPublicRead, types.BucketCannedACLPublicReadWrite, "":
-		return nil
-	default:
-		debuglogger.Logf("invalid bucket canned acl: %v", acl)
-		return s3err.GetAPIError(s3err.ErrInvalidArgument)
+	var srcBucketAcl ACL
+	if err := json.Unmarshal(srcBucketACLBytes, &srcBucketAcl); err != nil {
+		return err
 	}
+
+	if err := VerifyAccess(ctx, be, AccessOptions{
+		Acl:           srcBucketAcl,
+		AclPermission: types.PermissionRead,
+		IsRoot:        opts.IsRoot,
+		Acc:           opts.Acc,
+		Bucket:        srcBucket,
+		Object:        srcObject,
+		Action:        GetObjectAction,
+	}); err != nil {
+		return err
+	}
+
+	return nil
 }

auth/bucket_cors.go

@@ -1,338 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"encoding/xml"
-	"fmt"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"github.com/versity/versitygw/debuglogger"
-	"github.com/versity/versitygw/s3err"
-)
-
-// headerRegex is the regexp to validate http header names
-var headerRegex = regexp.MustCompile(`^[!#$%&'*+\-.^_` + "`" + `|~0-9A-Za-z]+$`)
-
-type CORSHeader string
-type CORSHTTPMethod string
-
-// IsValid validates the CORS http header
-// the rules are based on http RFC
-// https://datatracker.ietf.org/doc/html/rfc7230#section-3.2
-//
-// Empty values are considered as valid
-func (ch CORSHeader) IsValid() bool {
-	return ch == "" || headerRegex.MatchString(ch.String())
-}
-
-// String converts the header value to 'string'
-func (ch CORSHeader) String() string {
-	return string(ch)
-}
-
-// ToLower converts the header to lower case
-func (ch CORSHeader) ToLower() string {
-	return strings.ToLower(string(ch))
-}
-
-// IsValid validates the cors http request method:
-// the methods are case sensitive
-func (cm CORSHTTPMethod) IsValid() bool {
-	return cm.IsEmpty() || cm == http.MethodGet || cm == http.MethodHead || cm == http.MethodPut ||
-		cm == http.MethodPost || cm == http.MethodDelete
-}
-
-// IsEmpty checks if the cors method is an empty string
-func (cm CORSHTTPMethod) IsEmpty() bool {
-	return cm == ""
-}
-
-// String converts the method value to 'string'
-func (cm CORSHTTPMethod) String() string {
-	return string(cm)
-}
-
-type CORSConfiguration struct {
-	Rules []CORSRule `xml:"CORSRule"`
-}
-
-// Validate validates the cors configuration rules
-func (cc *CORSConfiguration) Validate() error {
-	if cc == nil || cc.Rules == nil {
-		debuglogger.Logf("invalid CORS configuration")
-		return s3err.GetAPIError(s3err.ErrMalformedXML)
-	}
-
-	if len(cc.Rules) == 0 {
-		debuglogger.Logf("empty CORS config rules")
-		return s3err.GetAPIError(s3err.ErrMalformedXML)
-	}
-
-	// validate each CORS rule
-	for _, rule := range cc.Rules {
-		if err := rule.Validate(); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type CORSAllowanceConfig struct {
-	Origin           string
-	Methods          string
-	ExposedHeaders   string
-	AllowCredentials string
-	AllowHeaders     string
-	MaxAge           *int32
-}
-
-// IsAllowed walks through the CORS rules and finds the first one allowing access.
-// If no rule grants access, returns 'AccessForbidden'
-func (cc *CORSConfiguration) IsAllowed(origin string, method CORSHTTPMethod, headers []CORSHeader) (*CORSAllowanceConfig, error) {
-	// if method is empty, anyways cors is forbidden
-	// skip, without going through the rules
-	if method.IsEmpty() {
-		debuglogger.Logf("empty Access-Control-Request-Method")
-		return nil, s3err.GetAPIError(s3err.ErrCORSForbidden)
-	}
-	for _, rule := range cc.Rules {
-		// find the first rule granting access
-		if isAllowed, wilcardOrigin := rule.Match(origin, method, headers); isAllowed {
-			o := origin
-			allowCredentials := "true"
-			if wilcardOrigin {
-				o = "*"
-				allowCredentials = "false"
-			}
-
-			return &CORSAllowanceConfig{
-				Origin:           o,
-				AllowCredentials: allowCredentials,
-				Methods:          rule.GetAllowedMethods(),
-				ExposedHeaders:   rule.GetExposeHeaders(),
-				AllowHeaders:     buildAllowedHeaders(headers),
-				MaxAge:           rule.MaxAgeSeconds,
-			}, nil
-		}
-	}
-
-	// if no matching rule is found, return AccessForbidden
-	return nil, s3err.GetAPIError(s3err.ErrCORSForbidden)
-}
-
-type CORSRule struct {
-	AllowedMethods []CORSHTTPMethod `xml:"AllowedMethod"`
-	AllowedHeaders []CORSHeader     `xml:"AllowedHeader"`
-	ExposeHeaders  []CORSHeader     `xml:"ExposeHeader"`
-	AllowedOrigins []string         `xml:"AllowedOrigin"`
-	ID             *string
-	MaxAgeSeconds  *int32
-}
-
-// Validate validates and returns error if CORS configuration has invalid rule
-func (cr *CORSRule) Validate() error {
-	// validate CORS allowed headers
-	for _, header := range cr.AllowedHeaders {
-		if !header.IsValid() {
-			debuglogger.Logf("invalid CORS allowed header: %s", header)
-			return s3err.GetInvalidCORSHeaderErr(header.String())
-		}
-	}
-	// validate CORS allowed methods
-	for _, method := range cr.AllowedMethods {
-		if !method.IsValid() {
-			debuglogger.Logf("invalid CORS allowed method: %s", method)
-			return s3err.GetUnsopportedCORSMethodErr(method.String())
-		}
-	}
-	// validate CORS expose headers
-	for _, header := range cr.ExposeHeaders {
-		if !header.IsValid() {
-			debuglogger.Logf("invalid CORS exposed header: %s", header)
-			return s3err.GetInvalidCORSHeaderErr(header.String())
-		}
-	}
-
-	return nil
-}
-
-// Match matches the provided origin, method and headers with the
-// CORS configuration rule
-// if the matching origin is "*", it returns true as the first argument
-func (cr *CORSRule) Match(origin string, method CORSHTTPMethod, headers []CORSHeader) (bool, bool) {
-	wildcardOrigin := false
-	originFound := false
-
-	// check if the provided origin exists in CORS AllowedOrigins
-	for _, or := range cr.AllowedOrigins {
-		if wildcardMatch(or, origin) {
-			originFound = true
-			if or == "*" {
-				// mark wildcardOrigin as true, if "*" is found in AllowedOrigins
-				wildcardOrigin = true
-			}
-			break
-		}
-	}
-
-	if !originFound {
-		return false, false
-	}
-
-	// cache the CORS AllowedMethods in a map
-	allowedMethods := cacheCORSMethods(cr.AllowedMethods)
-	// check if the provided method exists in CORS AllowedMethods
-	if _, ok := allowedMethods[method]; !ok {
-		return false, false
-	}
-
-	// check is CORS rule allowed headers match
-	// with the requested allowed headers
-	for _, reqHeader := range headers {
-		match := false
-		for _, header := range cr.AllowedHeaders {
-			if wildcardMatch(header.ToLower(), reqHeader.ToLower()) {
-				match = true
-				break
-			}
-		}
-
-		if !match {
-			return false, false
-		}
-	}
-
-	return true, wildcardOrigin
-}
-
-// GetExposeHeaders returns comma separated CORS expose headers
-func (cr *CORSRule) GetExposeHeaders() string {
-	var result strings.Builder
-
-	for i, h := range cr.ExposeHeaders {
-		if i > 0 {
-			result.WriteString(", ")
-		}
-		result.WriteString(h.String())
-	}
-
-	return result.String()
-}
-
-// buildAllowedHeaders builds a comma separated string from []CORSHeader
-func buildAllowedHeaders(headers []CORSHeader) string {
-	var result strings.Builder
-
-	for i, h := range headers {
-		if i > 0 {
-			result.WriteString(", ")
-		}
-		result.WriteString(h.ToLower())
-	}
-
-	return result.String()
-}
-
-// GetAllowedMethods returns comma separated CORS allowed methods
-func (cr *CORSRule) GetAllowedMethods() string {
-	var result strings.Builder
-
-	for i, m := range cr.AllowedMethods {
-		if i > 0 {
-			result.WriteString(", ")
-		}
-		result.WriteString(m.String())
-	}
-
-	return result.String()
-}
-
-// ParseCORSOutput parses raw bytes to 'CORSConfiguration'
-func ParseCORSOutput(data []byte) (*CORSConfiguration, error) {
-	var config CORSConfiguration
-	err := xml.Unmarshal(data, &config)
-	if err != nil {
-		debuglogger.Logf("unmarshal cors output: %v", err)
-		return nil, fmt.Errorf("failed to parse cors config: %w", err)
-	}
-
-	return &config, nil
-}
-
-func cacheCORSMethods(input []CORSHTTPMethod) map[CORSHTTPMethod]struct{} {
-	result := make(map[CORSHTTPMethod]struct{}, len(input))
-	for _, el := range input {
-		result[el] = struct{}{}
-	}
-
-	return result
-}
-
-// ParseCORSHeaders parses/validates Access-Control-Request-Headers
-// and returns []CORSHeaders
-func ParseCORSHeaders(headers string) ([]CORSHeader, error) {
-	result := []CORSHeader{}
-	if headers == "" {
-		return result, nil
-	}
-
-	headersSplitted := strings.Split(headers, ",")
-	for _, h := range headersSplitted {
-		corsHeader := CORSHeader(strings.TrimSpace(h))
-		if corsHeader == "" || !corsHeader.IsValid() {
-			debuglogger.Logf("invalid access control header: %s", h)
-			return nil, s3err.GetInvalidCORSRequestHeaderErr(h)
-		}
-		result = append(result, corsHeader)
-	}
-
-	return result, nil
-}
-
-func wildcardMatch(pattern, input string) bool {
-	pIdx, sIdx := 0, 0
-	starIdx, matchIdx := -1, 0
-
-	for sIdx < len(input) {
-		if pIdx < len(pattern) && pattern[pIdx] == input[sIdx] {
-			// exact match of current char
-			sIdx++
-			pIdx++
-		} else if pIdx < len(pattern) && pattern[pIdx] == '*' {
-			// remember star position
-			starIdx = pIdx
-			matchIdx = sIdx
-			pIdx++
-		} else if starIdx != -1 {
-			// backtrack: try to match more characters with '*'
-			pIdx = starIdx + 1
-			matchIdx++
-			sIdx = matchIdx
-		} else {
-			return false
-		}
-	}
-
-	// skip trailing stars
-	for pIdx < len(pattern) && pattern[pIdx] == '*' {
-		pIdx++
-	}
-
-	return pIdx == len(pattern)
-}

auth/bucket_cors_test.go

@@ -1,736 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"net/http"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/versity/versitygw/s3err"
-)
-
-func TestCORSHeader_IsValid(t *testing.T) {
-	tests := []struct {
-		name   string
-		header CORSHeader
-		want   bool
-	}{
-		{"empty", "", true},
-		{"valid", "X-Custom-Header", true},
-		{"invalid_1", "Invalid Header", false},
-		{"invalid_2", "invalid/header", false},
-		{"invalid_3", "Invalid\tHeader", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := tt.header.IsValid(); got != tt.want {
-				t.Errorf("IsValid() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestCORSHTTPMethod_IsValid(t *testing.T) {
-	tests := []struct {
-		name   string
-		method CORSHTTPMethod
-		want   bool
-	}{
-		{"empty valid", "", true},
-		{"GET valid", http.MethodGet, true},
-		{"HEAD valid", http.MethodHead, true},
-		{"PUT valid", http.MethodPut, true},
-		{"POST valid", http.MethodPost, true},
-		{"DELETE valid", http.MethodDelete, true},
-		{"get valid", "get", false},
-		{"put valid", "put", false},
-		{"post valid", "post", false},
-		{"head valid", "head", false},
-		{"invalid", "FOO", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := tt.method.IsValid(); got != tt.want {
-				t.Errorf("IsValid() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestCORSHeader_ToLower(t *testing.T) {
-	tests := []struct {
-		name   string
-		header CORSHeader
-		want   string
-	}{
-		{
-			name:   "already lowercase",
-			header: CORSHeader("content-type"),
-			want:   "content-type",
-		},
-		{
-			name:   "mixed case",
-			header: CORSHeader("X-CuStOm-HeAdEr"),
-			want:   "x-custom-header",
-		},
-		{
-			name:   "uppercase",
-			header: CORSHeader("AUTHORIZATION"),
-			want:   "authorization",
-		},
-		{
-			name:   "empty string",
-			header: CORSHeader(""),
-			want:   "",
-		},
-		{
-			name:   "numeric and symbols",
-			header: CORSHeader("X-123-HEADER"),
-			want:   "x-123-header",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.header.ToLower()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestCORSHTTPMethod_IsEmpty(t *testing.T) {
-	tests := []struct {
-		name   string
-		method CORSHTTPMethod
-		want   bool
-	}{
-		{
-			name:   "empty string is empty",
-			method: CORSHTTPMethod(""),
-			want:   true,
-		},
-		{
-			name:   "GET method is not empty",
-			method: CORSHTTPMethod("GET"),
-			want:   false,
-		},
-		{
-			name:   "random string is not empty",
-			method: CORSHTTPMethod("FOO"),
-			want:   false,
-		},
-		{
-			name:   "lowercase get is not empty (case sensitive)",
-			method: CORSHTTPMethod("get"),
-			want:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.method.IsEmpty()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestCORSConfiguration_Validate(t *testing.T) {
-	tests := []struct {
-		name string
-		cfg  *CORSConfiguration
-		want error
-	}{
-		{"nil config", nil, s3err.GetAPIError(s3err.ErrMalformedXML)},
-		{"nil rules", &CORSConfiguration{}, s3err.GetAPIError(s3err.ErrMalformedXML)},
-		{"empty rules", &CORSConfiguration{Rules: []CORSRule{}}, s3err.GetAPIError(s3err.ErrMalformedXML)},
-		{"invalid rule", &CORSConfiguration{Rules: []CORSRule{{AllowedHeaders: []CORSHeader{"Invalid Header"}}}}, s3err.GetInvalidCORSHeaderErr("Invalid Header")},
-		{"valid rule", &CORSConfiguration{Rules: []CORSRule{{
-			AllowedOrigins: []string{"origin"},
-			AllowedHeaders: []CORSHeader{"X-Test"},
-			AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-			ExposeHeaders:  []CORSHeader{"X-Expose"},
-		}}}, nil},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.cfg.Validate()
-			assert.EqualValues(t, tt.want, err)
-		})
-	}
-}
-
-func TestCORSConfiguration_IsAllowed(t *testing.T) {
-	type input struct {
-		cfg     *CORSConfiguration
-		origin  string
-		method  CORSHTTPMethod
-		headers []CORSHeader
-	}
-	type output struct {
-		result *CORSAllowanceConfig
-		err    error
-	}
-	tests := []struct {
-		name   string
-		input  input
-		output output
-	}{
-		{
-			name: "allowed exact origin",
-			input: input{
-				cfg: &CORSConfiguration{Rules: []CORSRule{{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				}}},
-				origin:  "http://allowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{
-				result: &CORSAllowanceConfig{
-					Origin:           "http://allowed.com",
-					AllowCredentials: "true",
-					Methods:          http.MethodGet,
-					AllowHeaders:     "x-test",
-					ExposedHeaders:   "",
-					MaxAge:           nil,
-				},
-				err: nil,
-			},
-		},
-		{
-			name: "allowed wildcard origin",
-			input: input{
-				cfg: &CORSConfiguration{Rules: []CORSRule{{
-					AllowedOrigins: []string{"*"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				}}},
-				origin:  "anything",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{
-				result: &CORSAllowanceConfig{
-					Origin:           "*",
-					AllowCredentials: "false",
-					AllowHeaders:     "x-test",
-					Methods:          http.MethodGet,
-					ExposedHeaders:   "",
-					MaxAge:           nil,
-				},
-				err: nil,
-			},
-		},
-		{
-			name: "forbidden no matching origin",
-			input: input{
-				cfg: &CORSConfiguration{Rules: []CORSRule{{
-					AllowedOrigins: []string{"http://nope.com"},
-				}}},
-				origin: "http://not-allowed.com",
-				method: http.MethodGet,
-			},
-			output: output{
-				result: nil,
-				err:    s3err.GetAPIError(s3err.ErrCORSForbidden),
-			},
-		},
-		{
-			name: "forbidden method not allowed",
-			input: input{
-				cfg: &CORSConfiguration{Rules: []CORSRule{{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodPost},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				}}},
-				origin:  "http://allowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{
-				result: nil,
-				err:    s3err.GetAPIError(s3err.ErrCORSForbidden),
-			},
-		},
-		{
-			name: "forbidden header not allowed",
-			input: input{
-				cfg: &CORSConfiguration{Rules: []CORSRule{{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				}}},
-				origin:  "http://allowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Nope"},
-			},
-			output: output{
-				result: nil,
-				err:    s3err.GetAPIError(s3err.ErrCORSForbidden),
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := tt.input.cfg.IsAllowed(tt.input.origin, tt.input.method, tt.input.headers)
-			assert.EqualValues(t, tt.output.err, err)
-			assert.EqualValues(t, tt.output.result, got)
-		})
-	}
-}
-
-func TestCORSRule_Validate(t *testing.T) {
-	tests := []struct {
-		name string
-		rule CORSRule
-		want error
-	}{
-		{
-			name: "valid rule",
-			rule: CORSRule{
-				AllowedOrigins: []string{"http://allowed.com"},
-				AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-				AllowedHeaders: []CORSHeader{"X-Test"},
-			},
-			want: nil,
-		},
-		{
-			name: "invalid allowed methods",
-			rule: CORSRule{
-				AllowedOrigins: []string{"http://allowed.com"},
-				AllowedMethods: []CORSHTTPMethod{"invalid_method"},
-				AllowedHeaders: []CORSHeader{"X-Test"},
-			},
-			want: s3err.GetUnsopportedCORSMethodErr("invalid_method"),
-		},
-		{
-			name: "invalid allowed header",
-			rule: CORSRule{
-				AllowedOrigins: []string{"http://allowed.com"},
-				AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-				AllowedHeaders: []CORSHeader{"Invalid Header"},
-			},
-			want: s3err.GetInvalidCORSHeaderErr("Invalid Header"),
-		},
-		{
-			name: "invalid allowed header",
-			rule: CORSRule{
-				AllowedOrigins: []string{"http://allowed.com"},
-				AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-				AllowedHeaders: []CORSHeader{"Content-Length"},
-				ExposeHeaders:  []CORSHeader{"Content-Encoding", "invalid header"},
-			},
-			want: s3err.GetInvalidCORSHeaderErr("invalid header"),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.rule.Validate()
-			assert.EqualValues(t, tt.want, err)
-		})
-	}
-}
-
-func TestCORSRule_Match(t *testing.T) {
-	type input struct {
-		rule    CORSRule
-		origin  string
-		method  CORSHTTPMethod
-		headers []CORSHeader
-	}
-	type output struct {
-		isAllowed  bool
-		isWildcard bool
-	}
-	tests := []struct {
-		name   string
-		input  input
-		output output
-	}{
-		{
-			name: "exact origin and method match",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				},
-				origin:  "http://allowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{isAllowed: true, isWildcard: false},
-		},
-		{
-			name: "wildcard origin match",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"*"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodPost},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				},
-				origin:  "http://random.com",
-				method:  http.MethodPost,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{isAllowed: true, isWildcard: true},
-		},
-		{
-			name: "wildcard containing origin match",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"http://random*"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodPost},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				},
-				origin:  "http://random.com",
-				method:  http.MethodPost,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{isAllowed: true, isWildcard: false},
-		},
-		{
-			name: "wildcard allowed headers match",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"http://something.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodPost},
-					AllowedHeaders: []CORSHeader{"X-*"},
-				},
-				origin:  "http://something.com",
-				method:  http.MethodPost,
-				headers: []CORSHeader{"X-Test", "X-Something", "X-Anyting"},
-			},
-			output: output{isAllowed: true, isWildcard: false},
-		},
-		{
-			name: "origin mismatch",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				},
-				origin:  "http://notallowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{isAllowed: false, isWildcard: false},
-		},
-		{
-			name: "method mismatch",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodPost},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				},
-				origin:  "http://allowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Test"},
-			},
-			output: output{isAllowed: false, isWildcard: false},
-		},
-		{
-			name: "header mismatch",
-			input: input{
-				rule: CORSRule{
-					AllowedOrigins: []string{"http://allowed.com"},
-					AllowedMethods: []CORSHTTPMethod{http.MethodGet},
-					AllowedHeaders: []CORSHeader{"X-Test"},
-				},
-				origin:  "http://allowed.com",
-				method:  http.MethodGet,
-				headers: []CORSHeader{"X-Other"},
-			},
-			output: output{isAllowed: false, isWildcard: false},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			isAllowed, wild := tt.input.rule.Match(tt.input.origin, tt.input.method, tt.input.headers)
-			assert.Equal(t, tt.output.isAllowed, isAllowed)
-			assert.Equal(t, tt.output.isWildcard, wild)
-		})
-	}
-}
-
-func TestGetExposeHeaders(t *testing.T) {
-	tests := []struct {
-		name string
-		rule CORSRule
-		want string
-	}{
-		{"multiple headers", CORSRule{ExposeHeaders: []CORSHeader{"Content-Length", "Content-Type", "Content-Encoding"}}, "Content-Length, Content-Type, Content-Encoding"},
-		{"single header", CORSRule{ExposeHeaders: []CORSHeader{"Authorization"}}, "Authorization"},
-		{"no headers", CORSRule{}, ""},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.rule.GetExposeHeaders()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestBuildAllowedHeaders(t *testing.T) {
-	tests := []struct {
-		name    string
-		headers []CORSHeader
-		want    string
-	}{
-		{
-			name:    "empty slice returns empty string",
-			headers: []CORSHeader{},
-			want:    "",
-		},
-		{
-			name:    "single header lowercase",
-			headers: []CORSHeader{"Content-Type"},
-			want:    "content-type",
-		},
-		{
-			name:    "multiple headers lowercased with commas",
-			headers: []CORSHeader{"Content-Type", "X-Custom-Header", "Authorization"},
-			want:    "content-type, x-custom-header, authorization",
-		},
-		{
-			name:    "already lowercase header",
-			headers: []CORSHeader{"accept"},
-			want:    "accept",
-		},
-		{
-			name:    "mixed case headers",
-			headers: []CORSHeader{"ACCEPT", "x-Powered-By"},
-			want:    "accept, x-powered-by",
-		},
-		{
-			name:    "empty header value",
-			headers: []CORSHeader{""},
-			want:    "",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := buildAllowedHeaders(tt.headers)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestGetAllowedMethods(t *testing.T) {
-	tests := []struct {
-		name string
-		rule CORSRule
-		want string
-	}{
-		{"multiple methods", CORSRule{AllowedMethods: []CORSHTTPMethod{http.MethodGet, http.MethodPost, http.MethodPut}}, "GET, POST, PUT"},
-		{"single method", CORSRule{AllowedMethods: []CORSHTTPMethod{http.MethodGet}}, "GET"},
-		{"no methods", CORSRule{}, ""},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.rule.GetAllowedMethods()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestParseCORSOutput(t *testing.T) {
-	tests := []struct {
-		name string
-		data string
-		want bool
-	}{
-		{"valid", `<CORSConfiguration><CORSRule></CORSRule></CORSConfiguration>`, true},
-		{"invalid xml", `<CORSConfiguration><CORSRule>`, false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cfg, err := ParseCORSOutput([]byte(tt.data))
-			if (err == nil) != tt.want {
-				t.Errorf("ParseCORSOutput() err = %v, want success=%v", err, tt.want)
-			}
-			if tt.want && cfg == nil {
-				t.Errorf("Expected non-nil config")
-			}
-		})
-	}
-}
-
-func TestCacheCORSProps(t *testing.T) {
-	tests := []struct {
-		name string
-		in   []CORSHTTPMethod
-		want map[string]struct{}
-	}{
-		{
-			name: "empty CORSHTTPMethod slice",
-			in:   []CORSHTTPMethod{},
-			want: map[string]struct{}{},
-		},
-		{
-			name: "single CORSHTTPMethod",
-			in:   []CORSHTTPMethod{http.MethodGet},
-			want: map[string]struct{}{http.MethodGet: {}},
-		},
-		{
-			name: "multiple CORSHTTPMethods",
-			in:   []CORSHTTPMethod{http.MethodGet, http.MethodPost, http.MethodPut},
-			want: map[string]struct{}{
-				http.MethodGet:  {},
-				http.MethodPost: {},
-				http.MethodPut:  {},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := cacheCORSMethods(tt.in)
-			assert.Equal(t, len(tt.want), len(got))
-			for key := range tt.want {
-				_, ok := got[CORSHTTPMethod(key)]
-				assert.True(t, ok)
-			}
-		})
-	}
-}
-
-func TestParseCORSHeaders(t *testing.T) {
-	tests := []struct {
-		name string
-		in   string
-		want []CORSHeader
-		err  error
-	}{
-		{
-			name: "empty string",
-			in:   "",
-			want: []CORSHeader{},
-			err:  nil,
-		},
-		{
-			name: "single valid header",
-			in:   "X-Test",
-			want: []CORSHeader{"X-Test"},
-			err:  nil,
-		},
-		{
-			name: "multiple valid headers with spaces",
-			in:   "X-Test, Content-Type, Authorization",
-			want: []CORSHeader{"X-Test", "Content-Type", "Authorization"},
-			err:  nil,
-		},
-		{
-			name: "header with leading/trailing spaces",
-			in:   "   X-Test   ",
-			want: []CORSHeader{"X-Test"},
-			err:  nil,
-		},
-		{
-			name: "contains invalid header",
-			in:   "X-Test, Invalid Header, Content-Type",
-			want: nil,
-			err:  s3err.GetInvalidCORSRequestHeaderErr(" Invalid Header"),
-		},
-		{
-			name: "only invalid header",
-			in:   "Invalid Header",
-			want: nil,
-			err:  s3err.GetInvalidCORSRequestHeaderErr("Invalid Header"),
-		},
-		{
-			name: "multiple commas in a row",
-			in:   "X-Test,,Content-Type",
-			want: nil,
-			err:  s3err.GetInvalidCORSRequestHeaderErr(""),
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := ParseCORSHeaders(tt.in)
-			assert.EqualValues(t, tt.err, err)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestWildcardMatch(t *testing.T) {
-	tests := []struct {
-		name    string
-		pattern string
-		input   string
-		want    bool
-	}{
-		// Exact match, no wildcards
-		{"exact match", "hello", "hello", true},
-		{"exact mismatch", "hello", "hell", false},
-		// Single '*' matching zero chars
-		{"star matches zero chars", "he*lo", "helo", true},
-		// Single '*' matching multiple chars
-		{"star matches multiple chars", "he*o", "heyyyyyo", true},
-		// '*' at start
-		{"star at start", "*world", "hello world", true},
-		// '*' at end
-		{"star at end", "hello*", "hello there", true},
-		// '*' matches whole string
-		{"only star", "*", "anything", true},
-		{"only star empty", "*", "", true},
-		// Multiple '*'s
-		{"multiple stars", "a*b*c", "axxxbzzzzyc", true},
-		{"multiple stars no match", "a*b*c", "axxxbzzzzy", false},
-		// Backtracking needed
-		{"backtracking required", "a*b*c", "ab123c", true},
-		// No match with star present
-		{"star but mismatch", "he*world", "hey there", false},
-		// Trailing stars in pattern
-		{"trailing stars match", "abc**", "abc", true},
-		{"trailing stars match longer", "abc**", "abccc", true},
-		// Empty pattern cases
-		{"empty pattern and empty input", "", "", true},
-		{"empty pattern non-empty input", "", "a", false},
-		{"only stars pattern with empty input", "***", "", true},
-		// Pattern longer than input
-		{"pattern longer no star", "abcd", "abc", false},
-		// Input longer but no star
-		{"input longer no star", "abc", "abcd", false},
-		// Complex interleaved match
-		{"complex interleaved", "*a*b*cd*", "xxaYYbZZcd123", true},
-		// Star match at the end after mismatch
-		{"mismatch then star match", "ab*xyz", "abzzzxyz", true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := wildcardMatch(tt.pattern, tt.input)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}

auth/bucket_policy.go

@@ -17,68 +17,26 @@ package auth
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"net/http"
 
 	"github.com/versity/versitygw/s3err"
 )
 
-var ErrAccessDenied = errors.New("access denied")
-
-type policyErr string
-
-func (p policyErr) Error() string {
-	return string(p)
-}
-
-const (
-	policyErrResourceMismatch     = policyErr("Action does not apply to any resource(s) in statement")
-	policyErrInvalidResource      = policyErr("Policy has invalid resource")
-	policyErrInvalidPrincipal     = policyErr("Invalid principal in policy")
-	policyErrInvalidAction        = policyErr("Policy has invalid action")
-	policyErrInvalidPolicy        = policyErr("This policy contains invalid Json")
-	policyErrInvalidFirstChar     = policyErr("Policies must be valid JSON and the first byte must be '{'")
-	policyErrEmptyStatement       = policyErr("Could not parse the policy: Statement is empty!")
-	policyErrMissingStatmentField = policyErr("Missing required field Statement")
-	policyErrInvalidVersion       = policyErr("The policy must contain a valid version string")
+var (
+	errResourceMismatch = errors.New("Action does not apply to any resource(s) in statement")
+	//lint:ignore ST1005 Reason: This error message is intended for end-user clarity and follows their expectations
+	errInvalidResource = errors.New("Policy has invalid resource")
+	//lint:ignore ST1005 Reason: This error message is intended for end-user clarity and follows their expectations
+	errInvalidPrincipal = errors.New("Invalid principal in policy")
+	//lint:ignore ST1005 Reason: This error message is intended for end-user clarity and follows their expectations
+	errInvalidAction = errors.New("Policy has invalid action")
 )
 
 type BucketPolicy struct {
-	Version   PolicyVersion      `json:"Version"`
 	Statement []BucketPolicyItem `json:"Statement"`
 }
 
-func (bp *BucketPolicy) UnmarshalJSON(data []byte) error {
-	var tmp struct {
-		Version   *PolicyVersion
-		Statement *[]BucketPolicyItem `json:"Statement"`
-	}
-
-	if err := json.Unmarshal(data, &tmp); err != nil {
-		return err
-	}
-
-	// If Statement is nil (not present in JSON), return an error
-	if tmp.Statement == nil {
-		return policyErrMissingStatmentField
-	}
-
-	if tmp.Version == nil {
-		// bucket policy version should defualt to '2008-10-17'
-		bp.Version = PolicyVersion2008
-	} else {
-		bp.Version = *tmp.Version
-	}
-
-	bp.Statement = *tmp.Statement
-	return nil
-}
-
 func (bp *BucketPolicy) Validate(bucket string, iam IAMService) error {
-	if !bp.Version.isValid() {
-		return policyErrInvalidVersion
-	}
-
 	for _, statement := range bp.Statement {
 		err := statement.Validate(bucket, iam)
 		if err != nil {
@@ -90,48 +48,17 @@ func (bp *BucketPolicy) Validate(bucket string, iam IAMService) error {
 }
 
 func (bp *BucketPolicy) isAllowed(principal string, action Action, resource string) bool {
-	var isAllowed bool
 	for _, statement := range bp.Statement {
 		if statement.findMatch(principal, action, resource) {
 			switch statement.Effect {
 			case BucketPolicyAccessTypeAllow:
-				isAllowed = true
+				return true
 			case BucketPolicyAccessTypeDeny:
 				return false
 			}
 		}
 	}
 
-	return isAllowed
-}
-
-// IsPublicFor checks if the bucket policy statements contain
-// an entity granting public access to the given resource and action
-func (bp *BucketPolicy) isPublicFor(resource string, action Action) bool {
-	var isAllowed bool
-	for _, statement := range bp.Statement {
-		if statement.isPublicFor(resource, action) {
-			switch statement.Effect {
-			case BucketPolicyAccessTypeAllow:
-				isAllowed = true
-			case BucketPolicyAccessTypeDeny:
-				return false
-			}
-		}
-	}
-
-	return isAllowed
-}
-
-// IsPublic checks if one of bucket policy statments grant
-// public access to ALL users
-func (bp *BucketPolicy) IsPublic() bool {
-	for _, statement := range bp.Statement {
-		if statement.isPublic() {
-			return true
-		}
-	}
-
 	return false
 }
 
@@ -162,10 +89,10 @@ func (bpi *BucketPolicyItem) Validate(bucket string, iam IAMService) error {
 			break
 		}
 		if *isObjectAction && !containsObjectAction {
-			return policyErrResourceMismatch
+			return errResourceMismatch
 		}
 		if !*isObjectAction && !containsBucketAction {
-			return policyErrResourceMismatch
+			return errResourceMismatch
 		}
 	}
 
@@ -180,18 +107,6 @@ func (bpi *BucketPolicyItem) findMatch(principal string, action Action, resource
 	return false
 }
 
-// isPublicFor checks if the bucket policy statemant grants public access
-// for given resource and action
-func (bpi *BucketPolicyItem) isPublicFor(resource string, action Action) bool {
-	return bpi.Principals.isPublic() && bpi.Actions.FindMatch(action) && bpi.Resources.FindMatch(resource)
-}
-
-// isPublic checks if the statement grants public access
-// to ALL users
-func (bpi *BucketPolicyItem) isPublic() bool {
-	return bpi.Principals.isPublic()
-}
-
 func getMalformedPolicyError(err error) error {
 	return s3err.APIError{
 		Code:           "MalformedPolicy",
@@ -200,31 +115,15 @@ func getMalformedPolicyError(err error) error {
 	}
 }
 
-// ParsePolicyDocument parses raw bytes to 'BucketPolicy'
-func ParsePolicyDocument(data []byte) (*BucketPolicy, error) {
-	var policy BucketPolicy
-	if err := json.Unmarshal(data, &policy); err != nil {
-		var pe policyErr
-		if errors.As(err, &pe) {
-			return nil, getMalformedPolicyError(err)
-		}
-		return nil, getMalformedPolicyError(policyErrInvalidPolicy)
-	}
-
-	return &policy, nil
-}
-
 func ValidatePolicyDocument(policyBin []byte, bucket string, iam IAMService) error {
-	if len(policyBin) == 0 || policyBin[0] != '{' {
-		return getMalformedPolicyError(policyErrInvalidFirstChar)
-	}
-	policy, err := ParsePolicyDocument(policyBin)
-	if err != nil {
-		return err
+	var policy BucketPolicy
+	if err := json.Unmarshal(policyBin, &policy); err != nil {
+		return getMalformedPolicyError(err)
 	}
 
 	if len(policy.Statement) == 0 {
-		return getMalformedPolicyError(policyErrEmptyStatement)
+		//lint:ignore ST1005 Reason: This error message is intended for end-user clarity and follows their expectations
+		return getMalformedPolicyError(errors.New("Could not parse the policy: Statement is empty!"))
 	}
 
 	if err := policy.Validate(bucket, iam); err != nil {
@@ -237,7 +136,7 @@ func ValidatePolicyDocument(policyBin []byte, bucket string, iam IAMService) err
 func VerifyBucketPolicy(policy []byte, access, bucket, object string, action Action) error {
 	var bucketPolicy BucketPolicy
 	if err := json.Unmarshal(policy, &bucketPolicy); err != nil {
-		return fmt.Errorf("failed to parse the bucket policy: %w", err)
+		return err
 	}
 
 	resource := bucket
@@ -251,53 +150,3 @@ func VerifyBucketPolicy(policy []byte, access, bucket, object string, action Act
 
 	return nil
 }
-
-// Checks if the bucket policy grants public access
-func VerifyPublicBucketPolicy(policy []byte, bucket, object string, action Action) error {
-	var bucketPolicy BucketPolicy
-	if err := json.Unmarshal(policy, &bucketPolicy); err != nil {
-		return err
-	}
-
-	resource := bucket
-	if object != "" {
-		resource += "/" + object
-	}
-
-	if !bucketPolicy.isPublicFor(resource, action) {
-		return ErrAccessDenied
-	}
-
-	return nil
-}
-
-// matchPattern checks if the input string matches the given pattern with wildcard(`*`) and any character(`?`).
-// - `?` matches exactly one occurrence of any character.
-// - `*` matches arbitrary many (including zero) occurrences of any character.
-func matchPattern(pattern, input string) bool {
-	pIdx, sIdx := 0, 0
-	starIdx, matchIdx := -1, 0
-
-	for sIdx < len(input) {
-		if pIdx < len(pattern) && (pattern[pIdx] == '?' || pattern[pIdx] == input[sIdx]) {
-			sIdx++
-			pIdx++
-		} else if pIdx < len(pattern) && pattern[pIdx] == '*' {
-			starIdx = pIdx
-			matchIdx = sIdx
-			pIdx++
-		} else if starIdx != -1 {
-			pIdx = starIdx + 1
-			matchIdx++
-			sIdx = matchIdx
-		} else {
-			return false
-		}
-	}
-
-	for pIdx < len(pattern) && pattern[pIdx] == '*' {
-		pIdx++
-	}
-
-	return pIdx == len(pattern)
-}

auth/bucket_policy_actions.go

@@ -22,241 +22,165 @@ import (
 type Action string
 
 const (
-	GetBucketAclAction                       Action = "s3:GetBucketAcl"
-	CreateBucketAction                       Action = "s3:CreateBucket"
-	PutBucketAclAction                       Action = "s3:PutBucketAcl"
-	DeleteBucketAction                       Action = "s3:DeleteBucket"
-	PutBucketVersioningAction                Action = "s3:PutBucketVersioning"
-	GetBucketVersioningAction                Action = "s3:GetBucketVersioning"
-	PutBucketPolicyAction                    Action = "s3:PutBucketPolicy"
-	GetBucketPolicyAction                    Action = "s3:GetBucketPolicy"
-	DeleteBucketPolicyAction                 Action = "s3:DeleteBucketPolicy"
-	AbortMultipartUploadAction               Action = "s3:AbortMultipartUpload"
-	ListMultipartUploadPartsAction           Action = "s3:ListMultipartUploadParts"
-	ListBucketMultipartUploadsAction         Action = "s3:ListBucketMultipartUploads"
-	PutObjectAction                          Action = "s3:PutObject"
-	GetObjectAction                          Action = "s3:GetObject"
-	GetObjectVersionAction                   Action = "s3:GetObjectVersion"
-	DeleteObjectAction                       Action = "s3:DeleteObject"
-	DeleteObjectVersionAction                Action = "s3:DeleteObjectVersion"
-	GetObjectAclAction                       Action = "s3:GetObjectAcl"
-	GetObjectAttributesAction                Action = "s3:GetObjectAttributes"
-	GetObjectVersionAttributesAction         Action = "s3:GetObjectVersionAttributes"
-	PutObjectAclAction                       Action = "s3:PutObjectAcl"
-	RestoreObjectAction                      Action = "s3:RestoreObject"
-	GetBucketTaggingAction                   Action = "s3:GetBucketTagging"
-	PutBucketTaggingAction                   Action = "s3:PutBucketTagging"
-	GetObjectTaggingAction                   Action = "s3:GetObjectTagging"
-	GetObjectVersionTaggingAction            Action = "s3:GetObjectVersionTagging"
-	PutObjectTaggingAction                   Action = "s3:PutObjectTagging"
-	PutObjectVersionTaggingAction            Action = "s3:PutObjectVersionTagging"
-	DeleteObjectTaggingAction                Action = "s3:DeleteObjectTagging"
-	DeleteObjectVersionTaggingAction         Action = "s3:DeleteObjectVersionTagging"
-	ListBucketVersionsAction                 Action = "s3:ListBucketVersions"
-	ListBucketAction                         Action = "s3:ListBucket"
-	GetBucketObjectLockConfigurationAction   Action = "s3:GetBucketObjectLockConfiguration"
-	PutBucketObjectLockConfigurationAction   Action = "s3:PutBucketObjectLockConfiguration"
-	GetObjectLegalHoldAction                 Action = "s3:GetObjectLegalHold"
-	PutObjectLegalHoldAction                 Action = "s3:PutObjectLegalHold"
-	GetObjectRetentionAction                 Action = "s3:GetObjectRetention"
-	PutObjectRetentionAction                 Action = "s3:PutObjectRetention"
-	BypassGovernanceRetentionAction          Action = "s3:BypassGovernanceRetention"
-	PutBucketOwnershipControlsAction         Action = "s3:PutBucketOwnershipControls"
-	GetBucketOwnershipControlsAction         Action = "s3:GetBucketOwnershipControls"
-	PutBucketCorsAction                      Action = "s3:PutBucketCORS"
-	GetBucketCorsAction                      Action = "s3:GetBucketCORS"
-	PutAnalyticsConfigurationAction          Action = "s3:PutAnalyticsConfiguration"
-	GetAnalyticsConfigurationAction          Action = "s3:GetAnalyticsConfiguration"
-	PutEncryptionConfigurationAction         Action = "s3:PutEncryptionConfiguration"
-	GetEncryptionConfigurationAction         Action = "s3:GetEncryptionConfiguration"
-	PutIntelligentTieringConfigurationAction Action = "s3:PutIntelligentTieringConfiguration"
-	GetIntelligentTieringConfigurationAction Action = "s3:GetIntelligentTieringConfiguration"
-	PutInventoryConfigurationAction          Action = "s3:PutInventoryConfiguration"
-	GetInventoryConfigurationAction          Action = "s3:GetInventoryConfiguration"
-	PutLifecycleConfigurationAction          Action = "s3:PutLifecycleConfiguration"
-	GetLifecycleConfigurationAction          Action = "s3:GetLifecycleConfiguration"
-	PutBucketLoggingAction                   Action = "s3:PutBucketLogging"
-	GetBucketLoggingAction                   Action = "s3:GetBucketLogging"
-	PutBucketRequestPaymentAction            Action = "s3:PutBucketRequestPayment"
-	GetBucketRequestPaymentAction            Action = "s3:GetBucketRequestPayment"
-	PutMetricsConfigurationAction            Action = "s3:PutMetricsConfiguration"
-	GetMetricsConfigurationAction            Action = "s3:GetMetricsConfiguration"
-	PutReplicationConfigurationAction        Action = "s3:PutReplicationConfiguration"
-	GetReplicationConfigurationAction        Action = "s3:GetReplicationConfiguration"
-	PutBucketPublicAccessBlockAction         Action = "s3:PutBucketPublicAccessBlock"
-	GetBucketPublicAccessBlockAction         Action = "s3:GetBucketPublicAccessBlock"
-	PutBucketNotificationAction              Action = "s3:PutBucketNotification"
-	GetBucketNotificationAction              Action = "s3:GetBucketNotification"
-	PutAccelerateConfigurationAction         Action = "s3:PutAccelerateConfiguration"
-	GetAccelerateConfigurationAction         Action = "s3:GetAccelerateConfiguration"
-	PutBucketWebsiteAction                   Action = "s3:PutBucketWebsite"
-	GetBucketWebsiteAction                   Action = "s3:GetBucketWebsite"
-	GetBucketPolicyStatusAction              Action = "s3:GetBucketPolicyStatus"
-	GetBucketLocationAction                  Action = "s3:GetBucketLocation"
-
-	AllActions Action = "s3:*"
+	GetBucketAclAction                     Action = "s3:GetBucketAcl"
+	CreateBucketAction                     Action = "s3:CreateBucket"
+	PutBucketAclAction                     Action = "s3:PutBucketAcl"
+	DeleteBucketAction                     Action = "s3:DeleteBucket"
+	PutBucketVersioningAction              Action = "s3:PutBucketVersioning"
+	GetBucketVersioningAction              Action = "s3:GetBucketVersioning"
+	PutBucketPolicyAction                  Action = "s3:PutBucketPolicy"
+	GetBucketPolicyAction                  Action = "s3:GetBucketPolicy"
+	DeleteBucketPolicyAction               Action = "s3:DeleteBucketPolicy"
+	AbortMultipartUploadAction             Action = "s3:AbortMultipartUpload"
+	ListMultipartUploadPartsAction         Action = "s3:ListMultipartUploadParts"
+	ListBucketMultipartUploadsAction       Action = "s3:ListBucketMultipartUploads"
+	PutObjectAction                        Action = "s3:PutObject"
+	GetObjectAction                        Action = "s3:GetObject"
+	GetObjectVersionAction                 Action = "s3:GetObjectVersion"
+	DeleteObjectAction                     Action = "s3:DeleteObject"
+	GetObjectAclAction                     Action = "s3:GetObjectAcl"
+	GetObjectAttributesAction              Action = "s3:GetObjectAttributes"
+	PutObjectAclAction                     Action = "s3:PutObjectAcl"
+	RestoreObjectAction                    Action = "s3:RestoreObject"
+	GetBucketTaggingAction                 Action = "s3:GetBucketTagging"
+	PutBucketTaggingAction                 Action = "s3:PutBucketTagging"
+	GetObjectTaggingAction                 Action = "s3:GetObjectTagging"
+	PutObjectTaggingAction                 Action = "s3:PutObjectTagging"
+	DeleteObjectTaggingAction              Action = "s3:DeleteObjectTagging"
+	ListBucketVersionsAction               Action = "s3:ListBucketVersions"
+	ListBucketAction                       Action = "s3:ListBucket"
+	GetBucketObjectLockConfigurationAction Action = "s3:GetBucketObjectLockConfiguration"
+	PutBucketObjectLockConfigurationAction Action = "s3:PutBucketObjectLockConfiguration"
+	GetObjectLegalHoldAction               Action = "s3:GetObjectLegalHold"
+	PutObjectLegalHoldAction               Action = "s3:PutObjectLegalHold"
+	GetObjectRetentionAction               Action = "s3:GetObjectRetention"
+	PutObjectRetentionAction               Action = "s3:PutObjectRetention"
+	BypassGovernanceRetentionAction        Action = "s3:BypassGovernanceRetention"
+	PutBucketOwnershipControlsAction       Action = "s3:PutBucketOwnershipControls"
+	GetBucketOwnershipControlsAction       Action = "s3:GetBucketOwnershipControls"
+	AllActions                             Action = "s3:*"
 )
 
 var supportedActionList = map[Action]struct{}{
-	GetBucketAclAction:                       {},
-	CreateBucketAction:                       {},
-	PutBucketAclAction:                       {},
-	DeleteBucketAction:                       {},
-	PutBucketVersioningAction:                {},
-	GetBucketVersioningAction:                {},
-	PutBucketPolicyAction:                    {},
-	GetBucketPolicyAction:                    {},
-	DeleteBucketPolicyAction:                 {},
-	AbortMultipartUploadAction:               {},
-	ListMultipartUploadPartsAction:           {},
-	ListBucketMultipartUploadsAction:         {},
-	PutObjectAction:                          {},
-	GetObjectAction:                          {},
-	GetObjectVersionAction:                   {},
-	DeleteObjectAction:                       {},
-	DeleteObjectVersionAction:                {},
-	GetObjectAclAction:                       {},
-	GetObjectAttributesAction:                {},
-	GetObjectVersionAttributesAction:         {},
-	PutObjectAclAction:                       {},
-	RestoreObjectAction:                      {},
-	GetBucketTaggingAction:                   {},
-	PutBucketTaggingAction:                   {},
-	GetObjectTaggingAction:                   {},
-	GetObjectVersionTaggingAction:            {},
-	PutObjectTaggingAction:                   {},
-	PutObjectVersionTaggingAction:            {},
-	DeleteObjectTaggingAction:                {},
-	DeleteObjectVersionTaggingAction:         {},
-	ListBucketVersionsAction:                 {},
-	ListBucketAction:                         {},
-	GetBucketObjectLockConfigurationAction:   {},
-	PutBucketObjectLockConfigurationAction:   {},
-	GetObjectLegalHoldAction:                 {},
-	PutObjectLegalHoldAction:                 {},
-	GetObjectRetentionAction:                 {},
-	PutObjectRetentionAction:                 {},
-	BypassGovernanceRetentionAction:          {},
-	PutBucketOwnershipControlsAction:         {},
-	GetBucketOwnershipControlsAction:         {},
-	PutBucketCorsAction:                      {},
-	GetBucketCorsAction:                      {},
-	PutAnalyticsConfigurationAction:          {},
-	GetAnalyticsConfigurationAction:          {},
-	PutEncryptionConfigurationAction:         {},
-	GetEncryptionConfigurationAction:         {},
-	PutIntelligentTieringConfigurationAction: {},
-	GetIntelligentTieringConfigurationAction: {},
-	PutInventoryConfigurationAction:          {},
-	GetInventoryConfigurationAction:          {},
-	PutLifecycleConfigurationAction:          {},
-	GetLifecycleConfigurationAction:          {},
-	PutBucketLoggingAction:                   {},
-	GetBucketLoggingAction:                   {},
-	PutBucketRequestPaymentAction:            {},
-	GetBucketRequestPaymentAction:            {},
-	PutMetricsConfigurationAction:            {},
-	GetMetricsConfigurationAction:            {},
-	PutReplicationConfigurationAction:        {},
-	GetReplicationConfigurationAction:        {},
-	PutBucketPublicAccessBlockAction:         {},
-	GetBucketPublicAccessBlockAction:         {},
-	PutBucketNotificationAction:              {},
-	GetBucketNotificationAction:              {},
-	PutAccelerateConfigurationAction:         {},
-	GetAccelerateConfigurationAction:         {},
-	PutBucketWebsiteAction:                   {},
-	GetBucketWebsiteAction:                   {},
-	GetBucketPolicyStatusAction:              {},
-	GetBucketLocationAction:                  {},
-	AllActions:                               {},
+	GetBucketAclAction:                     {},
+	CreateBucketAction:                     {},
+	PutBucketAclAction:                     {},
+	DeleteBucketAction:                     {},
+	PutBucketVersioningAction:              {},
+	GetBucketVersioningAction:              {},
+	PutBucketPolicyAction:                  {},
+	GetBucketPolicyAction:                  {},
+	DeleteBucketPolicyAction:               {},
+	AbortMultipartUploadAction:             {},
+	ListMultipartUploadPartsAction:         {},
+	ListBucketMultipartUploadsAction:       {},
+	PutObjectAction:                        {},
+	GetObjectAction:                        {},
+	GetObjectVersionAction:                 {},
+	DeleteObjectAction:                     {},
+	GetObjectAclAction:                     {},
+	GetObjectAttributesAction:              {},
+	PutObjectAclAction:                     {},
+	RestoreObjectAction:                    {},
+	GetBucketTaggingAction:                 {},
+	PutBucketTaggingAction:                 {},
+	GetObjectTaggingAction:                 {},
+	PutObjectTaggingAction:                 {},
+	DeleteObjectTaggingAction:              {},
+	ListBucketVersionsAction:               {},
+	ListBucketAction:                       {},
+	PutBucketObjectLockConfigurationAction: {},
+	GetObjectLegalHoldAction:               {},
+	PutObjectLegalHoldAction:               {},
+	GetObjectRetentionAction:               {},
+	PutObjectRetentionAction:               {},
+	BypassGovernanceRetentionAction:        {},
+	PutBucketOwnershipControlsAction:       {},
+	GetBucketOwnershipControlsAction:       {},
+	AllActions:                             {},
 }
 
 var supportedObjectActionList = map[Action]struct{}{
-	AbortMultipartUploadAction:       {},
-	ListMultipartUploadPartsAction:   {},
-	PutObjectAction:                  {},
-	GetObjectAction:                  {},
-	GetObjectVersionAction:           {},
-	DeleteObjectAction:               {},
-	DeleteObjectVersionAction:        {},
-	GetObjectAclAction:               {},
-	GetObjectAttributesAction:        {},
-	GetObjectVersionAttributesAction: {},
-	PutObjectAclAction:               {},
-	RestoreObjectAction:              {},
-	GetObjectTaggingAction:           {},
-	GetObjectVersionTaggingAction:    {},
-	PutObjectTaggingAction:           {},
-	PutObjectVersionTaggingAction:    {},
-	DeleteObjectTaggingAction:        {},
-	DeleteObjectVersionTaggingAction: {},
-	GetObjectLegalHoldAction:         {},
-	PutObjectLegalHoldAction:         {},
-	GetObjectRetentionAction:         {},
-	PutObjectRetentionAction:         {},
-	BypassGovernanceRetentionAction:  {},
-	AllActions:                       {},
+	AbortMultipartUploadAction:      {},
+	ListMultipartUploadPartsAction:  {},
+	PutObjectAction:                 {},
+	GetObjectAction:                 {},
+	GetObjectVersionAction:          {},
+	DeleteObjectAction:              {},
+	GetObjectAclAction:              {},
+	GetObjectAttributesAction:       {},
+	PutObjectAclAction:              {},
+	RestoreObjectAction:             {},
+	GetObjectTaggingAction:          {},
+	PutObjectTaggingAction:          {},
+	DeleteObjectTaggingAction:       {},
+	GetObjectLegalHoldAction:        {},
+	PutObjectLegalHoldAction:        {},
+	GetObjectRetentionAction:        {},
+	PutObjectRetentionAction:        {},
+	BypassGovernanceRetentionAction: {},
+	AllActions:                      {},
 }
 
 // Validates Action: it should either wildcard match with supported actions list or be in it
 func (a Action) IsValid() error {
 	if !strings.HasPrefix(string(a), "s3:") {
-		return policyErrInvalidAction
+		return errInvalidAction
 	}
 
 	if a == AllActions {
 		return nil
 	}
 
-	// first check for an exact match
-	if _, ok := supportedActionList[a]; ok {
-		return nil
-	}
-
-	// walk through the supported actions and try wildcard match
-	for action := range supportedActionList {
-		if action.Match(a) {
-			return nil
+	if a[len(a)-1] == '*' {
+		pattern := strings.TrimSuffix(string(a), "*")
+		for act := range supportedActionList {
+			if strings.HasPrefix(string(act), pattern) {
+				return nil
+			}
 		}
+
+		return errInvalidAction
 	}
 
-	return policyErrInvalidAction
+	_, found := supportedActionList[a]
+	if !found {
+		return errInvalidAction
+	}
+	return nil
 }
 
 func getBoolPtr(bl bool) *bool {
 	return &bl
 }
 
-// String converts the action to string
-func (a Action) String() string {
-	return string(a)
-}
-
-// Match wildcard matches the given pattern to the action
-func (a Action) Match(pattern Action) bool {
-	return matchPattern(pattern.String(), a.String())
-}
-
 // Checks if the action is object action
 // nil points to 's3:*'
 func (a Action) IsObjectAction() *bool {
 	if a == AllActions {
 		return nil
 	}
-
-	// first find an exact match
-	if _, ok := supportedObjectActionList[a]; ok {
-		return &ok
-	}
-
-	for action := range supportedObjectActionList {
-		if action.Match(a) {
-			return getBoolPtr(true)
+	if a[len(a)-1] == '*' {
+		pattern := strings.TrimSuffix(string(a), "*")
+		for act := range supportedObjectActionList {
+			if strings.HasPrefix(string(act), pattern) {
+				return getBoolPtr(true)
+			}
 		}
+
+		return getBoolPtr(false)
 	}
 
-	return getBoolPtr(false)
+	_, found := supportedObjectActionList[a]
+	return &found
+}
+
+func (a Action) WildCardMatch(act Action) bool {
+	if strings.HasSuffix(string(a), "*") {
+		pattern := strings.TrimSuffix(string(a), "*")
+		return strings.HasPrefix(string(act), pattern)
+	}
+	return false
 }
 
 type Actions map[Action]struct{}
@@ -267,7 +191,7 @@ func (a *Actions) UnmarshalJSON(data []byte) error {
 	var err error
 	if err = json.Unmarshal(data, &ss); err == nil {
 		if len(ss) == 0 {
-			return policyErrInvalidAction
+			return errInvalidAction
 		}
 		*a = make(Actions)
 		for _, s := range ss {
@@ -280,7 +204,7 @@ func (a *Actions) UnmarshalJSON(data []byte) error {
 		var s string
 		if err = json.Unmarshal(data, &s); err == nil {
 			if s == "" {
-				return policyErrInvalidAction
+				return errInvalidAction
 			}
 			*a = make(Actions)
 			err = a.Add(s)
@@ -305,7 +229,6 @@ func (a Actions) Add(str string) error {
 	return nil
 }
 
-// FindMatch tries to match the given action to the actions list
 func (a Actions) FindMatch(action Action) bool {
 	_, ok := a[AllActions]
 	if ok {
@@ -317,9 +240,8 @@ func (a Actions) FindMatch(action Action) bool {
 		return true
 	}
 
-	// search for a wildcard match
 	for act := range a {
-		if action.Match(act) {
+		if strings.HasSuffix(string(act), "*") && act.WildCardMatch(action) {
 			return true
 		}
 	}

auth/bucket_policy_actions_test.go

@@ -1,175 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAction_IsValid(t *testing.T) {
-	tests := []struct {
-		name    string
-		action  Action
-		wantErr bool
-	}{
-		{"valid exact action", GetObjectAction, false},
-		{"valid all actions", AllActions, false},
-		{"invalid prefix", "invalid:Action", true},
-		{"unsupported action 1", "s3:Unsupported", true},
-		{"unsupported action 2", "s3:HeadObject", true},
-		{"valid wildcard match 1", "s3:Get*", false},
-		{"valid wildcard match 2", "s3:*Object*", false},
-		{"valid wildcard match 3", "s3:*Multipart*", false},
-		{"any char match 1", "s3:Get?bject", false},
-		{"any char match 2", "s3:Get??bject", true},
-		{"any char match 3", "s3:???", true},
-		{"mixed match 1", "s3:Get?*", false},
-		{"mixed match 2", "s3:*Object?????", true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.action.IsValid()
-			if tt.wantErr {
-				assert.EqualValues(t, policyErrInvalidAction, err)
-			} else {
-				assert.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestAction_String(t *testing.T) {
-	a := Action("s3:TestAction")
-	assert.Equal(t, "s3:TestAction", a.String())
-}
-
-func TestAction_Match(t *testing.T) {
-	tests := []struct {
-		name    string
-		action  Action
-		pattern Action
-		want    bool
-	}{
-		{"exact match", "s3:GetObject", "s3:GetObject", true},
-		{"wildcard match", "s3:GetObject", "s3:Get*", true},
-		{"wildcard mismatch", "s3:PutObject", "s3:Get*", false},
-		{"any character match", "s3:Get1", "s3:Get?", true},
-		{"any character mismatch", "s3:Get12", "s3:Get?", false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.action.Match(tt.pattern)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestAction_IsObjectAction(t *testing.T) {
-	tests := []struct {
-		name   string
-		action Action
-		want   *bool
-	}{
-		{"all actions", AllActions, nil},
-		{"object action exact", GetObjectAction, getBoolPtr(true)},
-		{"object action wildcard", "s3:Get*", getBoolPtr(true)},
-		{"non object action", GetBucketAclAction, getBoolPtr(false)},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.action.IsObjectAction()
-			if tt.want == nil {
-				assert.Nil(t, got)
-			} else {
-				assert.NotNil(t, got)
-				assert.Equal(t, *tt.want, *got)
-			}
-		})
-	}
-}
-
-func TestActions_UnmarshalJSON(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		wantErr bool
-	}{
-		{"valid slice", `["s3:GetObject","s3:PutObject"]`, false},
-		{"empty slice", `[]`, true},
-		{"invalid action in slice", `["s3:Invalid"]`, true},
-		{"valid string", `"s3:GetObject"`, false},
-		{"empty string", `""`, true},
-		{"invalid string", `"s3:Invalid"`, true},
-		{"invalid json", `{}`, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var a Actions
-			err := json.Unmarshal([]byte(tt.input), &a)
-			if tt.wantErr {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestActions_Add(t *testing.T) {
-	tests := []struct {
-		name    string
-		action  string
-		wantErr bool
-	}{
-		{"valid add", "s3:GetObject", false},
-		{"invalid add", "s3:InvalidAction", true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			a := make(Actions)
-			err := a.Add(tt.action)
-			if tt.wantErr {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				_, ok := a[Action(tt.action)]
-				assert.True(t, ok)
-			}
-		})
-	}
-}
-
-func TestActions_FindMatch(t *testing.T) {
-	tests := []struct {
-		name    string
-		actions Actions
-		check   Action
-		want    bool
-	}{
-		{"all actions present", Actions{AllActions: {}}, GetObjectAction, true},
-		{"exact match", Actions{GetObjectAction: {}}, GetObjectAction, true},
-		{"wildcard match", Actions{"s3:Get*": {}}, GetObjectAction, true},
-		{"no match", Actions{"s3:Put*": {}}, GetObjectAction, false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.actions.FindMatch(tt.check)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}

auth/bucket_policy_effect_test.go

@@ -1,57 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestBucketPolicyAccessType_Validate(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   BucketPolicyAccessType
-		wantErr bool
-		errMsg  string
-	}{
-		{
-			name:    "valid allow",
-			input:   BucketPolicyAccessTypeAllow,
-			wantErr: false,
-		},
-		{
-			name:    "valid deny",
-			input:   BucketPolicyAccessTypeDeny,
-			wantErr: false,
-		},
-		{
-			name:    "invalid type",
-			input:   BucketPolicyAccessType("InvalidValue"),
-			wantErr: true,
-			errMsg:  "Invalid effect: InvalidValue",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.input.Validate()
-			if tt.wantErr {
-				assert.EqualError(t, err, tt.errMsg)
-			} else {
-				assert.NoError(t, err)
-			}
-		})
-	}
-}

auth/bucket_policy_principals.go

@@ -36,7 +36,7 @@ func (p *Principals) UnmarshalJSON(data []byte) error {
 
 	if err = json.Unmarshal(data, &ss); err == nil {
 		if len(ss) == 0 {
-			return policyErrInvalidPrincipal
+			return errInvalidPrincipal
 		}
 		*p = make(Principals)
 		for _, s := range ss {
@@ -45,7 +45,7 @@ func (p *Principals) UnmarshalJSON(data []byte) error {
 		return nil
 	} else if err = json.Unmarshal(data, &s); err == nil {
 		if s == "" {
-			return policyErrInvalidPrincipal
+			return errInvalidPrincipal
 		}
 		*p = make(Principals)
 		p.Add(s)
@@ -53,7 +53,7 @@ func (p *Principals) UnmarshalJSON(data []byte) error {
 		return nil
 	} else if err = json.Unmarshal(data, &k); err == nil {
 		if k.AWS == "" {
-			return policyErrInvalidPrincipal
+			return errInvalidPrincipal
 		}
 		*p = make(Principals)
 		p.Add(k.AWS)
@@ -65,7 +65,7 @@ func (p *Principals) UnmarshalJSON(data []byte) error {
 		}
 		if err = json.Unmarshal(data, &sk); err == nil {
 			if len(sk.AWS) == 0 {
-				return policyErrInvalidPrincipal
+				return errInvalidPrincipal
 			}
 			*p = make(Principals)
 			for _, s := range sk.AWS {
@@ -97,7 +97,7 @@ func (p Principals) Validate(iam IAMService) error {
 		if len(p) == 1 {
 			return nil
 		}
-		return policyErrInvalidPrincipal
+		return errInvalidPrincipal
 	}
 
 	accs, err := CheckIfAccountsExist(p.ToSlice(), iam)
@@ -105,7 +105,7 @@ func (p Principals) Validate(iam IAMService) error {
 		return err
 	}
 	if len(accs) > 0 {
-		return policyErrInvalidPrincipal
+		return errInvalidPrincipal
 	}
 
 	return nil
@@ -121,10 +121,3 @@ func (p Principals) Contains(userAccess string) bool {
 	_, found := p[userAccess]
 	return found
 }
-
-// Bucket policy grants public access, if it contains
-// a wildcard match to all the users
-func (p Principals) isPublic() bool {
-	_, ok := p["*"]
-	return ok
-}

auth/bucket_policy_principals_test.go

@@ -1,106 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestPrincipals_Add(t *testing.T) {
-	p := make(Principals)
-	p.Add("user1")
-	_, ok := p["user1"]
-	assert.True(t, ok)
-}
-
-func TestPrincipals_UnmarshalJSON(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		want    Principals
-		wantErr bool
-	}{
-		{"valid slice", `["user1","user2"]`, Principals{"user1": {}, "user2": {}}, false},
-		{"empty slice", `[]`, nil, true},
-		{"valid string", `"user1"`, Principals{"user1": {}}, false},
-		{"empty string", `""`, nil, true},
-		{"valid AWS object", `{"AWS":"user1"}`, Principals{"user1": {}}, false},
-		{"empty AWS object", `{"AWS":""}`, nil, true},
-		{"valid AWS array", `{"AWS":["user1","user2"]}`, Principals{"user1": {}, "user2": {}}, false},
-		{"empty AWS array", `{"AWS":[]}`, nil, true},
-		{"invalid json", `{invalid}`, nil, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var p Principals
-			err := json.Unmarshal([]byte(tt.input), &p)
-			if tt.wantErr {
-				assert.Error(t, err)
-			} else {
-				assert.NoError(t, err)
-				assert.Equal(t, tt.want, p)
-			}
-		})
-	}
-}
-
-func TestPrincipals_ToSlice(t *testing.T) {
-	p := Principals{"user1": {}, "user2": {}, "*": {}}
-	got := p.ToSlice()
-	assert.Contains(t, got, "user1")
-	assert.Contains(t, got, "user2")
-	assert.NotContains(t, got, "*")
-}
-
-func TestPrincipals_Validate(t *testing.T) {
-	iamSingle := NewIAMServiceSingle(Account{
-		Access: "user1",
-	})
-	tests := []struct {
-		name       string
-		principals Principals
-		mockIAM    IAMService
-		err        error
-	}{
-		{"only wildcard", Principals{"*": {}}, iamSingle, nil},
-		{"wildcard and user", Principals{"*": {}, "user1": {}}, iamSingle, policyErrInvalidPrincipal},
-		{"accounts exist returns err", Principals{"user2": {}, "user3": {}}, iamSingle, policyErrInvalidPrincipal},
-		{"accounts exist non-empty", Principals{"user1": {}}, iamSingle, nil},
-		{"accounts valid", Principals{"user1": {}}, iamSingle, nil},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.principals.Validate(tt.mockIAM)
-			assert.EqualValues(t, tt.err, err)
-		})
-	}
-}
-
-func TestPrincipals_Contains(t *testing.T) {
-	p := Principals{"user1": {}}
-	assert.True(t, p.Contains("user1"))
-	assert.False(t, p.Contains("user2"))
-
-	p = Principals{"*": {}}
-	assert.True(t, p.Contains("anyuser"))
-}
-
-func TestPrincipals_isPublic(t *testing.T) {
-	assert.True(t, Principals{"*": {}}.isPublic())
-	assert.False(t, Principals{"user1": {}}.isPublic())
-}

auth/bucket_policy_resources.go

@@ -29,7 +29,7 @@ func (r *Resources) UnmarshalJSON(data []byte) error {
 	var err error
 	if err = json.Unmarshal(data, &ss); err == nil {
 		if len(ss) == 0 {
-			return policyErrInvalidResource
+			return errInvalidResource
 		}
 		*r = make(Resources)
 		for _, s := range ss {
@@ -42,7 +42,7 @@ func (r *Resources) UnmarshalJSON(data []byte) error {
 		var s string
 		if err = json.Unmarshal(data, &s); err == nil {
 			if s == "" {
-				return policyErrInvalidResource
+				return errInvalidResource
 			}
 			*r = make(Resources)
 			err = r.Add(s)
@@ -59,7 +59,7 @@ func (r *Resources) UnmarshalJSON(data []byte) error {
 func (r Resources) Add(rc string) error {
 	ok, pattern := isValidResource(rc)
 	if !ok {
-		return policyErrInvalidResource
+		return errInvalidResource
 	}
 
 	r[pattern] = struct{}{}
@@ -93,7 +93,7 @@ func (r Resources) ContainsBucketPattern() bool {
 func (r Resources) Validate(bucket string) error {
 	for resource := range r {
 		if !strings.HasPrefix(resource, bucket) {
-			return policyErrInvalidResource
+			return errInvalidResource
 		}
 	}
 
@@ -102,19 +102,21 @@ func (r Resources) Validate(bucket string) error {
 
 func (r Resources) FindMatch(resource string) bool {
 	for res := range r {
-		if r.Match(res, resource) {
-			return true
+		if strings.HasSuffix(res, "*") {
+			pattern := strings.TrimSuffix(res, "*")
+			if strings.HasPrefix(resource, pattern) {
+				return true
+			}
+		} else {
+			if res == resource {
+				return true
+			}
 		}
 	}
 
 	return false
 }
 
-// Match matches the given input resource with the pattern
-func (r Resources) Match(pattern, input string) bool {
-	return matchPattern(pattern, input)
-}
-
 // Checks the resource to have arn prefix and not starting with /
 func isValidResource(rc string) (isValid bool, pattern string) {
 	if !strings.HasPrefix(rc, ResourceArnPrefix) {

auth/bucket_policy_resources_test.go

@@ -1,182 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func TestUnmarshalJSON(t *testing.T) {
-	var r Resources
-
-	cases := []struct {
-		input    string
-		expected int
-		wantErr  bool
-	}{
-		{`"arn:aws:s3:::my-bucket/*"`, 1, false},
-		{`["arn:aws:s3:::my-bucket/*", "arn:aws:s3:::other-bucket"]`, 2, false},
-		{`""`, 0, true},
-		{`[]`, 0, true},
-		{`["invalid-bucket"]`, 0, true},
-	}
-
-	for _, tc := range cases {
-		r = Resources{}
-		err := json.Unmarshal([]byte(tc.input), &r)
-		if (err != nil) != tc.wantErr {
-			t.Errorf("Unexpected error status for input %s: %v", tc.input, err)
-		}
-		if len(r) != tc.expected {
-			t.Errorf("Expected %d resources, got %d", tc.expected, len(r))
-		}
-	}
-}
-
-func TestAdd(t *testing.T) {
-	r := Resources{}
-
-	cases := []struct {
-		input   string
-		wantErr bool
-	}{
-		{"arn:aws:s3:::valid-bucket/*", false},
-		{"arn:aws:s3:::valid-bucket/object", false},
-		{"invalid-bucket/*", true},
-		{"/invalid-start", true},
-	}
-
-	for _, tc := range cases {
-		err := r.Add(tc.input)
-		if (err != nil) != tc.wantErr {
-			t.Errorf("Unexpected error status for input %s: %v", tc.input, err)
-		}
-	}
-}
-
-func TestContainsObjectPattern(t *testing.T) {
-	cases := []struct {
-		resources []string
-		expected  bool
-	}{
-		{[]string{"arn:aws:s3:::my-bucket/my-object"}, true},
-		{[]string{"arn:aws:s3:::my-bucket/*"}, true},
-		{[]string{"arn:aws:s3:::my-bucket"}, false},
-	}
-
-	for _, tc := range cases {
-		r := Resources{}
-		for _, res := range tc.resources {
-			r.Add(res)
-		}
-		if r.ContainsObjectPattern() != tc.expected {
-			t.Errorf("Expected object pattern to be %v for %v", tc.expected, tc.resources)
-		}
-	}
-}
-
-func TestContainsBucketPattern(t *testing.T) {
-	cases := []struct {
-		resources []string
-		expected  bool
-	}{
-		{[]string{"arn:aws:s3:::my-bucket"}, true},
-		{[]string{"arn:aws:s3:::my-bucket/*"}, false},
-		{[]string{"arn:aws:s3:::my-bucket/object"}, false},
-	}
-
-	for _, tc := range cases {
-		r := Resources{}
-		for _, res := range tc.resources {
-			r.Add(res)
-		}
-		if r.ContainsBucketPattern() != tc.expected {
-			t.Errorf("Expected bucket pattern to be %v for %v", tc.expected, tc.resources)
-		}
-	}
-}
-
-func TestValidate(t *testing.T) {
-	cases := []struct {
-		resources []string
-		bucket    string
-		expected  bool
-	}{
-		{[]string{"arn:aws:s3:::valid-bucket/*"}, "valid-bucket", true},
-		{[]string{"arn:aws:s3:::wrong-bucket/*"}, "valid-bucket", false},
-		{[]string{"arn:aws:s3:::valid-bucket/*", "arn:aws:s3:::valid-bucket/object/*"}, "valid-bucket", true},
-	}
-
-	for _, tc := range cases {
-		r := Resources{}
-		for _, res := range tc.resources {
-			r.Add(res)
-		}
-		if (r.Validate(tc.bucket) == nil) != tc.expected {
-			t.Errorf("Expected validation to be %v for bucket %s", tc.expected, tc.bucket)
-		}
-	}
-}
-
-func TestFindMatch(t *testing.T) {
-	cases := []struct {
-		resources []string
-		input     string
-		expected  bool
-	}{
-		{[]string{"arn:aws:s3:::my-bucket/*"}, "my-bucket/my-object", true},
-		{[]string{"arn:aws:s3:::my-bucket/object"}, "other-bucket/my-object", false},
-		{[]string{"arn:aws:s3:::my-bucket/object"}, "my-bucket/object", true},
-		{[]string{"arn:aws:s3:::my-bucket/*", "arn:aws:s3:::other-bucket/*"}, "other-bucket/something", true},
-	}
-
-	for _, tc := range cases {
-		r := Resources{}
-		for _, res := range tc.resources {
-			r.Add(res)
-		}
-		if r.FindMatch(tc.input) != tc.expected {
-			t.Errorf("Expected FindMatch to be %v for input %s", tc.expected, tc.input)
-		}
-	}
-}
-
-func TestMatch(t *testing.T) {
-	r := Resources{}
-	cases := []struct {
-		pattern  string
-		input    string
-		expected bool
-	}{
-		{"my-bucket/*", "my-bucket/object", true},
-		{"my-bucket/?bject", "my-bucket/object", true},
-		{"my-bucket/*", "other-bucket/object", false},
-		{"*", "any-bucket/object", true},
-		{"my-bucket/*", "my-bucket/subdir/object", true},
-		{"my-bucket/*", "other-bucket", false},
-		{"my-bucket/*/*", "my-bucket/hello", false},
-		{"my-bucket/*/*", "my-bucket/hello/world", true},
-		{"foo/???/bar", "foo/qux/bar", true},
-		{"foo/???/bar", "foo/quxx/bar", false},
-		{"foo/???/bar/*/?", "foo/qux/bar/hello/g", true},
-		{"foo/???/bar/*/?", "foo/qux/bar/hello/smth", false},
-	}
-	for _, tc := range cases {
-		if r.Match(tc.pattern, tc.input) != tc.expected {
-			t.Errorf("Match(%s, %s) failed, expected %v", tc.pattern, tc.input, tc.expected)
-		}
-	}
-}

auth/bucket_policy_version.go

@@ -1,32 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-type PolicyVersion string
-
-const (
-	PolicyVersion2008 PolicyVersion = "2008-10-17"
-	PolicyVersion2012 PolicyVersion = "2012-10-17"
-)
-
-// isValid checks if the policy version is valid or not
-func (pv PolicyVersion) isValid() bool {
-	switch pv {
-	case PolicyVersion2008, PolicyVersion2012:
-		return true
-	default:
-		return false
-	}
-}

auth/bucket_policy_version_test.go

@@ -1,54 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestPolicyVersion_isValid(t *testing.T) {
-	tests := []struct {
-		name  string // description of this test case
-		value string
-		want  bool
-	}{
-		{"valid 2008", "2008-10-17", true},
-		{"valid 2012", "2012-10-17", true},
-		{"invalid empty", "", false},
-		{"invalid 1", "invalid", false},
-		{"invalid 2", "2010-10-17", false},
-		{"invalid 3", "2006-00-12", false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := PolicyVersion(tt.value).isValid()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}

auth/iam.go

@@ -18,8 +18,6 @@ import (
 	"errors"
 	"fmt"
 	"time"
-
-	"github.com/versity/versitygw/s3err"
 )
 
 type Role string
@@ -30,48 +28,20 @@ const (
 	RoleUserPlus Role = "userplus"
 )
 
-func (r Role) IsValid() bool {
-	switch r {
-	case RoleAdmin:
-		return true
-	case RoleUser:
-		return true
-	case RoleUserPlus:
-		return true
-	default:
-		return false
-	}
-}
-
 // Account is a gateway IAM account
 type Account struct {
-	Access    string `json:"access"`
-	Secret    string `json:"secret"`
-	Role      Role   `json:"role"`
-	UserID    int    `json:"userID"`
-	GroupID   int    `json:"groupID"`
-	ProjectID int    `json:"projectID"`
-}
-
-type ListUserAccountsResult struct {
-	Accounts []Account
+	Access  string `json:"access"`
+	Secret  string `json:"secret"`
+	Role    Role   `json:"role"`
+	UserID  int    `json:"userID"`
+	GroupID int    `json:"groupID"`
 }
 
 // Mutable props, which could be changed when updating an IAM account
 type MutableProps struct {
-	Secret    *string `json:"secret"`
-	Role      Role    `json:"role"`
-	UserID    *int    `json:"userID"`
-	GroupID   *int    `json:"groupID"`
-	ProjectID *int    `json:"projectID"`
-}
-
-func (m MutableProps) Validate() error {
-	if m.Role != "" && !m.Role.IsValid() {
-		return s3err.GetAPIError(s3err.ErrAdminInvalidUserRole)
-	}
-
-	return nil
+	Secret  *string `json:"secret"`
+	UserID  *int    `json:"userID"`
+	GroupID *int    `json:"groupID"`
 }
 
 func updateAcc(acc *Account, props MutableProps) {
@@ -84,12 +54,6 @@ func updateAcc(acc *Account, props MutableProps) {
 	if props.UserID != nil {
 		acc.UserID = *props.UserID
 	}
-	if props.ProjectID != nil {
-		acc.ProjectID = *props.ProjectID
-	}
-	if props.Role != "" {
-		acc.Role = props.Role
-	}
 }
 
 // IAMService is the interface for all IAM service implementations
@@ -112,47 +76,37 @@ var (
 )
 
 type Opts struct {
-	RootAccount                 Account
-	Dir                         string
-	LDAPServerURL               string
-	LDAPBindDN                  string
-	LDAPPassword                string
-	LDAPQueryBase               string
-	LDAPObjClasses              string
-	LDAPAccessAtr               string
-	LDAPSecretAtr               string
-	LDAPRoleAtr                 string
-	LDAPUserIdAtr               string
-	LDAPGroupIdAtr              string
-	LDAPProjectIdAtr            string
-	LDAPTLSSkipVerify           bool
-	VaultEndpointURL            string
-	VaultNamespace              string
-	VaultSecretStoragePath      string
-	VaultSecretStorageNamespace string
-	VaultAuthMethod             string
-	VaultAuthNamespace          string
-	VaultMountPath              string
-	VaultRootToken              string
-	VaultRoleId                 string
-	VaultRoleSecret             string
-	VaultServerCert             string
-	VaultClientCert             string
-	VaultClientCertKey          string
-	S3Access                    string
-	S3Secret                    string
-	S3Region                    string
-	S3Bucket                    string
-	S3Endpoint                  string
-	S3DisableSSlVerfiy          bool
-	CacheDisable                bool
-	CacheTTL                    int
-	CachePrune                  int
-	IpaHost                     string
-	IpaVaultName                string
-	IpaUser                     string
-	IpaPassword                 string
-	IpaInsecure                 bool
+	RootAccount            Account
+	Dir                    string
+	LDAPServerURL          string
+	LDAPBindDN             string
+	LDAPPassword           string
+	LDAPQueryBase          string
+	LDAPObjClasses         string
+	LDAPAccessAtr          string
+	LDAPSecretAtr          string
+	LDAPRoleAtr            string
+	LDAPUserIdAtr          string
+	LDAPGroupIdAtr         string
+	VaultEndpointURL       string
+	VaultSecretStoragePath string
+	VaultMountPath         string
+	VaultRootToken         string
+	VaultRoleId            string
+	VaultRoleSecret        string
+	VaultServerCert        string
+	VaultClientCert        string
+	VaultClientCertKey     string
+	S3Access               string
+	S3Secret               string
+	S3Region               string
+	S3Bucket               string
+	S3Endpoint             string
+	S3DisableSSlVerfiy     bool
+	S3Debug                bool
+	CacheDisable           bool
+	CacheTTL               int
+	CachePrune             int
 }
 
 func New(o *Opts) (IAMService, error) {
@@ -166,25 +120,22 @@ func New(o *Opts) (IAMService, error) {
 	case o.LDAPServerURL != "":
 		svc, err = NewLDAPService(o.RootAccount, o.LDAPServerURL, o.LDAPBindDN, o.LDAPPassword,
 			o.LDAPQueryBase, o.LDAPAccessAtr, o.LDAPSecretAtr, o.LDAPRoleAtr, o.LDAPUserIdAtr,
-			o.LDAPGroupIdAtr, o.LDAPProjectIdAtr, o.LDAPObjClasses, o.LDAPTLSSkipVerify)
+			o.LDAPGroupIdAtr, o.LDAPObjClasses)
 		fmt.Printf("initializing LDAP IAM with %q\n", o.LDAPServerURL)
 	case o.S3Endpoint != "":
 		svc, err = NewS3(o.RootAccount, o.S3Access, o.S3Secret, o.S3Region, o.S3Bucket,
-			o.S3Endpoint, o.S3DisableSSlVerfiy)
+			o.S3Endpoint, o.S3DisableSSlVerfiy, o.S3Debug)
 		fmt.Printf("initializing S3 IAM with '%v/%v'\n",
 			o.S3Endpoint, o.S3Bucket)
 	case o.VaultEndpointURL != "":
-		svc, err = NewVaultIAMService(o.RootAccount, o.VaultEndpointURL, o.VaultNamespace, o.VaultSecretStoragePath, o.VaultSecretStorageNamespace,
-			o.VaultAuthMethod, o.VaultAuthNamespace, o.VaultMountPath, o.VaultRootToken, o.VaultRoleId, o.VaultRoleSecret,
+		svc, err = NewVaultIAMService(o.RootAccount, o.VaultEndpointURL, o.VaultSecretStoragePath,
+			o.VaultMountPath, o.VaultRootToken, o.VaultRoleId, o.VaultRoleSecret,
 			o.VaultServerCert, o.VaultClientCert, o.VaultClientCertKey)
 		fmt.Printf("initializing Vault IAM with %q\n", o.VaultEndpointURL)
-	case o.IpaHost != "":
-		svc, err = NewIpaIAMService(o.RootAccount, o.IpaHost, o.IpaVaultName, o.IpaUser, o.IpaPassword, o.IpaInsecure)
-		fmt.Printf("initializing IPA IAM with %q\n", o.IpaHost)
 	default:
 		// if no iam options selected, default to the single user mode
 		fmt.Println("No IAM service configured, enabling single account mode")
-		return NewIAMServiceSingle(o.RootAccount), nil
+		return IAMServiceSingle{}, nil
 	}
 
 	if err != nil {

auth/iam_internal.go

@@ -194,12 +194,11 @@ func (s *IAMServiceInternal) ListUserAccounts() ([]Account, error) {
 	var accs []Account
 	for _, k := range keys {
 		accs = append(accs, Account{
-			Access:    k,
-			Secret:    conf.AccessAccounts[k].Secret,
-			Role:      conf.AccessAccounts[k].Role,
-			UserID:    conf.AccessAccounts[k].UserID,
-			GroupID:   conf.AccessAccounts[k].GroupID,
-			ProjectID: conf.AccessAccounts[k].ProjectID,
+			Access:  k,
+			Secret:  conf.AccessAccounts[k].Secret,
+			Role:    conf.AccessAccounts[k].Role,
+			UserID:  conf.AccessAccounts[k].UserID,
+			GroupID: conf.AccessAccounts[k].GroupID,
 		})
 	}
 
@@ -291,49 +290,93 @@ func (s *IAMServiceInternal) readIAMData() ([]byte, error) {
 
 func (s *IAMServiceInternal) storeIAM(update UpdateAcctFunc) error {
 	// We are going to be racing with other running gateways without any
-	// coordination. So the strategy here is to read the current file data,
-	// update the data, write back out to a temp file, then rename the
-	// temp file to the original file. This rename will replace the
-	// original file with the new file. This is atomic and should always
-	// allow for a consistent view of the data. There is a small
-	// window where the file could be read and then updated by
-	// another process. In this case any updates the other process did
-	// will be lost. This is a limitation of the internal IAM service.
-	// This should be rare, and even when it does happen should result
-	// in a valid IAM file, just without the other process's updates.
+	// coordination. So the strategy here is to read the current file data.
+	// If the file doesn't exist, then we assume someone else is currently
+	// updating the file. So we just need to keep retrying. We also need
+	// to make sure the data is consistent within a single update. So racing
+	// writes to a file would possibly leave this in some invalid state.
+	// We can get atomic updates with rename. If we read the data, update
+	// the data, write to a temp file, then rename the tempfile back to the
+	// data file. This should always result in a complete data image.
 
-	iamFname := filepath.Join(s.dir, iamFile)
-	backupFname := filepath.Join(s.dir, iamBackupFile)
+	// There is at least one unsolved failure mode here.
+	// If a gateway removes the data file and then crashes, all other
+	// gateways will retry forever thinking that the original will eventually
+	// write the file.
 
-	b, err := os.ReadFile(iamFname)
-	if err != nil && !errors.Is(err, fs.ErrNotExist) {
-		return fmt.Errorf("read iam file: %w", err)
-	}
+	retries := 0
+	fname := filepath.Join(s.dir, iamFile)
 
-	// save copy of data
-	datacopy := make([]byte, len(b))
-	copy(datacopy, b)
+	for {
+		b, err := os.ReadFile(fname)
+		if errors.Is(err, fs.ErrNotExist) {
+			// racing with someone else updating
+			// keep retrying after backoff
+			retries++
+			if retries < maxretry {
+				time.Sleep(backoff)
+				continue
+			}
 
-	// make a backup copy in case something happens
-	err = s.writeUsingTempFile(b, backupFname)
-	if err != nil {
-		return fmt.Errorf("write backup iam file: %w", err)
-	}
+			// we have been unsuccessful trying to read the iam file
+			// so this must be the case where something happened and
+			// the file did not get updated successfully, and probably
+			// isn't going to be. The recovery procedure would be to
+			// copy the backup file into place of the original.
+			return fmt.Errorf("no iam file, needs backup recovery")
+		}
+		if err != nil && !errors.Is(err, fs.ErrNotExist) {
+			return fmt.Errorf("read iam file: %w", err)
+		}
 
-	b, err = update(b)
-	if err != nil {
-		return fmt.Errorf("update iam data: %w", err)
-	}
+		// reset retries on successful read
+		retries = 0
 
-	err = s.writeUsingTempFile(b, iamFname)
-	if err != nil {
-		return fmt.Errorf("write iam file: %w", err)
+		err = os.Remove(fname)
+		if errors.Is(err, fs.ErrNotExist) {
+			// racing with someone else updating
+			// keep retrying after backoff
+			time.Sleep(backoff)
+			continue
+		}
+		if err != nil && !errors.Is(err, fs.ErrNotExist) {
+			return fmt.Errorf("remove old iam file: %w", err)
+		}
+
+		// save copy of data
+		datacopy := make([]byte, len(b))
+		copy(datacopy, b)
+
+		// make a backup copy in case we crash before update
+		// this is after remove, so there is a small window something
+		// can go wrong, but the remove should barrier other gateways
+		// from trying to write backup at the same time. Only one
+		// gateway will successfully remove the file.
+		os.WriteFile(filepath.Join(s.dir, iamBackupFile), b, iamMode)
+
+		b, err = update(b)
+		if err != nil {
+			// update failed, try to write old data back out
+			os.WriteFile(fname, datacopy, iamMode)
+			return fmt.Errorf("update iam data: %w", err)
+		}
+
+		err = s.writeTempFile(b)
+		if err != nil {
+			// update failed, try to write old data back out
+			os.WriteFile(fname, datacopy, iamMode)
+			return err
+		}
+
+		break
 	}
 
 	return nil
 }
 
-func (s *IAMServiceInternal) writeUsingTempFile(b []byte, fname string) error {
+func (s *IAMServiceInternal) writeTempFile(b []byte) error {
+	fname := filepath.Join(s.dir, iamFile)
+
 	f, err := os.CreateTemp(s.dir, iamFile)
 	if err != nil {
 		return fmt.Errorf("create temp file: %w", err)
@@ -341,7 +384,6 @@ func (s *IAMServiceInternal) writeUsingTempFile(b []byte, fname string) error {
 	defer os.Remove(f.Name())
 
 	_, err = f.Write(b)
-	f.Close()
 	if err != nil {
 		return fmt.Errorf("write temp file: %w", err)
 	}

auth/iam_ipa.go

@@ -1,519 +0,0 @@
-// Copyright 2025 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package auth
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"slices"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/versity/versitygw/debuglogger"
-)
-
-const IpaVersion = "2.254"
-
-type IpaIAMService struct {
-	client          http.Client
-	id              int
-	version         string
-	host            string
-	vaultName       string
-	username        string
-	password        string
-	kraTransportKey *rsa.PublicKey
-	rootAcc         Account
-}
-
-var _ IAMService = &IpaIAMService{}
-
-func NewIpaIAMService(rootAcc Account, host, vaultName, username, password string, isInsecure bool) (*IpaIAMService, error) {
-	ipa := IpaIAMService{
-		id:        0,
-		version:   IpaVersion,
-		host:      host,
-		vaultName: vaultName,
-		username:  username,
-		password:  password,
-		rootAcc:   rootAcc,
-	}
-	jar, err := cookiejar.New(nil)
-	if err != nil {
-		// this should never happen
-		return nil, fmt.Errorf("cookie jar creation: %w", err)
-	}
-
-	mTLSConfig := &tls.Config{InsecureSkipVerify: isInsecure}
-	tr := &http.Transport{
-		TLSClientConfig: mTLSConfig,
-		Proxy:           http.ProxyFromEnvironment,
-	}
-	ipa.client = http.Client{Jar: jar, Transport: tr}
-
-	err = ipa.login()
-	if err != nil {
-		return nil, fmt.Errorf("ipa login failed: %w", err)
-	}
-
-	req, err := ipa.newRequest("vaultconfig_show/1", []string{}, map[string]any{"all": true})
-	if err != nil {
-		return nil, fmt.Errorf("ipa vaultconfig_show: %w", err)
-	}
-	vaultConfig := struct {
-		Kra_Server_Server             []string
-		Transport_Cert                Base64EncodedWrapped
-		Wrapping_default_algorithm    string
-		Wrapping_supported_algorithms []string
-	}{}
-	err = ipa.rpc(req, &vaultConfig)
-	if err != nil {
-		return nil, fmt.Errorf("ipa vault config: %w", err)
-	}
-
-	cert, err := x509.ParseCertificate(vaultConfig.Transport_Cert)
-	if err != nil {
-		return nil, fmt.Errorf("ipa cannot parse vault certificate: %w", err)
-	}
-
-	ipa.kraTransportKey = cert.PublicKey.(*rsa.PublicKey)
-
-	isSupported := slices.Contains(vaultConfig.Wrapping_supported_algorithms, "aes-128-cbc")
-
-	if !isSupported {
-		return nil,
-			fmt.Errorf("IPA vault does not support aes-128-cbc. Only %v supported",
-				vaultConfig.Wrapping_supported_algorithms)
-	}
-	return &ipa, nil
-}
-
-func (ipa *IpaIAMService) CreateAccount(account Account) error {
-	return fmt.Errorf("not implemented")
-}
-
-func (ipa *IpaIAMService) GetUserAccount(access string) (Account, error) {
-	if access == ipa.rootAcc.Access {
-		return ipa.rootAcc, nil
-	}
-
-	req, err := ipa.newRequest("user_show/1", []string{access}, map[string]any{})
-	if err != nil {
-		return Account{}, fmt.Errorf("ipa user_show: %w", err)
-	}
-
-	userResult := struct {
-		Gidnumber []string
-		Uidnumber []string
-		PidNumber []string
-	}{}
-
-	err = ipa.rpc(req, &userResult)
-	if err != nil {
-		return Account{}, err
-	}
-
-	uid, err := parseToInt(userResult.Uidnumber, "userID")
-	if err != nil {
-		return Account{}, err
-	}
-	gid, err := parseToInt(userResult.Gidnumber, "groupID")
-	if err != nil {
-		return Account{}, err
-	}
-	pId, err := parseToInt(userResult.PidNumber, "projectID")
-	if err != nil {
-		return Account{}, err
-	}
-
-	account := Account{
-		Access:    access,
-		Role:      RoleUser,
-		UserID:    uid,
-		GroupID:   gid,
-		ProjectID: pId,
-	}
-
-	session_key := make([]byte, 16)
-
-	_, err = rand.Read(session_key)
-	if err != nil {
-		return account, fmt.Errorf("ipa cannot generate session key: %w", err)
-	}
-
-	encryptedKey, err := rsa.EncryptPKCS1v15(rand.Reader, ipa.kraTransportKey, session_key)
-	if err != nil {
-		return account, fmt.Errorf("ipa vault secret retrieval: %w", err)
-	}
-
-	req, err = ipa.newRequest("vault_retrieve_internal/1", []string{ipa.vaultName},
-		map[string]any{"username": access,
-			"session_key":   Base64EncodedWrapped(encryptedKey),
-			"wrapping_algo": "aes-128-cbc"})
-	if err != nil {
-		return Account{}, fmt.Errorf("ipa vault_retrieve_internal: %w", err)
-	}
-
-	data := struct {
-		Vault_data Base64EncodedWrapped
-		Nonce      Base64EncodedWrapped
-	}{}
-
-	err = ipa.rpc(req, &data)
-	if err != nil {
-		return account, err
-	}
-
-	aes, err := aes.NewCipher(session_key)
-	if err != nil {
-		return account, fmt.Errorf("ipa cannot create AES cipher: %w", err)
-	}
-	cbc := cipher.NewCBCDecrypter(aes, data.Nonce)
-	cbc.CryptBlocks(data.Vault_data, data.Vault_data)
-	secretUnpaddedJson, err := pkcs7Unpad(data.Vault_data, 16)
-	if err != nil {
-		return account, fmt.Errorf("ipa cannot unpad decrypted result: %w", err)
-	}
-
-	secret := struct {
-		Data Base64Encoded
-	}{}
-	json.Unmarshal(secretUnpaddedJson, &secret)
-	account.Secret = string(secret.Data)
-
-	return account, nil
-}
-
-func (ipa *IpaIAMService) UpdateUserAccount(access string, props MutableProps) error {
-	return fmt.Errorf("not implemented")
-}
-
-func (ipa *IpaIAMService) DeleteUserAccount(access string) error {
-	return fmt.Errorf("not implemented")
-}
-
-func (ipa *IpaIAMService) ListUserAccounts() ([]Account, error) {
-	return []Account{}, fmt.Errorf("not implemented")
-}
-
-func (ipa *IpaIAMService) Shutdown() error {
-	return nil
-}
-
-// Implementation
-
-const requestRetries = 3
-
-func (ipa *IpaIAMService) login() error {
-	form := url.Values{}
-	form.Set("user", ipa.username)
-	form.Set("password", ipa.password)
-
-	req, err := http.NewRequest(
-		"POST",
-		fmt.Sprintf("%s/ipa/session/login_password", ipa.host),
-		strings.NewReader(form.Encode()))
-	if err != nil {
-		return err
-	}
-
-	req.Header.Set("referer", fmt.Sprintf("%s/ipa", ipa.host))
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-
-	var resp *http.Response
-	for i := range requestRetries {
-		resp, err = ipa.client.Do(req)
-		if err == nil {
-			break
-		}
-		// Check for transient network errors
-		if isRetryable(err) {
-			time.Sleep(time.Second * time.Duration(i+1))
-			continue
-		}
-		return fmt.Errorf("login POST to %s failed: %w", req.URL, err)
-	}
-	if err != nil {
-		return fmt.Errorf("login POST to %s failed after retries: %w",
-			req.URL, err)
-	}
-
-	defer resp.Body.Close()
-
-	if resp.StatusCode == 401 {
-		return errors.New("cannot login to FreeIPA: invalid credentials")
-	}
-
-	if resp.StatusCode != 200 {
-		return fmt.Errorf("cannot login to FreeIPA: status code %d",
-			resp.StatusCode)
-	}
-
-	return nil
-}
-
-type rpcRequest = string
-
-type rpcResponse struct {
-	Result    json.RawMessage
-	Principal string
-	Id        int
-	Version   string
-}
-
-func (p rpcResponse) String() string {
-	return string(p.Result)
-}
-
-var errRpc = errors.New("IPA RPC error")
-
-func (ipa *IpaIAMService) rpc(req rpcRequest, value any) error {
-	err := ipa.login()
-	if err != nil {
-		return err
-	}
-
-	res, err := ipa.rpcInternal(req)
-	if err != nil {
-		return err
-	}
-
-	return json.Unmarshal(res.Result, value)
-}
-
-func (ipa *IpaIAMService) rpcInternal(req rpcRequest) (rpcResponse, error) {
-	httpReq, err := http.NewRequest("POST",
-		fmt.Sprintf("%s/ipa/session/json", ipa.host),
-		strings.NewReader(req))
-	if err != nil {
-		return rpcResponse{}, err
-	}
-
-	debuglogger.IAMLogf("IPA request: %v", req)
-	httpReq.Header.Set("referer", fmt.Sprintf("%s/ipa", ipa.host))
-	httpReq.Header.Set("Content-Type", "application/json")
-
-	var httpResp *http.Response
-	for i := range requestRetries {
-		httpResp, err = ipa.client.Do(httpReq)
-		if err == nil {
-			break
-		}
-		// Check for transient network errors
-		if isRetryable(err) {
-			time.Sleep(time.Second * time.Duration(i+1))
-			continue
-		}
-		return rpcResponse{}, fmt.Errorf("ipa request to %s failed: %w",
-			httpReq.URL, err)
-	}
-	if err != nil {
-		return rpcResponse{},
-			fmt.Errorf("ipa request to %s failed after retries: %w",
-				httpReq.URL, err)
-	}
-
-	defer httpResp.Body.Close()
-
-	bytes, err := io.ReadAll(httpResp.Body)
-	debuglogger.IAMLogf("IPA response (%v): %v", err, string(bytes))
-	if err != nil {
-		return rpcResponse{}, err
-	}
-
-	result := struct {
-		Result struct {
-			Json    json.RawMessage `json:"result"`
-			Value   string          `json:"value"`
-			Summary any             `json:"summary"`
-		} `json:"result"`
-		Error     json.RawMessage `json:"error"`
-		Id        int             `json:"id"`
-		Principal string          `json:"principal"`
-		Version   string          `json:"version"`
-	}{}
-
-	err = json.Unmarshal(bytes, &result)
-	if err != nil {
-		return rpcResponse{}, err
-	}
-	if string(result.Error) != "null" {
-		return rpcResponse{}, fmt.Errorf("%s: %w", string(result.Error), errRpc)
-	}
-
-	return rpcResponse{
-		Result:    result.Result.Json,
-		Principal: result.Principal,
-		Id:        result.Id,
-		Version:   result.Version,
-	}, nil
-}
-
-func isRetryable(err error) bool {
-	if err == nil {
-		return false
-	}
-
-	if errors.Is(err, io.EOF) {
-		return true
-	}
-
-	if err, ok := err.(net.Error); ok && err.Timeout() {
-		return true
-	}
-
-	if opErr, ok := err.(*net.OpError); ok {
-		if sysErr, ok := opErr.Err.(*syscall.Errno); ok {
-			if *sysErr == syscall.ECONNRESET {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (ipa *IpaIAMService) newRequest(method string, args []string, dict map[string]any) (rpcRequest, error) {
-
-	id := ipa.id
-	ipa.id++
-
-	dict["version"] = ipa.version
-
-	jmethod, errMethod := json.Marshal(method)
-	jargs, errArgs := json.Marshal(args)
-	jdict, errDict := json.Marshal(dict)
-
-	err := errors.Join(errMethod, errArgs, errDict)
-	if err != nil {
-		return "", fmt.Errorf("ipa request invalid: %w", err)
-	}
-
-	request := map[string]interface{}{
-		"id":     id,
-		"method": json.RawMessage(jmethod),
-		"params": []json.RawMessage{json.RawMessage(jargs), json.RawMessage(jdict)},
-	}
-
-	requestJSON, err := json.Marshal(request)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal request: %w", err)
-	}
-
-	return string(requestJSON), nil
-}
-
-// pkcs7Unpad validates and unpads data from the given bytes slice.
-// The returned value will be 1 to n bytes smaller depending on the
-// amount of padding, where n is the block size.
-func pkcs7Unpad(b []byte, blocksize int) ([]byte, error) {
-	if blocksize <= 0 {
-		return nil, errors.New("invalid blocksize")
-	}
-	if len(b) == 0 {
-		return nil, errors.New("invalid PKCS7 data (empty or not padded)")
-	}
-	if len(b)%blocksize != 0 {
-		return nil, errors.New("invalid padding on input")
-	}
-	c := b[len(b)-1]
-	n := int(c)
-	if n == 0 || n > len(b) {
-		return nil, errors.New("invalid padding on input")
-	}
-	for i := 0; i < n; i++ {
-		if b[len(b)-n+i] != c {
-			return nil, errors.New("invalid padding on input")
-		}
-	}
-	return b[:len(b)-n], nil
-}
-
-/*
-e.g.
-
-	"value" {
-		"__base64__": "aGVsbG93b3JsZAo="
-	 }
-*/
-type Base64EncodedWrapped []byte
-
-func (b *Base64EncodedWrapped) UnmarshalJSON(data []byte) error {
-	intermediate := struct {
-		Base64 string `json:"__base64__"`
-	}{}
-	err := json.Unmarshal(data, &intermediate)
-	if err != nil {
-		return err
-	}
-	*b, err = base64.StdEncoding.DecodeString(intermediate.Base64)
-	return err
-}
-
-func (b *Base64EncodedWrapped) MarshalJSON() ([]byte, error) {
-	intermediate := struct {
-		Base64 string `json:"__base64__"`
-	}{Base64: base64.StdEncoding.EncodeToString(*b)}
-	return json.Marshal(intermediate)
-}
-
-/*
-e.g.
-
-	"value": "aGVsbG93b3JsZAo="
-*/
-type Base64Encoded []byte
-
-func (b *Base64Encoded) UnmarshalJSON(data []byte) error {
-	var intermediate string
-	err := json.Unmarshal(data, &intermediate)
-	if err != nil {
-		return err
-	}
-	*b, err = base64.StdEncoding.DecodeString(intermediate)
-	return err
-}
-
-// parseToInt parses the first argument of input string slice
-// to an integer. If slice is empty, it defaults to 0
-func parseToInt(input []string, argName string) (int, error) {
-	if len(input) == 0 {
-		debuglogger.IAMLogf("empty %s slice: defaulting to 0", argName)
-		return 0, nil
-	}
-
-	id, err := strconv.Atoi(input[0])
-	if err != nil {
-		debuglogger.IAMLogf("failed to parse %s: %v", argName, err)
-		return 0, fmt.Errorf("invalid %s: %w", argName, err)
-	}
-
-	return id, nil
-}

auth/iam_ldap.go

@@ -15,124 +15,54 @@
 package auth
 
 import (
-	"crypto/tls"
 	"fmt"
-	"net/url"
 	"strconv"
 	"strings"
-	"sync"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/go-ldap/ldap/v3"
-	"github.com/versity/versitygw/debuglogger"
 )
 
 type LdapIAMService struct {
-	conn          *ldap.Conn
-	queryBase     string
-	objClasses    []string
-	accessAtr     string
-	secretAtr     string
-	roleAtr       string
-	groupIdAtr    string
-	userIdAtr     string
-	projectIdAtr  string
-	rootAcc       Account
-	url           string
-	bindDN        string
-	pass          string
-	tlsSkipVerify bool
-	mu            sync.Mutex
+	conn       *ldap.Conn
+	queryBase  string
+	objClasses []string
+	accessAtr  string
+	secretAtr  string
+	roleAtr    string
+	groupIdAtr string
+	userIdAtr  string
+	rootAcc    Account
 }
 
 var _ IAMService = &LdapIAMService{}
 
-func NewLDAPService(rootAcc Account, ldapURL, bindDN, pass, queryBase, accAtr, secAtr, roleAtr, userIdAtr, groupIdAtr, projectIdAtr, objClasses string, tlsSkipVerify bool) (IAMService, error) {
-	if ldapURL == "" || bindDN == "" || pass == "" || queryBase == "" || accAtr == "" ||
-		secAtr == "" || roleAtr == "" || userIdAtr == "" || groupIdAtr == "" || projectIdAtr == "" || objClasses == "" {
+func NewLDAPService(rootAcc Account, url, bindDN, pass, queryBase, accAtr, secAtr, roleAtr, userIdAtr, groupIdAtr, objClasses string) (IAMService, error) {
+	if url == "" || bindDN == "" || pass == "" || queryBase == "" || accAtr == "" ||
+		secAtr == "" || roleAtr == "" || userIdAtr == "" || groupIdAtr == "" || objClasses == "" {
 		return nil, fmt.Errorf("required parameters list not fully provided")
 	}
-
-	conn, err := dialLDAP(ldapURL, tlsSkipVerify)
+	conn, err := ldap.DialURL(url)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to LDAP server: %w", err)
 	}
 
 	err = conn.Bind(bindDN, pass)
 	if err != nil {
-		conn.Close()
 		return nil, fmt.Errorf("failed to bind to LDAP server %w", err)
 	}
 	return &LdapIAMService{
-		conn:          conn,
-		queryBase:     queryBase,
-		objClasses:    strings.Split(objClasses, ","),
-		accessAtr:     accAtr,
-		secretAtr:     secAtr,
-		roleAtr:       roleAtr,
-		userIdAtr:     userIdAtr,
-		groupIdAtr:    groupIdAtr,
-		projectIdAtr:  projectIdAtr,
-		rootAcc:       rootAcc,
-		url:           ldapURL,
-		bindDN:        bindDN,
-		pass:          pass,
-		tlsSkipVerify: tlsSkipVerify,
+		conn:       conn,
+		queryBase:  queryBase,
+		objClasses: strings.Split(objClasses, ","),
+		accessAtr:  accAtr,
+		secretAtr:  secAtr,
+		roleAtr:    roleAtr,
+		userIdAtr:  userIdAtr,
+		groupIdAtr: groupIdAtr,
+		rootAcc:    rootAcc,
 	}, nil
 }
 
-// dialLDAP establishes an LDAP connection with optional TLS configuration
-func dialLDAP(ldapURL string, tlsSkipVerify bool) (*ldap.Conn, error) {
-	u, err := url.Parse(ldapURL)
-	if err != nil {
-		return nil, fmt.Errorf("invalid LDAP URL: %w", err)
-	}
-
-	// For ldaps:// URLs, use DialURL with custom TLS config if needed
-	if u.Scheme == "ldaps" && tlsSkipVerify {
-		tlsConfig := &tls.Config{
-			InsecureSkipVerify: tlsSkipVerify,
-		}
-		return ldap.DialURL(ldapURL, ldap.DialWithTLSConfig(tlsConfig))
-	}
-
-	// For ldap:// or when TLS verification is enabled, use standard DialURL
-	return ldap.DialURL(ldapURL)
-}
-
-func (ld *LdapIAMService) reconnect() error {
-	ld.conn.Close()
-
-	conn, err := dialLDAP(ld.url, ld.tlsSkipVerify)
-	if err != nil {
-		return fmt.Errorf("failed to reconnect to LDAP server: %w", err)
-	}
-
-	err = conn.Bind(ld.bindDN, ld.pass)
-	if err != nil {
-		conn.Close()
-		return fmt.Errorf("failed to bind to LDAP server on reconnect: %w", err)
-	}
-	ld.conn = conn
-	return nil
-}
-
-func (ld *LdapIAMService) execute(f func(*ldap.Conn) error) error {
-	ld.mu.Lock()
-	defer ld.mu.Unlock()
-
-	err := f(ld.conn)
-	if err != nil {
-		if e, ok := err.(*ldap.Error); ok && e.ResultCode == ldap.ErrorNetwork {
-			if reconnErr := ld.reconnect(); reconnErr != nil {
-				return reconnErr
-			}
-			return f(ld.conn)
-		}
-	}
-	return err
-}
-
 func (ld *LdapIAMService) CreateAccount(account Account) error {
 	if ld.rootAcc.Access == account.Access {
 		return ErrUserExists
@@ -144,11 +74,8 @@ func (ld *LdapIAMService) CreateAccount(account Account) error {
 	userEntry.Attribute(ld.roleAtr, []string{string(account.Role)})
 	userEntry.Attribute(ld.groupIdAtr, []string{fmt.Sprint(account.GroupID)})
 	userEntry.Attribute(ld.userIdAtr, []string{fmt.Sprint(account.UserID)})
-	userEntry.Attribute(ld.projectIdAtr, []string{fmt.Sprint(account.ProjectID)})
 
-	err := ld.execute(func(c *ldap.Conn) error {
-		return c.Add(userEntry)
-	})
+	err := ld.conn.Add(userEntry)
 	if err != nil {
 		return fmt.Errorf("error adding an entry: %w", err)
 	}
@@ -156,22 +83,10 @@ func (ld *LdapIAMService) CreateAccount(account Account) error {
 	return nil
 }
 
-func (ld *LdapIAMService) buildSearchFilter(access string) string {
-	var searchFilter strings.Builder
-	for _, el := range ld.objClasses {
-		searchFilter.WriteString(fmt.Sprintf("(objectClass=%v)", el))
-	}
-	if access != "" {
-		searchFilter.WriteString(fmt.Sprintf("(%v=%v)", ld.accessAtr, access))
-	}
-	return fmt.Sprintf("(&%v)", searchFilter.String())
-}
-
 func (ld *LdapIAMService) GetUserAccount(access string) (Account, error) {
 	if access == ld.rootAcc.Access {
 		return ld.rootAcc, nil
 	}
-	var result *ldap.SearchResult
 	searchRequest := ldap.NewSearchRequest(
 		ld.queryBase,
 		ldap.ScopeWholeSubtree,
@@ -179,27 +94,12 @@ func (ld *LdapIAMService) GetUserAccount(access string) (Account, error) {
 		0,
 		0,
 		false,
-		ld.buildSearchFilter(access),
-		[]string{ld.accessAtr, ld.secretAtr, ld.roleAtr, ld.userIdAtr, ld.groupIdAtr, ld.projectIdAtr},
+		fmt.Sprintf("(%v=%v)", ld.accessAtr, access),
+		[]string{ld.accessAtr, ld.secretAtr, ld.roleAtr, ld.userIdAtr, ld.groupIdAtr},
 		nil,
 	)
 
-	if debuglogger.IsIAMDebugEnabled() {
-		debuglogger.IAMLogf("LDAP Search Request")
-		debuglogger.IAMLogf(spew.Sdump(searchRequest))
-	}
-
-	err := ld.execute(func(c *ldap.Conn) error {
-		var err error
-		result, err = c.Search(searchRequest)
-		return err
-	})
-
-	if debuglogger.IsIAMDebugEnabled() {
-		debuglogger.IAMLogf("LDAP Search Result")
-		debuglogger.IAMLogf(spew.Sdump(result))
-	}
-
+	result, err := ld.conn.Search(searchRequest)
 	if err != nil {
 		return Account{}, err
 	}
@@ -211,27 +111,18 @@ func (ld *LdapIAMService) GetUserAccount(access string) (Account, error) {
 	entry := result.Entries[0]
 	groupId, err := strconv.Atoi(entry.GetAttributeValue(ld.groupIdAtr))
 	if err != nil {
-		return Account{}, fmt.Errorf("invalid entry value for group-id %q: %w",
-			entry.GetAttributeValue(ld.groupIdAtr), err)
+		return Account{}, fmt.Errorf("invalid entry value for group-id: %v", entry.GetAttributeValue(ld.groupIdAtr))
 	}
 	userId, err := strconv.Atoi(entry.GetAttributeValue(ld.userIdAtr))
 	if err != nil {
-		return Account{}, fmt.Errorf("invalid entry value for user-id %q: %w",
-			entry.GetAttributeValue(ld.userIdAtr), err)
+		return Account{}, fmt.Errorf("invalid entry value for group-id: %v", entry.GetAttributeValue(ld.userIdAtr))
 	}
-	projectID, err := strconv.Atoi(entry.GetAttributeValue(ld.projectIdAtr))
-	if err != nil {
-		return Account{}, fmt.Errorf("invalid entry value for project-id %q: %w",
-			entry.GetAttributeValue(ld.projectIdAtr), err)
-	}
-
 	return Account{
-		Access:    entry.GetAttributeValue(ld.accessAtr),
-		Secret:    entry.GetAttributeValue(ld.secretAtr),
-		Role:      Role(entry.GetAttributeValue(ld.roleAtr)),
-		GroupID:   groupId,
-		UserID:    userId,
-		ProjectID: projectID,
+		Access:  entry.GetAttributeValue(ld.accessAtr),
+		Secret:  entry.GetAttributeValue(ld.secretAtr),
+		Role:    Role(entry.GetAttributeValue(ld.roleAtr)),
+		GroupID: groupId,
+		UserID:  userId,
 	}, nil
 }
 
@@ -246,16 +137,8 @@ func (ld *LdapIAMService) UpdateUserAccount(access string, props MutableProps) e
 	if props.UserID != nil {
 		req.Replace(ld.userIdAtr, []string{fmt.Sprint(*props.UserID)})
 	}
-	if props.ProjectID != nil {
-		req.Replace(ld.projectIdAtr, []string{fmt.Sprint(*props.ProjectID)})
-	}
-	if props.Role != "" {
-		req.Replace(ld.roleAtr, []string{string(props.Role)})
-	}
 
-	err := ld.execute(func(c *ldap.Conn) error {
-		return c.Modify(req)
-	})
+	err := ld.conn.Modify(req)
 	//TODO: Handle non existing user case
 	if err != nil {
 		return err
@@ -266,9 +149,7 @@ func (ld *LdapIAMService) UpdateUserAccount(access string, props MutableProps) e
 func (ld *LdapIAMService) DeleteUserAccount(access string) error {
 	delReq := ldap.NewDelRequest(fmt.Sprintf("%v=%v, %v", ld.accessAtr, access, ld.queryBase), nil)
 
-	err := ld.execute(func(c *ldap.Conn) error {
-		return c.Del(delReq)
-	})
+	err := ld.conn.Del(delReq)
 	if err != nil {
 		return err
 	}
@@ -277,7 +158,10 @@ func (ld *LdapIAMService) DeleteUserAccount(access string) error {
 }
 
 func (ld *LdapIAMService) ListUserAccounts() ([]Account, error) {
-	var resp *ldap.SearchResult
+	searchFilter := ""
+	for _, el := range ld.objClasses {
+		searchFilter += fmt.Sprintf("(objectClass=%v)", el)
+	}
 	searchRequest := ldap.NewSearchRequest(
 		ld.queryBase,
 		ldap.ScopeWholeSubtree,
@@ -285,16 +169,12 @@ func (ld *LdapIAMService) ListUserAccounts() ([]Account, error) {
 		0,
 		0,
 		false,
-		ld.buildSearchFilter(""),
-		[]string{ld.accessAtr, ld.secretAtr, ld.roleAtr, ld.groupIdAtr, ld.projectIdAtr, ld.userIdAtr},
+		fmt.Sprintf("(&%v)", searchFilter),
+		[]string{ld.accessAtr, ld.secretAtr, ld.roleAtr, ld.groupIdAtr, ld.userIdAtr},
 		nil,
 	)
 
-	err := ld.execute(func(c *ldap.Conn) error {
-		var err error
-		resp, err = c.Search(searchRequest)
-		return err
-	})
+	resp, err := ld.conn.Search(searchRequest)
 	if err != nil {
 		return nil, err
 	}
@@ -303,27 +183,18 @@ func (ld *LdapIAMService) ListUserAccounts() ([]Account, error) {
 	for _, el := range resp.Entries {
 		groupId, err := strconv.Atoi(el.GetAttributeValue(ld.groupIdAtr))
 		if err != nil {
-			return nil, fmt.Errorf("invalid entry value for group-id %q: %w",
-				el.GetAttributeValue(ld.groupIdAtr), err)
+			return nil, fmt.Errorf("invalid entry value for group-id: %v", el.GetAttributeValue(ld.groupIdAtr))
 		}
 		userId, err := strconv.Atoi(el.GetAttributeValue(ld.userIdAtr))
 		if err != nil {
-			return nil, fmt.Errorf("invalid entry value for user-id %q: %w",
-				el.GetAttributeValue(ld.userIdAtr), err)
+			return nil, fmt.Errorf("invalid entry value for group-id: %v", el.GetAttributeValue(ld.userIdAtr))
 		}
-		projectID, err := strconv.Atoi(el.GetAttributeValue(ld.projectIdAtr))
-		if err != nil {
-			return nil, fmt.Errorf("invalid entry value for project-id %q: %w",
-				el.GetAttributeValue(ld.groupIdAtr), err)
-		}
-
 		result = append(result, Account{
-			Access:    el.GetAttributeValue(ld.accessAtr),
-			Secret:    el.GetAttributeValue(ld.secretAtr),
-			Role:      Role(el.GetAttributeValue(ld.roleAtr)),
-			GroupID:   groupId,
-			ProjectID: projectID,
-			UserID:    userId,
+			Access:  el.GetAttributeValue(ld.accessAtr),
+			Secret:  el.GetAttributeValue(ld.secretAtr),
+			Role:    Role(el.GetAttributeValue(ld.roleAtr)),
+			GroupID: groupId,
+			UserID:  userId,
 		})
 	}
 
@@ -332,7 +203,5 @@ func (ld *LdapIAMService) ListUserAccounts() ([]Account, error) {
 
 // Shutdown graceful termination of service
 func (ld *LdapIAMService) Shutdown() error {
-	ld.mu.Lock()
-	defer ld.mu.Unlock()
 	return ld.conn.Close()
 }

auth/iam_ldap_test.go

@@ -1,56 +0,0 @@
-package auth
-
-import "testing"
-
-func TestLdapIAMService_BuildSearchFilter(t *testing.T) {
-	tests := []struct {
-		name       string
-		objClasses []string
-		accessAtr  string
-		access     string
-		expected   string
-	}{
-		{
-			name:       "single object class with access",
-			objClasses: []string{"inetOrgPerson"},
-			accessAtr:  "uid",
-			access:     "testuser",
-			expected:   "(&(objectClass=inetOrgPerson)(uid=testuser))",
-		},
-		{
-			name:       "single object class without access",
-			objClasses: []string{"inetOrgPerson"},
-			accessAtr:  "uid",
-			access:     "",
-			expected:   "(&(objectClass=inetOrgPerson))",
-		},
-		{
-			name:       "multiple object classes with access",
-			objClasses: []string{"inetOrgPerson", "organizationalPerson"},
-			accessAtr:  "cn",
-			access:     "john.doe",
-			expected:   "(&(objectClass=inetOrgPerson)(objectClass=organizationalPerson)(cn=john.doe))",
-		},
-		{
-			name:       "multiple object classes without access",
-			objClasses: []string{"inetOrgPerson", "organizationalPerson", "person"},
-			accessAtr:  "cn",
-			access:     "",
-			expected:   "(&(objectClass=inetOrgPerson)(objectClass=organizationalPerson)(objectClass=person))",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ld := &LdapIAMService{
-				objClasses: tt.objClasses,
-				accessAtr:  tt.accessAtr,
-			}
-
-			result := ld.buildSearchFilter(tt.access)
-			if result != tt.expected {
-				t.Errorf("BuildSearchFilter() = %v, want %v", result, tt.expected)
-			}
-		})
-	}
-}

auth/iam_s3_object.go

@@ -33,7 +33,6 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/aws/smithy-go"
-	"github.com/versity/versitygw/debuglogger"
 )
 
 // IAMServiceS3 stores user accounts in an S3 object
@@ -57,13 +56,14 @@ type IAMServiceS3 struct {
 	bucket        string
 	endpoint      string
 	sslSkipVerify bool
+	debug         bool
 	rootAcc       Account
 	client        *s3.Client
 }
 
 var _ IAMService = &IAMServiceS3{}
 
-func NewS3(rootAcc Account, access, secret, region, bucket, endpoint string, sslSkipVerify bool) (*IAMServiceS3, error) {
+func NewS3(rootAcc Account, access, secret, region, bucket, endpoint string, sslSkipVerify, debug bool) (*IAMServiceS3, error) {
 	if access == "" {
 		return nil, fmt.Errorf("must provide s3 IAM service access key")
 	}
@@ -87,6 +87,7 @@ func NewS3(rootAcc Account, access, secret, region, bucket, endpoint string, ssl
 		bucket:        bucket,
 		endpoint:      endpoint,
 		sslSkipVerify: sslSkipVerify,
+		debug:         debug,
 		rootAcc:       rootAcc,
 	}
 
@@ -205,12 +206,11 @@ func (s *IAMServiceS3) ListUserAccounts() ([]Account, error) {
 	var accs []Account
 	for _, k := range keys {
 		accs = append(accs, Account{
-			Access:    k,
-			Secret:    conf.AccessAccounts[k].Secret,
-			Role:      conf.AccessAccounts[k].Role,
-			UserID:    conf.AccessAccounts[k].UserID,
-			GroupID:   conf.AccessAccounts[k].GroupID,
-			ProjectID: conf.AccessAccounts[k].ProjectID,
+			Access:  k,
+			Secret:  conf.AccessAccounts[k].Secret,
+			Role:    conf.AccessAccounts[k].Role,
+			UserID:  conf.AccessAccounts[k].UserID,
+			GroupID: conf.AccessAccounts[k].GroupID,
 		})
 	}
 
@@ -235,7 +235,7 @@ func (s *IAMServiceS3) getConfig() (aws.Config, error) {
 		config.WithHTTPClient(client),
 	}
 
-	if debuglogger.IsIAMDebugEnabled() {
+	if s.debug {
 		opts = append(opts,
 			config.WithClientLogMode(aws.LogSigning|aws.LogRetries|aws.LogRequest|aws.LogResponse|aws.LogRequestEventMessage|aws.LogResponseEventMessage))
 	}

auth/iam_single.go

@@ -15,49 +15,39 @@
 package auth
 
 import (
-	"github.com/versity/versitygw/s3err"
+	"errors"
 )
 
 // IAMServiceSingle manages the single tenant (root-only) IAM service
-type IAMServiceSingle struct {
-	root Account
-}
+type IAMServiceSingle struct{}
 
 var _ IAMService = &IAMServiceSingle{}
 
-func NewIAMServiceSingle(r Account) IAMService {
-	return &IAMServiceSingle{
-		root: r,
-	}
-}
+var ErrNotSupported = errors.New("method is not supported")
 
 // CreateAccount not valid in single tenant mode
 func (IAMServiceSingle) CreateAccount(account Account) error {
-	return s3err.GetAPIError(s3err.ErrAdminMethodNotSupported)
+	return ErrNotSupported
 }
 
-// GetUserAccount returns root account, if the root access key
-// is provided and "ErrAdminUserNotFound" otherwise
-func (s IAMServiceSingle) GetUserAccount(access string) (Account, error) {
-	if access == s.root.Access {
-		return s.root, nil
-	}
-	return Account{}, s3err.GetAPIError(s3err.ErrAdminUserNotFound)
+// GetUserAccount no accounts in single tenant mode
+func (IAMServiceSingle) GetUserAccount(access string) (Account, error) {
+	return Account{}, ErrNoSuchUser
 }
 
 // UpdateUserAccount no accounts in single tenant mode
 func (IAMServiceSingle) UpdateUserAccount(access string, props MutableProps) error {
-	return s3err.GetAPIError(s3err.ErrAdminMethodNotSupported)
+	return ErrNotSupported
 }
 
 // DeleteUserAccount no accounts in single tenant mode
 func (IAMServiceSingle) DeleteUserAccount(access string) error {
-	return s3err.GetAPIError(s3err.ErrAdminMethodNotSupported)
+	return ErrNotSupported
 }
 
 // ListUserAccounts no accounts in single tenant mode
 func (IAMServiceSingle) ListUserAccounts() ([]Account, error) {
-	return []Account{}, s3err.GetAPIError(s3err.ErrAdminMethodNotSupported)
+	return []Account{}, nil
 }
 
 // Shutdown graceful termination of service

auth/iam_vault.go

@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
 	"strings"
 	"time"
 
@@ -27,57 +26,28 @@ import (
 	"github.com/hashicorp/vault-client-go/schema"
 )
 
-const requestTimeout = 10 * time.Second
-
 type VaultIAMService struct {
 	client            *vault.Client
-	authReqOpts       []vault.RequestOption
-	kvReqOpts         []vault.RequestOption
+	reqOpts           []vault.RequestOption
 	secretStoragePath string
 	rootAcc           Account
-	creds             schema.AppRoleLoginRequest
-}
-
-type VaultIAMNamespace struct {
-	Auth          string
-	SecretStorage string
-}
-
-// Resolve empty specific namespaces to the fallback.
-// Empty result means root namespace.
-func resolveVaultNamespaces(authNamespace, secretStorageNamespace, fallback string) VaultIAMNamespace {
-	ns := VaultIAMNamespace{
-		Auth:          authNamespace,
-		SecretStorage: secretStorageNamespace,
-	}
-
-	if ns.Auth == "" {
-		ns.Auth = fallback
-	}
-	if ns.SecretStorage == "" {
-		ns.SecretStorage = fallback
-	}
-
-	return ns
 }
 
 var _ IAMService = &VaultIAMService{}
 
-func NewVaultIAMService(rootAcc Account, endpoint, namespace, secretStoragePath, secretStorageNamespace,
-	authMethod, authNamespace, mountPath, rootToken, roleID, roleSecret, serverCert,
-	clientCert, clientCertKey string) (IAMService, error) {
+func NewVaultIAMService(rootAcc Account, endpoint, secretStoragePath, mountPath, rootToken, roleID, roleSecret, serverCert, clientCert, clientCertKey string) (IAMService, error) {
 	opts := []vault.ClientOption{
 		vault.WithAddress(endpoint),
-		vault.WithRequestTimeout(requestTimeout),
+		// set request timeout to 10 secs
+		vault.WithRequestTimeout(10 * time.Second),
 	}
-
 	if serverCert != "" {
 		tls := vault.TLSConfiguration{}
 
 		tls.ServerCertificate.FromBytes = []byte(serverCert)
 		if clientCert != "" {
 			if clientCertKey == "" {
-				return nil, fmt.Errorf("client certificate and client certificate key should both be specified")
+				return nil, fmt.Errorf("client certificate and client certificate should both be specified")
 			}
 
 			tls.ClientCertificate.FromBytes = []byte(clientCert)
@@ -92,43 +62,10 @@ func NewVaultIAMService(rootAcc Account, endpoint, namespace, secretStoragePath,
 		return nil, fmt.Errorf("init vault client: %w", err)
 	}
 
-	authReqOpts := []vault.RequestOption{}
-	// if auth method path is not specified, it defaults to "approle"
-	if authMethod != "" {
-		authReqOpts = append(authReqOpts, vault.WithMountPath(authMethod))
-	}
-
-	kvReqOpts := []vault.RequestOption{}
-	// if mount path is not specified, it defaults to "kv-v2"
+	reqOpts := []vault.RequestOption{}
+	// if mount path is not specified, it defaults to "approle"
 	if mountPath != "" {
-		kvReqOpts = append(kvReqOpts, vault.WithMountPath(mountPath))
-	}
-
-	// Resolve namespaces using optional generic fallback "namespace"
-	ns := resolveVaultNamespaces(authNamespace, secretStorageNamespace, namespace)
-
-	// Guard: AppRole tokens are namespace scoped. If using AppRole and namespaces differ, error early.
-	// Root token can span namespaces because each request carries X-Vault-Namespace.
-	if rootToken == "" && ns.Auth != "" && ns.SecretStorage != "" && ns.Auth != ns.SecretStorage {
-		return nil, fmt.Errorf(
-			"approle tokens are namespace scoped. auth namespace %q and secret storage namespace %q differ. "+
-				"use the same namespace or authenticate with a root token",
-			ns.Auth, ns.SecretStorage,
-		)
-	}
-
-	// Apply namespaces to the correct request option sets.
-	// For root token we do not need an auth namespace since we are not logging in via auth.
-	if rootToken == "" && ns.Auth != "" {
-		authReqOpts = append(authReqOpts, vault.WithNamespace(ns.Auth))
-	}
-	if ns.SecretStorage != "" {
-		kvReqOpts = append(kvReqOpts, vault.WithNamespace(ns.SecretStorage))
-	}
-
-	creds := schema.AppRoleLoginRequest{
-		RoleId:   roleID,
-		SecretId: roleSecret,
+		reqOpts = append(reqOpts, vault.WithMountPath(mountPath))
 	}
 
 	// Authentication
@@ -143,8 +80,12 @@ func NewVaultIAMService(rootAcc Account, endpoint, namespace, secretStoragePath,
 			return nil, fmt.Errorf("role id and role secret must both be specified")
 		}
 
-		resp, err := client.Auth.AppRoleLogin(context.Background(),
-			creds, authReqOpts...)
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		resp, err := client.Auth.AppRoleLogin(ctx, schema.AppRoleLoginRequest{
+			RoleId:   roleID,
+			SecretId: roleSecret,
+		}, reqOpts...)
+		cancel()
 		if err != nil {
 			return nil, fmt.Errorf("approle authentication failure: %w", err)
 		}
@@ -158,81 +99,33 @@ func NewVaultIAMService(rootAcc Account, endpoint, namespace, secretStoragePath,
 
 	return &VaultIAMService{
 		client:            client,
-		authReqOpts:       authReqOpts,
-		kvReqOpts:         kvReqOpts,
+		reqOpts:           reqOpts,
 		secretStoragePath: secretStoragePath,
 		rootAcc:           rootAcc,
-		creds:             creds,
 	}, nil
 }
 
-func (vt *VaultIAMService) reAuthIfNeeded(err error) error {
-	if err == nil {
-		return nil
-	}
-
-	// Vault returns 403 for expired/revoked tokens
-	// pass all other errors back unchanged
-	if !vault.IsErrorStatus(err, http.StatusForbidden) {
-		return err
-	}
-
-	resp, authErr := vt.client.Auth.AppRoleLogin(context.Background(),
-		vt.creds, vt.authReqOpts...)
-	if authErr != nil {
-		return fmt.Errorf("vault re-authentication failure: %w", authErr)
-	}
-	if err := vt.client.SetToken(resp.Auth.ClientToken); err != nil {
-		return fmt.Errorf("vault re-authentication set token failure: %w", err)
-	}
-
-	return nil
-}
-
 func (vt *VaultIAMService) CreateAccount(account Account) error {
 	if vt.rootAcc.Access == account.Access {
 		return ErrUserExists
 	}
-	_, err := vt.client.Secrets.KvV2Write(context.Background(),
-		vt.secretStoragePath+"/"+account.Access, schema.KvV2WriteRequest{
-			Data: map[string]any{
-				account.Access: account,
-			},
-			Options: map[string]any{
-				"cas": 0,
-			},
-		}, vt.kvReqOpts...)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	_, err := vt.client.Secrets.KvV2Write(ctx, vt.secretStoragePath+"/"+account.Access, schema.KvV2WriteRequest{
+		Data: map[string]any{
+			account.Access: account,
+		},
+		Options: map[string]interface{}{
+			"cas": 0,
+		},
+	}, vt.reqOpts...)
+	cancel()
 	if err != nil {
 		if strings.Contains(err.Error(), "check-and-set") {
 			return ErrUserExists
 		}
-
-		reauthErr := vt.reAuthIfNeeded(err)
-		if reauthErr != nil {
-			return reauthErr
-		}
-		// retry once after re-auth
-		_, err = vt.client.Secrets.KvV2Write(context.Background(),
-			vt.secretStoragePath+"/"+account.Access, schema.KvV2WriteRequest{
-				Data: map[string]any{
-					account.Access: account,
-				},
-				Options: map[string]any{
-					"cas": 0,
-				},
-			}, vt.kvReqOpts...)
-		if err != nil {
-			if strings.Contains(err.Error(), "check-and-set") {
-				return ErrUserExists
-			}
-			if vault.IsErrorStatus(err, http.StatusForbidden) {
-				return fmt.Errorf("vault 403 permission denied on path %q. check KV mount path and policy. original: %w",
-					vt.secretStoragePath+"/"+account.Access, err)
-			}
-			return err
-		}
-		return nil
+		return err
 	}
+
 	return nil
 }
 
@@ -240,84 +133,66 @@ func (vt *VaultIAMService) GetUserAccount(access string) (Account, error) {
 	if vt.rootAcc.Access == access {
 		return vt.rootAcc, nil
 	}
-	resp, err := vt.client.Secrets.KvV2Read(context.Background(),
-		vt.secretStoragePath+"/"+access, vt.kvReqOpts...)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	resp, err := vt.client.Secrets.KvV2Read(ctx, vt.secretStoragePath+"/"+access, vt.reqOpts...)
+	cancel()
 	if err != nil {
-		reauthErr := vt.reAuthIfNeeded(err)
-		if reauthErr != nil {
-			return Account{}, reauthErr
-		}
-		// retry once after re-auth
-		resp, err = vt.client.Secrets.KvV2Read(context.Background(),
-			vt.secretStoragePath+"/"+access, vt.kvReqOpts...)
-		if err != nil {
-			return Account{}, err
-		}
+		return Account{}, err
 	}
+
 	acc, err := parseVaultUserAccount(resp.Data.Data, access)
 	if err != nil {
 		return Account{}, err
 	}
+
 	return acc, nil
 }
 
 func (vt *VaultIAMService) UpdateUserAccount(access string, props MutableProps) error {
+	//TODO: We need something like a transaction here ?
 	acc, err := vt.GetUserAccount(access)
 	if err != nil {
 		return err
 	}
+
 	updateAcc(&acc, props)
+
 	err = vt.DeleteUserAccount(access)
 	if err != nil {
 		return err
 	}
+
 	err = vt.CreateAccount(acc)
 	if err != nil {
 		return err
 	}
+
 	return nil
 }
 
 func (vt *VaultIAMService) DeleteUserAccount(access string) error {
-	_, err := vt.client.Secrets.KvV2DeleteMetadataAndAllVersions(context.Background(),
-		vt.secretStoragePath+"/"+access, vt.kvReqOpts...)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	_, err := vt.client.Secrets.KvV2DeleteMetadataAndAllVersions(ctx, vt.secretStoragePath+"/"+access, vt.reqOpts...)
+	cancel()
 	if err != nil {
-		reauthErr := vt.reAuthIfNeeded(err)
-		if reauthErr != nil {
-			return reauthErr
-		}
-		// retry once after re-auth
-		_, err = vt.client.Secrets.KvV2DeleteMetadataAndAllVersions(context.Background(),
-			vt.secretStoragePath+"/"+access, vt.kvReqOpts...)
-		if err != nil {
-			return err
-		}
+		return err
 	}
 	return nil
 }
 
 func (vt *VaultIAMService) ListUserAccounts() ([]Account, error) {
-	resp, err := vt.client.Secrets.KvV2List(context.Background(),
-		vt.secretStoragePath, vt.kvReqOpts...)
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	resp, err := vt.client.Secrets.KvV2List(ctx, vt.secretStoragePath, vt.reqOpts...)
+	cancel()
 	if err != nil {
-		reauthErr := vt.reAuthIfNeeded(err)
-		if reauthErr != nil {
-			if vault.IsErrorStatus(err, http.StatusNotFound) {
-				return []Account{}, nil
-			}
-			return nil, reauthErr
-		}
-		// retry once after re-auth
-		resp, err = vt.client.Secrets.KvV2List(context.Background(),
-			vt.secretStoragePath, vt.kvReqOpts...)
-		if err != nil {
-			if vault.IsErrorStatus(err, http.StatusNotFound) {
-				return []Account{}, nil
-			}
-			return nil, err
+		if vault.IsErrorStatus(err, 404) {
+			return []Account{}, nil
 		}
+		return nil, err
 	}
+
 	accs := []Account{}
+
 	for _, acss := range resp.Data.Keys {
 		acc, err := vt.GetUserAccount(acss)
 		if err != nil {
@@ -325,6 +200,7 @@ func (vt *VaultIAMService) ListUserAccounts() ([]Account, error) {
 		}
 		accs = append(accs, acc)
 	}
+
 	return accs, nil
 }
 
@@ -335,8 +211,8 @@ func (vt *VaultIAMService) Shutdown() error {
 
 var errInvalidUser error = errors.New("invalid user account entry in secrets engine")
 
-func parseVaultUserAccount(data map[string]any, access string) (acc Account, err error) {
-	usrAcc, ok := data[access].(map[string]any)
+func parseVaultUserAccount(data map[string]interface{}, access string) (acc Account, err error) {
+	usrAcc, ok := data[access].(map[string]interface{})
 	if !ok {
 		return acc, errInvalidUser
 	}
@@ -369,21 +245,12 @@ func parseVaultUserAccount(data map[string]any, access string) (acc Account, err
 	if err != nil {
 		return acc, errInvalidUser
 	}
-	projectIdJson, ok := usrAcc["projectID"].(json.Number)
-	if !ok {
-		return acc, errInvalidUser
-	}
-	projectID, err := projectIdJson.Int64()
-	if err != nil {
-		return acc, errInvalidUser
-	}
 
 	return Account{
-		Access:    acss,
-		Secret:    secret,
-		Role:      Role(role),
-		UserID:    int(userId),
-		GroupID:   int(groupId),
-		ProjectID: int(projectID),
+		Access:  acss,
+		Secret:  secret,
+		Role:    Role(role),
+		UserID:  int(userId),
+		GroupID: int(groupId),
 	}, nil
 }

auth/object_lock.go

@@ -24,9 +24,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/debuglogger"
 	"github.com/versity/versitygw/s3err"
-	"github.com/versity/versitygw/s3response"
 )
 
 type BucketLockConfig struct {
@@ -41,7 +39,7 @@ func ParseBucketLockConfigurationInput(input []byte) ([]byte, error) {
 		return nil, s3err.GetAPIError(s3err.ErrMalformedXML)
 	}
 
-	if lockConfig.ObjectLockEnabled != types.ObjectLockEnabledEnabled {
+	if lockConfig.ObjectLockEnabled != "" && lockConfig.ObjectLockEnabled != types.ObjectLockEnabledEnabled {
 		return nil, s3err.GetAPIError(s3err.ErrMalformedXML)
 	}
 
@@ -93,133 +91,51 @@ func ParseBucketLockConfigurationOutput(input []byte) (*types.ObjectLockConfigur
 	return result, nil
 }
 
-func ParseObjectLockRetentionInput(input []byte) (*s3response.PutObjectRetentionInput, error) {
-	var retention s3response.PutObjectRetentionInput
+func ParseObjectLockRetentionInput(input []byte) ([]byte, error) {
+	var retention types.ObjectLockRetention
 	if err := xml.Unmarshal(input, &retention); err != nil {
-		debuglogger.Logf("invalid object lock retention request body: %v", err)
-		return nil, s3err.GetAPIError(s3err.ErrMalformedXML)
+		return nil, s3err.GetAPIError(s3err.ErrInvalidRequest)
 	}
 
-	if retention.RetainUntilDate.Before(time.Now()) {
-		debuglogger.Logf("object lock retain until date must be in the future")
+	if retention.RetainUntilDate == nil || retention.RetainUntilDate.Before(time.Now()) {
 		return nil, s3err.GetAPIError(s3err.ErrPastObjectLockRetainDate)
 	}
 	switch retention.Mode {
 	case types.ObjectLockRetentionModeCompliance:
 	case types.ObjectLockRetentionModeGovernance:
 	default:
-		debuglogger.Logf("invalid object lock retention mode: %s", retention.Mode)
 		return nil, s3err.GetAPIError(s3err.ErrMalformedXML)
 	}
 
-	return &retention, nil
-}
-
-func ParseObjectLockRetentionInputToJSON(input *s3response.PutObjectRetentionInput) ([]byte, error) {
-	data, err := json.Marshal(input)
-	if err != nil {
-		debuglogger.Logf("parse object lock retention to JSON: %v", err)
-		return nil, fmt.Errorf("parse object lock retention: %w", err)
-	}
-
-	return data, nil
-}
-
-// IsObjectLockRetentionPutAllowed checks if the object lock retention PUT request
-// is allowed against the current state of the object lock
-func IsObjectLockRetentionPutAllowed(ctx context.Context, be backend.Backend, bucket, object, versionId, userAccess string, input *s3response.PutObjectRetentionInput, bypass bool) error {
-	ret, err := be.GetObjectRetention(ctx, bucket, object, versionId)
-	if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchObjectLockConfiguration)) {
-		// if object lock configuration is not set
-		// allow the retention modification without any checks
-		return nil
-	}
-	if err != nil {
-		debuglogger.Logf("failed to get object retention: %v", err)
-		return err
-	}
-
-	retention, err := ParseObjectLockRetentionOutput(ret)
-	if err != nil {
-		return err
-	}
-
-	if retention.Mode == input.Mode {
-		// if retention mode is the same
-		// the operation is allowed
-		return nil
-	}
-
-	if retention.Mode == types.ObjectLockRetentionModeCompliance {
-		// COMPLIANCE mode is by definition not allowed to modify
-		debuglogger.Logf("object lock retention change request from 'COMPLIANCE' to 'GOVERNANCE' is not allowed")
-		return s3err.GetAPIError(s3err.ErrObjectLocked)
-	}
-
-	if !bypass {
-		// if x-amz-bypass-governance-retention is not provided
-		// return error: object is locked
-		debuglogger.Logf("object lock retention mode change is not allowed and bypass governence is not forced")
-		return s3err.GetAPIError(s3err.ErrObjectLocked)
-	}
-
-	// the last case left, when user tries to chenge
-	// from 'GOVERNANCE' to 'COMPLIANCE' with
-	// 'x-amz-bypass-governance-retention' header
-	// first we need to check if user has 's3:BypassGovernanceRetention'
-	policy, err := be.GetBucketPolicy(ctx, bucket)
-	if err != nil {
-		// if it fails to get the policy, return object is locked
-		debuglogger.Logf("failed to get the bucket policy: %v", err)
-		return s3err.GetAPIError(s3err.ErrObjectLocked)
-	}
-	err = VerifyBucketPolicy(policy, userAccess, bucket, object, BypassGovernanceRetentionAction)
-	if err != nil {
-		// if user doesn't have "s3:BypassGovernanceRetention" permission
-		// return object is locked
-		debuglogger.Logf("the user is missing 's3:BypassGovernanceRetention' permission")
-		return s3err.GetAPIError(s3err.ErrObjectLocked)
-	}
-
-	return nil
+	return json.Marshal(retention)
 }
 
 func ParseObjectLockRetentionOutput(input []byte) (*types.ObjectLockRetention, error) {
 	var retention types.ObjectLockRetention
 	if err := json.Unmarshal(input, &retention); err != nil {
-		debuglogger.Logf("parse object lock retention output: %v", err)
 		return nil, fmt.Errorf("parse object lock retention: %w", err)
 	}
 
 	return &retention, nil
 }
 
-func ParseObjectLegalHoldOutput(status *bool) *s3response.GetObjectLegalHoldResult {
+func ParseObjectLegalHoldOutput(status *bool) *types.ObjectLockLegalHold {
 	if status == nil {
 		return nil
 	}
 
 	if *status {
-		return &s3response.GetObjectLegalHoldResult{
+		return &types.ObjectLockLegalHold{
 			Status: types.ObjectLockLegalHoldStatusOn,
 		}
 	}
 
-	return &s3response.GetObjectLegalHoldResult{
+	return &types.ObjectLockLegalHold{
 		Status: types.ObjectLockLegalHoldStatusOff,
 	}
 }
 
-func CheckObjectAccess(ctx context.Context, bucket, userAccess string, objects []types.ObjectIdentifier, bypass, isBucketPublic bool, be backend.Backend, isOverwrite bool) error {
-	if isOverwrite {
-		// if bucket versioning is enabled, any overwrite request
-		// should be enabled, as it leads to a new object version
-		// creation
-		res, err := be.GetBucketVersioning(ctx, bucket)
-		if err == nil && res.Status != nil && *res.Status == types.BucketVersioningStatusEnabled {
-			return nil
-		}
-	}
+func CheckObjectAccess(ctx context.Context, bucket, userAccess string, objects []string, bypass bool, be backend.Backend) error {
 	data, err := be.GetObjectLockConfiguration(ctx, bucket)
 	if err != nil {
 		if errors.Is(err, s3err.GetAPIError(s3err.ErrObjectLockConfigurationNotFound)) {
@@ -254,35 +170,12 @@ func CheckObjectAccess(ctx context.Context, bucket, userAccess string, objects [
 		}
 	}
 
-	var versioningEnabled bool
-	vers, err := be.GetBucketVersioning(ctx, bucket)
-	if err == nil && vers.Status != nil {
-		versioningEnabled = *vers.Status == types.BucketVersioningStatusEnabled
-	}
-
 	for _, obj := range objects {
-		var key, versionId string
-		if obj.Key != nil {
-			key = *obj.Key
-		}
-		if obj.VersionId != nil {
-			versionId = *obj.VersionId
-		}
-		// if bucket versioning is enabled and versionId isn't provided
-		// no lock check is needed, as it leads to a new delete marker creation
-		if versioningEnabled && versionId == "" {
-			continue
-		}
 		checkRetention := true
-		retentionData, err := be.GetObjectRetention(ctx, bucket, key, versionId)
+		retentionData, err := be.GetObjectRetention(ctx, bucket, obj, "")
 		if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchKey)) {
 			continue
 		}
-		// the object is a delete marker, if a `MethodNotAllowed` error is returned
-		// no object lock check is needed
-		if errors.Is(err, s3err.GetAPIError(s3err.ErrMethodNotAllowed)) {
-			continue
-		}
 		if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchObjectLockConfiguration)) {
 			checkRetention = false
 		}
@@ -297,46 +190,35 @@ func CheckObjectAccess(ctx context.Context, bucket, userAccess string, objects [
 			}
 
 			if retention.Mode != "" && retention.RetainUntilDate != nil {
-				if retention.RetainUntilDate.Before(time.Now()) {
-					// if the object retention is expired, the object
-					// is allowed for write operations(delete, modify)
-					return nil
-				}
-
-				switch retention.Mode {
-				case types.ObjectLockRetentionModeGovernance:
-					if !bypass {
-						return s3err.GetAPIError(s3err.ErrObjectLocked)
-					} else {
-						policy, err := be.GetBucketPolicy(ctx, bucket)
-						if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchBucketPolicy)) {
+				if retention.RetainUntilDate.After(time.Now()) {
+					switch retention.Mode {
+					case types.ObjectLockRetentionModeGovernance:
+						if !bypass {
 							return s3err.GetAPIError(s3err.ErrObjectLocked)
-						}
-						if err != nil {
-							return err
-						}
-						if isBucketPublic {
-							err = VerifyPublicBucketPolicy(policy, bucket, key, BypassGovernanceRetentionAction)
 						} else {
-							err = VerifyBucketPolicy(policy, userAccess, bucket, key, BypassGovernanceRetentionAction)
-						}
-						if err != nil {
-							return s3err.GetAPIError(s3err.ErrObjectLocked)
+							policy, err := be.GetBucketPolicy(ctx, bucket)
+							if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchBucketPolicy)) {
+								return s3err.GetAPIError(s3err.ErrObjectLocked)
+							}
+							if err != nil {
+								return err
+							}
+							err = VerifyBucketPolicy(policy, userAccess, bucket, obj, BypassGovernanceRetentionAction)
+							if err != nil {
+								return s3err.GetAPIError(s3err.ErrObjectLocked)
+							}
 						}
+					case types.ObjectLockRetentionModeCompliance:
+						return s3err.GetAPIError(s3err.ErrObjectLocked)
 					}
-				case types.ObjectLockRetentionModeCompliance:
-					return s3err.GetAPIError(s3err.ErrObjectLocked)
 				}
 			}
 		}
 
 		checkLegalHold := true
 
-		status, err := be.GetObjectLegalHold(ctx, bucket, key, versionId)
+		status, err := be.GetObjectLegalHold(ctx, bucket, obj, "")
 		if err != nil {
-			if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchKey)) {
-				continue
-			}
 			if errors.Is(err, s3err.GetAPIError(s3err.ErrNoSuchObjectLockConfiguration)) {
 				checkLegalHold = false
 			} else {
@@ -361,11 +243,7 @@ func CheckObjectAccess(ctx context.Context, bucket, userAccess string, objects [
 					if err != nil {
 						return err
 					}
-					if isBucketPublic {
-						err = VerifyPublicBucketPolicy(policy, bucket, key, BypassGovernanceRetentionAction)
-					} else {
-						err = VerifyBucketPolicy(policy, userAccess, bucket, key, BypassGovernanceRetentionAction)
-					}
+					err = VerifyBucketPolicy(policy, userAccess, bucket, obj, BypassGovernanceRetentionAction)
 					if err != nil {
 						return s3err.GetAPIError(s3err.ErrObjectLocked)
 					}

aws/signer/internal/v4/headers.go

@@ -8,8 +8,7 @@ var IgnoredHeaders = Rules{
 			// some clients use user-agent in signed headers
 			// "User-Agent":      struct{}{},
 			"X-Amzn-Trace-Id": struct{}{},
-			// Expect might appear in signed headers
-			// "Expect":          struct{}{},
+			"Expect":          struct{}{},
 		},
 	},
 }

aws/signer/internal/v4/headers_test.go

@@ -41,7 +41,7 @@ func TestIgnoredHeaders(t *testing.T) {
 	}{
 		"expect": {
 			Header:        "Expect",
-			ExpectIgnored: false,
+			ExpectIgnored: true,
 		},
 		"authorization": {
 			Header:        "Authorization",

backend/azure/err.go

@@ -40,7 +40,7 @@ func azErrToS3err(azErr *azcore.ResponseError) s3err.APIError {
 	case "BlobNotFound":
 		return s3err.GetAPIError(s3err.ErrNoSuchKey)
 	case "TagsTooLarge":
-		return s3err.GetAPIError(s3err.ErrInvalidTagValue)
+		return s3err.GetAPIError(s3err.ErrInvalidTag)
 	case "Requested Range Not Satisfiable":
 		return s3err.GetAPIError(s3err.ErrInvalidRange)
 	}

backend/backend.go

@@ -32,40 +32,37 @@ type Backend interface {
 	Shutdown()
 
 	// bucket operations
-	ListBuckets(context.Context, s3response.ListBucketsInput) (s3response.ListAllMyBucketsResult, error)
+	ListBuckets(_ context.Context, owner string, isAdmin bool) (s3response.ListAllMyBucketsResult, error)
 	HeadBucket(context.Context, *s3.HeadBucketInput) (*s3.HeadBucketOutput, error)
 	GetBucketAcl(context.Context, *s3.GetBucketAclInput) ([]byte, error)
 	CreateBucket(_ context.Context, _ *s3.CreateBucketInput, defaultACL []byte) error
 	PutBucketAcl(_ context.Context, bucket string, data []byte) error
-	DeleteBucket(_ context.Context, bucket string) error
+	DeleteBucket(context.Context, *s3.DeleteBucketInput) error
 	PutBucketVersioning(_ context.Context, bucket string, status types.BucketVersioningStatus) error
-	GetBucketVersioning(_ context.Context, bucket string) (s3response.GetBucketVersioningOutput, error)
+	GetBucketVersioning(_ context.Context, bucket string) (*s3.GetBucketVersioningOutput, error)
 	PutBucketPolicy(_ context.Context, bucket string, policy []byte) error
 	GetBucketPolicy(_ context.Context, bucket string) ([]byte, error)
 	DeleteBucketPolicy(_ context.Context, bucket string) error
 	PutBucketOwnershipControls(_ context.Context, bucket string, ownership types.ObjectOwnership) error
 	GetBucketOwnershipControls(_ context.Context, bucket string) (types.ObjectOwnership, error)
 	DeleteBucketOwnershipControls(_ context.Context, bucket string) error
-	PutBucketCors(_ context.Context, bucket string, cors []byte) error
-	GetBucketCors(_ context.Context, bucket string) ([]byte, error)
-	DeleteBucketCors(_ context.Context, bucket string) error
 
 	// multipart operations
-	CreateMultipartUpload(context.Context, s3response.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error)
-	CompleteMultipartUpload(context.Context, *s3.CompleteMultipartUploadInput) (_ s3response.CompleteMultipartUploadResult, versionid string, _ error)
+	CreateMultipartUpload(context.Context, *s3.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error)
+	CompleteMultipartUpload(context.Context, *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error)
 	AbortMultipartUpload(context.Context, *s3.AbortMultipartUploadInput) error
 	ListMultipartUploads(context.Context, *s3.ListMultipartUploadsInput) (s3response.ListMultipartUploadsResult, error)
 	ListParts(context.Context, *s3.ListPartsInput) (s3response.ListPartsResult, error)
-	UploadPart(context.Context, *s3.UploadPartInput) (*s3.UploadPartOutput, error)
-	UploadPartCopy(context.Context, *s3.UploadPartCopyInput) (s3response.CopyPartResult, error)
+	UploadPart(context.Context, *s3.UploadPartInput) (etag string, err error)
+	UploadPartCopy(context.Context, *s3.UploadPartCopyInput) (s3response.CopyObjectResult, error)
 
 	// standard object operations
-	PutObject(context.Context, s3response.PutObjectInput) (s3response.PutObjectOutput, error)
+	PutObject(context.Context, *s3.PutObjectInput) (s3response.PutObjectOutput, error)
 	HeadObject(context.Context, *s3.HeadObjectInput) (*s3.HeadObjectOutput, error)
 	GetObject(context.Context, *s3.GetObjectInput) (*s3.GetObjectOutput, error)
 	GetObjectAcl(context.Context, *s3.GetObjectAclInput) (*s3.GetObjectAclOutput, error)
-	GetObjectAttributes(context.Context, *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResponse, error)
-	CopyObject(context.Context, s3response.CopyObjectInput) (s3response.CopyObjectOutput, error)
+	GetObjectAttributes(context.Context, *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResult, error)
+	CopyObject(context.Context, *s3.CopyObjectInput) (*s3.CopyObjectOutput, error)
 	ListObjects(context.Context, *s3.ListObjectsInput) (s3response.ListObjectsResult, error)
 	ListObjectsV2(context.Context, *s3.ListObjectsV2Input) (s3response.ListObjectsV2Result, error)
 	DeleteObject(context.Context, *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error)
@@ -83,20 +80,20 @@ type Backend interface {
 	DeleteBucketTagging(_ context.Context, bucket string) error
 
 	// object tagging operations
-	GetObjectTagging(_ context.Context, bucket, object, versionId string) (map[string]string, error)
-	PutObjectTagging(_ context.Context, bucket, object, versionId string, tags map[string]string) error
-	DeleteObjectTagging(_ context.Context, bucket, object, versionId string) error
+	GetObjectTagging(_ context.Context, bucket, object string) (map[string]string, error)
+	PutObjectTagging(_ context.Context, bucket, object string, tags map[string]string) error
+	DeleteObjectTagging(_ context.Context, bucket, object string) error
 
 	// object lock operations
 	PutObjectLockConfiguration(_ context.Context, bucket string, config []byte) error
 	GetObjectLockConfiguration(_ context.Context, bucket string) ([]byte, error)
-	PutObjectRetention(_ context.Context, bucket, object, versionId string, retention []byte) error
+	PutObjectRetention(_ context.Context, bucket, object, versionId string, bypass bool, retention []byte) error
 	GetObjectRetention(_ context.Context, bucket, object, versionId string) ([]byte, error)
 	PutObjectLegalHold(_ context.Context, bucket, object, versionId string, status bool) error
 	GetObjectLegalHold(_ context.Context, bucket, object, versionId string) (*bool, error)
 
 	// non AWS actions
-	ChangeBucketOwner(_ context.Context, bucket, owner string) error
+	ChangeBucketOwner(_ context.Context, bucket string, acl []byte) error
 	ListBucketsAndOwners(context.Context) ([]s3response.Bucket, error)
 }
 
@@ -111,7 +108,7 @@ func (BackendUnsupported) Shutdown() {}
 func (BackendUnsupported) String() string {
 	return "Unsupported"
 }
-func (BackendUnsupported) ListBuckets(context.Context, s3response.ListBucketsInput) (s3response.ListAllMyBucketsResult, error) {
+func (BackendUnsupported) ListBuckets(context.Context, string, bool) (s3response.ListAllMyBucketsResult, error) {
 	return s3response.ListAllMyBucketsResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) HeadBucket(context.Context, *s3.HeadBucketInput) (*s3.HeadBucketOutput, error) {
@@ -126,14 +123,14 @@ func (BackendUnsupported) CreateBucket(context.Context, *s3.CreateBucketInput, [
 func (BackendUnsupported) PutBucketAcl(_ context.Context, bucket string, data []byte) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) DeleteBucket(_ context.Context, bucket string) error {
+func (BackendUnsupported) DeleteBucket(context.Context, *s3.DeleteBucketInput) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) PutBucketVersioning(_ context.Context, bucket string, status types.BucketVersioningStatus) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) GetBucketVersioning(_ context.Context, bucket string) (s3response.GetBucketVersioningOutput, error) {
-	return s3response.GetBucketVersioningOutput{}, s3err.GetAPIError(s3err.ErrNotImplemented)
+func (BackendUnsupported) GetBucketVersioning(_ context.Context, bucket string) (*s3.GetBucketVersioningOutput, error) {
+	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) PutBucketPolicy(_ context.Context, bucket string, policy []byte) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
@@ -153,21 +150,12 @@ func (BackendUnsupported) GetBucketOwnershipControls(_ context.Context, bucket s
 func (BackendUnsupported) DeleteBucketOwnershipControls(_ context.Context, bucket string) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) PutBucketCors(context.Context, string, []byte) error {
-	return s3err.GetAPIError(s3err.ErrNotImplemented)
-}
-func (BackendUnsupported) GetBucketCors(_ context.Context, bucket string) ([]byte, error) {
-	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
-}
-func (BackendUnsupported) DeleteBucketCors(_ context.Context, bucket string) error {
-	return s3err.GetAPIError(s3err.ErrNotImplemented)
-}
 
-func (BackendUnsupported) CreateMultipartUpload(context.Context, s3response.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error) {
+func (BackendUnsupported) CreateMultipartUpload(context.Context, *s3.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error) {
 	return s3response.InitiateMultipartUploadResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) CompleteMultipartUpload(context.Context, *s3.CompleteMultipartUploadInput) (s3response.CompleteMultipartUploadResult, string, error) {
-	return s3response.CompleteMultipartUploadResult{}, "", s3err.GetAPIError(s3err.ErrNotImplemented)
+func (BackendUnsupported) CompleteMultipartUpload(context.Context, *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error) {
+	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) AbortMultipartUpload(context.Context, *s3.AbortMultipartUploadInput) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
@@ -178,14 +166,14 @@ func (BackendUnsupported) ListMultipartUploads(context.Context, *s3.ListMultipar
 func (BackendUnsupported) ListParts(context.Context, *s3.ListPartsInput) (s3response.ListPartsResult, error) {
 	return s3response.ListPartsResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) UploadPart(context.Context, *s3.UploadPartInput) (*s3.UploadPartOutput, error) {
-	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
+func (BackendUnsupported) UploadPart(context.Context, *s3.UploadPartInput) (etag string, err error) {
+	return "", s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) UploadPartCopy(context.Context, *s3.UploadPartCopyInput) (s3response.CopyPartResult, error) {
-	return s3response.CopyPartResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
+func (BackendUnsupported) UploadPartCopy(context.Context, *s3.UploadPartCopyInput) (s3response.CopyObjectResult, error) {
+	return s3response.CopyObjectResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 
-func (BackendUnsupported) PutObject(context.Context, s3response.PutObjectInput) (s3response.PutObjectOutput, error) {
+func (BackendUnsupported) PutObject(context.Context, *s3.PutObjectInput) (s3response.PutObjectOutput, error) {
 	return s3response.PutObjectOutput{}, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) HeadObject(context.Context, *s3.HeadObjectInput) (*s3.HeadObjectOutput, error) {
@@ -197,11 +185,11 @@ func (BackendUnsupported) GetObject(context.Context, *s3.GetObjectInput) (*s3.Ge
 func (BackendUnsupported) GetObjectAcl(context.Context, *s3.GetObjectAclInput) (*s3.GetObjectAclOutput, error) {
 	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) GetObjectAttributes(context.Context, *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResponse, error) {
-	return s3response.GetObjectAttributesResponse{}, s3err.GetAPIError(s3err.ErrNotImplemented)
+func (BackendUnsupported) GetObjectAttributes(context.Context, *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResult, error) {
+	return s3response.GetObjectAttributesResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) CopyObject(context.Context, s3response.CopyObjectInput) (s3response.CopyObjectOutput, error) {
-	return s3response.CopyObjectOutput{}, s3err.GetAPIError(s3err.ErrNotImplemented)
+func (BackendUnsupported) CopyObject(context.Context, *s3.CopyObjectInput) (*s3.CopyObjectOutput, error) {
+	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) ListObjects(context.Context, *s3.ListObjectsInput) (s3response.ListObjectsResult, error) {
 	return s3response.ListObjectsResult{}, s3err.GetAPIError(s3err.ErrNotImplemented)
@@ -251,13 +239,13 @@ func (BackendUnsupported) DeleteBucketTagging(_ context.Context, bucket string)
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 
-func (BackendUnsupported) GetObjectTagging(_ context.Context, bucket, object, versionId string) (map[string]string, error) {
+func (BackendUnsupported) GetObjectTagging(_ context.Context, bucket, object string) (map[string]string, error) {
 	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) PutObjectTagging(_ context.Context, bucket, object, versionId string, tags map[string]string) error {
+func (BackendUnsupported) PutObjectTagging(_ context.Context, bucket, object string, tags map[string]string) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) DeleteObjectTagging(_ context.Context, bucket, object, versionId string) error {
+func (BackendUnsupported) DeleteObjectTagging(_ context.Context, bucket, object string) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 
@@ -267,7 +255,7 @@ func (BackendUnsupported) PutObjectLockConfiguration(_ context.Context, bucket s
 func (BackendUnsupported) GetObjectLockConfiguration(_ context.Context, bucket string) ([]byte, error) {
 	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
-func (BackendUnsupported) PutObjectRetention(_ context.Context, bucket, object, versionId string, retention []byte) error {
+func (BackendUnsupported) PutObjectRetention(_ context.Context, bucket, object, versionId string, bypass bool, retention []byte) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) GetObjectRetention(_ context.Context, bucket, object, versionId string) ([]byte, error) {
@@ -280,7 +268,7 @@ func (BackendUnsupported) GetObjectLegalHold(_ context.Context, bucket, object,
 	return nil, s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 
-func (BackendUnsupported) ChangeBucketOwner(_ context.Context, bucket, owner string) error {
+func (BackendUnsupported) ChangeBucketOwner(_ context.Context, bucket string, acl []byte) error {
 	return s3err.GetAPIError(s3err.ErrNotImplemented)
 }
 func (BackendUnsupported) ListBucketsAndOwners(context.Context) ([]s3response.Bucket, error) {

backend/common.go

@@ -17,18 +17,12 @@ package backend
 import (
 	"crypto/md5"
 	"encoding/hex"
-	"errors"
 	"fmt"
-	"hash"
 	"io"
-	"io/fs"
-	"math"
-	"net/url"
+	"net/http"
 	"os"
-	"regexp"
 	"strconv"
 	"strings"
-	"syscall"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
@@ -40,9 +34,6 @@ const (
 	// this is the media type for directories in AWS and Nextcloud
 	DirContentType     = "application/x-directory"
 	DefaultContentType = "binary/octet-stream"
-
-	// this is the minimum allowed size for mp parts
-	MinPartSize = 5 * 1024 * 1024
 )
 
 func IsValidBucketName(name string) bool { return true }
@@ -59,168 +50,53 @@ func (d ByObjectName) Len() int           { return len(d) }
 func (d ByObjectName) Swap(i, j int)      { d[i], d[j] = d[j], d[i] }
 func (d ByObjectName) Less(i, j int) bool { return *d[i].Key < *d[j].Key }
 
-func GetPtrFromString(str string) *string {
-	if str == "" {
-		return nil
-	}
-	return &str
-}
-
-func GetStringFromPtr(str *string) string {
-	if str == nil {
-		return ""
-	}
-	return *str
+func GetStringPtr(s string) *string {
+	return &s
 }
 
 func GetTimePtr(t time.Time) *time.Time {
 	return &t
 }
 
-func TrimEtag(etag *string) *string {
-	if etag == nil {
-		return nil
-	}
-
-	return GetPtrFromString(strings.Trim(*etag, "\""))
-}
-
 var (
-	errInvalidRange           = s3err.GetAPIError(s3err.ErrInvalidRange)
-	errInvalidCopySourceRange = s3err.GetAPIError(s3err.ErrInvalidCopySourceRange)
-	errPreconditionFailed     = s3err.GetAPIError(s3err.ErrPreconditionFailed)
-	errNotModified            = s3err.GetAPIError(s3err.ErrNotModified)
+	errInvalidRange = s3err.GetAPIError(s3err.ErrInvalidRange)
 )
 
-// ParseObjectRange parses input range header and returns startoffset, length, isValid
-// and error. If no endoffset specified, then length is set to the object size
-// for invalid inputs, it returns no error, but isValid=false
-// `InvalidRange` error is returnd, only if startoffset is greater than the object size
-func ParseObjectRange(size int64, acceptRange string) (int64, int64, bool, error) {
-	// Return full object (invalid range, no error) if header empty
-	if acceptRange == "" {
-		return 0, size, false, nil
-	}
-
-	rangeKv := strings.Split(acceptRange, "=")
-	if len(rangeKv) != 2 {
-		return 0, size, false, nil
-	}
-	if rangeKv[0] != "bytes" { // unsupported unit -> ignore
-		return 0, size, false, nil
-	}
-
-	bRange := strings.Split(rangeKv[1], "-")
-	if len(bRange) != 2 { // malformed / multi-range
-		return 0, size, false, nil
-	}
-
-	// Parse start; empty start indicates a suffix-byte-range-spec (e.g. bytes=-100)
-	startOffset, err := strconv.ParseInt(bRange[0], 10, strconv.IntSize)
-	if startOffset > int64(math.MaxInt) || startOffset < int64(math.MinInt) {
-		return 0, size, false, errInvalidRange
-	}
-	if err != nil && bRange[0] != "" { // invalid numeric start (non-empty) -> ignore range
-		return 0, size, false, nil
-	}
-
-	// If end part missing (e.g. bytes=100-)
-	if bRange[1] == "" {
-		if bRange[0] == "" { // bytes=- (meaningless) -> ignore
-			return 0, size, false, nil
-		}
-		// start beyond or at size is unsatisfiable -> error (RequestedRangeNotSatisfiable)
-		if startOffset >= size {
-			return 0, 0, false, errInvalidRange
-		}
-		// bytes=100- => from start to end
-		return startOffset, size - startOffset, true, nil
-	}
-
-	endOffset, err := strconv.ParseInt(bRange[1], 10, strconv.IntSize)
-	if endOffset > int64(math.MaxInt) {
-		return 0, size, false, errInvalidRange
-	}
-	if err != nil { // invalid numeric end -> ignore range
-		return 0, size, false, nil
-	}
-
-	// Suffix range handling (bRange[0] == "")
-	if bRange[0] == "" {
-		// Disallow -0 (always unsatisfiable)
-		if endOffset == 0 {
-			return 0, 0, false, errInvalidRange
-		}
-		// For zero-sized objects any positive suffix is treated as invalid (ignored, no error)
-		if size == 0 {
-			return 0, size, false, nil
-		}
-		// Clamp to object size (request more bytes than exist -> entire object)
-		endOffset = min(endOffset, size)
-		return size - endOffset, endOffset, true, nil
-	}
-
-	// Normal range (start-end)
-	if startOffset > endOffset { // start > end -> ignore
-		return 0, size, false, nil
-	}
-	// Start beyond or at end of object -> error
-	if startOffset >= size {
-		return 0, 0, false, errInvalidRange
-	}
-	// Adjust end beyond object size (trim)
-	if endOffset >= size {
-		endOffset = size - 1
-	}
-	return startOffset, endOffset - startOffset + 1, true, nil
-}
-
-// ParseCopySourceRange parses input range header and returns startoffset, length
-// and error. If no endoffset specified, then length is set to the object size
-func ParseCopySourceRange(size int64, acceptRange string) (int64, int64, error) {
+// ParseRange parses input range header and returns startoffset, length, and
+// error. If no endoffset specified, then length is set to -1.
+func ParseRange(size int64, acceptRange string) (int64, int64, error) {
 	if acceptRange == "" {
 		return 0, size, nil
 	}
 
 	rangeKv := strings.Split(acceptRange, "=")
 
-	if len(rangeKv) != 2 {
-		return 0, 0, errInvalidCopySourceRange
-	}
-
-	if rangeKv[0] != "bytes" {
-		return 0, 0, errInvalidCopySourceRange
+	if len(rangeKv) < 2 {
+		return 0, 0, errInvalidRange
 	}
 
 	bRange := strings.Split(rangeKv[1], "-")
-	if len(bRange) != 2 {
-		return 0, 0, errInvalidCopySourceRange
+	if len(bRange) < 1 || len(bRange) > 2 {
+		return 0, 0, errInvalidRange
 	}
 
 	startOffset, err := strconv.ParseInt(bRange[0], 10, 64)
 	if err != nil {
-		return 0, 0, errInvalidCopySourceRange
+		return 0, 0, errInvalidRange
 	}
 
-	if startOffset >= size {
-		return 0, 0, s3err.CreateExceedingRangeErr(size)
+	endOffset := int64(-1)
+	if len(bRange) == 1 || bRange[1] == "" {
+		return startOffset, endOffset, nil
 	}
 
-	if bRange[1] == "" {
-		return startOffset, size - startOffset + 1, nil
-	}
-
-	endOffset, err := strconv.ParseInt(bRange[1], 10, 64)
+	endOffset, err = strconv.ParseInt(bRange[1], 10, 64)
 	if err != nil {
-		return 0, 0, errInvalidCopySourceRange
+		return 0, 0, errInvalidRange
 	}
 
-	if endOffset < startOffset {
-		return 0, 0, errInvalidCopySourceRange
-	}
-
-	if endOffset >= size {
-		return 0, 0, s3err.CreateExceedingRangeErr(size)
+	if endOffset <= startOffset {
+		return 0, 0, errInvalidRange
 	}
 
 	return startOffset, endOffset - startOffset + 1, nil
@@ -233,145 +109,31 @@ func ParseCopySource(copySourceHeader string) (string, string, string, error) {
 		copySourceHeader = copySourceHeader[1:]
 	}
 
-	var copySource, versionId string
-	i := strings.LastIndex(copySourceHeader, "?versionId=")
-	if i == -1 {
-		copySource = copySourceHeader
-	} else {
-		copySource = copySourceHeader[:i]
-		versionId = copySourceHeader[i+11:]
+	cSplitted := strings.Split(copySourceHeader, "?")
+	copySource := cSplitted[0]
+	var versionId string
+	if len(cSplitted) > 1 {
+		versionIdParts := strings.Split(cSplitted[1], "=")
+		if len(versionIdParts) != 2 || versionIdParts[0] != "versionId" {
+			return "", "", "", s3err.GetAPIError(s3err.ErrInvalidRequest)
+		}
+		versionId = versionIdParts[1]
 	}
 
 	srcBucket, srcObject, ok := strings.Cut(copySource, "/")
 	if !ok {
-		return "", "", "", s3err.GetAPIError(s3err.ErrInvalidCopySourceBucket)
+		return "", "", "", s3err.GetAPIError(s3err.ErrInvalidCopySource)
 	}
 
 	return srcBucket, srcObject, versionId, nil
 }
 
-// ParseObjectTags parses the url encoded input string into
-// map[string]string with unescaped key/value pair
-func ParseObjectTags(tagging string) (map[string]string, error) {
-	if tagging == "" {
-		return nil, nil
+func CreateExceedingRangeErr(objSize int64) s3err.APIError {
+	return s3err.APIError{
+		Code:           "InvalidArgument",
+		Description:    fmt.Sprintf("Range specified is not valid for source object of size: %d", objSize),
+		HTTPStatusCode: http.StatusBadRequest,
 	}
-
-	tagSet := make(map[string]string)
-
-	for tagging != "" {
-		var tag string
-		tag, tagging, _ = strings.Cut(tagging, "&")
-		// if 'tag' before the first appearance of '&' is empty continue
-		if tag == "" {
-			continue
-		}
-
-		key, value, found := strings.Cut(tag, "=")
-		// if key is empty, but "=" is present, return invalid url ecnoding err
-		if found && key == "" {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidURLEncodedTagging)
-		}
-
-		// return invalid tag key, if the key is longer than 128
-		if len(key) > 128 {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagKey)
-		}
-
-		// return invalid tag value, if tag value is longer than 256
-		if len(value) > 256 {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagValue)
-		}
-
-		// query unescape tag key
-		key, err := url.QueryUnescape(key)
-		if err != nil {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidURLEncodedTagging)
-		}
-
-		// query unescape tag value
-		value, err = url.QueryUnescape(value)
-		if err != nil {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidURLEncodedTagging)
-		}
-
-		// check tag key to be valid
-		if !isValidTagComponent(key) {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagKey)
-		}
-
-		// check tag value to be valid
-		if !isValidTagComponent(value) {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagValue)
-		}
-
-		// duplicate keys are not allowed: return invalid url encoding err
-		_, ok := tagSet[key]
-		if ok {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidURLEncodedTagging)
-		}
-
-		tagSet[key] = value
-	}
-
-	return tagSet, nil
-}
-
-// ParseCreateBucketTags parses and validates the bucket
-// tagging from CreateBucket input
-func ParseCreateBucketTags(tagging []types.Tag) (map[string]string, error) {
-	if len(tagging) == 0 {
-		return nil, nil
-	}
-
-	tagset := make(map[string]string, len(tagging))
-
-	if len(tagging) > 50 {
-		return nil, s3err.GetAPIError(s3err.ErrBucketTaggingLimited)
-	}
-
-	for _, tag := range tagging {
-		// validate tag key length
-		key := GetStringFromPtr(tag.Key)
-		if len(key) == 0 || len(key) > 128 {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagKey)
-		}
-
-		// validate tag key string chars
-		if !isValidTagComponent(key) {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagKey)
-		}
-
-		// validate tag value length
-		value := GetStringFromPtr(tag.Value)
-		if len(value) > 256 {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagValue)
-		}
-
-		// validate tag value string chars
-		if !isValidTagComponent(value) {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidTagValue)
-		}
-
-		// make sure there are no duplicate keys
-		_, ok := tagset[key]
-		if ok {
-			return nil, s3err.GetAPIError(s3err.ErrDuplicateTagKey)
-		}
-
-		tagset[key] = value
-	}
-
-	return tagset, nil
-}
-
-// tag component (key/value) name rule regexp
-// https://docs.aws.amazon.com/AmazonS3/latest/API/API_control_Tag.html
-var validTagComponent = regexp.MustCompile(`^([\p{L}\p{Z}\p{N}_.:/=+\-@]*)$`)
-
-// isValidTagComponent validates the tag component(key/value) name
-func isValidTagComponent(str string) bool {
-	return validTagComponent.Match([]byte(str))
 }
 
 func GetMultipartMD5(parts []types.CompletedPart) string {
@@ -379,8 +141,8 @@ func GetMultipartMD5(parts []types.CompletedPart) string {
 	for _, part := range parts {
 		partsEtagBytes = append(partsEtagBytes, getEtagBytes(*part.ETag)...)
 	}
-
-	return fmt.Sprintf("\"%s-%d\"", md5String(partsEtagBytes), len(parts))
+	s3MD5 := fmt.Sprintf("%s-%d", md5String(partsEtagBytes), len(parts))
+	return s3MD5
 }
 
 func getEtagBytes(etag string) []byte {
@@ -408,262 +170,3 @@ func (f *FileSectionReadCloser) Read(p []byte) (int, error) {
 func (f *FileSectionReadCloser) Close() error {
 	return f.F.Close()
 }
-
-// MoveFile moves a file from source to destination.
-func MoveFile(source, destination string, perm os.FileMode) error {
-	// We use Rename as the atomic operation for object puts. The upload is
-	// written to a temp file to not conflict with any other simultaneous
-	// uploads. The final operation is to move the temp file into place for
-	// the object. This ensures the object semantics of last upload completed
-	// wins and is not some combination of writes from simultaneous uploads.
-	err := os.Rename(source, destination)
-	if err == nil || !errors.Is(err, syscall.EXDEV) {
-		return err
-	}
-
-	// Rename can fail if the source and destination are not on the same
-	// filesystem. The fallback is to copy the file and then remove the source.
-	// We need to be careful that the desination does not exist before copying
-	// to prevent any other simultaneous writes to the file.
-	sourceFile, err := os.Open(source)
-	if err != nil {
-		return fmt.Errorf("open source: %w", err)
-	}
-	defer sourceFile.Close()
-
-	var destFile *os.File
-	for {
-		destFile, err = os.OpenFile(destination, os.O_CREATE|os.O_EXCL|os.O_WRONLY, perm)
-		if err != nil {
-			if errors.Is(err, fs.ErrExist) {
-				if removeErr := os.Remove(destination); removeErr != nil {
-					return fmt.Errorf("remove existing destination: %w", removeErr)
-				}
-				continue
-			}
-			return fmt.Errorf("create destination: %w", err)
-		}
-		break
-	}
-	defer destFile.Close()
-
-	_, err = io.Copy(destFile, sourceFile)
-	if err != nil {
-		return fmt.Errorf("copy data: %w", err)
-	}
-
-	err = os.Remove(source)
-	if err != nil {
-		return fmt.Errorf("remove source: %w", err)
-	}
-
-	return nil
-}
-
-// GenerateEtag generates a new quoted etag from the provided hash.Hash
-func GenerateEtag(h hash.Hash) string {
-	dataSum := h.Sum(nil)
-	return fmt.Sprintf("\"%s\"", hex.EncodeToString(dataSum[:]))
-}
-
-// AreEtagsSame compares 2 etags by ignoring quotes
-func AreEtagsSame(e1, e2 string) bool {
-	return strings.Trim(e1, `"`) == strings.Trim(e2, `"`)
-}
-
-func getBoolPtr(b bool) *bool {
-	return &b
-}
-
-type PreConditions struct {
-	IfMatch       *string
-	IfNoneMatch   *string
-	IfModSince    *time.Time
-	IfUnmodeSince *time.Time
-}
-
-// EvaluatePreconditions takes the object ETag, the last modified time and
-// evaluates the read preconditions:
-// - if-match,
-// - if-none-match
-// - if-modified-since
-// - if-unmodified-since
-// if-match and if-none-match are ETag comparisions
-// if-modified-since and if-unmodified-since are last modifed time comparisons
-func EvaluatePreconditions(etag string, modTime time.Time, preconditions PreConditions) error {
-	if preconditions.IfMatch == nil && preconditions.IfNoneMatch == nil && preconditions.IfModSince == nil && preconditions.IfUnmodeSince == nil {
-		return nil
-	}
-
-	etag = strings.Trim(etag, `"`)
-
-	// convert all conditions to *bool to evaluate the conditions
-	var ifMatch, ifNoneMatch, ifModSince, ifUnmodeSince *bool
-	if preconditions.IfMatch != nil {
-		ifMatch = getBoolPtr(*preconditions.IfMatch == etag)
-	}
-	if preconditions.IfNoneMatch != nil {
-		ifNoneMatch = getBoolPtr(*preconditions.IfNoneMatch != etag)
-	}
-	if preconditions.IfModSince != nil {
-		ifModSince = getBoolPtr(preconditions.IfModSince.UTC().Before(modTime.UTC()))
-	}
-	if preconditions.IfUnmodeSince != nil {
-		ifUnmodeSince = getBoolPtr(preconditions.IfUnmodeSince.UTC().After(modTime.UTC()))
-	}
-
-	if ifMatch != nil {
-		// if `if-match` doesn't matches, return PreconditionFailed
-		if !*ifMatch {
-			return errPreconditionFailed
-		}
-
-		// if-match matches
-		if *ifMatch {
-			if ifNoneMatch != nil {
-				// if `if-none-match` doesn't match return NotModified
-				if !*ifNoneMatch {
-					return errNotModified
-				}
-
-				// if both `if-match` and `if-none-match` match, return no error
-				return nil
-			}
-
-			// if `if-match` matches but `if-modified-since` is false return NotModified
-			if ifModSince != nil && !*ifModSince {
-				return errNotModified
-			}
-
-			// ignore `if-unmodified-since` as `if-match` is true
-			return nil
-		}
-	}
-
-	if ifNoneMatch != nil {
-		if *ifNoneMatch {
-			// if `if-none-match` is true, but `if-unmodified-since` is false
-			// return PreconditionFailed
-			if ifUnmodeSince != nil && !*ifUnmodeSince {
-				return errPreconditionFailed
-			}
-
-			// ignore `if-modified-since` as `if-none-match` is true
-			return nil
-		} else {
-			// if `if-none-match` is false and `if-unmodified-since` is false
-			// return PreconditionFailed
-			if ifUnmodeSince != nil && !*ifUnmodeSince {
-				return errPreconditionFailed
-			}
-
-			// in all other cases when `if-none-match` is false return NotModified
-			return errNotModified
-		}
-	}
-
-	if ifModSince != nil && !*ifModSince {
-		// if both `if-modified-since` and `if-unmodified-since` are false
-		// return PreconditionFailed
-		if ifUnmodeSince != nil && !*ifUnmodeSince {
-			return errPreconditionFailed
-		}
-
-		// if only `if-modified-since` is false, return NotModified
-		return errNotModified
-	}
-
-	// if `if-unmodified-since` is false return PreconditionFailed
-	if ifUnmodeSince != nil && !*ifUnmodeSince {
-		return errPreconditionFailed
-	}
-
-	return nil
-}
-
-// EvaluateMatchPreconditions evaluates if-match and if-none-match preconditions
-func EvaluateMatchPreconditions(etag string, ifMatch, ifNoneMatch *string) error {
-	etag = strings.Trim(etag, `"`)
-	if ifMatch != nil && *ifMatch != etag {
-		return errPreconditionFailed
-	}
-	if ifNoneMatch != nil && *ifNoneMatch == etag {
-		return errPreconditionFailed
-	}
-
-	return nil
-}
-
-// EvaluateObjectPutPreconditions evaluates if-match and if-none-match preconditions
-// for object PUT(PutObject, CompleteMultipartUpload) actions
-func EvaluateObjectPutPreconditions(etag string, ifMatch, ifNoneMatch *string, objExists bool) error {
-	if ifMatch == nil && ifNoneMatch == nil {
-		return nil
-	}
-
-	if ifNoneMatch != nil && *ifNoneMatch != "*" {
-		return s3err.GetAPIError(s3err.ErrNotImplemented)
-	}
-
-	if ifNoneMatch != nil && ifMatch != nil {
-		return s3err.GetAPIError(s3err.ErrNotImplemented)
-	}
-
-	if ifNoneMatch != nil && objExists {
-		return s3err.GetAPIError(s3err.ErrPreconditionFailed)
-	}
-
-	if ifMatch != nil && !objExists {
-		return s3err.GetAPIError(s3err.ErrNoSuchKey)
-	}
-
-	etag = strings.Trim(etag, `"`)
-
-	if ifMatch != nil && *ifMatch != etag {
-		return s3err.GetAPIError(s3err.ErrPreconditionFailed)
-	}
-
-	return nil
-}
-
-type ObjectDeletePreconditions struct {
-	IfMatch            *string
-	IfMatchLastModTime *time.Time
-	IfMatchSize        *int64
-}
-
-// EvaluateObjectDeletePreconditions evaluates preconditions for DeleteObject
-func EvaluateObjectDeletePreconditions(etag string, modTime time.Time, size int64, preconditions ObjectDeletePreconditions) error {
-	ifMatch := preconditions.IfMatch
-	if ifMatch != nil && *ifMatch != etag {
-		return errPreconditionFailed
-	}
-
-	ifMatchTime := preconditions.IfMatchLastModTime
-	if ifMatchTime != nil && ifMatchTime.Unix() != modTime.Unix() {
-		return errPreconditionFailed
-	}
-
-	ifMatchSize := preconditions.IfMatchSize
-	if ifMatchSize != nil && *ifMatchSize != size {
-		return errPreconditionFailed
-	}
-
-	return nil
-}
-
-// IsValidDirectoryName returns true if the string is a valid name
-// for a directory
-func IsValidDirectoryName(name string) bool {
-	// directories may not contain a path separator
-	if strings.ContainsRune(name, '/') {
-		return false
-	}
-
-	// directories may not contain null character
-	if strings.ContainsRune(name, 0) {
-		return false
-	}
-
-	return true
-}

backend/meta/meta.go

@@ -14,19 +14,17 @@
 
 package meta
 
-import "os"
-
 // MetadataStorer defines the interface for managing metadata.
 // When object == "", the operation is on the bucket.
 type MetadataStorer interface {
 	// RetrieveAttribute retrieves the value of a specific attribute for an object or a bucket.
 	// Returns the value of the attribute, or an error if the attribute does not exist.
-	RetrieveAttribute(f *os.File, bucket, object, attribute string) ([]byte, error)
+	RetrieveAttribute(bucket, object, attribute string) ([]byte, error)
 
 	// StoreAttribute stores the value of a specific attribute for an object or a bucket.
 	// If attribute already exists, new attribute should replace existing.
 	// Returns an error if the operation fails.
-	StoreAttribute(f *os.File, bucket, object, attribute string, value []byte) error
+	StoreAttribute(bucket, object, attribute string, value []byte) error
 
 	// DeleteAttribute removes the value of a specific attribute for an object or a bucket.
 	// Returns an error if the operation fails.

backend/meta/none.go

@@ -1,54 +0,0 @@
-// Copyright 2025 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package meta
-
-import (
-	"os"
-)
-
-// NoMeta is a metadata storer that does not store metadata.
-// This can be useful for read only mounts where attempting to store metadata
-// would fail.
-type NoMeta struct{}
-
-// RetrieveAttribute retrieves the value of a specific attribute for an object or a bucket.
-// always returns ErrNoSuchKey
-func (NoMeta) RetrieveAttribute(_ *os.File, _, _, _ string) ([]byte, error) {
-	return nil, ErrNoSuchKey
-}
-
-// StoreAttribute stores the value of a specific attribute for an object or a bucket.
-// always returns nil without storing the attribute
-func (NoMeta) StoreAttribute(_ *os.File, _, _, _ string, _ []byte) error {
-	return nil
-}
-
-// DeleteAttribute removes the value of a specific attribute for an object or a bucket.
-// always returns nil without deleting the attribute
-func (NoMeta) DeleteAttribute(_, _, _ string) error {
-	return nil
-}
-
-// ListAttributes lists all attributes for an object or a bucket.
-// always returns an empty list of attributes
-func (NoMeta) ListAttributes(_, _ string) ([]string, error) {
-	return []string{}, nil
-}
-
-// DeleteAttributes removes all attributes for an object or a bucket.
-// always returns nil without deleting any attributes
-func (NoMeta) DeleteAttributes(bucket, object string) error {
-	return nil
-}

backend/meta/sidecar.go

@@ -1,197 +0,0 @@
-// Copyright 2025 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package meta
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-)
-
-// SideCar is a metadata storer that uses sidecar files to store metadata.
-type SideCar struct {
-	dir string
-}
-
-const (
-	sidecarmeta = "meta"
-)
-
-// NewSideCar creates a new SideCar metadata storer.
-func NewSideCar(dir string) (SideCar, error) {
-	fi, err := os.Lstat(dir)
-	if err != nil {
-		return SideCar{}, fmt.Errorf("failed to stat directory: %v", err)
-	}
-	if !fi.IsDir() {
-		return SideCar{}, fmt.Errorf("not a directory")
-	}
-
-	return SideCar{dir: dir}, nil
-}
-
-// RetrieveAttribute retrieves the value of a specific attribute for an object or a bucket.
-func (s SideCar) RetrieveAttribute(_ *os.File, bucket, object, attribute string) ([]byte, error) {
-	metadir := filepath.Join(s.dir, bucket, object, sidecarmeta)
-	if object == "" {
-		metadir = filepath.Join(s.dir, bucket, sidecarmeta)
-	}
-	attr := filepath.Join(metadir, attribute)
-
-	value, err := os.ReadFile(attr)
-	if errors.Is(err, os.ErrNotExist) {
-		return nil, ErrNoSuchKey
-	}
-	if err != nil {
-		return nil, fmt.Errorf("failed to read attribute: %v", err)
-	}
-
-	return value, nil
-}
-
-// StoreAttribute stores the value of a specific attribute for an object or a bucket.
-func (s SideCar) StoreAttribute(_ *os.File, bucket, object, attribute string, value []byte) error {
-	metadir := filepath.Join(s.dir, bucket, object, sidecarmeta)
-	if object == "" {
-		metadir = filepath.Join(s.dir, bucket, sidecarmeta)
-	}
-	err := os.MkdirAll(metadir, 0777)
-	if err != nil {
-		return fmt.Errorf("failed to create metadata directory: %v", err)
-	}
-
-	attr := filepath.Join(metadir, attribute)
-	err = os.WriteFile(attr, value, 0666)
-	if err != nil {
-		return fmt.Errorf("failed to write attribute: %v", err)
-	}
-
-	return nil
-}
-
-// DeleteAttribute removes the value of a specific attribute for an object or a bucket.
-func (s SideCar) DeleteAttribute(bucket, object, attribute string) error {
-	metadir := filepath.Join(s.dir, bucket, object, sidecarmeta)
-	if object == "" {
-		metadir = filepath.Join(s.dir, bucket, sidecarmeta)
-	}
-	attr := filepath.Join(metadir, attribute)
-
-	err := os.Remove(attr)
-	if errors.Is(err, os.ErrNotExist) {
-		return ErrNoSuchKey
-	}
-	if err != nil {
-		return fmt.Errorf("failed to remove attribute: %v", err)
-	}
-
-	s.cleanupEmptyDirs(metadir, bucket, object)
-
-	return nil
-}
-
-// ListAttributes lists all attributes for an object or a bucket.
-func (s SideCar) ListAttributes(bucket, object string) ([]string, error) {
-	metadir := filepath.Join(s.dir, bucket, object, sidecarmeta)
-	if object == "" {
-		metadir = filepath.Join(s.dir, bucket, sidecarmeta)
-	}
-
-	ents, err := os.ReadDir(metadir)
-	if errors.Is(err, os.ErrNotExist) {
-		return []string{}, nil
-	}
-	if err != nil {
-		return nil, fmt.Errorf("failed to list attributes: %v", err)
-	}
-
-	var attrs []string
-	for _, ent := range ents {
-		attrs = append(attrs, ent.Name())
-	}
-
-	return attrs, nil
-}
-
-// DeleteAttributes removes all attributes for an object or a bucket.
-func (s SideCar) DeleteAttributes(bucket, object string) error {
-	metadir := filepath.Join(s.dir, bucket, object, sidecarmeta)
-	if object == "" {
-		metadir = filepath.Join(s.dir, bucket, sidecarmeta)
-	}
-
-	err := os.RemoveAll(metadir)
-	if err != nil && !errors.Is(err, os.ErrNotExist) {
-		return fmt.Errorf("failed to remove attributes: %v", err)
-	}
-	s.cleanupEmptyDirs(metadir, bucket, object)
-	return nil
-}
-
-func (s SideCar) cleanupEmptyDirs(metadir, bucket, object string) {
-	removeIfEmpty(metadir)
-	if bucket == "" {
-		return
-	}
-	bucketDir := filepath.Join(s.dir, bucket)
-	if object != "" {
-		removeEmptyParents(filepath.Dir(metadir), bucketDir)
-	}
-	removeIfEmpty(bucketDir)
-}
-
-func removeIfEmpty(dir string) {
-	empty, err := isDirEmpty(dir)
-	if err != nil || !empty {
-		return
-	}
-	_ = os.Remove(dir)
-}
-
-func removeEmptyParents(dir, stopDir string) {
-	for {
-		if dir == stopDir || dir == "." || dir == string(filepath.Separator) {
-			return
-		}
-		empty, err := isDirEmpty(dir)
-		if err != nil || !empty {
-			return
-		}
-		err = os.Remove(dir)
-		if err != nil {
-			return
-		}
-		dir = filepath.Dir(dir)
-	}
-}
-
-func isDirEmpty(dir string) (bool, error) {
-	f, err := os.Open(dir)
-	if err != nil {
-		return false, err
-	}
-	defer f.Close()
-
-	ents, err := f.Readdirnames(1)
-	if err == io.EOF {
-		return true, nil
-	}
-	if err != nil {
-		return false, err
-	}
-	return len(ents) == 0, nil
-}

backend/meta/xattr.go

@@ -17,13 +17,15 @@ package meta
 import (
 	"errors"
 	"fmt"
-	"os"
 	"path/filepath"
 	"strings"
 	"syscall"
 
 	"github.com/pkg/xattr"
-	"github.com/versity/versitygw/s3err"
+)
+
+const (
+	xattrPrefix = "user."
 )
 
 var (
@@ -34,15 +36,7 @@ var (
 type XattrMeta struct{}
 
 // RetrieveAttribute retrieves the value of a specific attribute for an object in a bucket.
-func (x XattrMeta) RetrieveAttribute(f *os.File, bucket, object, attribute string) ([]byte, error) {
-	if f != nil {
-		b, err := xattr.FGet(f, xattrPrefix+attribute)
-		if errors.Is(err, xattr.ENOATTR) {
-			return nil, ErrNoSuchKey
-		}
-		return b, err
-	}
-
+func (x XattrMeta) RetrieveAttribute(bucket, object, attribute string) ([]byte, error) {
 	b, err := xattr.Get(filepath.Join(bucket, object), xattrPrefix+attribute)
 	if errors.Is(err, xattr.ENOATTR) {
 		return nil, ErrNoSuchKey
@@ -51,20 +45,8 @@ func (x XattrMeta) RetrieveAttribute(f *os.File, bucket, object, attribute strin
 }
 
 // StoreAttribute stores the value of a specific attribute for an object in a bucket.
-func (x XattrMeta) StoreAttribute(f *os.File, bucket, object, attribute string, value []byte) error {
-	if f != nil {
-		err := xattr.FSet(f, xattrPrefix+attribute, value)
-		if errors.Is(err, syscall.EROFS) {
-			return s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-		}
-		return err
-	}
-
-	err := xattr.Set(filepath.Join(bucket, object), xattrPrefix+attribute, value)
-	if errors.Is(err, syscall.EROFS) {
-		return s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-	}
-	return err
+func (x XattrMeta) StoreAttribute(bucket, object, attribute string, value []byte) error {
+	return xattr.Set(filepath.Join(bucket, object), xattrPrefix+attribute, value)
 }
 
 // DeleteAttribute removes the value of a specific attribute for an object in a bucket.
@@ -73,9 +55,6 @@ func (x XattrMeta) DeleteAttribute(bucket, object, attribute string) error {
 	if errors.Is(err, xattr.ENOATTR) {
 		return ErrNoSuchKey
 	}
-	if errors.Is(err, syscall.EROFS) {
-		return s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-	}
 	return err
 }
 

backend/meta/xattr_freebsd.go

@@ -1,19 +0,0 @@
-// Copyright 2026 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-//go:build freebsd
-
-package meta
-
-const xattrPrefix = ""

backend/meta/xattr_other.go

@@ -1,19 +0,0 @@
-// Copyright 2026 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-//go:build !freebsd
-
-package meta
-
-const xattrPrefix = "user."

backend/mkdir.go

@@ -15,6 +15,11 @@ import (
 	"github.com/versity/versitygw/s3err"
 )
 
+var (
+	// TODO: make this configurable
+	defaultDirPerm fs.FileMode = 0755
+)
+
 // MkdirAll is similar to os.MkdirAll but it will return
 // ErrObjectParentIsFile when appropriate
 // MkdirAll creates a directory named path,
@@ -27,7 +32,7 @@ import (
 // and returns nil.
 // Any directory created will be set to provided uid/gid ownership
 // if doChown is true.
-func MkdirAll(path string, uid, gid int, doChown bool, dirPerm fs.FileMode) error {
+func MkdirAll(path string, uid, gid int, doChown bool) error {
 	// Fast path: if we can tell whether path is a directory or file, stop with success or error.
 	dir, err := os.Stat(path)
 	if err == nil {
@@ -50,14 +55,14 @@ func MkdirAll(path string, uid, gid int, doChown bool, dirPerm fs.FileMode) erro
 
 	if j > 1 {
 		// Create parent.
-		err = MkdirAll(path[:j-1], uid, gid, doChown, dirPerm)
+		err = MkdirAll(path[:j-1], uid, gid, doChown)
 		if err != nil {
 			return err
 		}
 	}
 
 	// Parent now exists; invoke Mkdir and use its result.
-	err = os.Mkdir(path, dirPerm)
+	err = os.Mkdir(path, defaultDirPerm)
 	if err != nil {
 		// Handle arguments like "foo/." by
 		// double-checking that directory doesn't exist.

backend/posix/parentdir_other.go

@@ -1,25 +0,0 @@
-// Copyright 2026 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-//go:build !windows
-
-package posix
-
-import (
-	"github.com/versity/versitygw/s3err"
-)
-
-func handleParentDirError(_ string) error {
-	return s3err.GetAPIError(s3err.ErrObjectParentIsFile)
-}

backend/posix/parentdir_windows.go

@@ -1,46 +0,0 @@
-// Copyright 2026 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-//go:build windows
-
-package posix
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/versity/versitygw/s3err"
-)
-
-func handleParentDirError(name string) error {
-	dir := filepath.Dir(name)
-
-	// Walk up the directory hierarchy
-	for dir != "." && dir != "/" {
-		d, statErr := os.Stat(dir)
-		if statErr == nil {
-			// Path component exists
-			if !d.IsDir() {
-				// Found a file in the ancestor path
-				return s3err.GetAPIError(s3err.ErrObjectParentIsFile)
-			}
-			// Found a valid directory ancestor, parent truly doesn't exist
-			break
-		}
-		// Continue checking parent directories
-		dir = filepath.Dir(dir)
-	}
-	// Parent doesn't exist or is a directory, treat as ENOENT
-	return nil
-}

backend/posix/with_otmpfile.go

@@ -26,11 +26,9 @@ import (
 	"path/filepath"
 	"strconv"
 	"syscall"
-	"time"
 
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/s3err"
 	"golang.org/x/sys/unix"
 )
 
@@ -45,7 +43,6 @@ type tmpfile struct {
 	needsChown bool
 	uid        int
 	gid        int
-	newDirPerm fs.FileMode
 }
 
 var (
@@ -53,13 +50,9 @@ var (
 	defaultFilePerm uint32 = 0644
 )
 
-func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Account, dofalloc bool, forceNoTmpFile bool) (*tmpfile, error) {
+func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Account, dofalloc bool) (*tmpfile, error) {
 	uid, gid, doChown := p.getChownIDs(acct)
 
-	if forceNoTmpFile {
-		return p.openMkTemp(dir, bucket, obj, size, dofalloc, uid, gid, doChown)
-	}
-
 	// O_TMPFILE allows for a file handle to an unnamed file in the filesystem.
 	// This can help reduce contention within the namespace (parent directories),
 	// etc. And will auto cleanup the inode on close if we never link this
@@ -68,12 +61,38 @@ func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Accou
 	// this is not supported.
 	fd, err := unix.Open(dir, unix.O_RDWR|unix.O_TMPFILE|unix.O_CLOEXEC, defaultFilePerm)
 	if err != nil {
-		if errors.Is(err, syscall.EROFS) {
-			return nil, s3err.GetAPIError(s3err.ErrMethodNotAllowed)
+		// O_TMPFILE not supported, try fallback
+		err = backend.MkdirAll(dir, uid, gid, doChown)
+		if err != nil {
+			return nil, fmt.Errorf("make temp dir: %w", err)
+		}
+		f, err := os.CreateTemp(dir,
+			fmt.Sprintf("%x.", sha256.Sum256([]byte(obj))))
+		if err != nil {
+			return nil, err
+		}
+		tmp := &tmpfile{
+			f:          f,
+			bucket:     bucket,
+			objname:    obj,
+			size:       size,
+			needsChown: doChown,
+			uid:        uid,
+			gid:        gid,
+		}
+		// falloc is best effort, its fine if this fails
+		if size > 0 && dofalloc {
+			tmp.falloc()
 		}
 
-		// O_TMPFILE not supported, try fallback
-		return p.openMkTemp(dir, bucket, obj, size, dofalloc, uid, gid, doChown)
+		if doChown {
+			err := f.Chown(uid, gid)
+			if err != nil {
+				return nil, fmt.Errorf("set temp file ownership: %w", err)
+			}
+		}
+
+		return tmp, nil
 	}
 
 	// for O_TMPFILE, filename is /proc/self/fd/<fd> to be used
@@ -89,7 +108,6 @@ func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Accou
 		needsChown: doChown,
 		uid:        uid,
 		gid:        gid,
-		newDirPerm: p.newDirPerm,
 	}
 
 	// falloc is best effort, its fine if this fails
@@ -107,46 +125,6 @@ func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Accou
 	return tmp, nil
 }
 
-func (p *Posix) openMkTemp(dir, bucket, obj string, size int64, dofalloc bool, uid, gid int, doChown bool) (*tmpfile, error) {
-	err := backend.MkdirAll(dir, uid, gid, doChown, p.newDirPerm)
-	if err != nil {
-		if errors.Is(err, syscall.EROFS) {
-			return nil, s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-		}
-		return nil, fmt.Errorf("make temp dir: %w", err)
-	}
-	f, err := os.CreateTemp(dir,
-		fmt.Sprintf("%x.", sha256.Sum256([]byte(obj))))
-	if err != nil {
-		if errors.Is(err, syscall.EROFS) {
-			return nil, s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-		}
-		return nil, err
-	}
-	tmp := &tmpfile{
-		f:          f,
-		bucket:     bucket,
-		objname:    obj,
-		size:       size,
-		needsChown: doChown,
-		uid:        uid,
-		gid:        gid,
-	}
-	// falloc is best effort, its fine if this fails
-	if size > 0 && dofalloc {
-		tmp.falloc()
-	}
-
-	if doChown {
-		err := f.Chown(uid, gid)
-		if err != nil {
-			return nil, fmt.Errorf("set temp file ownership: %w", err)
-		}
-	}
-
-	return tmp, nil
-}
-
 func (tmp *tmpfile) falloc() error {
 	err := syscall.Fallocate(int(tmp.f.Fd()), 0, 0, tmp.size)
 	if err != nil {
@@ -156,9 +134,6 @@ func (tmp *tmpfile) falloc() error {
 }
 
 func (tmp *tmpfile) link() error {
-	// make sure this is cleaned up in all error cases
-	defer tmp.f.Close()
-
 	// We use Linkat/Rename as the atomic operation for object puts. The
 	// upload is written to a temp (or unnamed/O_TMPFILE) file to not conflict
 	// with any other simultaneous uploads. The final operation is to move the
@@ -166,10 +141,14 @@ func (tmp *tmpfile) link() error {
 	// of last upload completed wins and is not some combination of writes
 	// from simultaneous uploads.
 	objPath := filepath.Join(tmp.bucket, tmp.objname)
+	err := os.Remove(objPath)
+	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return fmt.Errorf("remove stale path: %w", err)
+	}
 
 	dir := filepath.Dir(objPath)
 
-	err := backend.MkdirAll(dir, tmp.uid, tmp.gid, tmp.needsChown, tmp.newDirPerm)
+	err = backend.MkdirAll(dir, tmp.uid, tmp.gid, tmp.needsChown)
 	if err != nil {
 		return fmt.Errorf("make parent dir: %w", err)
 	}
@@ -193,31 +172,9 @@ func (tmp *tmpfile) link() error {
 
 	err = unix.Linkat(int(procdir.Fd()), filepath.Base(tmp.f.Name()),
 		int(dirf.Fd()), filepath.Base(objPath), unix.AT_SYMLINK_FOLLOW)
-	if errors.Is(err, syscall.EEXIST) {
-		// Linkat cannot overwrite files; we will allocate a temporary file, Linkat to it and then Renameat it
-		// to avoid potential race condition
-		retries := 1
-		for {
-			tmpName := fmt.Sprintf(".%s.sgwtmp.%d", filepath.Base(objPath), time.Now().UnixNano())
-			err := unix.Linkat(int(procdir.Fd()), filepath.Base(tmp.f.Name()),
-				int(dirf.Fd()), tmpName, unix.AT_SYMLINK_FOLLOW)
-			if errors.Is(err, syscall.EEXIST) && retries < 3 {
-				retries += 1
-				continue
-			}
-			if err != nil {
-				return fmt.Errorf("cannot find free temporary file: %w", err)
-			}
-
-			err = unix.Renameat(int(dirf.Fd()), tmpName, int(dirf.Fd()), filepath.Base(objPath))
-			if err != nil {
-				return fmt.Errorf("overwriting renameat failed: %w", err)
-			}
-			break
-		}
-	} else if err != nil {
-		return fmt.Errorf("link tmpfile (fd %q as %q): %w",
-			filepath.Base(tmp.f.Name()), objPath, err)
+	if err != nil {
+		return fmt.Errorf("link tmpfile (%q in %q): %w",
+			filepath.Dir(objPath), filepath.Base(tmp.f.Name()), err)
 	}
 
 	err = tmp.f.Close()
@@ -245,9 +202,7 @@ func (tmp *tmpfile) fallbackLink() error {
 	objPath := filepath.Join(tmp.bucket, tmp.objname)
 	err = os.Rename(tempname, objPath)
 	if err != nil {
-		// rename only works for files within the same filesystem
-		// if this fails fallback to copy
-		return backend.MoveFile(tempname, objPath, fs.FileMode(defaultFilePerm))
+		return fmt.Errorf("rename tmpfile: %w", err)
 	}
 
 	return nil

backend/posix/without_otmpfile.go

@@ -24,11 +24,9 @@ import (
 	"io/fs"
 	"os"
 	"path/filepath"
-	"syscall"
 
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/s3err"
 )
 
 type tmpfile struct {
@@ -38,24 +36,18 @@ type tmpfile struct {
 	size    int64
 }
 
-func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Account, _ bool, _ bool) (*tmpfile, error) {
+func (p *Posix) openTmpFile(dir, bucket, obj string, size int64, acct auth.Account, _ bool) (*tmpfile, error) {
 	uid, gid, doChown := p.getChownIDs(acct)
 
 	// Create a temp file for upload while in progress (see link comments below).
 	var err error
-	err = backend.MkdirAll(dir, uid, gid, doChown, p.newDirPerm)
+	err = backend.MkdirAll(dir, uid, gid, doChown)
 	if err != nil {
-		if errors.Is(err, syscall.EROFS) {
-			return nil, s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-		}
 		return nil, fmt.Errorf("make temp dir: %w", err)
 	}
 	f, err := os.CreateTemp(dir,
 		fmt.Sprintf("%x.", sha256.Sum256([]byte(obj))))
 	if err != nil {
-		if errors.Is(err, syscall.EROFS) {
-			return nil, s3err.GetAPIError(s3err.ErrMethodNotAllowed)
-		}
 		return nil, fmt.Errorf("create temp file: %w", err)
 	}
 
@@ -80,17 +72,31 @@ func (tmp *tmpfile) link() error {
 	// this will no longer exist
 	defer os.Remove(tempname)
 
+	// We use Rename as the atomic operation for object puts. The upload is
+	// written to a temp file to not conflict with any other simultaneous
+	// uploads. The final operation is to move the temp file into place for
+	// the object. This ensures the object semantics of last upload completed
+	// wins and is not some combination of writes from simultaneous uploads.
 	objPath := filepath.Join(tmp.bucket, tmp.objname)
+	err := os.Remove(objPath)
+	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return fmt.Errorf("remove stale path: %w", err)
+	}
 
 	// reset default file mode because CreateTemp uses 0600
 	tmp.f.Chmod(defaultFilePerm)
 
-	err := tmp.f.Close()
+	err = tmp.f.Close()
 	if err != nil {
 		return fmt.Errorf("close tmpfile: %w", err)
 	}
 
-	return backend.MoveFile(tempname, objPath, defaultFilePerm)
+	err = os.Rename(tempname, objPath)
+	if err != nil {
+		return fmt.Errorf("rename tmpfile: %w", err)
+	}
+
+	return nil
 }
 
 func (tmp *tmpfile) Write(b []byte) (int, error) {

backend/s3proxy/client.go

@@ -36,11 +36,6 @@ func (s *S3Proxy) getClientWithCtx(ctx context.Context) (*s3.Client, error) {
 	if s.endpoint != "" {
 		return s3.NewFromConfig(cfg, func(o *s3.Options) {
 			o.BaseEndpoint = &s.endpoint
-			o.UsePathStyle = s.usePathStyle
-			// The http body stream is not seekable, so most operations cannot
-			// be retried. The error returned to the original client may be
-			// retried by the client.
-			o.Retryer = aws.NopRetryer{}
 		}), nil
 	}
 

backend/scoutfs/scoutfs_compat.go

@@ -17,70 +17,29 @@
 package scoutfs
 
 import (
-	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/fs"
 	"os"
 	"path/filepath"
 	"strconv"
-	"strings"
-	"syscall"
 
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/pkg/xattr"
+	"golang.org/x/sys/unix"
+
 	"github.com/versity/scoutfs-go"
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
 	"github.com/versity/versitygw/backend/meta"
 	"github.com/versity/versitygw/backend/posix"
-	"github.com/versity/versitygw/debuglogger"
-	"github.com/versity/versitygw/s3err"
-	"github.com/versity/versitygw/s3response"
 )
 
-type ScoutFS struct {
-	*posix.Posix
-	rootfd  *os.File
-	rootdir string
-
-	// glaciermode enables the following behavior:
-	// GET object:  if file offline, return invalid object state
-	// HEAD object: if file offline, set obj storage class to GLACIER
-	//              if file offline and staging, x-amz-restore: ongoing-request="true"
-	//              if file offline and not staging, x-amz-restore: ongoing-request="false"
-	//              if file online, x-amz-restore: ongoing-request="false", expiry-date="Fri, 2 Dec 2050 00:00:00 GMT"
-	//              note: this expiry-date is not used but provided for client glacier compatibility
-	// ListObjects: if file offline, set obj storage class to GLACIER
-	// RestoreObject: add batch stage request to file
-	glaciermode bool
-
-	// disableNoArchive is used to disable setting scoutam noarchive flag
-	// on multipart parts. This is enabled by default to prevent archive
-	// copies of temporary multipart parts.
-	disableNoArchive bool
-
-	// enable posix level bucket name validations, not needed if the
-	// frontend handlers are already validating bucket names
-	validateBucketName bool
-
-	// projectIDEnabled enables setting projectid of new buckets and objects
-	// to the account project id when non-0
-	projectIDEnabled bool
-}
-
 func New(rootdir string, opts ScoutfsOpts) (*ScoutFS, error) {
 	metastore := meta.XattrMeta{}
 
 	p, err := posix.New(rootdir, metastore, posix.PosixOpts{
-		ChownUID:            opts.ChownUID,
-		ChownGID:            opts.ChownGID,
-		BucketLinks:         opts.BucketLinks,
-		NewDirPerm:          opts.NewDirPerm,
-		VersioningDir:       opts.VersioningDir,
-		ValidateBucketNames: opts.ValidateBucketNames,
+		ChownUID:    opts.ChownUID,
+		ChownGID:    opts.ChownGID,
+		BucketLinks: opts.BucketLinks,
 	})
 	if err != nil {
 		return nil, err
@@ -91,491 +50,148 @@ func New(rootdir string, opts ScoutfsOpts) (*ScoutFS, error) {
 		return nil, fmt.Errorf("open %v: %w", rootdir, err)
 	}
 
-	setProjectID := opts.SetProjectID
-	if opts.SetProjectID {
-		setProjectID = fGetFormatVersion(f).AtLeast(versionScoutFsV2)
-		if !setProjectID {
-			fmt.Println("WARNING:")
-			fmt.Println("Disabling ProjectIDs for unsupported FS format version")
-			fmt.Println("See documentation for format version upgrades")
-		}
-	}
-
 	return &ScoutFS{
-		Posix:            p,
-		rootfd:           f,
-		rootdir:          rootdir,
-		glaciermode:      opts.GlacierMode,
-		disableNoArchive: opts.DisableNoArchive,
-		projectIDEnabled: setProjectID,
+		Posix:       p,
+		rootfd:      f,
+		rootdir:     rootdir,
+		meta:        metastore,
+		chownuid:    opts.ChownUID,
+		chowngid:    opts.ChownGID,
+		glaciermode: opts.GlacierMode,
 	}, nil
 }
 
-const (
-	stageComplete      = "ongoing-request=\"false\", expiry-date=\"Fri, 2 Dec 2050 00:00:00 GMT\""
-	stageInProgress    = "true"
-	stageNotInProgress = "false"
-)
+const procfddir = "/proc/self/fd"
 
-const (
-	// ScoutFS special xattr types
-	systemPrefix = "scoutfs.hide."
-	flagskey     = systemPrefix + "sam_flags"
-)
-
-const (
-	// ScoutAM Flags
-
-	// Staging - file requested stage
-	Staging uint64 = 1 << iota
-	// StageFail - all copies failed to stage
-	StageFail
-	// NoArchive - no archive copies of file should be made
-	NoArchive
-	// ExtCacheRequested means file policy requests Ext Cache
-	ExtCacheRequested
-	// ExtCacheDone means this file ext cache copy has been
-	// created already (and possibly pruned, so may not exist)
-	ExtCacheDone
-)
-
-func (s *ScoutFS) Shutdown() {
-	s.Posix.Shutdown()
-	s.rootfd.Close()
+type tmpfile struct {
+	f          *os.File
+	bucket     string
+	objname    string
+	size       int64
+	needsChown bool
+	uid        int
+	gid        int
 }
 
-func (*ScoutFS) String() string {
-	return "ScoutFS Gateway"
-}
+var (
+	// TODO: make this configurable
+	defaultFilePerm uint32 = 0644
+)
 
-func (s *ScoutFS) CreateBucket(ctx context.Context, input *s3.CreateBucketInput, acl []byte) error {
-	err := s.Posix.CreateBucket(ctx, input, acl)
-	if err != nil {
-		return err
-	}
+func (s *ScoutFS) openTmpFile(dir, bucket, obj string, size int64, acct auth.Account) (*tmpfile, error) {
+	uid, gid, doChown := s.getChownIDs(acct)
 
-	if s.projectIDEnabled {
-		acct, ok := ctx.Value("account").(auth.Account)
-		if !ok {
-			acct = auth.Account{}
-		}
-
-		if !isValidProjectID(acct.ProjectID) {
-			// early return to avoid the open if we dont have a valid
-			// project id
-			return nil
-		}
-
-		f, err := os.Open(*input.Bucket)
-		if err != nil {
-			debuglogger.InternalError(fmt.Errorf("create bucket %q set project id - open: %v",
-				*input.Bucket, err))
-			return nil
-		}
-
-		err = s.setProjectID(f, acct.ProjectID)
-		f.Close()
-		if err != nil {
-			debuglogger.InternalError(fmt.Errorf("create bucket %q set project id: %v",
-				*input.Bucket, err))
-		}
-	}
-
-	return nil
-}
-
-func (s *ScoutFS) HeadObject(ctx context.Context, input *s3.HeadObjectInput) (*s3.HeadObjectOutput, error) {
-	res, err := s.Posix.HeadObject(ctx, input)
+	// O_TMPFILE allows for a file handle to an unnamed file in the filesystem.
+	// This can help reduce contention within the namespace (parent directories),
+	// etc. And will auto cleanup the inode on close if we never link this
+	// file descriptor into the namespace.
+	fd, err := unix.Open(dir, unix.O_RDWR|unix.O_TMPFILE|unix.O_CLOEXEC, defaultFilePerm)
 	if err != nil {
 		return nil, err
 	}
 
-	if s.glaciermode {
-		objPath := filepath.Join(*input.Bucket, *input.Key)
+	// for O_TMPFILE, filename is /proc/self/fd/<fd> to be used
+	// later to link file into namespace
+	f := os.NewFile(uintptr(fd), filepath.Join(procfddir, strconv.Itoa(fd)))
 
-		stclass := types.StorageClassStandard
-		requestOngoing := ""
+	tmp := &tmpfile{
+		f:          f,
+		bucket:     bucket,
+		objname:    obj,
+		size:       size,
+		needsChown: doChown,
+		uid:        uid,
+		gid:        gid,
+	}
 
-		requestOngoing = stageComplete
-
-		// Check if there are any offline exents associated with this file.
-		// If so, we will set storage class to glacier.
-		st, err := scoutfs.StatMore(objPath)
-		if errors.Is(err, fs.ErrNotExist) {
-			return nil, s3err.GetAPIError(s3err.ErrNoSuchKey)
-		}
+	if doChown {
+		err := f.Chown(uid, gid)
 		if err != nil {
-			return nil, fmt.Errorf("stat more: %w", err)
+			return nil, fmt.Errorf("set temp file ownership: %w", err)
 		}
-		if st.Offline_blocks != 0 {
-			stclass = types.StorageClassGlacier
-			requestOngoing = stageNotInProgress
-
-			ok, err := isStaging(objPath)
-			if errors.Is(err, fs.ErrNotExist) {
-				return nil, s3err.GetAPIError(s3err.ErrNoSuchKey)
-			}
-			if err != nil {
-				return nil, fmt.Errorf("check stage status: %w", err)
-			}
-			if ok {
-				requestOngoing = stageInProgress
-			}
-		}
-
-		res.Restore = &requestOngoing
-		res.StorageClass = stclass
 	}
 
-	return res, nil
+	return tmp, nil
 }
 
-func (s *ScoutFS) PutObject(ctx context.Context, po s3response.PutObjectInput) (s3response.PutObjectOutput, error) {
-	acct, ok := ctx.Value("account").(auth.Account)
-	if !ok {
-		acct = auth.Account{}
+func (tmp *tmpfile) link() error {
+	// We use Linkat/Rename as the atomic operation for object puts. The
+	// upload is written to a temp (or unnamed/O_TMPFILE) file to not conflict
+	// with any other simultaneous uploads. The final operation is to move the
+	// temp file into place for the object. This ensures the object semantics
+	// of last upload completed wins and is not some combination of writes
+	// from simultaneous uploads.
+	objPath := filepath.Join(tmp.bucket, tmp.objname)
+	err := os.Remove(objPath)
+	if err != nil && !errors.Is(err, fs.ErrNotExist) {
+		return fmt.Errorf("remove stale path: %w", err)
 	}
 
-	return s.Posix.PutObjectWithPostFunc(ctx, po, func(f *os.File) error {
-		err := s.setProjectID(f, acct.ProjectID)
-		if err != nil {
-			debuglogger.InternalError(fmt.Errorf("put object %v/%v set project id: %v",
-				filepath.Join(*po.Bucket, *po.Key), acct.ProjectID, err))
-		}
+	dir := filepath.Dir(objPath)
 
-		return nil
-	})
-}
-
-func (s *ScoutFS) UploadPart(ctx context.Context, input *s3.UploadPartInput) (*s3.UploadPartOutput, error) {
-	acct, ok := ctx.Value("account").(auth.Account)
-	if !ok {
-		acct = auth.Account{}
-	}
-
-	return s.Posix.UploadPartWithPostFunc(ctx, input,
-		func(f *os.File) error {
-			if !s.disableNoArchive {
-				err := setNoArchive(f)
-				if err != nil {
-					return fmt.Errorf("set noarchive: %w", err)
-				}
-			}
-
-			err := s.setProjectID(f, acct.ProjectID)
-			if err != nil {
-				return fmt.Errorf("set project id %v: %w", acct.ProjectID, err)
-			}
-
-			return nil
-		})
-}
-
-// CompleteMultipartUpload scoutfs complete upload uses scoutfs move blocks
-// ioctl to not have to read and copy the part data to the final object. This
-// saves a read and write cycle for all mutlipart uploads.
-func (s *ScoutFS) CompleteMultipartUpload(ctx context.Context, input *s3.CompleteMultipartUploadInput) (s3response.CompleteMultipartUploadResult, string, error) {
-	acct, ok := ctx.Value("account").(auth.Account)
-	if !ok {
-		acct = auth.Account{}
-	}
-
-	return s.Posix.CompleteMultipartUploadWithCopy(ctx, input,
-		func(from *os.File, to *os.File) error {
-			// May fail if the files are not 4K aligned; check for alignment
-			ffi, err := from.Stat()
-			if err != nil {
-				return fmt.Errorf("complete-mpu stat from: %w", err)
-			}
-			tfi, err := to.Stat()
-			if err != nil {
-				return fmt.Errorf("complete-mpu stat to: %w", err)
-			}
-			if ffi.Size()%4096 != 0 || tfi.Size()%4096 != 0 {
-				return os.ErrInvalid
-			}
-
-			err = s.setProjectID(to, acct.ProjectID)
-			if err != nil {
-				debuglogger.InternalError(fmt.Errorf("complete-mpu %q/%q set project id %v: %v",
-					*input.Bucket, *input.Key, acct.ProjectID, err))
-			}
-
-			err = scoutfs.MoveData(from, to)
-			if err != nil {
-				return fmt.Errorf("complete-mpu movedata: %w", err)
-			}
-
-			return nil
-		})
-}
-
-func (s *ScoutFS) isBucketValid(bucket string) bool {
-	if !s.validateBucketName {
-		return true
-	}
-
-	return backend.IsValidDirectoryName(bucket)
-}
-
-func (s *ScoutFS) GetObject(ctx context.Context, input *s3.GetObjectInput) (*s3.GetObjectOutput, error) {
-	bucket := *input.Bucket
-	object := *input.Key
-
-	if !s.isBucketValid(bucket) {
-		return nil, s3err.GetAPIError(s3err.ErrInvalidBucketName)
-	}
-
-	_, err := os.Stat(bucket)
-	if errors.Is(err, fs.ErrNotExist) {
-		return nil, s3err.GetAPIError(s3err.ErrNoSuchBucket)
-	}
+	err = backend.MkdirAll(dir, tmp.uid, tmp.gid, tmp.needsChown)
 	if err != nil {
-		return nil, fmt.Errorf("stat bucket: %w", err)
+		return fmt.Errorf("make parent dir: %w", err)
 	}
 
-	objPath := filepath.Join(bucket, object)
-
-	fi, err := os.Stat(objPath)
-	if errors.Is(err, fs.ErrNotExist) || errors.Is(err, syscall.ENOTDIR) {
-		return nil, s3err.GetAPIError(s3err.ErrNoSuchKey)
-	}
-	if errors.Is(err, syscall.ENAMETOOLONG) {
-		return nil, s3err.GetAPIError(s3err.ErrKeyTooLong)
-	}
+	procdir, err := os.Open(procfddir)
 	if err != nil {
-		return nil, fmt.Errorf("stat object: %w", err)
+		return fmt.Errorf("open proc dir: %w", err)
 	}
+	defer procdir.Close()
 
-	if strings.HasSuffix(object, "/") && !fi.IsDir() {
-		return nil, s3err.GetAPIError(s3err.ErrNoSuchKey)
-	}
-
-	if s.glaciermode {
-		// Check if there are any offline exents associated with this file.
-		// If so, we will return the InvalidObjectState error.
-		st, err := scoutfs.StatMore(objPath)
-		if errors.Is(err, fs.ErrNotExist) {
-			return nil, s3err.GetAPIError(s3err.ErrNoSuchKey)
-		}
-		if err != nil {
-			return nil, fmt.Errorf("stat more: %w", err)
-		}
-		if st.Offline_blocks != 0 {
-			return nil, s3err.GetAPIError(s3err.ErrInvalidObjectState)
-		}
-	}
-
-	return s.Posix.GetObject(ctx, input)
-}
-
-func (s *ScoutFS) ListObjects(ctx context.Context, input *s3.ListObjectsInput) (s3response.ListObjectsResult, error) {
-	if s.glaciermode {
-		return s.Posix.ListObjectsParametrized(ctx, input, s.glacierFileToObj)
-	} else {
-		return s.Posix.ListObjects(ctx, input)
-	}
-}
-
-func (s *ScoutFS) ListObjectsV2(ctx context.Context, input *s3.ListObjectsV2Input) (s3response.ListObjectsV2Result, error) {
-	if s.glaciermode {
-		return s.Posix.ListObjectsV2Parametrized(ctx, input, s.glacierFileToObj)
-	} else {
-		return s.Posix.ListObjectsV2(ctx, input)
-	}
-}
-
-// FileToObj function for ListObject calls that adds a Glacier storage class if the file is offline
-func (s *ScoutFS) glacierFileToObj(bucket string, fetchOwner bool) backend.GetObjFunc {
-	posixFileToObj := s.Posix.FileToObj(bucket, fetchOwner)
-
-	return func(path string, d fs.DirEntry) (s3response.Object, error) {
-		res, err := posixFileToObj(path, d)
-		if err != nil || d.IsDir() {
-			return res, err
-		}
-		objPath := filepath.Join(bucket, path)
-		// Check if there are any offline exents associated with this file.
-		// If so, we will return the Glacier storage class
-		st, err := scoutfs.StatMore(objPath)
-		if errors.Is(err, fs.ErrNotExist) {
-			return s3response.Object{}, backend.ErrSkipObj
-		}
-		if err != nil {
-			return s3response.Object{}, fmt.Errorf("stat more: %w", err)
-		}
-		if st.Offline_blocks != 0 {
-			res.StorageClass = types.ObjectStorageClassGlacier
-		}
-		return res, nil
-	}
-}
-
-// RestoreObject will set stage request on file if offline and do nothing if
-// file is online
-func (s *ScoutFS) RestoreObject(_ context.Context, input *s3.RestoreObjectInput) error {
-	bucket := *input.Bucket
-	object := *input.Key
-
-	if !s.isBucketValid(bucket) {
-		return s3err.GetAPIError(s3err.ErrInvalidBucketName)
-	}
-
-	_, err := os.Stat(bucket)
-	if errors.Is(err, fs.ErrNotExist) {
-		return s3err.GetAPIError(s3err.ErrNoSuchBucket)
-	}
+	dirf, err := os.Open(dir)
 	if err != nil {
-		return fmt.Errorf("stat bucket: %w", err)
+		return fmt.Errorf("open parent dir: %w", err)
+	}
+	defer dirf.Close()
+
+	err = unix.Linkat(int(procdir.Fd()), filepath.Base(tmp.f.Name()),
+		int(dirf.Fd()), filepath.Base(objPath), unix.AT_SYMLINK_FOLLOW)
+	if err != nil {
+		return fmt.Errorf("link tmpfile: %w", err)
 	}
 
-	err = setStaging(filepath.Join(bucket, object))
-	if errors.Is(err, fs.ErrNotExist) {
-		return s3err.GetAPIError(s3err.ErrNoSuchKey)
-	}
+	err = tmp.f.Close()
 	if err != nil {
-		return fmt.Errorf("stage object: %w", err)
+		return fmt.Errorf("close tmpfile: %w", err)
 	}
 
 	return nil
 }
 
-func isStaging(objname string) (bool, error) {
-	b, err := xattr.Get(objname, flagskey)
-	if err != nil && !isNoAttr(err) {
-		return false, err
+func (tmp *tmpfile) Write(b []byte) (int, error) {
+	if int64(len(b)) > tmp.size {
+		return 0, fmt.Errorf("write exceeds content length %v", tmp.size)
 	}
 
-	var flags uint64
-	if !isNoAttr(err) {
-		err = json.Unmarshal(b, &flags)
-		if err != nil {
-			return false, err
-		}
-	}
-
-	return flags&Staging == Staging, nil
+	n, err := tmp.f.Write(b)
+	tmp.size -= int64(n)
+	return n, err
 }
 
-func setFlag(objname string, flag uint64) error {
-	f, err := os.Open(objname)
+func (tmp *tmpfile) cleanup() {
+	tmp.f.Close()
+}
+
+func moveData(from *os.File, to *os.File) error {
+	return scoutfs.MoveData(from, to)
+}
+
+func statMore(path string) (stat, error) {
+	st, err := scoutfs.StatMore(path)
 	if err != nil {
-		return err
+		return stat{}, err
 	}
-	defer f.Close()
+	var s stat
 
-	return fsetFlag(f, flag)
-}
-
-func fsetFlag(f *os.File, flag uint64) error {
-	b, err := xattr.FGet(f, flagskey)
-	if err != nil && !isNoAttr(err) {
-		return err
-	}
-
-	var oldflags uint64
-	if !isNoAttr(err) {
-		err = json.Unmarshal(b, &oldflags)
-		if err != nil {
-			return err
-		}
-	}
-
-	newflags := oldflags | flag
-
-	if newflags == oldflags {
-		// no flags change, just return
-		return nil
-	}
-
-	b, err = json.Marshal(&newflags)
-	if err != nil {
-		return err
-	}
-
-	return xattr.FSet(f, flagskey, b)
-}
-
-func setStaging(objname string) error {
-	return setFlag(objname, Staging)
-}
-
-func setNoArchive(f *os.File) error {
-	return fsetFlag(f, NoArchive)
-}
-
-func isNoAttr(err error) bool {
-	xerr, ok := err.(*xattr.Error)
-	if ok && xerr.Err == xattr.ENOATTR {
-		return true
-	}
-	return false
-}
-
-func (s *ScoutFS) setProjectID(f *os.File, proj int) error {
-	if s.projectIDEnabled && isValidProjectID(proj) {
-		err := scoutfs.SetProjectID(f, uint64(proj))
-		if err != nil {
-			return fmt.Errorf("set project id: %w", err)
-		}
-	}
-	return nil
-}
-
-func isValidProjectID(proj int) bool {
-	return proj > 0
-}
-
-const (
-	sysscoutfs    = "/sys/fs/scoutfs/"
-	formatversion = "format_version"
-)
-
-// GetFormatVersion returns ScoutFS version reported by sysfs
-func fGetFormatVersion(f *os.File) scoutFsVersion {
-	fsid, err := scoutfs.GetIDs(f)
-	if err != nil {
-		return versionScoutFsNotScoutFS
-	}
-
-	path := filepath.Join(sysscoutfs, fsid.ShortID, formatversion)
-	buf, err := os.ReadFile(path)
-	if err != nil {
-		return versionScoutFsUnknown
-	}
-
-	str := strings.TrimSpace(string(buf))
-	vers, err := strconv.Atoi(str)
-	if err != nil {
-		return versionScoutFsUnknown
-	}
-
-	return scoutFsVersion(vers)
-}
-
-const (
-	// versionScoutFsUnknown is unknown version
-	versionScoutFsUnknown scoutFsVersion = iota
-	// versionScoutFsV1 is version 1
-	versionScoutFsV1
-	// versionScoutFsV2 is version 2
-	versionScoutFsV2
-	// versionScoutFsMin is minimum scoutfs version
-	versionScoutFsMin = versionScoutFsV1
-	// versionScoutFsMax is maximum scoutfs version
-	versionScoutFsMax = versionScoutFsV2
-	// versionScoutFsNotScoutFS means the target FS is not scoutfs
-	versionScoutFsNotScoutFS = versionScoutFsMax + 1
-)
-
-// scoutFsVersion version
-type scoutFsVersion int
-
-// AtLeast returns true if version is valid and at least b
-func (a scoutFsVersion) AtLeast(b scoutFsVersion) bool {
-	return a.IsValid() && a >= b
-}
-
-func (a scoutFsVersion) IsValid() bool {
-	return a >= versionScoutFsMin && a <= versionScoutFsMax
+	s.Meta_seq = st.Meta_seq
+	s.Data_seq = st.Data_seq
+	s.Data_version = st.Data_version
+	s.Online_blocks = st.Online_blocks
+	s.Offline_blocks = st.Offline_blocks
+	s.Crtime_sec = st.Crtime_sec
+	s.Crtime_nsec = st.Crtime_nsec
+
+	return s, nil
 }

backend/scoutfs/scoutfs_incompat.go

@@ -17,15 +17,49 @@
 package scoutfs
 
 import (
+	"errors"
 	"fmt"
+	"os"
 
-	"github.com/versity/versitygw/backend"
+	"github.com/versity/versitygw/auth"
 )
 
-type ScoutFS struct {
-	backend.BackendUnsupported
-}
-
 func New(rootdir string, opts ScoutfsOpts) (*ScoutFS, error) {
 	return nil, fmt.Errorf("scoutfs only available on linux")
 }
+
+type tmpfile struct {
+	f *os.File
+}
+
+var (
+	errNotSupported = errors.New("not supported")
+)
+
+func (s *ScoutFS) openTmpFile(_, _, _ string, _ int64, _ auth.Account) (*tmpfile, error) {
+	// make these look used for static check
+	_ = s.chownuid
+	_ = s.chowngid
+	_ = s.euid
+	_ = s.egid
+	return nil, errNotSupported
+}
+
+func (tmp *tmpfile) link() error {
+	return errNotSupported
+}
+
+func (tmp *tmpfile) Write(b []byte) (int, error) {
+	return 0, errNotSupported
+}
+
+func (tmp *tmpfile) cleanup() {
+}
+
+func moveData(_, _ *os.File) error {
+	return errNotSupported
+}
+
+func statMore(_ string) (stat, error) {
+	return stat{}, errNotSupported
+}

backend/scoutfs/stat.go

@@ -1,4 +1,4 @@
-// Copyright 2025 Versity Software
+// Copyright 2023 Versity Software
 // This file is licensed under the Apache License, Version 2.0
 // (the "License"); you may not use this file except in compliance
 // with the License.  You may obtain a copy of the License at
@@ -12,13 +12,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package utils
+package scoutfs
 
-func IsObjectNameValid(name string) bool {
-	switch clean(name) {
-	case "", ".", "..", "/":
-		return false
-	}
-
-	return isObjectLocal(name)
+type stat struct {
+	Meta_seq       uint64
+	Data_seq       uint64
+	Data_version   uint64
+	Online_blocks  uint64
+	Offline_blocks uint64
+	Crtime_sec     uint64
+	Crtime_nsec    uint32
 }

backend/walk_test.go

@@ -31,18 +31,9 @@ import (
 )
 
 type walkTest struct {
-	fsys   fs.FS
-	getobj backend.GetObjFunc
-	cases  []testcase
-}
-
-type testcase struct {
-	name      string
-	prefix    string
-	delimiter string
-	marker    string
-	maxObjs   int32
-	expected  backend.WalkResults
+	fsys     fs.FS
+	expected backend.WalkResults
+	getobj   backend.GetObjFunc
 }
 
 func getObj(path string, d fs.DirEntry) (s3response.Object, error) {
@@ -97,170 +88,50 @@ func TestWalk(t *testing.T) {
 				"photos/2006/February/sample3.jpg": {},
 				"photos/2006/February/sample4.jpg": {},
 			},
-			getobj: getObj,
-			cases: []testcase{
-				{
-					name:      "aws example",
-					delimiter: "/",
-					maxObjs:   1000,
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("photos/"),
-						}},
-						Objects: []s3response.Object{{
-							Key: backend.GetPtrFromString("sample.jpg"),
-						}},
-					},
-				},
-				{
-					name:      "max objs",
-					delimiter: "/",
-					prefix:    "photos/2006/February/",
-					maxObjs:   2,
-					expected: backend.WalkResults{
-						Objects: []s3response.Object{
-							{
-								Key: backend.GetPtrFromString("photos/2006/February/sample2.jpg"),
-							},
-							{
-								Key: backend.GetPtrFromString("photos/2006/February/sample3.jpg"),
-							},
-						},
-					},
-				},
+			expected: backend.WalkResults{
+				CommonPrefixes: []types.CommonPrefix{{
+					Prefix: backend.GetStringPtr("photos/"),
+				}},
+				Objects: []s3response.Object{{
+					Key: backend.GetStringPtr("sample.jpg"),
+				}},
 			},
+			getobj: getObj,
 		},
 		{
 			// test case single dir/single file
 			fsys: fstest.MapFS{
 				"test/file": {},
 			},
-			getobj: getObj,
-			cases: []testcase{
-				{
-					name:      "single dir single file",
-					delimiter: "/",
-					maxObjs:   1000,
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("test/"),
-						}},
-						Objects: []s3response.Object{},
-					},
-				},
-			},
-		},
-		{
-			// non-standard delimiter
-			fsys: fstest.MapFS{
-				"photo|s/200|6/Januar|y/sampl|e1.jpg": {},
-				"photo|s/200|6/Januar|y/sampl|e2.jpg": {},
-				"photo|s/200|6/Januar|y/sampl|e3.jpg": {},
+			expected: backend.WalkResults{
+				CommonPrefixes: []types.CommonPrefix{{
+					Prefix: backend.GetStringPtr("test/"),
+				}},
+				Objects: []s3response.Object{},
 			},
 			getobj: getObj,
-			cases: []testcase{
-				{
-					name:      "different delimiter 1",
-					delimiter: "|",
-					maxObjs:   1000,
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("photo|"),
-						}},
-					},
-				},
-				{
-					name:      "different delimiter 2",
-					delimiter: "|",
-					maxObjs:   1000,
-					prefix:    "photo|",
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("photo|s/200|"),
-						}},
-					},
-				},
-				{
-					name:      "different delimiter 3",
-					delimiter: "|",
-					maxObjs:   1000,
-					prefix:    "photo|s/200|",
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("photo|s/200|6/Januar|"),
-						}},
-					},
-				},
-				{
-					name:      "different delimiter 4",
-					delimiter: "|",
-					maxObjs:   1000,
-					prefix:    "photo|s/200|",
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("photo|s/200|6/Januar|"),
-						}},
-					},
-				},
-				{
-					name:      "different delimiter 5",
-					delimiter: "|",
-					maxObjs:   1000,
-					prefix:    "photo|s/200|6/Januar|",
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{{
-							Prefix: backend.GetPtrFromString("photo|s/200|6/Januar|y/sampl|"),
-						}},
-					},
-				},
-				{
-					name:      "different delimiter 6",
-					delimiter: "|",
-					maxObjs:   1000,
-					prefix:    "photo|s/200|6/Januar|y/sampl|",
-					expected: backend.WalkResults{
-						Objects: []s3response.Object{
-							{
-								Key: backend.GetPtrFromString("photo|s/200|6/Januar|y/sampl|e1.jpg"),
-							},
-							{
-								Key: backend.GetPtrFromString("photo|s/200|6/Januar|y/sampl|e2.jpg"),
-							},
-							{
-								Key: backend.GetPtrFromString("photo|s/200|6/Januar|y/sampl|e3.jpg"),
-							},
-						},
-					},
-				},
-			},
 		},
 	}
 
 	for _, tt := range tests {
-		for _, tc := range tt.cases {
-			res, err := backend.Walk(context.Background(),
-				tt.fsys, tc.prefix, tc.delimiter, tc.marker, tc.maxObjs,
-				tt.getobj, []string{})
-			if err != nil {
-				t.Errorf("%v: walk: %v", tc.name, err)
-			}
-
-			compareResults(tc.name, res, tc.expected, t)
+		res, err := backend.Walk(context.Background(), tt.fsys, "", "/", "", 1000, tt.getobj, []string{})
+		if err != nil {
+			t.Fatalf("walk: %v", err)
 		}
+
+		compareResults(res, tt.expected, t)
 	}
 }
 
-func compareResults(name string, got, wanted backend.WalkResults, t *testing.T) {
+func compareResults(got, wanted backend.WalkResults, t *testing.T) {
 	if !compareCommonPrefix(got.CommonPrefixes, wanted.CommonPrefixes) {
-		t.Errorf("%v: unexpected common prefix, got %v wanted %v",
-			name,
+		t.Errorf("unexpected common prefix, got %v wanted %v",
 			printCommonPrefixes(got.CommonPrefixes),
 			printCommonPrefixes(wanted.CommonPrefixes))
 	}
 
 	if !compareObjects(got.Objects, wanted.Objects) {
-		t.Errorf("%v: unexpected object, got %v wanted %v",
-			name,
+		t.Errorf("unexpected object, got %v wanted %v",
 			printObjects(got.Objects),
 			printObjects(wanted.Objects))
 	}
@@ -331,16 +202,10 @@ func containsObject(c s3response.Object, list []s3response.Object) bool {
 func printObjects(list []s3response.Object) string {
 	res := "["
 	for _, cp := range list {
-		var key string
-		if cp.Key == nil {
-			key = "<nil>"
-		} else {
-			key = *cp.Key
-		}
 		if res == "[" {
-			res = res + key
+			res = res + *cp.Key
 		} else {
-			res = res + ", " + key
+			res = res + ", " + *cp.Key
 		}
 	}
 	return res + "]"
@@ -392,702 +257,3 @@ func TestWalkStop(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 }
-
-// TestOrderWalk tests the lexicographic ordering of the object names
-// for the case where readdir sort order of a directory is different
-// than the lexicographic ordering of the full paths. The below has
-// a readdir sort order for dir1/:
-// a, a.b
-// but if you consider the character that comes after a is "/", then
-// the "." should come before "/" in the lexicographic ordering:
-// a.b/, a/
-func TestOrderWalk(t *testing.T) {
-	tests := []walkTest{
-		{
-			fsys: fstest.MapFS{
-				"dir1/a/file1":   {},
-				"dir1/a/file2":   {},
-				"dir1/a/file3":   {},
-				"dir1/a.b/file1": {},
-				"dir1/a.b/file2": {},
-			},
-			getobj: getObj,
-			cases: []testcase{
-				{
-					name:    "order test",
-					maxObjs: 1000,
-					prefix:  "dir1/",
-					expected: backend.WalkResults{
-						Objects: []s3response.Object{
-							{Key: backend.GetPtrFromString("dir1/")},
-							{Key: backend.GetPtrFromString("dir1/a.b/")},
-							{Key: backend.GetPtrFromString("dir1/a.b/file1")},
-							{Key: backend.GetPtrFromString("dir1/a.b/file2")},
-							{Key: backend.GetPtrFromString("dir1/a/")},
-							{Key: backend.GetPtrFromString("dir1/a/file1")},
-							{Key: backend.GetPtrFromString("dir1/a/file2")},
-							{Key: backend.GetPtrFromString("dir1/a/file3")},
-						},
-					},
-				},
-			},
-		},
-		{
-			fsys: fstest.MapFS{
-				"dir|1/a/file1":   {},
-				"dir|1/a/file2":   {},
-				"dir|1/a/file3":   {},
-				"dir|1/a.b/file1": {},
-				"dir|1/a.b/file2": {},
-			},
-			getobj: getObj,
-			cases: []testcase{
-				{
-					name:      "order test delim",
-					maxObjs:   1000,
-					delimiter: "|",
-					prefix:    "dir|",
-					expected: backend.WalkResults{
-						Objects: []s3response.Object{
-							{
-								Key: backend.GetPtrFromString("dir|1/a.b/file1"),
-							},
-							{
-								Key: backend.GetPtrFromString("dir|1/a.b/file2"),
-							},
-							{
-								Key: backend.GetPtrFromString("dir|1/a/file1"),
-							},
-							{
-								Key: backend.GetPtrFromString("dir|1/a/file2"),
-							},
-							{
-								Key: backend.GetPtrFromString("dir|1/a/file3"),
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			fsys: fstest.MapFS{
-				"a": &fstest.MapFile{Mode: fs.ModeDir},
-			},
-			getobj: getObj,
-			cases: []testcase{
-				{
-					name:      "single dir obj",
-					maxObjs:   1000,
-					delimiter: "/",
-					prefix:    "a",
-					expected: backend.WalkResults{
-						CommonPrefixes: []types.CommonPrefix{
-							{
-								Prefix: backend.GetPtrFromString("a/"),
-							},
-						},
-					},
-				},
-				{
-					name:      "single dir obj",
-					maxObjs:   1000,
-					delimiter: "/",
-					prefix:    "a/",
-					expected: backend.WalkResults{
-						Objects: []s3response.Object{
-							{
-								Key: backend.GetPtrFromString("a/"),
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		for _, tc := range tt.cases {
-			res, err := backend.Walk(context.Background(),
-				tt.fsys, tc.prefix, tc.delimiter, tc.marker, tc.maxObjs,
-				tt.getobj, []string{})
-			if err != nil {
-				t.Errorf("%v: walk: %v", tc.name, err)
-			}
-
-			compareResultsOrdered(tc.name, res, tc.expected, t)
-		}
-	}
-}
-
-type markerTest struct {
-	fsys   fs.FS
-	getobj backend.GetObjFunc
-	cases  []markertestcase
-}
-
-type markertestcase struct {
-	name      string
-	prefix    string
-	delimiter string
-	marker    string
-	maxObjs   int32
-	expected  []backend.WalkResults
-}
-
-func TestMarker(t *testing.T) {
-	tests := []markerTest{
-		{
-			fsys: fstest.MapFS{
-				"dir/sample2.jpg": {},
-				"dir/sample3.jpg": {},
-				"dir/sample4.jpg": {},
-				"dir/sample5.jpg": {},
-			},
-			getobj: getObj,
-			cases: []markertestcase{
-				{
-					name:      "multi page marker",
-					delimiter: "/",
-					prefix:    "dir/",
-					maxObjs:   2,
-					expected: []backend.WalkResults{
-						{
-							Objects: []s3response.Object{
-								{
-									Key: backend.GetPtrFromString("dir/sample2.jpg"),
-								},
-								{
-									Key: backend.GetPtrFromString("dir/sample3.jpg"),
-								},
-							},
-							Truncated: true,
-						},
-						{
-							Objects: []s3response.Object{
-								{
-									Key: backend.GetPtrFromString("dir/sample4.jpg"),
-								},
-								{
-									Key: backend.GetPtrFromString("dir/sample5.jpg"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			fsys: fstest.MapFS{
-				"dir1/subdir/file.txt": {},
-				"dir1/subdir.ext":      {},
-				"dir1/subdir1.ext":     {},
-				"dir1/subdir2.ext":     {},
-			},
-			getobj: getObj,
-			cases: []markertestcase{
-				{
-					name:      "integration test case 1",
-					maxObjs:   2,
-					delimiter: "/",
-					prefix:    "dir1/",
-					expected: []backend.WalkResults{
-						{
-							Objects: []s3response.Object{
-								{
-									Key: backend.GetPtrFromString("dir1/subdir.ext"),
-								},
-							},
-							CommonPrefixes: []types.CommonPrefix{
-								{
-									Prefix: backend.GetPtrFromString("dir1/subdir/"),
-								},
-							},
-							Truncated: true,
-						},
-						{
-							Objects: []s3response.Object{
-								{
-									Key: backend.GetPtrFromString("dir1/subdir1.ext"),
-								},
-								{
-									Key: backend.GetPtrFromString("dir1/subdir2.ext"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			fsys: fstest.MapFS{
-				"asdf":          {},
-				"boo/bar":       {},
-				"boo/baz/xyzzy": {},
-				"cquux/thud":    {},
-				"cquux/bla":     {},
-			},
-			getobj: getObj,
-			cases: []markertestcase{
-				{
-					name:      "integration test case2",
-					maxObjs:   1,
-					delimiter: "/",
-					marker:    "boo/",
-					expected: []backend.WalkResults{
-						{
-							Objects: []s3response.Object{},
-							CommonPrefixes: []types.CommonPrefix{
-								{
-									Prefix: backend.GetPtrFromString("cquux/"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			fsys: fstest.MapFS{
-				"bar": {},
-				"baz": {},
-				"foo": {},
-			},
-			getobj: getObj,
-			cases: []markertestcase{
-				{
-					name:    "exact limit count",
-					maxObjs: 3,
-					expected: []backend.WalkResults{
-						{
-							Objects: []s3response.Object{
-								{
-									Key: backend.GetPtrFromString("bar"),
-								},
-								{
-									Key: backend.GetPtrFromString("baz"),
-								},
-								{
-									Key: backend.GetPtrFromString("foo"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			fsys: fstest.MapFS{
-				"d1/f1": {},
-				"d2/f2": {},
-				"d3/f3": {},
-				"d4/f4": {},
-			},
-			getobj: getObj,
-			cases: []markertestcase{
-				{
-					name:      "limited common prefix",
-					maxObjs:   3,
-					delimiter: "/",
-					expected: []backend.WalkResults{
-						{
-							CommonPrefixes: []types.CommonPrefix{
-								{
-									Prefix: backend.GetPtrFromString("d1/"),
-								},
-								{
-									Prefix: backend.GetPtrFromString("d2/"),
-								},
-								{
-									Prefix: backend.GetPtrFromString("d3/"),
-								},
-							},
-							Truncated: true,
-						},
-						{
-							CommonPrefixes: []types.CommonPrefix{
-								{
-									Prefix: backend.GetPtrFromString("d4/"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		for _, tc := range tt.cases {
-			marker := tc.marker
-			for i, page := range tc.expected {
-				res, err := backend.Walk(context.Background(),
-					tt.fsys, tc.prefix, tc.delimiter, marker, tc.maxObjs,
-					tt.getobj, []string{})
-				if err != nil {
-					t.Errorf("%v: walk: %v", tc.name, err)
-				}
-				marker = res.NextMarker
-
-				compareResultsOrdered(tc.name, res, page, t)
-
-				if res.Truncated != page.Truncated {
-					t.Errorf("%v page %v expected truncated %v, got %v",
-						tc.name, i, page.Truncated, res.Truncated)
-				}
-			}
-		}
-	}
-}
-
-func compareResultsOrdered(name string, got, wanted backend.WalkResults, t *testing.T) {
-	if !compareObjectsOrdered(got.Objects, wanted.Objects) {
-		t.Errorf("%v: unexpected object, got %v wanted %v",
-			name,
-			printObjects(got.Objects),
-			printObjects(wanted.Objects))
-	}
-	if !comparePrefixesOrdered(got.CommonPrefixes, wanted.CommonPrefixes) {
-		t.Errorf("%v: unexpected prefix, got %v wanted %v",
-			name,
-			printCommonPrefixes(got.CommonPrefixes),
-			printCommonPrefixes(wanted.CommonPrefixes))
-	}
-}
-
-func compareObjectsOrdered(a, b []s3response.Object) bool {
-	if len(a) == 0 && len(b) == 0 {
-		return true
-	}
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i, obj := range a {
-		if *obj.Key != *b[i].Key {
-			return false
-		}
-	}
-	return true
-}
-
-func comparePrefixesOrdered(a, b []types.CommonPrefix) bool {
-	if len(a) == 0 && len(b) == 0 {
-		return true
-	}
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i, cp := range a {
-		if *cp.Prefix != *b[i].Prefix {
-			return false
-		}
-	}
-	return true
-}
-
-// ---- Versioning Tests ----
-
-// getVersionsTestFunc is a simple GetVersionsFunc implementation for tests that
-// returns a single latest version for each file or directory encountered.
-// Directories are reported with a trailing delimiter in the key to match the
-// behavior of the non-versioned Walk tests where directory objects are listed.
-func getVersionsTestFunc(path, versionIdMarker string, pastVersionIdMarker *bool, availableObjCount int, d fs.DirEntry) (*backend.ObjVersionFuncResult, error) {
-	// If we have no available slots left, signal truncation (should be rare in these tests)
-	if availableObjCount <= 0 {
-		return &backend.ObjVersionFuncResult{Truncated: true, NextVersionIdMarker: ""}, nil
-	}
-
-	key := path
-	if d.IsDir() {
-		key = key + "/"
-	}
-	ver := "v1"
-	latest := true
-	ov := s3response.ObjectVersion{Key: &key, VersionId: &ver, IsLatest: &latest}
-	return &backend.ObjVersionFuncResult{ObjectVersions: []s3response.ObjectVersion{ov}}, nil
-}
-
-// TestWalkVersions mirrors TestWalk but exercises WalkVersions and validates
-// common prefixes and object versions for typical delimiter/prefix scenarios.
-func TestWalkVersions(t *testing.T) {
-	fsys := fstest.MapFS{
-		"dir1/a/file1": {},
-		"dir1/a/file2": {},
-		"dir1/b/file3": {},
-		"rootfile":     {},
-	}
-
-	// Without a delimiter, every directory and file becomes an object version
-	// via the test GetVersionsFunc (directories have trailing '/').
-	expected := backend.WalkVersioningResults{
-		ObjectVersions: []s3response.ObjectVersion{
-			{Key: backend.GetPtrFromString("dir1/")},
-			{Key: backend.GetPtrFromString("dir1/a/")},
-			{Key: backend.GetPtrFromString("dir1/a/file1")},
-			{Key: backend.GetPtrFromString("dir1/a/file2")},
-			{Key: backend.GetPtrFromString("dir1/b/")},
-			{Key: backend.GetPtrFromString("dir1/b/file3")},
-			{Key: backend.GetPtrFromString("rootfile")},
-		},
-	}
-
-	res, err := backend.WalkVersions(context.Background(), fsys, "", "", "", "", 1000, getVersionsTestFunc, []string{})
-	if err != nil {
-		t.Fatalf("walk versions: %v", err)
-	}
-	compareVersionResultsOrdered("simple versions no delimiter", res, expected, t)
-}
-
-// TestOrderWalkVersions mirrors TestOrderWalk, exercising ordering semantics for
-// version listings (lexicographic ordering of directory and file version keys).
-func TestOrderWalkVersions(t *testing.T) {
-	fsys := fstest.MapFS{
-		"dir1/a/file1":   {},
-		"dir1/a/file2":   {},
-		"dir1/a/file3":   {},
-		"dir1/a.b/file1": {},
-		"dir1/a.b/file2": {},
-	}
-
-	// Expect lexicographic ordering similar to non-version walk when no delimiter.
-	expected := backend.WalkVersioningResults{
-		ObjectVersions: []s3response.ObjectVersion{
-			{Key: backend.GetPtrFromString("dir1/")},
-			{Key: backend.GetPtrFromString("dir1/a.b/")},
-			{Key: backend.GetPtrFromString("dir1/a.b/file1")},
-			{Key: backend.GetPtrFromString("dir1/a.b/file2")},
-			{Key: backend.GetPtrFromString("dir1/a/")},
-			{Key: backend.GetPtrFromString("dir1/a/file1")},
-			{Key: backend.GetPtrFromString("dir1/a/file2")},
-			{Key: backend.GetPtrFromString("dir1/a/file3")},
-		},
-	}
-
-	res, err := backend.WalkVersions(context.Background(), fsys, "dir1/", "", "", "", 1000, getVersionsTestFunc, []string{})
-	if err != nil {
-		t.Fatalf("order walk versions: %v", err)
-	}
-	compareVersionResultsOrdered("order versions no delimiter", res, expected, t)
-}
-
-// compareVersionResults compares unordered sets of common prefixes and object versions
-// compareVersionResultsOrdered compares ordered slices
-func compareVersionResultsOrdered(name string, got, wanted backend.WalkVersioningResults, t *testing.T) {
-	if !compareObjectVersionsOrdered(got.ObjectVersions, wanted.ObjectVersions) {
-		t.Errorf("%v: unexpected object versions, got %v wanted %v", name, printVersionObjects(got.ObjectVersions), printVersionObjects(wanted.ObjectVersions))
-	}
-	if !comparePrefixesOrdered(got.CommonPrefixes, wanted.CommonPrefixes) {
-		t.Errorf("%v: unexpected prefix, got %v wanted %v", name, printCommonPrefixes(got.CommonPrefixes), printCommonPrefixes(wanted.CommonPrefixes))
-	}
-}
-
-func compareObjectVersionsOrdered(a, b []s3response.ObjectVersion) bool {
-	if len(a) == 0 && len(b) == 0 {
-		return true
-	}
-	if len(a) != len(b) {
-		return false
-	}
-	for i, ov := range a {
-		if ov.Key == nil || b[i].Key == nil {
-			return false
-		}
-		if *ov.Key != *b[i].Key {
-			return false
-		}
-	}
-	return true
-}
-
-func printVersionObjects(list []s3response.ObjectVersion) string {
-	res := "["
-	for _, ov := range list {
-		var key string
-		if ov.Key == nil {
-			key = "<nil>"
-		} else {
-			key = *ov.Key
-		}
-		if res == "[" {
-			res = res + key
-		} else {
-			res = res + ", " + key
-		}
-	}
-	return res + "]"
-}
-
-// multiVersionGetVersionsFunc is a more sophisticated test function that simulates
-// multiple versions per object, similar to the integration test behavior.
-// It creates multiple versions for each file with deterministic version IDs.
-func createMultiVersionFunc(files map[string]int) backend.GetVersionsFunc {
-	// Pre-generate all versions for deterministic testing
-	versionedFiles := make(map[string][]s3response.ObjectVersion)
-
-	for path, versionCount := range files {
-		versions := make([]s3response.ObjectVersion, versionCount)
-		for i := range versionCount {
-			versionId := fmt.Sprintf("v%d", i+1)
-			isLatest := i == versionCount-1 // Last version is latest
-			key := path
-
-			versions[i] = s3response.ObjectVersion{
-				Key:       &key,
-				VersionId: &versionId,
-				IsLatest:  &isLatest,
-			}
-		}
-		// Reverse slice so latest comes first (reverse chronological order)
-		for i, j := 0, len(versions)-1; i < j; i, j = i+1, j-1 {
-			versions[i], versions[j] = versions[j], versions[i]
-		}
-		versionedFiles[path] = versions
-	}
-
-	return func(path, versionIdMarker string, pastVersionIdMarker *bool, availableObjCount int, d fs.DirEntry) (*backend.ObjVersionFuncResult, error) {
-		if availableObjCount <= 0 {
-			return &backend.ObjVersionFuncResult{Truncated: true}, nil
-		}
-
-		// Handle directories - just return a single directory version
-		if d.IsDir() {
-			key := path + "/"
-			ver := "v1"
-			latest := true
-			ov := s3response.ObjectVersion{Key: &key, VersionId: &ver, IsLatest: &latest}
-			return &backend.ObjVersionFuncResult{ObjectVersions: []s3response.ObjectVersion{ov}}, nil
-		}
-
-		// Get versions for this file
-		versions, exists := versionedFiles[path]
-		if !exists {
-			// No versions for this file, skip it
-			return &backend.ObjVersionFuncResult{}, backend.ErrSkipObj
-		}
-
-		// Handle version ID marker pagination
-		startIdx := 0
-		if versionIdMarker != "" && !*pastVersionIdMarker {
-			// Find the starting position after the marker
-			for i, version := range versions {
-				if *version.VersionId == versionIdMarker {
-					startIdx = i + 1
-					*pastVersionIdMarker = true
-					break
-				}
-			}
-		}
-
-		// Return available versions up to the limit
-		endIdx := min(startIdx+availableObjCount, len(versions))
-
-		result := &backend.ObjVersionFuncResult{
-			ObjectVersions: versions[startIdx:endIdx],
-		}
-
-		// Check if we need to truncate
-		if endIdx < len(versions) {
-			result.Truncated = true
-			result.NextVersionIdMarker = *versions[endIdx-1].VersionId
-		}
-
-		return result, nil
-	}
-}
-
-// TestWalkVersionsTruncated tests the pagination behavior of WalkVersions
-// when there are multiple versions per object and the result is truncated.
-// This mirrors the integration test ListObjectVersions_multiple_object_versions_truncated.
-func TestWalkVersionsTruncated(t *testing.T) {
-	// Create filesystem with the same files as integration test
-	fsys := fstest.MapFS{
-		"foo": {},
-		"bar": {},
-		"baz": {},
-	}
-
-	// Define version counts per file (matching integration test)
-	versionCounts := map[string]int{
-		"foo": 4, // 4 versions
-		"bar": 3, // 3 versions
-		"baz": 5, // 5 versions
-	}
-
-	getVersionsFunc := createMultiVersionFunc(versionCounts)
-
-	// Test first page with limit of 5 (should be truncated)
-	maxKeys := 5
-	res1, err := backend.WalkVersions(context.Background(), fsys, "", "", "", "", maxKeys, getVersionsFunc, []string{})
-	if err != nil {
-		t.Fatalf("walk versions first page: %v", err)
-	}
-
-	// Verify first page results
-	if !res1.Truncated {
-		t.Error("expected first page to be truncated")
-	}
-
-	if len(res1.ObjectVersions) != maxKeys {
-		t.Errorf("expected %d versions in first page, got %d", maxKeys, len(res1.ObjectVersions))
-	}
-
-	// Expected order: bar (3 versions), baz (2 versions) - lexicographic order
-	expectedFirstPage := []string{"bar", "bar", "bar", "baz", "baz"}
-	if len(res1.ObjectVersions) != len(expectedFirstPage) {
-		t.Fatalf("first page length mismatch: expected %d, got %d", len(expectedFirstPage), len(res1.ObjectVersions))
-	}
-
-	for i, expected := range expectedFirstPage {
-		if res1.ObjectVersions[i].Key == nil || *res1.ObjectVersions[i].Key != expected {
-			t.Errorf("first page[%d]: expected key %s, got %v", i, expected, res1.ObjectVersions[i].Key)
-		}
-	}
-
-	// Verify next markers are set
-	if res1.NextMarker == "" {
-		t.Error("expected NextMarker to be set on truncated result")
-	}
-	if res1.NextVersionIdMarker == "" {
-		t.Error("expected NextVersionIdMarker to be set on truncated result")
-	}
-
-	// Test second page using markers
-	res2, err := backend.WalkVersions(context.Background(), fsys, "", "", res1.NextMarker, res1.NextVersionIdMarker, maxKeys, getVersionsFunc, []string{})
-	if err != nil {
-		t.Fatalf("walk versions second page: %v", err)
-	}
-
-	t.Logf("Second page: ObjectVersions=%d, Truncated=%v, NextMarker=%s, NextVersionIdMarker=%s",
-		len(res2.ObjectVersions), res2.Truncated, res2.NextMarker, res2.NextVersionIdMarker)
-
-	for i, ov := range res2.ObjectVersions {
-		t.Logf("  [%d] Key=%s, VersionId=%s", i, *ov.Key, *ov.VersionId)
-	}
-
-	// Verify second page results
-	// With maxKeys=5, we should have 3 pages total: 5 + 5 + 2 = 12
-
-	// Test third page if needed
-	var res3 backend.WalkVersioningResults
-	if res2.Truncated {
-		res3, err = backend.WalkVersions(context.Background(), fsys, "", "", res2.NextMarker, res2.NextVersionIdMarker, maxKeys, getVersionsFunc, []string{})
-		if err != nil {
-			t.Fatalf("walk versions third page: %v", err)
-		}
-
-		t.Logf("Third page: ObjectVersions=%d, Truncated=%v, NextMarker=%s, NextVersionIdMarker=%s",
-			len(res3.ObjectVersions), res3.Truncated, res3.NextMarker, res3.NextVersionIdMarker)
-
-		for i, ov := range res3.ObjectVersions {
-			t.Logf("  [%d] Key=%s, VersionId=%s", i, *ov.Key, *ov.VersionId)
-		}
-	}
-
-	// Verify total count across all pages
-	totalVersions := len(res1.ObjectVersions) + len(res2.ObjectVersions) + len(res3.ObjectVersions)
-	expectedTotal := versionCounts["foo"] + versionCounts["bar"] + versionCounts["baz"]
-	if totalVersions != expectedTotal {
-		t.Errorf("total versions mismatch: expected %d, got %d", expectedTotal, totalVersions)
-	}
-}

cmd/versitygw/admin.go

@@ -20,20 +20,15 @@ import (
 	"crypto/tls"
 	"encoding/hex"
 	"encoding/json"
-	"encoding/xml"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
-	"strings"
 	"text/tabwriter"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/aws/smithy-go"
 	"github.com/urfave/cli/v2"
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/s3response"
@@ -42,7 +37,6 @@ import (
 var (
 	adminAccess   string
 	adminSecret   string
-	adminRegion   string
 	adminEndpoint string
 	allowInsecure bool
 )
@@ -86,11 +80,6 @@ func adminCommand() *cli.Command {
 						Usage:   "groupID for the new user",
 						Aliases: []string{"gi"},
 					},
-					&cli.IntFlag{
-						Name:    "project-id",
-						Usage:   "projectID for the new user",
-						Aliases: []string{"pi"},
-					},
 				},
 			},
 			{
@@ -109,11 +98,6 @@ func adminCommand() *cli.Command {
 						Usage:   "secret access key for the new user",
 						Aliases: []string{"s"},
 					},
-					&cli.StringFlag{
-						Name:    "role",
-						Usage:   "the new user role",
-						Aliases: []string{"r"},
-					},
 					&cli.IntFlag{
 						Name:    "user-id",
 						Usage:   "userID for the new user",
@@ -124,11 +108,6 @@ func adminCommand() *cli.Command {
 						Usage:   "groupID for the new user",
 						Aliases: []string{"gi"},
 					},
-					&cli.IntFlag{
-						Name:    "project-id",
-						Usage:   "projectID for the new user",
-						Aliases: []string{"pi"},
-					},
 				},
 			},
 			{
@@ -173,66 +152,6 @@ func adminCommand() *cli.Command {
 				Usage:  "Lists all the gateway buckets and owners.",
 				Action: listBuckets,
 			},
-			{
-				Name:   "create-bucket",
-				Usage:  "Create a new bucket with owner",
-				Action: createBucket,
-				Flags: []cli.Flag{
-					&cli.StringFlag{
-						Name:     "owner",
-						Usage:    "access key id of the bucket owner",
-						Required: true,
-						Aliases:  []string{"o"},
-					},
-					&cli.StringFlag{
-						Name:     "bucket",
-						Usage:    "bucket name",
-						Required: true,
-					},
-					&cli.StringFlag{
-						Name:  "acl",
-						Usage: "canned ACL to apply to the bucket",
-					},
-					&cli.StringFlag{
-						Name:  "grant-full-control",
-						Usage: "Allows grantee the read, write, read ACP, and write ACP permissions on the bucket.",
-					},
-					&cli.StringFlag{
-						Name:  "grant-read",
-						Usage: "Allows grantee to list the objects in the bucket.",
-					},
-					&cli.StringFlag{
-						Name:  "grant-read-acp",
-						Usage: "Allows grantee to read the bucket ACL.",
-					},
-					&cli.StringFlag{
-						Name: "grant-write",
-						Usage: `Allows grantee to create new objects in the bucket.
-							For the bucket and object owners of existing objects, also allows deletions and overwrites of those objects.`,
-					},
-					&cli.StringFlag{
-						Name:  "grant-write-acp",
-						Usage: "Allows grantee to write the ACL for the applicable bucket.",
-					},
-					&cli.StringFlag{
-						Name:  "create-bucket-configuration",
-						Usage: "bucket configuration (LocationConstraint, Tags)",
-					},
-					&cli.BoolFlag{
-						Name:  "object-lock-enabled-for-bucket",
-						Usage: "enable object lock for the bucket",
-					},
-					&cli.BoolFlag{
-						Name:  "no-object-lock-enabled-for-bucket",
-						Usage: "disable object lock for the bucket",
-					},
-					&cli.StringFlag{
-						Name:  "object-ownership",
-						Usage: "bucket object ownership setting",
-						Value: "",
-					},
-				},
-			},
 		},
 		Flags: []cli.Flag{
 			// TODO: create a configuration file for this
@@ -241,6 +160,7 @@ func adminCommand() *cli.Command {
 				Usage:       "admin access key id",
 				EnvVars:     []string{"ADMIN_ACCESS_KEY_ID", "ADMIN_ACCESS_KEY"},
 				Aliases:     []string{"a"},
+				Required:    true,
 				Destination: &adminAccess,
 			},
 			&cli.StringFlag{
@@ -248,16 +168,9 @@ func adminCommand() *cli.Command {
 				Usage:       "admin secret access key",
 				EnvVars:     []string{"ADMIN_SECRET_ACCESS_KEY", "ADMIN_SECRET_KEY"},
 				Aliases:     []string{"s"},
+				Required:    true,
 				Destination: &adminSecret,
 			},
-			&cli.StringFlag{
-				Name:        "region",
-				Usage:       "admin s3 region string",
-				EnvVars:     []string{"ADMIN_REGION"},
-				Value:       "us-east-1",
-				Destination: &adminRegion,
-				Aliases:     []string{"r"},
-			},
 			&cli.StringFlag{
 				Name:        "endpoint-url",
 				Usage:       "admin apis endpoint url",
@@ -277,32 +190,6 @@ func adminCommand() *cli.Command {
 	}
 }
 
-// getAdminCreds returns the effective admin access key ID and secret key.
-// If admin-specific credentials are not provided, it falls back to the
-// root user credentials. Both resulting values must be non-empty;
-// otherwise, an error is returned.
-func getAdminCreds() (string, string, error) {
-	access := adminAccess
-	secret := adminSecret
-
-	// Fallbacks to root user credentials
-	if access == "" {
-		access = rootUserAccess
-	}
-	if secret == "" {
-		secret = rootUserSecret
-	}
-
-	if access == "" {
-		return "", "", errors.New("subcommand admin access key id is not set")
-	}
-	if secret == "" {
-		return "", "", errors.New("subcommand admin secret access key is not set")
-	}
-
-	return access, secret, nil
-}
-
 func initHTTPClient() *http.Client {
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: allowInsecure},
@@ -311,12 +198,8 @@ func initHTTPClient() *http.Client {
 }
 
 func createUser(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
 	access, secret, role := ctx.String("access"), ctx.String("secret"), ctx.String("role")
-	userID, groupID, projectID := ctx.Int("user-id"), ctx.Int("group-id"), ctx.Int("project-id")
+	userID, groupID := ctx.Int("user-id"), ctx.Int("group-id")
 	if access == "" || secret == "" {
 		return fmt.Errorf("invalid input parameters for the new user access/secret keys")
 	}
@@ -325,32 +208,31 @@ func createUser(ctx *cli.Context) error {
 	}
 
 	acc := auth.Account{
-		Access:    access,
-		Secret:    secret,
-		Role:      auth.Role(role),
-		UserID:    userID,
-		GroupID:   groupID,
-		ProjectID: projectID,
+		Access:  access,
+		Secret:  secret,
+		Role:    auth.Role(role),
+		UserID:  userID,
+		GroupID: groupID,
 	}
 
-	accxml, err := xml.Marshal(acc)
+	accJson, err := json.Marshal(acc)
 	if err != nil {
 		return fmt.Errorf("failed to parse user data: %w", err)
 	}
 
-	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/create-user", adminEndpoint), bytes.NewBuffer(accxml))
+	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/create-user", adminEndpoint), bytes.NewBuffer(accJson))
 	if err != nil {
 		return fmt.Errorf("failed to send the request: %w", err)
 	}
 
 	signer := v4.NewSigner()
 
-	hashedPayload := sha256.Sum256(accxml)
+	hashedPayload := sha256.Sum256(accJson)
 	hexPayload := hex.EncodeToString(hashedPayload[:])
 
 	req.Header.Set("X-Amz-Content-Sha256", hexPayload)
 
-	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
+	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
 	if signErr != nil {
 		return fmt.Errorf("failed to sign the request: %w", err)
 	}
@@ -369,17 +251,15 @@ func createUser(ctx *cli.Context) error {
 	}
 
 	if resp.StatusCode >= 400 {
-		return parseApiError(body)
+		return fmt.Errorf("%s", body)
 	}
 
+	fmt.Printf("%s\n", body)
+
 	return nil
 }
 
 func deleteUser(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
 	access := ctx.String("access")
 	if access == "" {
 		return fmt.Errorf("invalid input parameter for the user access key")
@@ -397,7 +277,7 @@ func deleteUser(ctx *cli.Context) error {
 
 	req.Header.Set("X-Amz-Content-Sha256", hexPayload)
 
-	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
+	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
 	if signErr != nil {
 		return fmt.Errorf("failed to sign the request: %w", err)
 	}
@@ -416,33 +296,17 @@ func deleteUser(ctx *cli.Context) error {
 	}
 
 	if resp.StatusCode >= 400 {
-		return parseApiError(body)
+		return fmt.Errorf("%s", body)
 	}
 
+	fmt.Printf("%s\n", body)
+
 	return nil
 }
 
 func updateUser(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
-
-	access, secret, userId, groupId, projectID, role :=
-		ctx.String("access"),
-		ctx.String("secret"),
-		ctx.Int("user-id"),
-		ctx.Int("group-id"),
-		ctx.Int("projectID"),
-		auth.Role(ctx.String("role"))
-
+	access, secret, userId, groupId := ctx.String("access"), ctx.String("secret"), ctx.Int("user-id"), ctx.Int("group-id")
 	props := auth.MutableProps{}
-	if ctx.IsSet("role") {
-		if !role.IsValid() {
-			return fmt.Errorf("invalid user role: %v", role)
-		}
-		props.Role = role
-	}
 	if ctx.IsSet("secret") {
 		props.Secret = &secret
 	}
@@ -452,28 +316,25 @@ func updateUser(ctx *cli.Context) error {
 	if ctx.IsSet("group-id") {
 		props.GroupID = &groupId
 	}
-	if ctx.IsSet("project-id") {
-		props.ProjectID = &projectID
-	}
 
-	propsxml, err := xml.Marshal(props)
+	propsJSON, err := json.Marshal(props)
 	if err != nil {
 		return fmt.Errorf("failed to parse user attributes: %w", err)
 	}
 
-	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/update-user?access=%v", adminEndpoint, access), bytes.NewBuffer(propsxml))
+	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/update-user?access=%v", adminEndpoint, access), bytes.NewBuffer(propsJSON))
 	if err != nil {
 		return fmt.Errorf("failed to send the request: %w", err)
 	}
 
 	signer := v4.NewSigner()
 
-	hashedPayload := sha256.Sum256(propsxml)
+	hashedPayload := sha256.Sum256(propsJSON)
 	hexPayload := hex.EncodeToString(hashedPayload[:])
 
 	req.Header.Set("X-Amz-Content-Sha256", hexPayload)
 
-	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
+	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
 	if signErr != nil {
 		return fmt.Errorf("failed to sign the request: %w", err)
 	}
@@ -492,18 +353,15 @@ func updateUser(ctx *cli.Context) error {
 	}
 
 	if resp.StatusCode >= 400 {
-		return parseApiError(body)
+		return fmt.Errorf("%s", body)
 	}
 
+	fmt.Printf("%s\n", body)
+
 	return nil
 }
 
 func listUsers(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
-
 	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/list-users", adminEndpoint), nil)
 	if err != nil {
 		return fmt.Errorf("failed to send the request: %w", err)
@@ -516,7 +374,7 @@ func listUsers(ctx *cli.Context) error {
 
 	req.Header.Set("X-Amz-Content-Sha256", hexPayload)
 
-	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
+	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
 	if signErr != nil {
 		return fmt.Errorf("failed to sign the request: %w", err)
 	}
@@ -535,260 +393,15 @@ func listUsers(ctx *cli.Context) error {
 	}
 
 	if resp.StatusCode >= 400 {
-		return parseApiError(body)
+		return fmt.Errorf("%s", body)
 	}
 
-	var accs auth.ListUserAccountsResult
-	if err := xml.Unmarshal(body, &accs); err != nil {
+	var accs []auth.Account
+	if err := json.Unmarshal(body, &accs); err != nil {
 		return err
 	}
 
-	printAcctTable(accs.Accounts)
-
-	return nil
-}
-
-type createBucketInput struct {
-	LocationConstraint *string
-	Tags               []types.Tag
-}
-
-// parseCreateBucketPayload parses the
-func parseCreateBucketPayload(input string) ([]byte, error) {
-	input = strings.TrimSpace(input)
-	if input == "" {
-		return []byte{}, nil
-	}
-
-	// try to parse as json, if the input starts with '{'
-	if input[0] == '{' {
-		var raw createBucketInput
-		err := json.Unmarshal([]byte(input), &raw)
-		if err != nil {
-			return nil, fmt.Errorf("invalid JSON input: %w", err)
-		}
-
-		return xml.Marshal(s3response.CreateBucketConfiguration{
-			LocationConstraint: raw.LocationConstraint,
-			TagSet:             raw.Tags,
-		})
-	}
-
-	var config s3response.CreateBucketConfiguration
-
-	// parse as string - shorthand syntax
-	inputParts, err := splitTopLevel(input)
-	if err != nil {
-		return nil, err
-	}
-	for _, part := range inputParts {
-		part = strings.TrimSpace(part)
-		if strings.HasPrefix(part, "LocationConstraint=") {
-			locConstraint := strings.TrimPrefix(part, "LocationConstraint=")
-			config.LocationConstraint = &locConstraint
-		} else if strings.HasPrefix(part, "Tags=") {
-			tags, err := parseTagging(strings.TrimPrefix(part, "Tags="))
-			if err != nil {
-				return nil, err
-			}
-
-			config.TagSet = tags
-		} else {
-			return nil, fmt.Errorf("invalid component: %v", part)
-		}
-	}
-
-	return xml.Marshal(config)
-}
-
-var errInvalidTagsSyntax = errors.New("invalid tags syntax")
-
-// splitTopLevel splits a shorthand configuration string into top-level components.
-// The function splits only on commas that are not nested inside '{}' or '[]'.
-func splitTopLevel(s string) ([]string, error) {
-	var parts []string
-	start := 0
-	depth := 0
-
-	for i, r := range s {
-		switch r {
-		case '{', '[':
-			depth++
-		case '}', ']':
-			depth--
-		case ',':
-			if depth == 0 {
-				parts = append(parts, s[start:i])
-				start = i + 1
-			}
-		}
-	}
-
-	if depth != 0 {
-		return nil, errors.New("invalid string format")
-	}
-
-	// add last segment
-	if start < len(s) {
-		parts = append(parts, s[start:])
-	}
-
-	return parts, nil
-}
-
-// parseTagging parses a tag set expressed in shorthand syntax into AWS CLI tags.
-// Expected format:
-//
-//	[{Key=string,Value=string},{Key=string,Value=string}]
-//
-// The function validates bracket structure, splits tag objects at the top level,
-// and delegates individual tag parsing to parseTag. It returns an error if the
-// syntax is invalid or if any tag entry cannot be parsed.
-func parseTagging(input string) ([]types.Tag, error) {
-	if len(input) < 2 {
-		return nil, errInvalidTagsSyntax
-	}
-
-	if input[0] != '[' || input[len(input)-1] != ']' {
-		return nil, errInvalidTagsSyntax
-	}
-	// strip []
-	input = input[1 : len(input)-1]
-
-	tagComponents, err := splitTopLevel(input)
-	if err != nil {
-		return nil, errInvalidTagsSyntax
-	}
-	result := make([]types.Tag, 0, len(tagComponents))
-	for _, tagComponent := range tagComponents {
-		tagComponent = strings.TrimSpace(tagComponent)
-		tag, err := parseTag(tagComponent)
-		if err != nil {
-			return nil, err
-		}
-
-		result = append(result, tag)
-	}
-
-	return result, nil
-}
-
-// parseTag parses a single tag definition in shorthand form.
-// Expected format:
-//
-// {Key=string,Value=string}
-func parseTag(input string) (types.Tag, error) {
-	input = strings.TrimSpace(input)
-
-	if len(input) < 2 {
-		return types.Tag{}, errInvalidTagsSyntax
-	}
-
-	if input[0] != '{' || input[len(input)-1] != '}' {
-		return types.Tag{}, errInvalidTagsSyntax
-	}
-
-	// strip {}
-	input = input[1 : len(input)-1]
-
-	components := strings.Split(input, ",")
-	if len(components) != 2 {
-		return types.Tag{}, errInvalidTagsSyntax
-	}
-
-	var key, value string
-
-	for _, c := range components {
-		c = strings.TrimSpace(c)
-
-		switch {
-		case strings.HasPrefix(c, "Key="):
-			key = strings.TrimPrefix(c, "Key=")
-		case strings.HasPrefix(c, "Value="):
-			value = strings.TrimPrefix(c, "Value=")
-		default:
-			return types.Tag{}, errInvalidTagsSyntax
-		}
-	}
-
-	if key == "" {
-		return types.Tag{}, errInvalidTagsSyntax
-	}
-
-	return types.Tag{
-		Key:   &key,
-		Value: &value,
-	}, nil
-}
-
-func createBucket(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
-
-	bucket, owner := ctx.String("bucket"), ctx.String("owner")
-
-	payload, err := parseCreateBucketPayload(ctx.String("create-bucket-configuration"))
-	if err != nil {
-		return fmt.Errorf("invalid create bucket configuration: %w", err)
-	}
-
-	hashedPayload := sha256.Sum256(payload)
-	hexPayload := hex.EncodeToString(hashedPayload[:])
-
-	headers := map[string]string{
-		"x-amz-content-sha256":     hexPayload,
-		"x-vgw-owner":              owner,
-		"x-amz-acl":                ctx.String("acl"),
-		"x-amz-grant-full-control": ctx.String("grant-full-control"),
-		"x-amz-grant-read":         ctx.String("grant-read"),
-		"x-amz-grant-read-acp":     ctx.String("grant-read-acp"),
-		"x-amz-grant-write":        ctx.String("grant-write"),
-		"x-amz-grant-write-acp":    ctx.String("grant-write-acp"),
-		"x-amz-object-ownership":   ctx.String("object-ownership"),
-	}
-
-	if ctx.Bool("object-lock-enabled-for-bucket") {
-		headers["x-amz-bucket-object-lock-enabled"] = "true"
-	}
-	if ctx.Bool("no-object-lock-enabled-for-bucket") {
-		headers["x-amz-bucket-object-lock-enabled"] = "false"
-	}
-
-	req, err := http.NewRequestWithContext(ctx.Context, http.MethodPatch, fmt.Sprintf("%s/%s/create", adminEndpoint, bucket), bytes.NewReader(payload))
-	if err != nil {
-		return err
-	}
-
-	for key, value := range headers {
-		if value != "" {
-			req.Header.Set(key, value)
-		}
-	}
-
-	signer := v4.NewSigner()
-	err = signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
-	if err != nil {
-		return fmt.Errorf("failed to sign the request: %w", err)
-	}
-
-	client := initHTTPClient()
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return fmt.Errorf("failed to send the request: %w", err)
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode >= 400 {
-		return parseApiError(body)
-	}
+	printAcctTable(accs)
 
 	return nil
 }
@@ -805,21 +418,16 @@ const (
 func printAcctTable(accs []auth.Account) {
 	w := new(tabwriter.Writer)
 	w.Init(os.Stdout, minwidth, tabwidth, padding, padchar, flags)
-	fmt.Fprintln(w, "Account\tRole\tUserID\tGroupID\tProjectID")
-	fmt.Fprintln(w, "-------\t----\t------\t-------\t---------")
+	fmt.Fprintln(w, "Account\tRole\tUserID\tGroupID")
+	fmt.Fprintln(w, "-------\t----\t------\t-------")
 	for _, acc := range accs {
-		fmt.Fprintf(w, "%v\t%v\t%v\t%v\t%v\n", acc.Access, acc.Role, acc.UserID, acc.GroupID, acc.ProjectID)
+		fmt.Fprintf(w, "%v\t%v\t%v\t%v\n", acc.Access, acc.Role, acc.UserID, acc.GroupID)
 	}
 	fmt.Fprintln(w)
 	w.Flush()
 }
 
 func changeBucketOwner(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
-
 	bucket, owner := ctx.String("bucket"), ctx.String("owner")
 	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/change-bucket-owner/?bucket=%v&owner=%v", adminEndpoint, bucket, owner), nil)
 	if err != nil {
@@ -833,7 +441,7 @@ func changeBucketOwner(ctx *cli.Context) error {
 
 	req.Header.Set("X-Amz-Content-Sha256", hexPayload)
 
-	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
+	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
 	if signErr != nil {
 		return fmt.Errorf("failed to sign the request: %w", err)
 	}
@@ -852,9 +460,11 @@ func changeBucketOwner(ctx *cli.Context) error {
 	}
 
 	if resp.StatusCode >= 400 {
-		return parseApiError(body)
+		return fmt.Errorf("%s", body)
 	}
 
+	fmt.Println(string(body))
+
 	return nil
 }
 
@@ -871,11 +481,6 @@ func printBuckets(buckets []s3response.Bucket) {
 }
 
 func listBuckets(ctx *cli.Context) error {
-	adminAccess, adminSecret, err := getAdminCreds()
-	if err != nil {
-		return err
-	}
-
 	req, err := http.NewRequest(http.MethodPatch, fmt.Sprintf("%v/list-buckets", adminEndpoint), nil)
 	if err != nil {
 		return fmt.Errorf("failed to send the request: %w", err)
@@ -888,7 +493,7 @@ func listBuckets(ctx *cli.Context) error {
 
 	req.Header.Set("X-Amz-Content-Sha256", hexPayload)
 
-	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", adminRegion, time.Now())
+	signErr := signer.SignHTTP(req.Context(), aws.Credentials{AccessKeyID: adminAccess, SecretAccessKey: adminSecret}, req, hexPayload, "s3", region, time.Now())
 	if signErr != nil {
 		return fmt.Errorf("failed to sign the request: %w", err)
 	}
@@ -907,26 +512,15 @@ func listBuckets(ctx *cli.Context) error {
 	}
 
 	if resp.StatusCode >= 400 {
-		return parseApiError(body)
+		return fmt.Errorf("%s", body)
 	}
 
-	var result s3response.ListBucketsResult
-	if err := xml.Unmarshal(body, &result); err != nil {
+	var buckets []s3response.Bucket
+	if err := json.Unmarshal(body, &buckets); err != nil {
 		return err
 	}
 
-	printBuckets(result.Buckets)
+	printBuckets(buckets)
 
 	return nil
 }
-
-func parseApiError(body []byte) error {
-	var apiErr smithy.GenericAPIError
-	err := xml.Unmarshal(body, &apiErr)
-	if err != nil {
-		apiErr.Code = "InternalServerError"
-		apiErr.Message = err.Error()
-	}
-
-	return &apiErr
-}

cmd/versitygw/gateway_test.go

@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/versity/versitygw/backend/meta"
 	"github.com/versity/versitygw/backend/posix"
@@ -58,9 +57,7 @@ func initPosix(ctx context.Context) {
 		log.Fatalf("make temp directory: %v", err)
 	}
 
-	be, err := posix.New(tempdir, meta.XattrMeta{}, posix.PosixOpts{
-		NewDirPerm: 0755,
-	})
+	be, err := posix.New(tempdir, meta.XattrMeta{}, posix.PosixOpts{})
 	if err != nil {
 		log.Fatalf("init posix: %v", err)
 	}
@@ -78,9 +75,6 @@ func initPosix(ctx context.Context) {
 		}
 		wg.Done()
 	}()
-
-	// wait for server to start
-	time.Sleep(1 * time.Second)
 }
 
 func TestIntegration(t *testing.T) {

cmd/versitygw/main.go

@@ -16,84 +16,64 @@ package main
 
 import (
 	"context"
+	"crypto/tls"
 	"fmt"
 	"log"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
-	"strconv"
 	"strings"
 
+	"github.com/gofiber/fiber/v2"
 	"github.com/urfave/cli/v2"
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/debuglogger"
 	"github.com/versity/versitygw/metrics"
 	"github.com/versity/versitygw/s3api"
 	"github.com/versity/versitygw/s3api/middlewares"
-	"github.com/versity/versitygw/s3api/utils"
 	"github.com/versity/versitygw/s3event"
 	"github.com/versity/versitygw/s3log"
-	"github.com/versity/versitygw/webui"
 )
 
 var (
-	port, admPort                          string
-	rootUserAccess                         string
-	rootUserSecret                         string
-	region                                 string
-	corsAllowOrigin                        string
-	admCertFile, admKeyFile                string
-	certFile, keyFile                      string
-	kafkaURL, kafkaTopic, kafkaKey         string
-	natsURL, natsTopic                     string
-	rabbitmqURL, rabbitmqExchange          string
-	rabbitmqRoutingKey                     string
-	eventWebhookURL                        string
-	eventConfigFilePath                    string
-	logWebhookURL, accessLog               string
-	adminLogFile                           string
-	healthPath                             string
-	virtualDomain                          string
-	debug                                  bool
-	keepAlive                              bool
-	pprof                                  string
-	quiet                                  bool
-	readonly                               bool
-	disableStrictBucketNames               bool
-	iamDir                                 string
-	ldapURL, ldapBindDN, ldapPassword      string
-	ldapQueryBase, ldapObjClasses          string
-	ldapAccessAtr, ldapSecAtr, ldapRoleAtr string
-	ldapUserIdAtr, ldapGroupIdAtr          string
-	ldapProjectIdAtr                       string
-	ldapTLSSkipVerify                      bool
-	vaultEndpointURL, vaultNamespace       string
-	vaultSecretStoragePath                 string
-	vaultSecretStorageNamespace            string
-	vaultAuthMethod, vaultAuthNamespace    string
-	vaultMountPath                         string
-	vaultRootToken, vaultRoleId            string
-	vaultRoleSecret, vaultServerCert       string
-	vaultClientCert, vaultClientCertKey    string
-	s3IamAccess, s3IamSecret               string
-	s3IamRegion, s3IamBucket               string
-	s3IamEndpoint                          string
-	s3IamSslNoVerify                       bool
-	iamCacheDisable                        bool
-	iamCacheTTL                            int
-	iamCachePrune                          int
-	metricsService                         string
-	statsdServers                          string
-	dogstatsServers                        string
-	ipaHost, ipaVaultName                  string
-	ipaUser, ipaPassword                   string
-	ipaInsecure                            bool
-	iamDebug                               bool
-	webuiAddr                              string
-	webuiCertFile, webuiKeyFile            string
-	webuiNoTLS                             bool
+	port, admPort                            string
+	rootUserAccess                           string
+	rootUserSecret                           string
+	region                                   string
+	admCertFile, admKeyFile                  string
+	certFile, keyFile                        string
+	kafkaURL, kafkaTopic, kafkaKey           string
+	natsURL, natsTopic                       string
+	eventWebhookURL                          string
+	eventConfigFilePath                      string
+	logWebhookURL, accessLog                 string
+	adminLogFile                             string
+	healthPath                               string
+	debug                                    bool
+	pprof                                    string
+	quiet                                    bool
+	readonly                                 bool
+	iamDir                                   string
+	ldapURL, ldapBindDN, ldapPassword        string
+	ldapQueryBase, ldapObjClasses            string
+	ldapAccessAtr, ldapSecAtr, ldapRoleAtr   string
+	ldapUserIdAtr, ldapGroupIdAtr            string
+	vaultEndpointURL, vaultSecretStoragePath string
+	vaultMountPath, vaultRootToken           string
+	vaultRoleId, vaultRoleSecret             string
+	vaultServerCert, vaultClientCert         string
+	vaultClientCertKey                       string
+	s3IamAccess, s3IamSecret                 string
+	s3IamRegion, s3IamBucket                 string
+	s3IamEndpoint                            string
+	s3IamSslNoVerify, s3IamDebug             bool
+	iamCacheDisable                          bool
+	iamCacheTTL                              int
+	iamCachePrune                            int
+	metricsService                           string
+	statsdServers                            string
+	dogstatsServers                          string
 )
 
 var (
@@ -115,7 +95,6 @@ func main() {
 		scoutfsCommand(),
 		s3Command(),
 		azureCommand(),
-		pluginCommand(),
 		adminCommand(),
 		testCommand(),
 		utilsCommand(),
@@ -171,30 +150,6 @@ func initFlags() []cli.Flag {
 			Destination: &port,
 			Aliases:     []string{"p"},
 		},
-		&cli.StringFlag{
-			Name:        "webui",
-			Usage:       "enable WebUI server on the specified listen address (e.g. ':7071', '127.0.0.1:7071', 'localhost:7071'; disabled when omitted)",
-			EnvVars:     []string{"VGW_WEBUI_PORT"},
-			Destination: &webuiAddr,
-		},
-		&cli.StringFlag{
-			Name:        "webui-cert",
-			Usage:       "TLS cert file for WebUI (defaults to --cert value when WebUI is enabled)",
-			EnvVars:     []string{"VGW_WEBUI_CERT"},
-			Destination: &webuiCertFile,
-		},
-		&cli.StringFlag{
-			Name:        "webui-key",
-			Usage:       "TLS key file for WebUI (defaults to --key value when WebUI is enabled)",
-			EnvVars:     []string{"VGW_WEBUI_KEY"},
-			Destination: &webuiKeyFile,
-		},
-		&cli.BoolFlag{
-			Name:        "webui-no-tls",
-			Usage:       "disable TLS for WebUI even if TLS is configured for the gateway",
-			EnvVars:     []string{"VGW_WEBUI_NO_TLS"},
-			Destination: &webuiNoTLS,
-		},
 		&cli.StringFlag{
 			Name:        "access",
 			Usage:       "root user access key",
@@ -217,12 +172,6 @@ func initFlags() []cli.Flag {
 			Destination: &region,
 			Aliases:     []string{"r"},
 		},
-		&cli.StringFlag{
-			Name:        "cors-allow-origin",
-			Usage:       "default CORS Access-Control-Allow-Origin value (applied when no bucket CORS configuration exists, and for admin APIs)",
-			EnvVars:     []string{"VGW_CORS_ALLOW_ORIGIN"},
-			Destination: &corsAllowOrigin,
-		},
 		&cli.StringFlag{
 			Name:        "cert",
 			Usage:       "TLS cert file",
@@ -257,7 +206,6 @@ func initFlags() []cli.Flag {
 		&cli.BoolFlag{
 			Name:        "debug",
 			Usage:       "enable debug output",
-			Value:       false,
 			EnvVars:     []string{"VGW_DEBUG"},
 			Destination: &debug,
 		},
@@ -267,12 +215,6 @@ func initFlags() []cli.Flag {
 			EnvVars:     []string{"VGW_PPROF"},
 			Destination: &pprof,
 		},
-		&cli.BoolFlag{
-			Name:        "keep-alive",
-			Usage:       "enable keep-alive connections (for finnicky clients)",
-			EnvVars:     []string{"VGW_KEEP_ALIVE"},
-			Destination: &keepAlive,
-		},
 		&cli.BoolFlag{
 			Name:        "quiet",
 			Usage:       "silence stdout request logging output",
@@ -280,13 +222,6 @@ func initFlags() []cli.Flag {
 			Destination: &quiet,
 			Aliases:     []string{"q"},
 		},
-		&cli.StringFlag{
-			Name:        "virtual-domain",
-			Usage:       "enables the virtual host style bucket addressing with the specified arg as the base domain",
-			EnvVars:     []string{"VGW_VIRTUAL_DOMAIN"},
-			Destination: &virtualDomain,
-			Aliases:     []string{"vd"},
-		},
 		&cli.StringFlag{
 			Name:        "access-log",
 			Usage:       "enable server access logging to specified file",
@@ -340,27 +275,6 @@ func initFlags() []cli.Flag {
 			Destination: &natsTopic,
 			Aliases:     []string{"ent"},
 		},
-		&cli.StringFlag{
-			Name:        "event-rabbitmq-url",
-			Usage:       "rabbitmq server url to send the bucket notifications (amqp or amqps scheme)",
-			EnvVars:     []string{"VGW_EVENT_RABBITMQ_URL"},
-			Destination: &rabbitmqURL,
-			Aliases:     []string{"eru"},
-		},
-		&cli.StringFlag{
-			Name:        "event-rabbitmq-exchange",
-			Usage:       "rabbitmq exchange to publish bucket notifications to (blank for default)",
-			EnvVars:     []string{"VGW_EVENT_RABBITMQ_EXCHANGE"},
-			Destination: &rabbitmqExchange,
-			Aliases:     []string{"ere"},
-		},
-		&cli.StringFlag{
-			Name:        "event-rabbitmq-routing-key",
-			Usage:       "rabbitmq routing key when publishing bucket notifications (defaults to bucket name when blank)",
-			EnvVars:     []string{"VGW_EVENT_RABBITMQ_ROUTING_KEY"},
-			Destination: &rabbitmqRoutingKey,
-			Aliases:     []string{"errk"},
-		},
 		&cli.StringFlag{
 			Name:        "event-webhook-url",
 			Usage:       "webhook url to send bucket notifications",
@@ -441,54 +355,18 @@ func initFlags() []cli.Flag {
 			EnvVars:     []string{"VGW_IAM_LDAP_GROUP_ID_ATR"},
 			Destination: &ldapGroupIdAtr,
 		},
-		&cli.StringFlag{
-			Name:        "iam-ldap-project-id-atr",
-			Usage:       "ldap server user project id attribute name",
-			EnvVars:     []string{"VGW_IAM_LDAP_PROJECT_ID_ATR"},
-			Destination: &ldapProjectIdAtr,
-		},
-		&cli.BoolFlag{
-			Name:        "iam-ldap-tls-skip-verify",
-			Usage:       "disable TLS certificate verification for LDAP connections (insecure, for self-signed certificates)",
-			EnvVars:     []string{"VGW_IAM_LDAP_TLS_SKIP_VERIFY"},
-			Destination: &ldapTLSSkipVerify,
-		},
 		&cli.StringFlag{
 			Name:        "iam-vault-endpoint-url",
 			Usage:       "vault server url",
 			EnvVars:     []string{"VGW_IAM_VAULT_ENDPOINT_URL"},
 			Destination: &vaultEndpointURL,
 		},
-		&cli.StringFlag{
-			Name:        "iam-vault-namespace",
-			Usage:       "vault server namespace",
-			EnvVars:     []string{"VGW_IAM_VAULT_NAMESPACE"},
-			Destination: &vaultNamespace,
-		},
 		&cli.StringFlag{
 			Name:        "iam-vault-secret-storage-path",
 			Usage:       "vault server secret storage path",
 			EnvVars:     []string{"VGW_IAM_VAULT_SECRET_STORAGE_PATH"},
 			Destination: &vaultSecretStoragePath,
 		},
-		&cli.StringFlag{
-			Name:        "iam-vault-secret-storage-namespace",
-			Usage:       "vault server secret storage namespace",
-			EnvVars:     []string{"VGW_IAM_VAULT_SECRET_STORAGE_NAMESPACE"},
-			Destination: &vaultSecretStorageNamespace,
-		},
-		&cli.StringFlag{
-			Name:        "iam-vault-auth-method",
-			Usage:       "vault server auth method",
-			EnvVars:     []string{"VGW_IAM_VAULT_AUTH_METHOD"},
-			Destination: &vaultAuthMethod,
-		},
-		&cli.StringFlag{
-			Name:        "iam-vault-auth-namespace",
-			Usage:       "vault server auth namespace",
-			EnvVars:     []string{"VGW_IAM_VAULT_AUTH_NAMESPACE"},
-			Destination: &vaultAuthNamespace,
-		},
 		&cli.StringFlag{
 			Name:        "iam-vault-mount-path",
 			Usage:       "vault server mount path",
@@ -568,6 +446,12 @@ func initFlags() []cli.Flag {
 			EnvVars:     []string{"VGW_S3_IAM_NO_VERIFY"},
 			Destination: &s3IamSslNoVerify,
 		},
+		&cli.BoolFlag{
+			Name:        "s3-iam-debug",
+			Usage:       "s3 IAM debug output",
+			EnvVars:     []string{"VGW_S3_IAM_DEBUG"},
+			Destination: &s3IamDebug,
+		},
 		&cli.BoolFlag{
 			Name:        "iam-cache-disable",
 			Usage:       "disable local iam cache",
@@ -588,13 +472,6 @@ func initFlags() []cli.Flag {
 			Value:       3600,
 			Destination: &iamCachePrune,
 		},
-		&cli.BoolFlag{
-			Name:        "iam-debug",
-			Usage:       "enable IAM debug output",
-			Value:       false,
-			EnvVars:     []string{"VGW_IAM_DEBUG"},
-			Destination: &iamDebug,
-		},
 		&cli.StringFlag{
 			Name: "health",
 			Usage: `health check endpoint path. Health endpoint will be configured on GET http method: GET <health>
@@ -608,12 +485,6 @@ func initFlags() []cli.Flag {
 			EnvVars:     []string{"VGW_READ_ONLY"},
 			Destination: &readonly,
 		},
-		&cli.BoolFlag{
-			Name:        "disable-strict-bucket-names",
-			Usage:       "allow relaxed bucket naming (disables strict validation checks)",
-			EnvVars:     []string{"VGW_DISABLE_STRICT_BUCKET_NAMES"},
-			Destination: &disableStrictBucketNames,
-		},
 		&cli.StringFlag{
 			Name:        "metrics-service-name",
 			Usage:       "service name tag for metrics, hostname if blank",
@@ -635,36 +506,6 @@ func initFlags() []cli.Flag {
 			Aliases:     []string{"mds"},
 			Destination: &dogstatsServers,
 		},
-		&cli.StringFlag{
-			Name:        "ipa-host",
-			Usage:       "FreeIPA server url e.g. https://ipa.example.test",
-			EnvVars:     []string{"VGW_IPA_HOST"},
-			Destination: &ipaHost,
-		},
-		&cli.StringFlag{
-			Name:        "ipa-vault-name",
-			Usage:       "A name of the user vault containing their secret",
-			EnvVars:     []string{"VGW_IPA_VAULT_NAME"},
-			Destination: &ipaVaultName,
-		},
-		&cli.StringFlag{
-			Name:        "ipa-user",
-			Usage:       "Username used to connect to FreeIPA (requires permissions to read user vault contents)",
-			EnvVars:     []string{"VGW_IPA_USER"},
-			Destination: &ipaUser,
-		},
-		&cli.StringFlag{
-			Name:        "ipa-password",
-			Usage:       "Password of the user used to connect to FreeIPA",
-			EnvVars:     []string{"VGW_IPA_PASSWORD"},
-			Destination: &ipaPassword,
-		},
-		&cli.BoolFlag{
-			Name:        "ipa-insecure",
-			Usage:       "Disable verify TLS certificate of FreeIPA server",
-			EnvVars:     []string{"VGW_IPA_INSECURE"},
-			Destination: &ipaInsecure,
-		},
 	}
 }
 
@@ -673,44 +514,6 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 		return fmt.Errorf("root user access and secret key must be provided")
 	}
 
-	webuiAddr = strings.TrimSpace(webuiAddr)
-	if webuiAddr != "" && isAllDigits(webuiAddr) {
-		webuiAddr = ":" + webuiAddr
-	}
-
-	// WebUI runs in a browser and typically talks to the gateway/admin APIs cross-origin
-	// (different port). If no bucket CORS configuration exists, those API responses need
-	// a default Access-Control-Allow-Origin to be usable from the WebUI.
-	if webuiAddr != "" && strings.TrimSpace(corsAllowOrigin) == "" {
-		// A single Access-Control-Allow-Origin value cannot cover multiple specific
-		// origins. Default to '*' for usability and print a warning so operators can
-		// lock it down explicitly.
-		corsAllowOrigin = "*"
-		webuiScheme := "http"
-		if !webuiNoTLS && (strings.TrimSpace(webuiCertFile) != "" || strings.TrimSpace(certFile) != "") {
-			webuiScheme = "https"
-		}
-
-		// Suggest a more secure explicit origin based on the actual WebUI listening interfaces.
-		// (Browsers require an exact origin match; this is typically one chosen hostname/IP.)
-		var suggestion string
-		ips, ipsErr := getMatchingIPs(webuiAddr)
-		_, webPrt, prtErr := net.SplitHostPort(webuiAddr)
-		if ipsErr == nil && prtErr == nil && len(ips) > 0 {
-			origins := make([]string, 0, len(ips))
-			for _, ip := range ips {
-				origins = append(origins, fmt.Sprintf("%s://%s:%s", webuiScheme, ip, webPrt))
-			}
-			suggestion = fmt.Sprintf("consider setting it to one of: %s (or your public hostname)", strings.Join(origins, ", "))
-		} else {
-			suggestion = fmt.Sprintf("consider setting it to %s://<host>:<port>", webuiScheme)
-		}
-
-		fmt.Fprintf(os.Stderr, "WARNING: --webui is enabled but --cors-allow-origin is not set; defaulting to '*'; %s\n", suggestion)
-	}
-
-	utils.SetBucketNameValidationStrict(!disableStrictBucketNames)
-
 	if pprof != "" {
 		// listen on specified port for pprof debug
 		// point browser to http://<ip:port>/debug/pprof/
@@ -719,10 +522,16 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 		}()
 	}
 
+	app := fiber.New(fiber.Config{
+		AppName:               "versitygw",
+		ServerHeader:          "VERSITYGW",
+		StreamRequestBody:     true,
+		DisableKeepalive:      true,
+		Network:               fiber.NetworkTCP,
+		DisableStartupMessage: true,
+	})
+
 	var opts []s3api.Option
-	if corsAllowOrigin != "" {
-		opts = append(opts, s3api.WithCORSAllowOrigin(corsAllowOrigin))
-	}
 
 	if certFile != "" || keyFile != "" {
 		if certFile == "" {
@@ -732,12 +541,14 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 			return fmt.Errorf("TLS cert specified without key file")
 		}
 
-		cs := utils.NewCertStorage()
-		err := cs.SetCertificate(certFile, keyFile)
+		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
 			return fmt.Errorf("tls: load certs: %v", err)
 		}
-		opts = append(opts, s3api.WithTLS(cs))
+		opts = append(opts, s3api.WithTLS(cert))
+	}
+	if debug {
+		opts = append(opts, s3api.WithDebug())
 	}
 	if admPort == "" {
 		opts = append(opts, s3api.WithAdminServer())
@@ -751,17 +562,29 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 	if readonly {
 		opts = append(opts, s3api.WithReadOnly())
 	}
-	if virtualDomain != "" {
-		opts = append(opts, s3api.WithHostStyle(virtualDomain))
-	}
-	if keepAlive {
-		opts = append(opts, s3api.WithKeepAlive())
-	}
-	if debug {
-		debuglogger.SetDebugEnabled()
-	}
-	if iamDebug {
-		debuglogger.SetIAMDebugEnabled()
+
+	admApp := fiber.New(fiber.Config{
+		AppName:               "versitygw",
+		ServerHeader:          "VERSITYGW",
+		Network:               fiber.NetworkTCP,
+		DisableStartupMessage: true,
+	})
+
+	var admOpts []s3api.AdminOpt
+
+	if admCertFile != "" || admKeyFile != "" {
+		if admCertFile == "" {
+			return fmt.Errorf("TLS key specified without cert file")
+		}
+		if admKeyFile == "" {
+			return fmt.Errorf("TLS cert specified without key file")
+		}
+
+		cert, err := tls.LoadX509KeyPair(admCertFile, admKeyFile)
+		if err != nil {
+			return fmt.Errorf("tls: load certs: %v", err)
+		}
+		admOpts = append(admOpts, s3api.WithAdminSrvTLS(cert))
 	}
 
 	iam, err := auth.New(&auth.Opts{
@@ -770,46 +593,36 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 			Secret: rootUserSecret,
 			Role:   auth.RoleAdmin,
 		},
-		Dir:                         iamDir,
-		LDAPServerURL:               ldapURL,
-		LDAPBindDN:                  ldapBindDN,
-		LDAPPassword:                ldapPassword,
-		LDAPQueryBase:               ldapQueryBase,
-		LDAPObjClasses:              ldapObjClasses,
-		LDAPAccessAtr:               ldapAccessAtr,
-		LDAPSecretAtr:               ldapSecAtr,
-		LDAPRoleAtr:                 ldapRoleAtr,
-		LDAPUserIdAtr:               ldapUserIdAtr,
-		LDAPGroupIdAtr:              ldapGroupIdAtr,
-		LDAPProjectIdAtr:            ldapProjectIdAtr,
-		LDAPTLSSkipVerify:           ldapTLSSkipVerify,
-		VaultEndpointURL:            vaultEndpointURL,
-		VaultNamespace:              vaultNamespace,
-		VaultSecretStoragePath:      vaultSecretStoragePath,
-		VaultSecretStorageNamespace: vaultSecretStorageNamespace,
-		VaultAuthMethod:             vaultAuthMethod,
-		VaultAuthNamespace:          vaultAuthNamespace,
-		VaultMountPath:              vaultMountPath,
-		VaultRootToken:              vaultRootToken,
-		VaultRoleId:                 vaultRoleId,
-		VaultRoleSecret:             vaultRoleSecret,
-		VaultServerCert:             vaultServerCert,
-		VaultClientCert:             vaultClientCert,
-		VaultClientCertKey:          vaultClientCertKey,
-		S3Access:                    s3IamAccess,
-		S3Secret:                    s3IamSecret,
-		S3Region:                    s3IamRegion,
-		S3Bucket:                    s3IamBucket,
-		S3Endpoint:                  s3IamEndpoint,
-		S3DisableSSlVerfiy:          s3IamSslNoVerify,
-		CacheDisable:                iamCacheDisable,
-		CacheTTL:                    iamCacheTTL,
-		CachePrune:                  iamCachePrune,
-		IpaHost:                     ipaHost,
-		IpaVaultName:                ipaVaultName,
-		IpaUser:                     ipaUser,
-		IpaPassword:                 ipaPassword,
-		IpaInsecure:                 ipaInsecure,
+		Dir:                    iamDir,
+		LDAPServerURL:          ldapURL,
+		LDAPBindDN:             ldapBindDN,
+		LDAPPassword:           ldapPassword,
+		LDAPQueryBase:          ldapQueryBase,
+		LDAPObjClasses:         ldapObjClasses,
+		LDAPAccessAtr:          ldapAccessAtr,
+		LDAPSecretAtr:          ldapSecAtr,
+		LDAPRoleAtr:            ldapRoleAtr,
+		LDAPUserIdAtr:          ldapUserIdAtr,
+		LDAPGroupIdAtr:         ldapGroupIdAtr,
+		VaultEndpointURL:       vaultEndpointURL,
+		VaultSecretStoragePath: vaultSecretStoragePath,
+		VaultMountPath:         vaultMountPath,
+		VaultRootToken:         vaultRootToken,
+		VaultRoleId:            vaultRoleId,
+		VaultRoleSecret:        vaultRoleSecret,
+		VaultServerCert:        vaultServerCert,
+		VaultClientCert:        vaultClientCert,
+		VaultClientCertKey:     vaultClientCertKey,
+		S3Access:               s3IamAccess,
+		S3Secret:               s3IamSecret,
+		S3Region:               s3IamRegion,
+		S3Bucket:               s3IamBucket,
+		S3Endpoint:             s3IamEndpoint,
+		S3DisableSSlVerfiy:     s3IamSslNoVerify,
+		S3Debug:                s3IamDebug,
+		CacheDisable:           iamCacheDisable,
+		CacheTTL:               iamCacheTTL,
+		CachePrune:             iamCachePrune,
 	})
 	if err != nil {
 		return fmt.Errorf("setup iam: %w", err)
@@ -839,9 +652,6 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 		KafkaTopicKey:        kafkaKey,
 		NatsURL:              natsURL,
 		NatsTopic:            natsTopic,
-		RabbitmqURL:          rabbitmqURL,
-		RabbitmqExchange:     rabbitmqExchange,
-		RabbitmqRoutingKey:   rabbitmqRoutingKey,
 		WebhookURL:           eventWebhookURL,
 		FilterConfigFilePath: eventConfigFilePath,
 	})
@@ -849,7 +659,7 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 		return fmt.Errorf("init bucket event notifications: %w", err)
 	}
 
-	srv, err := s3api.New(be, middlewares.RootUserConfig{
+	srv, err := s3api.New(app, be, middlewares.RootUserConfig{
 		Access: rootUserAccess,
 		Secret: rootUserSecret,
 	}, port, region, iam, loggers.S3Logger, loggers.AdminLogger, evSender, metricsManager, opts...)
@@ -857,135 +667,17 @@ func runGateway(ctx context.Context, be backend.Backend) error {
 		return fmt.Errorf("init gateway: %v", err)
 	}
 
-	var admSrv *s3api.S3AdminServer
-
-	if admPort != "" {
-		var opts []s3api.AdminOpt
-		if corsAllowOrigin != "" {
-			opts = append(opts, s3api.WithAdminCORSAllowOrigin(corsAllowOrigin))
-		}
-
-		if admCertFile != "" || admKeyFile != "" {
-			if admCertFile == "" {
-				return fmt.Errorf("TLS key specified without cert file")
-			}
-			if admKeyFile == "" {
-				return fmt.Errorf("TLS cert specified without key file")
-			}
-
-			cs := utils.NewCertStorage()
-			err = cs.SetCertificate(admCertFile, admKeyFile)
-			if err != nil {
-				return fmt.Errorf("tls: load certs: %v", err)
-			}
-			opts = append(opts, s3api.WithAdminSrvTLS(cs))
-		}
-		if quiet {
-			opts = append(opts, s3api.WithAdminQuiet())
-		}
-		if debug {
-			opts = append(opts, s3api.WithAdminDebug())
-		}
-
-		admSrv = s3api.NewAdminServer(be, middlewares.RootUserConfig{Access: rootUserAccess, Secret: rootUserSecret}, admPort, region, iam, loggers.AdminLogger, srv.Router.Ctrl, opts...)
-	}
-
-	var webSrv *webui.Server
-	webuiSSLEnabled := false
-	webTLSCert := ""
-	webTLSKey := ""
-	if webuiAddr != "" {
-		_, webPrt, err := net.SplitHostPort(webuiAddr)
-		if err != nil {
-			return fmt.Errorf("webui listen address must be in the form ':port' or 'host:port': %w", err)
-		}
-		webPortNum, err := strconv.Atoi(webPrt)
-		if err != nil {
-			return fmt.Errorf("webui port must be a number: %w", err)
-		}
-		if webPortNum < 0 || webPortNum > 65535 {
-			return fmt.Errorf("webui port must be between 0 and 65535")
-		}
-
-		var webOpts []webui.Option
-		if !webuiNoTLS {
-			// WebUI can either use explicitly provided TLS files or reuse the
-			// gateway's TLS files by default.
-			webTLSCert = webuiCertFile
-			webTLSKey = webuiKeyFile
-			if webTLSCert == "" && webTLSKey == "" {
-				webTLSCert = certFile
-				webTLSKey = keyFile
-			}
-			if webTLSCert != "" || webTLSKey != "" {
-				if webTLSCert == "" {
-					return fmt.Errorf("webui TLS key specified without cert file")
-				}
-				if webTLSKey == "" {
-					return fmt.Errorf("webui TLS cert specified without key file")
-				}
-				webuiSSLEnabled = true
-
-				cs := utils.NewCertStorage()
-				err := cs.SetCertificate(webTLSCert, webTLSKey)
-				if err != nil {
-					return fmt.Errorf("tls: load certs: %v", err)
-				}
-
-				webOpts = append(webOpts, webui.WithTLS(cs))
-			}
-		}
-
-		sslEnabled := certFile != ""
-		admSSLEnabled := sslEnabled
-		if admPort != "" {
-			admSSLEnabled = admCertFile != ""
-		}
-
-		gateways, err := buildServiceURLs(port, sslEnabled)
-		if err != nil {
-			return fmt.Errorf("webui: build gateway URLs: %w", err)
-		}
-
-		adminGateways := gateways
-		if admPort != "" {
-			adminGateways, err = buildServiceURLs(admPort, admSSLEnabled)
-			if err != nil {
-				return fmt.Errorf("webui: build admin gateway URLs: %w", err)
-			}
-		}
-
-		if quiet {
-			webOpts = append(webOpts, webui.WithQuiet())
-		}
-
-		webSrv = webui.NewServer(&webui.ServerConfig{
-			ListenAddr:    webuiAddr,
-			Gateways:      gateways,
-			AdminGateways: adminGateways,
-			Region:        region,
-		}, webOpts...)
-	}
+	admSrv := s3api.NewAdminServer(admApp, be, middlewares.RootUserConfig{Access: rootUserAccess, Secret: rootUserSecret}, admPort, region, iam, loggers.AdminLogger, admOpts...)
 
 	if !quiet {
-		printBanner(port, admPort, certFile != "", admCertFile != "", webuiAddr, webuiSSLEnabled)
+		printBanner(port, admPort, certFile != "", admCertFile != "")
 	}
 
-	servers := 1
-	if admPort != "" {
-		servers++
-	}
-	if webSrv != nil {
-		servers++
-	}
-	c := make(chan error, servers)
+	c := make(chan error, 2)
 	go func() { c <- srv.Serve() }()
 	if admPort != "" {
 		go func() { c <- admSrv.Serve() }()
 	}
-	if webSrv != nil {
-		go func() { c <- webSrv.Serve() }()
-	}
 
 	// for/select blocks until shutdown
 Loop:
@@ -1010,71 +702,35 @@ Loop:
 					break Loop
 				}
 			}
-			if certFile != "" && keyFile != "" {
-				err = srv.CertStorage.SetCertificate(certFile, keyFile)
-				if err != nil {
-					debuglogger.InternalError(fmt.Errorf("srv cert reload failed: %w", err))
-				} else {
-					fmt.Printf("srv cert reloaded (cert: %s, key: %s)\n", certFile, keyFile)
-				}
-			}
-			if admPort != "" && admCertFile != "" && admKeyFile != "" {
-				err = admSrv.CertStorage.SetCertificate(admCertFile, admKeyFile)
-				if err != nil {
-					debuglogger.InternalError(fmt.Errorf("admSrv cert reload failed: %w", err))
-				} else {
-					fmt.Printf("admSrv cert reloaded (cert: %s, key: %s)\n", admCertFile, admKeyFile)
-				}
-			}
-			if webSrv != nil && webTLSCert != "" && webTLSKey != "" {
-				err := webSrv.CertStorage.SetCertificate(webTLSCert, webTLSKey)
-				if err != nil {
-					debuglogger.InternalError(fmt.Errorf("webSrv cert reload failed: %w", err))
-				} else {
-					fmt.Printf("webSrv cert reloaded (cert: %s, key: %s)\n", webTLSCert, webTLSKey)
-				}
-			}
 		}
 	}
 	saveErr := err
 
-	// first shut down the s3api and admin servers
-	// as they have dependecy from other modules
-	err = srv.ShutDown()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "shutdown api server: %v\n", err)
-	}
-
-	if admSrv != nil {
-		err := admSrv.Shutdown()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "shutdown admin server: %v\n", err)
-		}
-	}
-
-	if webSrv != nil {
-		err := webSrv.Shutdown()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "shutdown webui server: %v\n", err)
-		}
-	}
-
 	be.Shutdown()
 
 	err = iam.Shutdown()
 	if err != nil {
+		if saveErr == nil {
+			saveErr = err
+		}
 		fmt.Fprintf(os.Stderr, "shutdown iam: %v\n", err)
 	}
 
 	if loggers.S3Logger != nil {
 		err := loggers.S3Logger.Shutdown()
 		if err != nil {
+			if saveErr == nil {
+				saveErr = err
+			}
 			fmt.Fprintf(os.Stderr, "shutdown s3 logger: %v\n", err)
 		}
 	}
 	if loggers.AdminLogger != nil {
 		err := loggers.AdminLogger.Shutdown()
 		if err != nil {
+			if saveErr == nil {
+				saveErr = err
+			}
 			fmt.Fprintf(os.Stderr, "shutdown admin logger: %v\n", err)
 		}
 	}
@@ -1082,6 +738,9 @@ Loop:
 	if evSender != nil {
 		err := evSender.Close()
 		if err != nil {
+			if saveErr == nil {
+				saveErr = err
+			}
 			fmt.Fprintf(os.Stderr, "close event sender: %v\n", err)
 		}
 	}
@@ -1093,7 +752,7 @@ Loop:
 	return saveErr
 }
 
-func printBanner(port, admPort string, ssl, admSsl bool, webuiAddr string, webuiSsl bool) {
+func printBanner(port, admPort string, ssl, admSsl bool) {
 	interfaces, err := getMatchingIPs(port)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to match local IP addresses: %v\n", err)
@@ -1175,30 +834,6 @@ func printBanner(port, admPort string, ssl, admSsl bool, webuiAddr string, webui
 		}
 	}
 
-	if strings.TrimSpace(webuiAddr) != "" {
-		webInterfaces, err := getMatchingIPs(webuiAddr)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to match webui port local IP addresses: %v\n", err)
-			return
-		}
-		_, webPrt, err := net.SplitHostPort(webuiAddr)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Failed to parse webui port: %v\n", err)
-			return
-		}
-		lines = append(lines,
-			centerText(""),
-			leftText("WebUI listening on:"),
-		)
-		for _, ip := range webInterfaces {
-			url := fmt.Sprintf("http://%s:%s", ip, webPrt)
-			if webuiSsl {
-				url = fmt.Sprintf("https://%s:%s", ip, webPrt)
-			}
-			lines = append(lines, leftText("  "+url))
-		}
-	}
-
 	// Print the top border
 	fmt.Println("┌" + strings.Repeat("─", columnWidth-2) + "┐")
 
@@ -1274,46 +909,13 @@ func getMatchingIPs(spec string) ([]string, error) {
 	return result, nil
 }
 
-func buildServiceURLs(spec string, ssl bool) ([]string, error) {
-	interfaces, err := getMatchingIPs(spec)
-	if err != nil {
-		return nil, err
-	}
-	_, prt, err := net.SplitHostPort(spec)
-	if err != nil {
-		return nil, fmt.Errorf("parse address/port: %w", err)
-	}
-	if len(interfaces) == 0 {
-		interfaces = []string{"localhost"}
-	}
-
-	scheme := "http"
-	if ssl {
-		scheme = "https"
-	}
-	urls := make([]string, 0, len(interfaces))
-	for _, ip := range interfaces {
-		urls = append(urls, fmt.Sprintf("%s://%s:%s", scheme, ip, prt))
-	}
-	return urls, nil
-}
-
-func isAllDigits(s string) bool {
-	if s == "" {
-		return false
-	}
-	for _, r := range s {
-		if r < '0' || r > '9' {
-			return false
-		}
-	}
-	return true
-}
-
 const columnWidth = 70
 
 func centerText(text string) string {
-	padding := max((columnWidth-2-len(text))/2, 0)
+	padding := (columnWidth - 2 - len(text)) / 2
+	if padding < 0 {
+		padding = 0
+	}
 	return strings.Repeat(" ", padding) + text
 }
 

cmd/versitygw/plugin.go

@@ -1,75 +0,0 @@
-// Copyright 2025 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package main
-
-import (
-	"errors"
-	"fmt"
-	"plugin"
-
-	"github.com/urfave/cli/v2"
-	"github.com/versity/versitygw/plugins"
-)
-
-func pluginCommand() *cli.Command {
-	return &cli.Command{
-		Name:        "plugin",
-		Usage:       "load a backend from a plugin",
-		Description: "Runs a s3 gateway and redirects the requests to the backend defined in the plugin",
-		Action:      runPluginBackend,
-		Flags: []cli.Flag{
-			&cli.StringFlag{
-				Name:    "config",
-				Usage:   "location of the plugin config file",
-				Aliases: []string{"c"},
-				EnvVars: []string{"VGW_PLUGIN_CONFIG"},
-			},
-		},
-	}
-}
-
-func runPluginBackend(ctx *cli.Context) error {
-	if ctx.NArg() == 0 {
-		return fmt.Errorf("no plugin file provided to be loaded")
-	}
-
-	pluginPath := ctx.Args().Get(0)
-	config := ctx.String("config")
-
-	p, err := plugin.Open(pluginPath)
-	if err != nil {
-		return err
-	}
-
-	backendSymbol, err := p.Lookup("Backend")
-	if err != nil {
-		return err
-	}
-	backendPluginPtr, ok := backendSymbol.(*plugins.BackendPlugin)
-	if !ok {
-		return errors.New("plugin is not of type *plugins.BackendPlugin")
-	}
-
-	if backendPluginPtr == nil {
-		return errors.New("variable Backend is nil")
-	}
-
-	be, err := (*backendPluginPtr).New(config)
-	if err != nil {
-		return err
-	}
-
-	return runGateway(ctx.Context, be)
-}

cmd/versitygw/posix.go

@@ -16,8 +16,6 @@ package main
 
 import (
 	"fmt"
-	"io/fs"
-	"math"
 
 	"github.com/urfave/cli/v2"
 	"github.com/versity/versitygw/backend/meta"
@@ -28,10 +26,6 @@ var (
 	chownuid, chowngid bool
 	bucketlinks        bool
 	versioningDir      string
-	dirPerms           uint
-	sidecar            string
-	nometa             bool
-	forceNoTmpFile     bool
 )
 
 func posixCommand() *cli.Command {
@@ -74,32 +68,6 @@ will be translated into the file /mnt/fs/gwroot/mybucket/a/b/c/myobject`,
 				EnvVars:     []string{"VGW_VERSIONING_DIR"},
 				Destination: &versioningDir,
 			},
-			&cli.UintFlag{
-				Name:        "dir-perms",
-				Usage:       "default directory permissions for new directories",
-				EnvVars:     []string{"VGW_DIR_PERMS"},
-				Destination: &dirPerms,
-				DefaultText: "0755",
-				Value:       0755,
-			},
-			&cli.StringFlag{
-				Name:        "sidecar",
-				Usage:       "use provided sidecar directory to store metadata",
-				EnvVars:     []string{"VGW_META_SIDECAR"},
-				Destination: &sidecar,
-			},
-			&cli.BoolFlag{
-				Name:        "nometa",
-				Usage:       "disable metadata storage",
-				EnvVars:     []string{"VGW_META_NONE"},
-				Destination: &nometa,
-			},
-			&cli.BoolFlag{
-				Name:        "disableotmp",
-				Usage:       "disable O_TMPFILE support for new objects",
-				EnvVars:     []string{"VGW_DISABLE_OTMP"},
-				Destination: &forceNoTmpFile,
-			},
 		},
 	}
 }
@@ -110,47 +78,19 @@ func runPosix(ctx *cli.Context) error {
 	}
 
 	gwroot := (ctx.Args().Get(0))
-
-	if dirPerms > math.MaxUint32 {
-		return fmt.Errorf("invalid directory permissions: %d", dirPerms)
-	}
-
-	if nometa && sidecar != "" {
-		return fmt.Errorf("cannot use both nometa and sidecar metadata")
-	}
-
-	opts := posix.PosixOpts{
-		ChownUID:            chownuid,
-		ChownGID:            chowngid,
-		BucketLinks:         bucketlinks,
-		VersioningDir:       versioningDir,
-		NewDirPerm:          fs.FileMode(dirPerms),
-		ForceNoTmpFile:      forceNoTmpFile,
-		ValidateBucketNames: disableStrictBucketNames,
-	}
-
-	var ms meta.MetadataStorer
-	switch {
-	case sidecar != "":
-		sc, err := meta.NewSideCar(sidecar)
-		if err != nil {
-			return fmt.Errorf("failed to init sidecar metadata: %w", err)
-		}
-		ms = sc
-		opts.SideCarDir = sidecar
-	case nometa:
-		ms = meta.NoMeta{}
-	default:
-		ms = meta.XattrMeta{}
-		err := meta.XattrMeta{}.Test(gwroot)
-		if err != nil {
-			return fmt.Errorf("xattr check failed: %w", err)
-		}
-	}
-
-	be, err := posix.New(gwroot, ms, opts)
+	err := meta.XattrMeta{}.Test(gwroot)
 	if err != nil {
-		return fmt.Errorf("failed to init posix backend: %w", err)
+		return fmt.Errorf("posix xattr check: %v", err)
+	}
+
+	be, err := posix.New(gwroot, meta.XattrMeta{}, posix.PosixOpts{
+		ChownUID:      chownuid,
+		ChownGID:      chowngid,
+		BucketLinks:   bucketlinks,
+		VersioningDir: versioningDir,
+	})
+	if err != nil {
+		return fmt.Errorf("init posix: %v", err)
 	}
 
 	return runGateway(ctx.Context, be)

cmd/versitygw/s3.go

@@ -26,10 +26,8 @@ var (
 	s3proxySecret          string
 	s3proxyEndpoint        string
 	s3proxyRegion          string
-	s3proxyMetaBucket      string
 	s3proxyDisableChecksum bool
 	s3proxySslSkipVerify   bool
-	s3proxyUsePathStyle    bool
 	s3proxyDebug           bool
 )
 
@@ -73,12 +71,6 @@ to an s3 storage backend service.`,
 				EnvVars:     []string{"VGW_S3_REGION"},
 				Destination: &s3proxyRegion,
 			},
-			&cli.StringFlag{
-				Name:        "meta-bucket",
-				Usage:       "s3 service meta bucket to store buckets acl/policy",
-				EnvVars:     []string{"VGW_S3_META_BUCKET"},
-				Destination: &s3proxyMetaBucket,
-			},
 			&cli.BoolFlag{
 				Name:        "disable-checksum",
 				Usage:       "disable gateway to server object checksums",
@@ -93,13 +85,6 @@ to an s3 storage backend service.`,
 				Value:       false,
 				Destination: &s3proxySslSkipVerify,
 			},
-			&cli.BoolFlag{
-				Name:        "use-path-style",
-				Usage:       "use path style addressing for s3 proxy",
-				EnvVars:     []string{"VGW_S3_USE_PATH_STYLE"},
-				Value:       false,
-				Destination: &s3proxyUsePathStyle,
-			},
 			&cli.BoolFlag{
 				Name:        "debug",
 				Usage:       "output extra debug tracing",
@@ -112,8 +97,8 @@ to an s3 storage backend service.`,
 }
 
 func runS3(ctx *cli.Context) error {
-	be, err := s3proxy.New(ctx.Context, s3proxyAccess, s3proxySecret, s3proxyEndpoint, s3proxyRegion,
-		s3proxyMetaBucket, s3proxyDisableChecksum, s3proxySslSkipVerify, s3proxyUsePathStyle, s3proxyDebug)
+	be, err := s3proxy.New(s3proxyAccess, s3proxySecret, s3proxyEndpoint, s3proxyRegion,
+		s3proxyDisableChecksum, s3proxySslSkipVerify, s3proxyDebug)
 	if err != nil {
 		return fmt.Errorf("init s3 backend: %w", err)
 	}

cmd/versitygw/scoutfs.go

@@ -16,17 +16,13 @@ package main
 
 import (
 	"fmt"
-	"io/fs"
-	"math"
 
 	"github.com/urfave/cli/v2"
 	"github.com/versity/versitygw/backend/scoutfs"
 )
 
 var (
-	glacier          bool
-	disableNoArchive bool
-	setProjectID     bool
+	glacier bool
 )
 
 func scoutfsCommand() *cli.Command {
@@ -67,38 +63,12 @@ move interfaces as well as support for tiered filesystems.`,
 				EnvVars:     []string{"VGW_CHOWN_GID"},
 				Destination: &chowngid,
 			},
-			&cli.BoolFlag{
-				Name:        "projectid",
-				Usage:       "set project id on newly created buckets, files, and directories to client account ProjectID",
-				EnvVars:     []string{"VGW_SET_PROJECT_ID"},
-				Destination: &setProjectID,
-			},
 			&cli.BoolFlag{
 				Name:        "bucketlinks",
 				Usage:       "allow symlinked directories at bucket level to be treated as buckets",
 				EnvVars:     []string{"VGW_BUCKET_LINKS"},
 				Destination: &bucketlinks,
 			},
-			&cli.StringFlag{
-				Name:        "versioning-dir",
-				Usage:       "the directory path to enable bucket versioning",
-				EnvVars:     []string{"VGW_VERSIONING_DIR"},
-				Destination: &versioningDir,
-			},
-			&cli.UintFlag{
-				Name:        "dir-perms",
-				Usage:       "default directory permissions for new directories",
-				EnvVars:     []string{"VGW_DIR_PERMS"},
-				Destination: &dirPerms,
-				DefaultText: "0755",
-				Value:       0755,
-			},
-			&cli.BoolFlag{
-				Name:        "disable-noarchive",
-				Usage:       "disable setting noarchive for multipart part uploads",
-				EnvVars:     []string{"VGW_DISABLE_NOARCHIVE"},
-				Destination: &disableNoArchive,
-			},
 		},
 	}
 }
@@ -108,20 +78,11 @@ func runScoutfs(ctx *cli.Context) error {
 		return fmt.Errorf("no directory provided for operation")
 	}
 
-	if dirPerms > math.MaxUint32 {
-		return fmt.Errorf("invalid directory permissions: %d", dirPerms)
-	}
-
 	var opts scoutfs.ScoutfsOpts
 	opts.GlacierMode = glacier
 	opts.ChownUID = chownuid
 	opts.ChownGID = chowngid
 	opts.BucketLinks = bucketlinks
-	opts.NewDirPerm = fs.FileMode(dirPerms)
-	opts.DisableNoArchive = disableNoArchive
-	opts.VersioningDir = versioningDir
-	opts.ValidateBucketNames = disableStrictBucketNames
-	opts.SetProjectID = setProjectID
 
 	be, err := scoutfs.New(ctx.Args().Get(0), opts)
 	if err != nil {

cmd/versitygw/test.go

@@ -34,12 +34,9 @@ var (
 	totalReqs         int
 	upload            bool
 	download          bool
-	hostStyle         bool
+	pathStyle         bool
 	checksumDisable   bool
 	versioningEnabled bool
-	azureTests        bool
-	tlsStatus         bool
-	parallel          bool
 )
 
 func testCommand() *cli.Command {
@@ -75,24 +72,12 @@ func initTestFlags() []cli.Flag {
 			Destination: &endpoint,
 			Aliases:     []string{"e"},
 		},
-		&cli.BoolFlag{
-			Name:        "host-style",
-			Usage:       "Use host-style bucket addressing",
-			Value:       false,
-			Destination: &hostStyle,
-		},
 		&cli.BoolFlag{
 			Name:        "debug",
 			Usage:       "enable debug mode",
 			Aliases:     []string{"d"},
 			Destination: &debug,
 		},
-		&cli.BoolFlag{
-			Name:        "allow-insecure",
-			Usage:       "skip tls verification",
-			Aliases:     []string{"ai"},
-			Destination: &tlsStatus,
-		},
 	}
 }
 
@@ -110,37 +95,12 @@ func initTestCommands() []*cli.Command {
 					Destination: &versioningEnabled,
 					Aliases:     []string{"vs"},
 				},
-				&cli.BoolFlag{
-					Name:        "azure-test-mode",
-					Usage:       "Skips tests that are not supported by Azure",
-					Destination: &azureTests,
-					Aliases:     []string{"azure"},
-				},
-				&cli.BoolFlag{
-					Name:        "parallel",
-					Usage:       "executes the tests concurrently",
-					Destination: &parallel,
-					Aliases:     []string{"p"},
-				},
 			},
 		},
 		{
 			Name:   "posix",
 			Usage:  "Tests posix specific features",
 			Action: getAction(integration.TestPosix),
-			Flags: []cli.Flag{
-				&cli.BoolFlag{
-					Name:        "versioning-enabled",
-					Usage:       "Test posix when versioning is enabled",
-					Destination: &versioningEnabled,
-					Aliases:     []string{"vs"},
-				},
-			},
-		},
-		{
-			Name:   "scoutfs",
-			Usage:  "Tests scoutfs full flow",
-			Action: getAction(integration.TestScoutfs),
 		},
 		{
 			Name:   "iam",
@@ -204,6 +164,12 @@ func initTestCommands() []*cli.Command {
 					Value:       1,
 					Destination: &concurrency,
 				},
+				&cli.BoolFlag{
+					Name:        "pathStyle",
+					Usage:       "Use Pathstyle bucket addressing",
+					Value:       false,
+					Destination: &pathStyle,
+				},
 				&cli.BoolFlag{
 					Name:        "checksumDis",
 					Usage:       "Disable server checksum",
@@ -230,13 +196,12 @@ func initTestCommands() []*cli.Command {
 					integration.WithEndpoint(endpoint),
 					integration.WithConcurrency(concurrency),
 					integration.WithPartSize(partSize),
-					integration.WithTLSStatus(tlsStatus),
 				}
 				if debug {
 					opts = append(opts, integration.WithDebug())
 				}
-				if hostStyle {
-					opts = append(opts, integration.WithHostStyle())
+				if pathStyle {
+					opts = append(opts, integration.WithPathStyle())
 				}
 				if checksumDisable {
 					opts = append(opts, integration.WithDisableChecksum())
@@ -291,7 +256,6 @@ func initTestCommands() []*cli.Command {
 					integration.WithRegion(region),
 					integration.WithEndpoint(endpoint),
 					integration.WithConcurrency(concurrency),
-					integration.WithTLSStatus(tlsStatus),
 				}
 				if debug {
 					opts = append(opts, integration.WithDebug())
@@ -299,9 +263,6 @@ func initTestCommands() []*cli.Command {
 				if checksumDisable {
 					opts = append(opts, integration.WithDisableChecksum())
 				}
-				if hostStyle {
-					opts = append(opts, integration.WithHostStyle())
-				}
 
 				s3conf := integration.NewS3Conf(opts...)
 
@@ -311,16 +272,15 @@ func initTestCommands() []*cli.Command {
 	}, extractIntTests()...)
 }
 
-type testFunc func(*integration.TestState)
+type testFunc func(*integration.S3Conf)
 
-func getAction(tf testFunc) func(ctx *cli.Context) error {
+func getAction(tf testFunc) func(*cli.Context) error {
 	return func(ctx *cli.Context) error {
 		opts := []integration.Option{
 			integration.WithAccess(awsID),
 			integration.WithSecret(awsSecret),
 			integration.WithRegion(region),
 			integration.WithEndpoint(endpoint),
-			integration.WithTLSStatus(tlsStatus),
 		}
 		if debug {
 			opts = append(opts, integration.WithDebug())
@@ -328,22 +288,14 @@ func getAction(tf testFunc) func(ctx *cli.Context) error {
 		if versioningEnabled {
 			opts = append(opts, integration.WithVersioningEnabled())
 		}
-		if azureTests {
-			opts = append(opts, integration.WithAzureMode())
-		}
-		if hostStyle {
-			opts = append(opts, integration.WithHostStyle())
-		}
 
 		s := integration.NewS3Conf(opts...)
-		ts := integration.NewTestState(ctx.Context, s, parallel)
-		tf(ts)
-		ts.Wait()
+		tf(s)
 
 		fmt.Println()
-		fmt.Println("RAN:", integration.RunCount.Load(), "PASS:", integration.PassCount.Load(), "FAIL:", integration.FailCount.Load())
-		if integration.FailCount.Load() > 0 {
-			return fmt.Errorf("test failed with %v errors", integration.FailCount.Load())
+		fmt.Println("RAN:", integration.RunCount, "PASS:", integration.PassCount, "FAIL:", integration.FailCount)
+		if integration.FailCount > 0 {
+			return fmt.Errorf("test failed with %v errors", integration.FailCount)
 		}
 		return nil
 	}
@@ -363,30 +315,15 @@ func extractIntTests() (commands []*cli.Command) {
 					integration.WithSecret(awsSecret),
 					integration.WithRegion(region),
 					integration.WithEndpoint(endpoint),
-					integration.WithTLSStatus(tlsStatus),
 				}
 				if debug {
 					opts = append(opts, integration.WithDebug())
 				}
-				if versioningEnabled {
-					opts = append(opts, integration.WithVersioningEnabled())
-				}
-				if hostStyle {
-					opts = append(opts, integration.WithHostStyle())
-				}
 
 				s := integration.NewS3Conf(opts...)
 				err := testFunc(s)
 				return err
 			},
-			Flags: []cli.Flag{
-				&cli.BoolFlag{
-					Name:        "versioning-enabled",
-					Usage:       "Test the bucket object versioning, if the versioning is enabled",
-					Destination: &versioningEnabled,
-					Aliases:     []string{"vs"},
-				},
-			},
 		})
 	}
 	return

debuglogger/logger.go

@@ -1,275 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package debuglogger
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"sync/atomic"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-type Color string
-type prefix string
-
-const (
-	green  Color = "\033[32m"
-	yellow Color = "\033[33m"
-	blue   Color = "\033[34m"
-	red    Color = "\033[31m"
-	Purple Color = "\033[0;35m"
-
-	prefixPanic        prefix = "[PANIC]: "
-	prefixInernalError prefix = "[INTERNAL ERROR]: "
-	prefixInfo         prefix = "[INFO]: "
-	prefixDebug        prefix = "[DEBUG]: "
-
-	reset      = "\033[0m"
-	borderChar = "─"
-	boxWidth   = 120
-)
-
-// Panic prints the panics out in the console
-func Panic(er error) {
-	printError(prefixPanic, er)
-}
-
-// InternalError prints the internal error out in the console
-func InternalError(er error) {
-	printError(prefixInernalError, er)
-}
-
-func printError(prefix prefix, er error) {
-	fmt.Fprintf(os.Stderr, string(red)+string(prefix)+"%v"+reset+"\n", er)
-}
-
-// Logs http request details: headers, body, params, query args
-func LogFiberRequestDetails(ctx *fiber.Ctx) {
-	// Log the full request url
-	fullURL := ctx.Protocol() + "://" + ctx.Hostname() + ctx.OriginalURL()
-	fmt.Printf("%s[URL]: %s%s\n", green, fullURL, reset)
-
-	// log request headers
-	wrapInBox(green, "REQUEST HEADERS", boxWidth, func() {
-		for key, value := range ctx.Request().Header.All() {
-			printWrappedLine(yellow, string(key), string(value))
-		}
-	})
-	// skip request body log for PutObject and UploadPart
-	skipBodyLog := isLargeDataAction(ctx)
-	if !skipBodyLog {
-		body := ctx.Request().Body()
-		if len(body) != 0 {
-			printBoxTitleLine(blue, "REQUEST BODY", boxWidth, false)
-			fmt.Printf("%s%s%s\n", blue, body, reset)
-			printHorizontalBorder(blue, boxWidth, false)
-		}
-	}
-
-	if ctx.Request().URI().QueryArgs().Len() != 0 {
-		for key, value := range ctx.Request().URI().QueryArgs().All() {
-			log.Printf("%s: %s", key, value)
-		}
-	}
-}
-
-// Logs http response details: body, headers
-func LogFiberResponseDetails(ctx *fiber.Ctx) {
-	wrapInBox(green, "RESPONSE HEADERS", boxWidth, func() {
-		for key, value := range ctx.Response().Header.All() {
-			printWrappedLine(yellow, string(key), string(value))
-		}
-	})
-
-	_, ok := ctx.Locals("skip-res-body-log").(bool)
-	if !ok {
-		body := ctx.Response().Body()
-		if len(body) != 0 {
-			PrintInsideHorizontalBorders(blue, "RESPONSE BODY", string(body), boxWidth)
-		}
-	}
-}
-
-var debugEnabled atomic.Bool
-
-// SetDebugEnabled sets the debug mode
-func SetDebugEnabled() {
-	debugEnabled.Store(true)
-}
-
-// IsDebugEnabled returns true if debugging is enabled
-func IsDebugEnabled() bool {
-	return debugEnabled.Load()
-}
-
-// Logf is the same as 'fmt.Printf' with debug prefix,
-// a color added and '\n' at the end
-func Logf(format string, v ...any) {
-	if !debugEnabled.Load() {
-		return
-	}
-
-	fmt.Printf(string(yellow)+string(prefixDebug)+format+reset+"\n", v...)
-}
-
-// Infof prints out green info block with [INFO]: prefix
-func Infof(format string, v ...any) {
-	if !debugEnabled.Load() {
-		return
-	}
-
-	fmt.Printf(string(green)+string(prefixInfo)+format+reset+"\n", v...)
-}
-
-var debugIAMEnabled atomic.Bool
-
-// SetIAMDebugEnabled sets the IAM debug mode
-func SetIAMDebugEnabled() {
-	debugIAMEnabled.Store(true)
-}
-
-// IsDebugEnabled returns true if debugging enabled
-func IsIAMDebugEnabled() bool {
-	return debugEnabled.Load()
-}
-
-// IAMLogf is the same as 'fmt.Printf' with debug prefix,
-// a color added and '\n' at the end
-func IAMLogf(format string, v ...any) {
-	if !debugIAMEnabled.Load() {
-		return
-	}
-
-	fmt.Printf(string(yellow)+string(prefixDebug)+format+reset+"\n", v...)
-}
-
-// PrintInsideHorizontalBorders prints the text inside horizontal
-// border and title in the center of upper border
-func PrintInsideHorizontalBorders(color Color, title, text string, width int) {
-	if !debugEnabled.Load() {
-		return
-	}
-	printBoxTitleLine(color, title, width, false)
-	fmt.Printf("%s%s%s\n", color, text, reset)
-	printHorizontalBorder(color, width, false)
-}
-
-// Prints out box title either with closing characters or not:  "┌", "┐"
-// e.g ┌────────────────[ RESPONSE HEADERS ]────────────────┐
-func printBoxTitleLine(color Color, title string, length int, closing bool) {
-	leftCorner, rightCorner := "┌", "┐"
-
-	if !closing {
-		leftCorner, rightCorner = borderChar, borderChar
-	}
-
-	// Calculate how many border characters are needed
-	titleFormatted := fmt.Sprintf("[ %s ]", title)
-	borderSpace := length - len(titleFormatted) - 2 // 2 for corners
-	leftLen := borderSpace / 2
-	rightLen := borderSpace - leftLen
-
-	// Build the line
-	line := leftCorner +
-		strings.Repeat(borderChar, leftLen) +
-		titleFormatted +
-		strings.Repeat(borderChar, rightLen) +
-		rightCorner
-
-	fmt.Println(string(color) + line + reset)
-}
-
-// Prints out a horizontal line either with closing characters or not: "└", "┘"
-func printHorizontalBorder(color Color, length int, closing bool) {
-	leftCorner, rightCorner := "└", "┘"
-	if !closing {
-		leftCorner, rightCorner = borderChar, borderChar
-	}
-
-	line := leftCorner + strings.Repeat(borderChar, length-2) + rightCorner + reset
-	fmt.Println(string(color) + line)
-}
-
-// wrapInBox wraps the output of a function call (fn) inside a styled box with a title.
-func wrapInBox(color Color, title string, length int, fn func()) {
-	printBoxTitleLine(color, title, length, true)
-	fn()
-	printHorizontalBorder(color, length, true)
-}
-
-// returns the provided string length
-// defaulting to 13 for exceeding lengths
-func getLen(str string) int {
-	if len(str) < 13 {
-		return 13
-	}
-
-	return len(str)
-}
-
-// prints a formatted key-value pair within a box layout,
-// wrapping the value text if it exceeds the allowed width.
-func printWrappedLine(keyColor Color, key, value string) {
-	prefix := fmt.Sprintf("%s│%s %s%-13s%s : ", green, reset, keyColor, key, reset)
-	prefixLen := len(prefix) - len(green) - len(reset) - len(keyColor) - len(reset)
-	// the actual prefix size without colors
-	actualPrefixLen := getLen(key) + 5
-
-	lineWidth := boxWidth - prefixLen
-	valueLines := wrapText(value, lineWidth)
-
-	for i, line := range valueLines {
-		if i == 0 {
-			if len(line) < lineWidth {
-				line += strings.Repeat(" ", lineWidth-len(line))
-			}
-			fmt.Printf("%s%s%s %s│%s\n", prefix, reset, line, green, reset)
-		} else {
-			line = strings.Repeat(" ", actualPrefixLen-2) + line
-			if len(line) < boxWidth-4 {
-				line += strings.Repeat(" ", boxWidth-len(line)-4)
-			}
-			fmt.Printf("%s│ %s%s %s│%s\n", green, reset, line, green, reset)
-		}
-	}
-}
-
-// wrapText splits the input text into lines of at most `width` characters each.
-func wrapText(text string, width int) []string {
-	var lines []string
-	for len(text) > width {
-		lines = append(lines, text[:width])
-		text = text[width:]
-	}
-	if text != "" {
-		lines = append(lines, text)
-	}
-	return lines
-}
-
-// TODO: remove this and use utils.IsBidDataAction after refactoring
-// and creating 'internal' package
-func isLargeDataAction(ctx *fiber.Ctx) bool {
-	if ctx.Method() == http.MethodPut && len(strings.Split(ctx.Path(), "/")) >= 3 {
-		if !ctx.Request().URI().QueryArgs().Has("tagging") && ctx.Get("X-Amz-Copy-Source") == "" && !ctx.Request().URI().QueryArgs().Has("acl") {
-			return true
-		}
-	}
-	return false
-}

docker-entrypoint.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-set -e
-
-BIN="${VGW_BINARY:-/usr/local/bin/versitygw}"
-
-if [ ! -x "$BIN" ]; then
-    echo "Entrypoint error: versitygw binary not found at $BIN" >&2
-    exit 1
-fi
-
-# If arguments were provided, run them directly for backward compatibility.
-if [ "$#" -gt 0 ]; then
-    exec "$BIN" "$@"
-fi
-
-backend="${VGW_BACKEND:-}"
-if [ -z "$backend" ]; then
-    cat >&2 <<'EOF'
-No command arguments were provided and VGW_BACKEND is unset.
-Set VGW_BACKEND to one of: posix, scoutfs, s3, azure, plugin
-or pass explicit arguments to the container to run the versitygw command directly.
-EOF
-    exit 1
-fi
-
-case "$backend" in
-    posix|scoutfs|s3|azure|plugin)
-        ;;
-    *)
-        echo "VGW_BACKEND invalid backend (was '$backend')." >&2
-        exit 1
-        ;;
-esac
-
-set -- "$backend"
-
-if [ -n "${VGW_BACKEND_ARG:-}" ]; then
-    set -- "$@" "$VGW_BACKEND_ARG"
-fi
-
-if [ -n "${VGW_BACKEND_ARGS:-}" ]; then
-    # shellcheck disable=SC2086
-    set -- "$@" ${VGW_BACKEND_ARGS}
-fi
-
-if [ -n "${VGW_ARGS:-}" ]; then
-    # shellcheck disable=SC2086
-    set -- "$@" ${VGW_ARGS}
-fi
-
-exec "$BIN" "$@"

extra/example.conf

@@ -23,8 +23,7 @@
 # VersityGW Required Options #
 ##############################
 
-# VGW_BACKEND must be defined, and must be one of: posix, scoutfs, s3, azure,
-# or plugin
+# VGW_BACKEND must be defined, and must be one of: posix, scoutfs, or s3
 # This defines the backend that the VGW will use for data access.
 VGW_BACKEND=posix
 
@@ -100,32 +99,6 @@ ROOT_SECRET_ACCESS_KEY=
 # endpoint is unauthenticated, and returns a 200 status for GET.
 #VGW_HEALTH=
 
-# Enable VGW_READ_ONLY to only allow read operations to the S3 server. No write
-# operations will be allowed.
-#VGW_READ_ONLY=false
-
-# The VGW_VIRTUAL_DOMAIN option enables the virtual host style bucket
-# addressing. The path style addressing is the default, and remains enabled
-# even when virtual host style is enabled. The VGW_VIRTUAL_DOMAIN option
-# specifies the domain name that will be used for the virtual host style
-# addressing. For virtual addressing, access to a bucket is in the request
-# form:
-# https://<bucket>.<VGW_VIRTUAL_DOMAIN>/
-# for example: https://mybucket.example.com/ where
-# VGW_VIRTUAL_DOMAIN=example.com
-# and all subdomains of VGW_VIRTUAL_DOMAIN should be reserved for buckets.
-# This means that virtual host addressing will generally require a DNS
-# entry for each bucket that needs to be accessed.
-# The default path style request is of the form:
-# https://<VGW_ENDPOINT>/<bucket>
-#VGW_VIRTUAL_DOMAIN=
-
-# By default, versitygw will enforce similar bucket naming rules as described
-# in https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html
-# Set to true to allow legacy or non-DNS-compliant bucket names by skipping
-# strict validation checks.
-#VGW_DISABLE_STRICT_BUCKET_NAMES=false
-
 ###############
 # Access Logs #
 ###############
@@ -176,19 +149,6 @@ ROOT_SECRET_ACCESS_KEY=
 #VGW_EVENT_NATS_URL=
 #VGW_EVENT_NATS_TOPIC=
 
-# Bucket events can be sent to a RabbitMQ messaging service. When
-# VGW_EVENT_RABBITMQ_URL is specified, events will be published to the specified
-# exchange (VGW_EVENT_RABBITMQ_EXCHANGE) using the routing key
-# (VGW_EVENT_RABBITMQ_ROUTING_KEY). If exchange is blank the default exchange is
-# used. If routing key is blank, it will be left empty (the server can bind a
-# queue with an empty binding key or you can set an explicit key).
-# Example URL formats:
-#   amqp://user:pass@rabbitmq:5672/
-#   amqps://user:pass@rabbitmq:5671/vhost
-#VGW_EVENT_RABBITMQ_URL=
-#VGW_EVENT_RABBITMQ_EXCHANGE=
-#VGW_EVENT_RABBITMQ_ROUTING_KEY=
-
 # Bucket events can be sent to a webhook. When VGW_EVENT_WEBHOOK_URL is
 # specified, all configured bucket events will be sent to the webhook.
 #VGW_EVENT_WEBHOOK_URL=
@@ -201,42 +161,6 @@ ROOT_SECRET_ACCESS_KEY=
 # to generate a default rules file "event_config.json" in the current directory.
 #VGW_EVENT_FILTER=
 
-###########
-# Web GUI #
-###########
-
-# The VGW_WEBUI_PORT option enables the Web GUI server on the specified
-# listening address. The Web GUI provides a browser-based interface for managing
-# users, buckets and objects. The format can be either ':port' to listen on all
-# interfaces (e.g., ':7071') or 'host:port' to listen on a specific interface
-# (e.g., '127.0.0.1:7071' or 'localhost:7071'). When omitted, the Web GUI is
-# disabled.
-#VGW_WEBUI_PORT=
-
-# The VGW_WEBUI_CERT and VGW_WEBUI_KEY options specify the TLS certificate and
-# private key for the Web GUI server. If these are not specified and TLS is
-# configured for the gateway (VGW_CERT and VGW_KEY), the Web GUI will use the
-# same certificates as the gateway. If neither are specified, the Web GUI will
-# run without TLS (HTTP only). These options allow the Web GUI to use different
-# certificates than the main S3 gateway.
-#VGW_WEBUI_CERT=
-#VGW_WEBUI_KEY=
-
-# The VGW_WEBUI_NO_TLS option disables TLS for the Web GUI even if TLS
-# certificates are configured for the gateway. Set to true to force the Web GUI
-# to use HTTP instead of HTTPS. This can be useful when running the Web GUI
-# behind a reverse proxy that handles TLS termination.
-#VGW_WEBUI_NO_TLS=false
-
-# The VGW_CORS_ALLOW_ORIGIN option sets the default CORS (Cross-Origin Resource
-# Sharing) Access-Control-Allow-Origin header value. This header is applied to
-# responses when no bucket-specific CORS configuration exists, and for all admin
-# API responses. When the Web GUI is enabled and this option is not set, it
-# defaults to '*' (allow all origins) for usability. For production environments,
-# it is recommended to set this to a specific origin (e.g.,
-# 'https://webui.example.com') to improve security.
-#VGW_CORS_ALLOW_ORIGIN=
-
 #######################
 # Debug / Diagnostics #
 #######################
@@ -315,29 +239,6 @@ ROOT_SECRET_ACCESS_KEY=
 #VGW_IAM_LDAP_ROLE_ATR=
 #VGW_IAM_LDAP_USER_ID_ATR=
 #VGW_IAM_LDAP_GROUP_ID_ATR=
-# Disable TLS certificate verification for LDAP connections (insecure, allows
-# self-signed certificates). This should only be used in testing environments
-# or when using self-signed certificates. The default is false (verification
-# enabled).
-#VGW_IAM_LDAP_TLS_SKIP_VERIFY=false
-
-# The FreeIPA options will enable the FreeIPA IAM service with accounts stored
-# in an external FreeIPA service. Currently the FreeIPA IAM service only
-# supports account retrieval. Creating and modifying accounts must be done
-# outside of the versitygw service.
-# FreeIPA server url e.g. https://ipa.example.test
-#VGW_IPA_HOST=
-# A name of the user vault containing their secret
-#VGW_IPA_VAULT_NAME=
-# Username used to connect to FreeIPA (requires permissions to read user vault
-# contents)
-#VGW_IPA_USER=
-# Password of the user used to connect to FreeIPA
-#VGW_IPA_PASSWORD=
-# Disable verify TLS certificate of FreeIPA server
-#VGW_IPA_INSECURE=false
-# FreeIPA IAM debug output
-#VGW_IPA_DEBUG=false
 
 ###############
 # IAM caching #
@@ -410,46 +311,6 @@ ROOT_SECRET_ACCESS_KEY=
 # to directories at the top level gateway directory as buckets.
 #VGW_BUCKET_LINKS=false
 
-# The default permissions mode when creating new directories is 0755. Use
-# VGW_DIR_PERMS option to set a different mode for any new directory that the
-# gateway creates. This applies to buckets created through the gateway as well
-# as any parent directories automatically created with object uploads.
-#VGW_DIR_PERMS=0755
-
-# To enable object versions, the VGW_VERSIONING_DIR option must be set to the
-# directory that will be used to store the object versions. The version
-# directory must NOT be a subdirectory of the VGW_BACKEND_ARG directory.
-#VGW_VERSIONING_DIR=
-
-# The gateway uses xattrs to store metadata for objects by default. For systems
-# that do not support xattrs, the VGW_META_SIDECAR option can be set to a
-# directory that will be used to store the metadata for objects. This is
-# currently experimental, and may have issues for some edge cases.
-#VGW_META_SIDECAR=
-
-# The VGW_META_NONE option will disable the metadata functionality for the
-# gateway. This will cause the gateway to not store any metadata for objects
-# or buckets. This include bucket ACLs and Policy. This may be useful for
-# read only access to pre-existing data where the gateway should not modify
-# the data. It is recommened to enable VGW_READ_ONLY (Global Options) along
-# with this.
-#VGW_META_NONE=false
-
-# The gateway will use O_TMPFILE for writing objects while uploading and
-# link the file to the final object name when the upload is complete if the
-# filesystem supports O_TMPFILE. This creates an atomic object creation
-# that is not visible to other clients or racing uploads until the upload
-# is complete. This will not work if there is a different filesystem mounted
-# below the bucket level than where the bucket resides. The VGW_DISABLE_OTMP
-# option can be set to true to disable this functionality and force the fallback
-# mode when O_TMPFILE is not available. This fallback will create a temporary
-# file in the bucket directory and rename it to the final object name when
-# the upload is complete if the final location is in the same filesystem, or
-# copy the file to the final location if the final location is in a different
-# filesystem. This fallback mode is still atomic, but may be less efficient
-# than O_TMPFILE when the data needs to be copied into the final location.
-#VGW_DISABLE_OTMP=false
-
 ###########
 # scoutfs #
 ###########
@@ -481,36 +342,10 @@ ROOT_SECRET_ACCESS_KEY=
 #VGW_CHOWN_UID=false
 #VGW_CHOWN_GID=false
 
-# The VGW_SET_PROJECT_ID option will enable setting account defined ProjectID
-# for newly created buckets, files, and directories if the account ProjectID
-# is greater than 0 and the filesystem format version supports project IDs.
-#VGW_SET_PROJECT_ID=false
-
 # The VGW_BUCKET_LINKS option will enable the gateway to treat symbolic links
 # to directories at the top level gateway directory as buckets.
 #VGW_BUCKET_LINKS=false
 
-# The default permissions mode when creating new directories is 0755. Use
-# VGW_DIR_PERMS option to set a different mode for any new directory that the
-# gateway creates. This applies to buckets created through the gateway as well
-# as any parent directories automatically created with object uploads.
-#VGW_DIR_PERMS=0755
-
-# To enable object versions, the VGW_VERSIONING_DIR option must be set to the
-# directory that will be used to store the object versions. The version
-# directory must NOT be a subdirectory of the VGW_BACKEND_ARG directory.
-# There may be implications for archive policy updates to include version
-# directory as well. It is recommended to discuss archive implications of
-# versioning with Versity support before enabling on an archiving filesystem.
-#VGW_VERSIONING_DIR=
-
-# The default behavior of the gateway is to automatically set the noarchive
-# flag on the multipart upload parts while the multipart upload is in progress.
-# This is to prevent the parts from being archived since they are temporary
-# and will be deleted after the multipart upload is completed or aborted. The
-# VGW_DISABLE_NOARCHIVE option can be set to true to disable this behavior.
-#VGW_DISABLE_NOARCHIVE=false
-
 ######
 # s3 #
 ######
@@ -533,48 +368,3 @@ ROOT_SECRET_ACCESS_KEY=
 #VGW_S3_DISABLE_CHECKSUM=false
 #VGW_S3_SSL_SKIP_VERIFY=false
 #VGW_S3_DEBUG=false
-
-########
-# azure #
-########
-
-# The azure backend allows the gateway to store objects in Azure Blob Storage.
-# Buckets created through the gateway map to blob containers within the
-# configured storage account. This backend is useful when existing workflows
-# expect an S3-compatible interface while data resides in Azure.
-
-# When the azure backend is selected, configure credentials with one of the
-# following approaches:
-# - Shared key: Define AZ_ACCOUNT_NAME with the storage account name and
-#   AZ_ACCESS_KEY with the corresponding account key.
-# - SAS token: Set AZ_SAS_TOKEN to an account or container scoped SAS token.
-#   Provide AZ_ENDPOINT if the token does not implicitly define the endpoint.
-# - Default Azure credentials: Leave AZ_ACCOUNT_NAME and AZ_ACCESS_KEY blank
-#   and configure the standard Azure identity environment variables supported
-#   by the DefaultAzureCredential chain (e.g. AZURE_CLIENT_ID, AZURE_TENANT_ID,
-#   AZURE_CLIENT_SECRET, managed identity, etc.).
-# Use AZ_ENDPOINT to override the service URL (for example when targeting
-# Azurite or a sovereign cloud). If unset, it defaults to
-# https://<account>.blob.core.windows.net/ when an account name is provided.
-#AZ_ACCOUNT_NAME=
-#AZ_ACCESS_KEY=
-#AZ_SAS_TOKEN=
-#AZ_ENDPOINT=
-
-##########
-# plugin #
-##########
-
-# The plugin backend loads a Go plugin shared object that exposes a variable
-# named "Backend" of type *plugins.BackendPlugin. The gateway uses the
-# exported constructor to create the backend implementation at runtime.
-
-# Set VGW_BACKEND_ARG to the absolute path of the compiled plugin (.so) file.
-# The path must be readable by the gateway service account and remain stable
-# across restarts.
-#VGW_BACKEND_ARG=/usr/lib/versitygw/plugins/example.so
-
-# Provide the plugin-specific configuration file path via VGW_PLUGIN_CONFIG.
-# The gateway automatically forwards this value to the plugin backend when it
-# starts up.
-#VGW_PLUGIN_CONFIG=/etc/versitygw.d/example-plugin.conf

extra/versitygw@.service

@@ -17,7 +17,7 @@ Group=root
 
 EnvironmentFile=/etc/versitygw.d/%i.conf
 
-ExecStart=/bin/bash -c 'if [[ ! ("${VGW_BACKEND}" == "posix" || "${VGW_BACKEND}" == "scoutfs" || "${VGW_BACKEND}" == "s3" || "${VGW_BACKEND}" == "azure" || "${VGW_BACKEND}" == "plugin") ]]; then echo "VGW_BACKEND environment variable ${VGW_BACKEND} not set to valid backend type"; exit 1; fi && exec /usr/bin/versitygw "$VGW_BACKEND" "$VGW_BACKEND_ARG"'
+ExecStart=/bin/bash -c 'if [[ ! ("${VGW_BACKEND}" == "posix" || "${VGW_BACKEND}" == "scoutfs" || "${VGW_BACKEND}" == "s3") ]]; then echo "VGW_BACKEND environment variable not set to one of posix, scoutfs, or s3"; exit 1; fi && exec /usr/bin/versitygw "$VGW_BACKEND" "$VGW_BACKEND_ARG"'
 
 # Let systemd restart this service always
 Restart=always

go.mod

@@ -1,92 +1,81 @@
 module github.com/versity/versitygw
 
-go 1.24.0
-
-toolchain go1.24.1
+go 1.21.0
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4
-	github.com/DataDog/datadog-go/v5 v5.8.2
-	github.com/aws/aws-sdk-go-v2 v1.41.1
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1
-	github.com/aws/smithy-go v1.24.0
-	github.com/davecgh/go-spew v1.1.1
-	github.com/go-ldap/ldap/v3 v3.4.12
-	github.com/gofiber/fiber/v2 v2.52.10
-	github.com/google/go-cmp v0.7.0
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0
+	github.com/DataDog/datadog-go/v5 v5.5.0
+	github.com/aws/aws-sdk-go-v2 v1.30.5
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2
+	github.com/aws/smithy-go v1.20.4
+	github.com/go-ldap/ldap/v3 v3.4.8
+	github.com/gofiber/fiber/v2 v2.52.5
+	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/vault-client-go v0.4.3
-	github.com/minio/crc64nvme v1.1.1
-	github.com/nats-io/nats.go v1.48.0
-	github.com/oklog/ulid/v2 v2.1.1
-	github.com/pkg/xattr v0.4.12
-	github.com/rabbitmq/amqp091-go v1.10.0
-	github.com/segmentio/kafka-go v0.4.50
-	github.com/smira/go-statsd v1.3.4
-	github.com/stretchr/testify v1.11.1
-	github.com/urfave/cli/v2 v2.27.7
-	github.com/valyala/fasthttp v1.69.0
-	github.com/versity/scoutfs-go v0.0.0-20240625221833-95fd765b760b
-	golang.org/x/sync v0.19.0
-	golang.org/x/sys v0.40.0
+	github.com/nats-io/nats.go v1.37.0
+	github.com/oklog/ulid/v2 v2.1.0
+	github.com/pkg/xattr v0.4.10
+	github.com/segmentio/kafka-go v0.4.47
+	github.com/smira/go-statsd v1.3.3
+	github.com/urfave/cli/v2 v2.27.4
+	github.com/valyala/fasthttp v1.55.0
+	github.com/versity/scoutfs-go v0.0.0-20240325223134-38eb2f5f7d44
+	golang.org/x/sys v0.25.0
 )
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
-	github.com/Azure/go-ntlmssp v0.1.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
-	github.com/clipperhouse/stringish v0.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.4.0 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
+	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
 	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/nats-io/nkeys v0.4.14 // indirect
+	github.com/nats-io/nkeys v0.4.7 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
-	github.com/pierrec/lz4/v4 v4.1.25 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
-	golang.org/x/crypto v0.47.0 // indirect
-	golang.org/x/net v0.49.0 // indirect
-	golang.org/x/text v0.33.0 // indirect
-	golang.org/x/time v0.14.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/time v0.6.0 // indirect
 )
 
 require (
-	github.com/andybalholm/brotli v1.2.0 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.32.7
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.7
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.21.0
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
-	github.com/klauspost/compress v1.18.3 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.27.33
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.32
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.19 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/valyala/tcplisten v1.0.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 )

go.sum

@@ -1,104 +1,98 @@
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1 h1:/Zt+cDPnpC3OVDm/JKLOs7M2DKmLRIIp3XIx9pHHiig=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.8.1/go.mod h1:Ng3urmn6dYe8gnbCMoHHVl5APYz2txho3koEkV2o2HA=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4 h1:jWQK1GI+LeGGUKBADtcH2rRqPxYB1Ljwms5gFA2LqrM=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4/go.mod h1:8mwH4klAm9DUgR2EEHyEEAQlRDvLPyg5fQry3y+cDew=
-github.com/Azure/go-ntlmssp v0.1.0 h1:DjFo6YtWzNqNvQdrwEyr/e4nhU3vRiwenz5QX7sFz+A=
-github.com/Azure/go-ntlmssp v0.1.0/go.mod h1:NYqdhxd/8aAct/s4qSYZEerdPuH1liG2/X9DiVTbhpk=
-github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
-github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
-github.com/DataDog/datadog-go/v5 v5.8.2 h1:9IEfH1Mw9AjWwhAMqCAkhbxjuJeMxm2ARX2VdgL+ols=
-github.com/DataDog/datadog-go/v5 v5.8.2/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 h1:nyQWyZvwGTvunIMxi1Y9uXkcyr+I7TeNrr/foo4Kpk8=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0/go.mod h1:l38EPgmsp71HHLq9j7De57JcKOWPyhrsW1Awm1JS6K0=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 h1:Be6KInmFEKV81c0pOAEbRYehLMwmmGI1exuFj248AMk=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0/go.mod h1:WCPBHsOXfBVnivScjs2ypRfimjEW0qPVLGgJkZlrIOA=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU=
+github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
 github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e h1:4dAU9FXIyQktpoUAgOJK3OTFc/xug0PCXYCqU0FgDKI=
-github.com/alexbrainman/sspi v0.0.0-20250919150558-7d374ff0d59e/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
-github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
-github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
-github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU=
-github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
-github.com/aws/aws-sdk-go-v2/config v1.32.7 h1:vxUyWGUwmkQ2g19n7JY/9YL8MfAIl7bTesIUykECXmY=
-github.com/aws/aws-sdk-go-v2/config v1.32.7/go.mod h1:2/Qm5vKUU/r7Y+zUk/Ptt2MDAEKAfUtKc1+3U1Mo3oY=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.7 h1:tHK47VqqtJxOymRrNtUXN5SP/zUTvZKeLx4tH6PGQc8=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.7/go.mod h1:qOZk8sPDrxhf+4Wf4oT2urYJrYt3RejHSzgAquYeppw=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 h1:I0GyV8wiYrP8XpA70g1HBcQO1JlQxCMTW9npl5UbDHY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17/go.mod h1:tyw7BOl5bBe/oqvoIeECFJjMdzXoa/dfVz3QQ5lgHGA=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.21.0 h1:pQZGI0qQXeCHZHMeWzhwPu+4jkWrdrIb2dgpG4OKmco=
-github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.21.0/go.mod h1:XGq5kImVqQT4HUNbbG+0Y8O74URsPNH7CGPg1s1HW5E=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 h1:xOLELNKGp2vsiteLsvLPwxC+mYmO6OZ8PYgiuPJzF8U=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17/go.mod h1:5M5CI3D12dNOtH3/mk6minaRwI2/37ifCURZISxA/IQ=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 h1:WWLqlh79iO48yLkj1v3ISRNiv+3KdQoZ6JWyfcsyQik=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17/go.mod h1:EhG22vHRrvF8oXSTYStZhJc1aUgKtnJe+aOiFEV90cM=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 h1:JqcdRG//czea7Ppjb+g/n4o8i/R50aTBHkA7vu0lK+k=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17/go.mod h1:CO+WeGmIdj/MlPel2KwID9Gt7CNq4M65HUfBW97liM0=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEdJbzUCEWkVXEXoqlXV72J5keC1GvILMOuD00E=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 h1:Z5EiPIzXKewUQK0QTMkutjiaPVeVYXX7KIqhXu/0fXs=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8/go.mod h1:FsTpJtvC4U1fyDXk7c71XoDv3HlRm8V3NiYLeYLh5YE=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozM8oXlgLG/n6WLaFGoea7/CddrCfIiSA+xdY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 h1:bGeHBsGZx0Dvu/eJC0Lh9adJa3M1xREcndxLNZlve2U=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17/go.mod h1:dcW24lbU0CzHusTE8LLHhRLI42ejmINN8Lcr22bwh/g=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1 h1:C2dUPSnEpy4voWFIq3JNd8gN0Y5vYGDo44eUE58a/p8=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1/go.mod h1:5jggDlZ2CLQhwJBiZJb4vfk4f0GxWdEDruWKEJ1xOdo=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 h1:VrhDvQib/i0lxvr3zqlUwLwJP4fpmpyD9wYG1vfSu+Y=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.5/go.mod h1:k029+U8SY30/3/ras4G/Fnv/b88N4mAfliNn08Dem4M=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 h1:v6EiMvhEYBoHABfbGB4alOYmCIrcgyPPiBE1wZAEbqk=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.9/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 h1:gd84Omyu9JLriJVCbGApcLzVR3XtmC4ZDPcAI6Ftvds=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 h1:5fFjR/ToSOzB2OQ/XqWpZBmNvmP/pJ1jOWYlFDJTjRQ=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.6/go.mod h1:qgFDZQSD/Kys7nJnVqYlWKnh0SSdMjAi0uSwON4wgYQ=
-github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
-github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
-github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
-github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
-github.com/clipperhouse/uax29/v2 v2.4.0 h1:RXqE/l5EiAbA4u97giimKNlmpvkmz+GrBVTelsoXy9g=
-github.com/clipperhouse/uax29/v2 v2.4.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
-github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3sHPnBo=
-github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/aws/aws-sdk-go-v2 v1.30.5 h1:mWSRTwQAb0aLE17dSzztCVJWI9+cRMgqebndjwDyK0g=
+github.com/aws/aws-sdk-go-v2 v1.30.5/go.mod h1:CT+ZPWXbYrci8chcARI3OmI/qgd+f6WtuLOoaIA8PR0=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 h1:70PVAiL15/aBMh5LThwgXdSQorVr91L127ttckI9QQU=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4/go.mod h1:/MQxMqci8tlqDH+pjmoLu1i0tbWCUP1hhyMRuFxpQCw=
+github.com/aws/aws-sdk-go-v2/config v1.27.33 h1:Nof9o/MsmH4oa0s2q9a0k7tMz5x/Yj5k06lDODWz3BU=
+github.com/aws/aws-sdk-go-v2/config v1.27.33/go.mod h1:kEqdYzRb8dd8Sy2pOdEbExTTF5v7ozEXX0McgPE7xks=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.32 h1:7Cxhp/BnT2RcGy4VisJ9miUPecY+lyE9I8JvcZofn9I=
+github.com/aws/aws-sdk-go-v2/credentials v1.17.32/go.mod h1:P5/QMF3/DCHbXGEGkdbilXHsyTBX5D3HSwcrSc9p20I=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 h1:pfQ2sqNpMVK6xz2RbqLEL0GH87JOwSxPV2rzm8Zsb74=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13/go.mod h1:NG7RXPUlqfsCLLFfi0+IpKN4sCB9D9fw/qTaSB+xRoU=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18 h1:9DIp7vhmOPmueCDwpXa45bEbLHHTt1kcxChdTJWWxvI=
+github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.18/go.mod h1:aJv/Fwz8r56ozwYFRC4bzoeL1L17GYQYemfblOBux1M=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 h1:pI7Bzt0BJtYA0N/JEC6B8fJ4RBrEMi1LBrkMdFYNSnQ=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17/go.mod h1:Dh5zzJYMtxfIjYW+/evjQ8uj2OyR/ve2KROHGHlSFqE=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 h1:Mqr/V5gvrhA2gvgnF42Zh5iMiQNcOYthFYwCyrnuWlc=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17/go.mod h1:aLJpZlCmjE+V+KtN1q1uyZkfnUWpQGpbsn89XPKyzfU=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 h1:VaRN3TlFdd6KxX1x3ILT5ynH6HvKgqdiXoTxAF4HQcQ=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1/go.mod h1:FbtygfRFze9usAadmnGJNc8KsP346kEe+y2/oyhGAGc=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17 h1:Roo69qTpfu8OlJ2Tb7pAYVuF0CpuUMB0IYWwYP/4DZM=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.17/go.mod h1:NcWPxQzGM1USQggaTVwz6VpqMZPX1CvDJLDh6jnOCa4=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 h1:KypMCbLPPHEmf9DgMGw51jMj77VfGPAN2Kv4cfhlfgI=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4/go.mod h1:Vz1JQXliGcQktFTN/LN6uGppAIRoLBR2bMvIMP0gOjc=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19 h1:FLMkfEiRjhgeDTCjjLoc3URo/TBkgeQbocA78lfkzSI=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.19/go.mod h1:Vx+GucNSsdhaxs3aZIKfSUjKVGsxN25nX2SRcdhuw08=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 h1:rfprUlsdzgl7ZL2KlXiUAoJnI/VxfHCvDFr2QDFj6u4=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19/go.mod h1:SCWkEdRq8/7EK60NcvvQ6NXKuTcchAD4ROAsC37VEZE=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17 h1:u+EfGmksnJc/x5tq3A+OD7LrMbSSR/5TrKLvkdy/fhY=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.17/go.mod h1:VaMx6302JHax2vHJWgRo+5n9zvbacs3bLU/23DNQrTY=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2 h1:Kp6PWAlXwP1UvIflkIP6MFZYBNDCa4mFCGtxrpICVOg=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.61.2/go.mod h1:5FmD/Dqq57gP+XwaUnd5WFPipAuzrf0HmupX27Gvjvc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 h1:pIaGg+08llrP7Q5aiz9ICWbY8cqhTkyy+0SHvfzQpTc=
+github.com/aws/aws-sdk-go-v2/service/sso v1.22.7/go.mod h1:eEygMHnTKH/3kNp9Jr1n3PdejuSNcgwLe1dWgQtO0VQ=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 h1:/Cfdu0XV3mONYKaOt1Gr0k1KvQzkzPyiKUdlWJqy+J4=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7/go.mod h1:bCbAxKDqNvkHxRaIMnyVPXPo+OaPRwvmgzMxbz1VKSA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 h1:NKTa1eqZYw8tiHSRGpP0VtTdub/8KNk8sDkNPFaOKDE=
+github.com/aws/aws-sdk-go-v2/service/sts v1.30.7/go.mod h1:NXi1dIAGteSaRLqYgarlhP/Ij0cFT+qmCwiJqWh/U5o=
+github.com/aws/smithy-go v1.20.4 h1:2HK1zBdPgRbjFOHlfeQZfpC4r72MOb9bZkiFwggKO+4=
+github.com/aws/smithy-go v1.20.4/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667 h1:BP4M0CvQ4S3TGls2FvczZtj5Re/2ZzkV9VwqPHH/3Bo=
-github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-ldap/ldap/v3 v3.4.12 h1:1b81mv7MagXZ7+1r7cLTWmyuTqVqdwbtJSjC0DAp9s4=
-github.com/go-ldap/ldap/v3 v3.4.12/go.mod h1:+SPAGcTtOfmGsCb3h1RFiq4xpp4N636G75OEace8lNo=
-github.com/gofiber/fiber/v2 v2.52.10 h1:jRHROi2BuNti6NYXmZ6gbNSfT3zj/8c0xy94GOU5elY=
-github.com/gofiber/fiber/v2 v2.52.10/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.7 h1:DTX+lbVTWaTw1hQ+PbZPlnDZPEIs0SS/GCZAl535dDk=
+github.com/go-asn1-ber/asn1-ber v1.5.7/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-ldap/ldap/v3 v3.4.8 h1:loKJyspcRezt2Q3ZRMq2p/0v8iOurlmeXDPw6fikSvQ=
+github.com/go-ldap/ldap/v3 v3.4.8/go.mod h1:qS3Sjlu76eHfHGpUdWkAXQTw4beih+cHsco2jXlIXrk=
+github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo=
+github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
 github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
-github.com/hashicorp/go-retryablehttp v0.7.8 h1:ylXZWnqa7Lhqpk0L1P1LzDtGcCR0rPVUrx/c8Unxc48=
-github.com/hashicorp/go-retryablehttp v0.7.8/go.mod h1:rjiScheydd+CxvumBsIrFKlx3iS0jrZ7LvzFGFmuKbw=
+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/vault-client-go v0.4.3 h1:zG7STGVgn/VK6rnZc0k8PGbfv2x/sJExRKHSUg3ljWc=
@@ -115,78 +109,72 @@ github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh6
 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
 github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
-github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=
-github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=
-github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw=
-github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
-github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
-github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
-github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI=
-github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/nats-io/nats.go v1.48.0 h1:pSFyXApG+yWU/TgbKCjmm5K4wrHu86231/w84qRVR+U=
-github.com/nats-io/nats.go v1.48.0/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g=
-github.com/nats-io/nkeys v0.4.14 h1:ofx8UiyHP5S4Q52/THHucCJsMWu6zhf4DLh0U2593HE=
-github.com/nats-io/nkeys v0.4.14/go.mod h1:seG5UKwYdZXb7M1y1vvu53mNh3xq2B6um/XUgYAgvkM=
+github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE=
+github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8=
+github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI=
+github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc=
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
-github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s=
-github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
+github.com/oklog/ulid/v2 v2.1.0 h1:+9lhoxAP56we25tyYETBBY1YLA2SaoLvUFgrP2miPJU=
+github.com/oklog/ulid/v2 v2.1.0/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
 github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
-github.com/pierrec/lz4/v4 v4.1.25 h1:kocOqRffaIbU5djlIBr7Wh+cx82C0vtFb0fOurZHqD0=
-github.com/pierrec/lz4/v4 v4.1.25/go.mod h1:EoQMVJgeeEOMsCqCzqFm2O0cJvljX2nGZjcRIPL34O4=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/xattr v0.4.12 h1:rRTkSyFNTRElv6pkA3zpjHpQ90p/OdHQC1GmGh1aTjM=
-github.com/pkg/xattr v0.4.12/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU=
+github.com/pkg/xattr v0.4.10 h1:Qe0mtiNFHQZ296vRgUjRCoPHPqH7VdTOrZx3g0T+pGA=
+github.com/pkg/xattr v0.4.10/go.mod h1:di8WF84zAKk8jzR1UBTEWh9AUlIZZ7M/JNt8e9B6ktU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzukfVhBw=
-github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/segmentio/kafka-go v0.4.50 h1:mcyC3tT5WeyWzrFbd6O374t+hmcu1NKt2Pu1L3QaXmc=
-github.com/segmentio/kafka-go v0.4.50/go.mod h1:Y1gn60kzLEEaW28YshXyk2+VCUKbJ3Qr6DrnT3i4+9E=
+github.com/segmentio/kafka-go v0.4.47 h1:IqziR4pA3vrZq7YdRxaT3w1/5fvIH5qpCwstUanQQB0=
+github.com/segmentio/kafka-go v0.4.47/go.mod h1:HjF6XbOKh0Pjlkr5GVZxt6CsjjwnmhVOfURM5KMd8qg=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/smira/go-statsd v1.3.4 h1:kBYWcLSGT+qC6JVbvfz48kX7mQys32fjDOPrfmsSx2c=
-github.com/smira/go-statsd v1.3.4/go.mod h1:RjdsESPgDODtg1VpVVf9MJrEW2Hw0wtRNbmB1CAhu6A=
+github.com/smira/go-statsd v1.3.3 h1:WnMlmGTyMpzto+HvOJWRPoLaLlk5EGfzsnlQBcvj4yI=
+github.com/smira/go-statsd v1.3.3/go.mod h1:RjdsESPgDODtg1VpVVf9MJrEW2Hw0wtRNbmB1CAhu6A=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/urfave/cli/v2 v2.27.7 h1:bH59vdhbjLv3LAvIu6gd0usJHgoTTPhCFib8qqOwXYU=
-github.com/urfave/cli/v2 v2.27.7/go.mod h1:CyNAG/xg+iAOg0N4MPGZqVmv2rCoP267496AOXUZjA4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
+github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.69.0 h1:fNLLESD2SooWeh2cidsuFtOcrEi4uB4m1mPrkJMZyVI=
-github.com/valyala/fasthttp v1.69.0/go.mod h1:4wA4PfAraPlAsJ5jMSqCE2ug5tqUPwKXxVj8oNECGcw=
-github.com/versity/scoutfs-go v0.0.0-20240625221833-95fd765b760b h1:kuqsuYRMG1c6YXBAQvWO7CiurlpYtjDJWI6oZ2K/ZZE=
-github.com/versity/scoutfs-go v0.0.0-20240625221833-95fd765b760b/go.mod h1:gJsq73k+4685y+rbDIpPY8i/5GbsiwP6JFoFyUDB1fQ=
+github.com/valyala/fasthttp v1.55.0 h1:Zkefzgt6a7+bVKHnu/YaYSOPfNYNisSVBo/unVCf8k8=
+github.com/valyala/fasthttp v1.55.0/go.mod h1:NkY9JtkrpPKmgwV3HTaS2HWaJss9RSIsRVfcxxoHiOM=
+github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
+github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
+github.com/versity/scoutfs-go v0.0.0-20240325223134-38eb2f5f7d44 h1:Wx1o3pNrCzsHIIDyZ2MLRr6tF/1FhAr7HNDn80QqDWE=
+github.com/versity/scoutfs-go v0.0.0-20240325223134-38eb2f5f7d44/go.mod h1:gJsq73k+4685y+rbDIpPY8i/5GbsiwP6JFoFyUDB1fQ=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=
@@ -195,25 +183,38 @@ github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
-github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
-github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
-go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
-golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
-golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -221,27 +222,49 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
-golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
-golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
+golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

metrics/actions.go

@@ -24,108 +24,54 @@ var (
 )
 
 var (
-	ActionUndetected                                  = "ActionUnDetected"
-	ActionAbortMultipartUpload                        = "s3_AbortMultipartUpload"
-	ActionCompleteMultipartUpload                     = "s3_CompleteMultipartUpload"
-	ActionCopyObject                                  = "s3_CopyObject"
-	ActionCreateBucket                                = "s3_CreateBucket"
-	ActionCreateMultipartUpload                       = "s3_CreateMultipartUpload"
-	ActionDeleteBucket                                = "s3_DeleteBucket"
-	ActionDeleteBucketPolicy                          = "s3_DeleteBucketPolicy"
-	ActionDeleteBucketTagging                         = "s3_DeleteBucketTagging"
-	ActionDeleteObject                                = "s3_DeleteObject"
-	ActionDeleteObjectTagging                         = "s3_DeleteObjectTagging"
-	ActionDeleteObjects                               = "s3_DeleteObjects"
-	ActionGetBucketAcl                                = "s3_GetBucketAcl"
-	ActionGetBucketPolicy                             = "s3_GetBucketPolicy"
-	ActionGetBucketTagging                            = "s3_GetBucketTagging"
-	ActionGetBucketVersioning                         = "s3_GetBucketVersioning"
-	ActionGetObject                                   = "s3_GetObject"
-	ActionGetObjectAcl                                = "s3_GetObjectAcl"
-	ActionGetObjectAttributes                         = "s3_GetObjectAttributes"
-	ActionGetObjectLegalHold                          = "s3_GetObjectLegalHold"
-	ActionGetObjectLockConfiguration                  = "s3_GetObjectLockConfiguration"
-	ActionGetObjectRetention                          = "s3_GetObjectRetention"
-	ActionGetObjectTagging                            = "s3_GetObjectTagging"
-	ActionHeadBucket                                  = "s3_HeadBucket"
-	ActionHeadObject                                  = "s3_HeadObject"
-	ActionListAllMyBuckets                            = "s3_ListAllMyBuckets"
-	ActionListMultipartUploads                        = "s3_ListMultipartUploads"
-	ActionListObjectVersions                          = "s3_ListObjectVersions"
-	ActionListObjects                                 = "s3_ListObjects"
-	ActionListObjectsV2                               = "s3_ListObjectsV2"
-	ActionListParts                                   = "s3_ListParts"
-	ActionPutBucketAcl                                = "s3_PutBucketAcl"
-	ActionPutBucketPolicy                             = "s3_PutBucketPolicy"
-	ActionPutBucketTagging                            = "s3_PutBucketTagging"
-	ActionPutBucketVersioning                         = "s3_PutBucketVersioning"
-	ActionPutObject                                   = "s3_PutObject"
-	ActionPutObjectAcl                                = "s3_PutObjectAcl"
-	ActionPutObjectLegalHold                          = "s3_PutObjectLegalHold"
-	ActionPutObjectLockConfiguration                  = "s3_PutObjectLockConfiguration"
-	ActionPutObjectRetention                          = "s3_PutObjectRetention"
-	ActionPutObjectTagging                            = "s3_PutObjectTagging"
-	ActionRestoreObject                               = "s3_RestoreObject"
-	ActionSelectObjectContent                         = "s3_SelectObjectContent"
-	ActionUploadPart                                  = "s3_UploadPart"
-	ActionUploadPartCopy                              = "s3_UploadPartCopy"
-	ActionPutBucketOwnershipControls                  = "s3_PutBucketOwnershipControls"
-	ActionGetBucketOwnershipControls                  = "s3_GetBucketOwnershipControls"
-	ActionDeleteBucketOwnershipControls               = "s3_DeleteBucketOwnershipControls"
-	ActionPutBucketCors                               = "s3_PutBucketCors"
-	ActionGetBucketCors                               = "s3_GetBucketCors"
-	ActionDeleteBucketCors                            = "s3_DeleteBucketCors"
-	ActionOptions                                     = "s3_Options"
-	ActionPutBucketAnalyticsConfiguration             = "s3_PutBucketAnalyticsConfiguration"
-	ActionGetBucketAnalyticsConfiguration             = "s3_GetBucketAnalyticsConfiguration"
-	ActionListBucketAnalyticsConfigurations           = "s3_ListBucketAnalyticsConfigurations"
-	ActionDeleteBucketAnalyticsConfiguration          = "s3_DeleteBucketAnalyticsConfiguration"
-	ActionPutBucketEncryption                         = "s3_PutBucketEncryption"
-	ActionGetBucketEncryption                         = "s3_GetBucketEncryption"
-	ActionDeleteBucketEncryption                      = "s3_DeleteBucketEncryption"
-	ActionPutBucketIntelligentTieringConfiguration    = "s3_PutBucketIntelligentTieringConfiguration"
-	ActionGetBucketIntelligentTieringConfiguration    = "s3_GetBucketIntelligentTieringConfiguration"
-	ActionListBucketIntelligentTieringConfigurations  = "s3_ListBucketIntelligentTieringConfigurations"
-	ActionDeleteBucketIntelligentTieringConfiguration = "s3_DeleteBucketIntelligentTieringConfiguration"
-	ActionPutBucketInventoryConfiguration             = "s3_PutBucketInventoryConfiguration"
-	ActionGetBucketInventoryConfiguration             = "s3_GetBucketInventoryConfiguration"
-	ActionListBucketInventoryConfigurations           = "s3_ListBucketInventoryConfigurations"
-	ActionDeleteBucketInventoryConfiguration          = "s3_DeleteBucketInventoryConfiguration"
-	ActionPutBucketLifecycleConfiguration             = "s3_PutBucketLifecycleConfiguration"
-	ActionGetBucketLifecycleConfiguration             = "s3_GetBucketLifecycleConfiguration"
-	ActionDeleteBucketLifecycle                       = "s3_DeleteBucketLifecycle"
-	ActionPutBucketLogging                            = "s3_PutBucketLogging"
-	ActionGetBucketLogging                            = "s3_GetBucketLogging"
-	ActionPutBucketRequestPayment                     = "s3_PutBucketRequestPayment"
-	ActionGetBucketRequestPayment                     = "s3_GetBucketRequestPayment"
-	ActionPutBucketMetricsConfiguration               = "s3_PutBucketMetricsConfiguration"
-	ActionGetBucketMetricsConfiguration               = "s3_GetBucketMetricsConfiguration"
-	ActionListBucketMetricsConfigurations             = "s3_ListBucketMetricsConfigurations"
-	ActionDeleteBucketMetricsConfiguration            = "s3_DeleteBucketMetricsConfiguration"
-	ActionPutBucketReplication                        = "s3_PutBucketReplication"
-	ActionGetBucketReplication                        = "s3_GetBucketReplication"
-	ActionDeleteBucketReplication                     = "s3_DeleteBucketReplication"
-	ActionPutPublicAccessBlock                        = "s3_PutPublicAccessBlock"
-	ActionGetPublicAccessBlock                        = "s3_GetPublicAccessBlock"
-	ActionDeletePublicAccessBlock                     = "s3_DeletePublicAccessBlock"
-	ActionPutBucketNotificationConfiguration          = "s3_PutBucketNotificationConfiguration"
-	ActionGetBucketNotificationConfiguration          = "s3_GetBucketNotificationConfiguration"
-	ActionPutBucketAccelerateConfiguration            = "s3_PutBucketAccelerateConfiguration"
-	ActionGetBucketAccelerateConfiguration            = "s3_GetBucketAccelerateConfiguration"
-	ActionPutBucketWebsite                            = "s3_PutBucketWebsite"
-	ActionGetBucketWebsite                            = "s3_GetBucketWebsite"
-	ActionDeleteBucketWebsite                         = "s3_DeleteBucketWebsite"
-	ActionGetBucketPolicyStatus                       = "s3_GetBucketPolicyStatus"
-	ActionGetBucketLocation                           = "s3_GetBucketLocation"
-
-	// Admin actions
-	ActionAdminCreateUser        = "admin_CreateUser"
-	ActionAdminUpdateUser        = "admin_UpdateUser"
-	ActionAdminDeleteUser        = "admin_DeleteUser"
-	ActionAdminChangeBucketOwner = "admin_ChangeBucketOwner"
-	ActionAdminListUsers         = "admin_ListUsers"
-	ActionAdminListBuckets       = "admin_ListBuckets"
-	ActionAdminCreateBucket      = "admin_CreateBucket"
+	ActionUndetected                    = "ActionUnDetected"
+	ActionAbortMultipartUpload          = "s3_AbortMultipartUpload"
+	ActionCompleteMultipartUpload       = "s3_CompleteMultipartUpload"
+	ActionCopyObject                    = "s3_CopyObject"
+	ActionCreateBucket                  = "s3_CreateBucket"
+	ActionCreateMultipartUpload         = "s3_CreateMultipartUpload"
+	ActionDeleteBucket                  = "s3_DeleteBucket"
+	ActionDeleteBucketPolicy            = "s3_DeleteBucketPolicy"
+	ActionDeleteBucketTagging           = "s3_DeleteBucketTagging"
+	ActionDeleteObject                  = "s3_DeleteObject"
+	ActionDeleteObjectTagging           = "s3_DeleteObjectTagging"
+	ActionDeleteObjects                 = "s3_DeleteObjects"
+	ActionGetBucketAcl                  = "s3_GetBucketAcl"
+	ActionGetBucketPolicy               = "s3_GetBucketPolicy"
+	ActionGetBucketTagging              = "s3_GetBucketTagging"
+	ActionGetBucketVersioning           = "s3_GetBucketVersioning"
+	ActionGetObject                     = "s3_GetObject"
+	ActionGetObjectAcl                  = "s3_GetObjectAcl"
+	ActionGetObjectAttributes           = "s3_GetObjectAttributes"
+	ActionGetObjectLegalHold            = "s3_GetObjectLegalHold"
+	ActionGetObjectLockConfiguration    = "s3_GetObjectLockConfiguration"
+	ActionGetObjectRetention            = "s3_GetObjectRetention"
+	ActionGetObjectTagging              = "s3_GetObjectTagging"
+	ActionHeadBucket                    = "s3_HeadBucket"
+	ActionHeadObject                    = "s3_HeadObject"
+	ActionListAllMyBuckets              = "s3_ListAllMyBuckets"
+	ActionListMultipartUploads          = "s3_ListMultipartUploads"
+	ActionListObjectVersions            = "s3_ListObjectVersions"
+	ActionListObjects                   = "s3_ListObjects"
+	ActionListObjectsV2                 = "s3_ListObjectsV2"
+	ActionListParts                     = "s3_ListParts"
+	ActionPutBucketAcl                  = "s3_PutBucketAcl"
+	ActionPutBucketPolicy               = "s3_PutBucketPolicy"
+	ActionPutBucketTagging              = "s3_PutBucketTagging"
+	ActionPutBucketVersioning           = "s3_PutBucketVersioning"
+	ActionPutObject                     = "s3_PutObject"
+	ActionPutObjectAcl                  = "s3_PutObjectAcl"
+	ActionPutObjectLegalHold            = "s3_PutObjectLegalHold"
+	ActionPutObjectLockConfiguration    = "s3_PutObjectLockConfiguration"
+	ActionPutObjectRetention            = "s3_PutObjectRetention"
+	ActionPutObjectTagging              = "s3_PutObjectTagging"
+	ActionRestoreObject                 = "s3_RestoreObject"
+	ActionSelectObjectContent           = "s3_SelectObjectContent"
+	ActionUploadPart                    = "s3_UploadPart"
+	ActionUploadPartCopy                = "s3_UploadPartCopy"
+	ActionPutBucketOwnershipControls    = "s3_PutBucketOwnershipControls"
+	ActionGetBucketOwnershipControls    = "s3_GetBucketOwnershipControls"
+	ActionDeleteBucketOwnershipControls = "s3_DeleteBucketOwnershipControls"
 )
 
 func init() {
@@ -312,196 +258,4 @@ func init() {
 		Name:    "UploadPartCopy",
 		Service: "s3",
 	}
-	ActionMap[ActionPutBucketCors] = Action{
-		Name:    "PutBucketCors",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketCors] = Action{
-		Name:    "GetBucketCors",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketCors] = Action{
-		Name:    "DeleteBucketCors",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketOwnershipControls] = Action{
-		Name:    "PutBucketOwnershipControls",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketOwnershipControls] = Action{
-		Name:    "GetBucketOwnershipControls",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketOwnershipControls] = Action{
-		Name:    "DeleteBucketOwnershipControls",
-		Service: "s3",
-	}
-	ActionMap[ActionOptions] = Action{
-		Name:    "Options",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketAnalyticsConfiguration] = Action{
-		Name:    "PutBucketAnalyticsConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketAnalyticsConfiguration] = Action{
-		Name:    "GetBucketAnalyticsConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionListBucketAnalyticsConfigurations] = Action{
-		Name:    "ListBucketAnalyticsConfigurations",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketAnalyticsConfiguration] = Action{
-		Name:    "DeleteBucketAnalyticsConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketEncryption] = Action{
-		Name:    "PutBucketEncryption",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketEncryption] = Action{
-		Name:    "GetBucketEncryption",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketEncryption] = Action{
-		Name:    "DeleteBucketEncryption",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketIntelligentTieringConfiguration] = Action{
-		Name:    "PutBucketIntelligentTieringConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketIntelligentTieringConfiguration] = Action{
-		Name:    "GetBucketIntelligentTieringConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionListBucketIntelligentTieringConfigurations] = Action{
-		Name:    "ListBucketIntelligentTieringConfigurations",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketIntelligentTieringConfiguration] = Action{
-		Name:    "DeleteBucketIntelligentTieringConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketInventoryConfiguration] = Action{
-		Name:    "PutBucketInventoryConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketInventoryConfiguration] = Action{
-		Name:    "GetBucketInventoryConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionListBucketInventoryConfigurations] = Action{
-		Name:    "ListBucketInventoryConfigurations",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketInventoryConfiguration] = Action{
-		Name:    "DeleteBucketInventoryConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketLifecycleConfiguration] = Action{
-		Name:    "PutBucketLifecycleConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketLifecycleConfiguration] = Action{
-		Name:    "GetBucketLifecycleConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketLifecycle] = Action{
-		Name:    "DeleteBucketLifecycle",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketLogging] = Action{
-		Name:    "PutBucketLogging",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketLogging] = Action{
-		Name:    "GetBucketLogging",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketRequestPayment] = Action{
-		Name:    "PutBucketRequestPayment",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketRequestPayment] = Action{
-		Name:    "GetBucketRequestPayment",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketMetricsConfiguration] = Action{
-		Name:    "PutBucketMetricsConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketMetricsConfiguration] = Action{
-		Name:    "GetBucketMetricsConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionListBucketMetricsConfigurations] = Action{
-		Name:    "ListBucketMetricsConfigurations",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketMetricsConfiguration] = Action{
-		Name:    "DeleteBucketMetricsConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketReplication] = Action{
-		Name:    "PutBucketReplication",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketReplication] = Action{
-		Name:    "GetBucketReplication",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketReplication] = Action{
-		Name:    "DeleteBucketReplication",
-		Service: "s3",
-	}
-	ActionMap[ActionPutPublicAccessBlock] = Action{
-		Name:    "PutPublicAccessBlock",
-		Service: "s3",
-	}
-	ActionMap[ActionGetPublicAccessBlock] = Action{
-		Name:    "GetPublicAccessBlock",
-		Service: "s3",
-	}
-	ActionMap[ActionDeletePublicAccessBlock] = Action{
-		Name:    "DeletePublicAccessBlock",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketNotificationConfiguration] = Action{
-		Name:    "PutBucketNotificationConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketNotificationConfiguration] = Action{
-		Name:    "GetBucketNotificationConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketAccelerateConfiguration] = Action{
-		Name:    "PutBucketAccelerateConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketAccelerateConfiguration] = Action{
-		Name:    "GetBucketAccelerateConfiguration",
-		Service: "s3",
-	}
-	ActionMap[ActionPutBucketWebsite] = Action{
-		Name:    "PutBucketWebsite",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketWebsite] = Action{
-		Name:    "GetBucketWebsite",
-		Service: "s3",
-	}
-	ActionMap[ActionDeleteBucketWebsite] = Action{
-		Name:    "DeleteBucketWebsite",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketPolicyStatus] = Action{
-		Name:    "GetBucketPolicyStatus",
-		Service: "s3",
-	}
-	ActionMap[ActionGetBucketLocation] = Action{
-		Name:    "GetBucketLocation",
-		Service: "s3",
-	}
 }

metrics/metrics.go

@@ -41,14 +41,8 @@ type Tag struct {
 	Value string
 }
 
-// Manager is the interface definition for metrics manager
-type Manager interface {
-	Send(ctx *fiber.Ctx, err error, action string, count int64, status int)
-	Close()
-}
-
-// manager is a manager of metrics plugins
-type manager struct {
+// Manager is a manager of metrics plugins
+type Manager struct {
 	wg  sync.WaitGroup
 	ctx context.Context
 
@@ -65,7 +59,7 @@ type Config struct {
 }
 
 // NewManager initializes metrics plugins and returns a new metrics manager
-func NewManager(ctx context.Context, conf Config) (Manager, error) {
+func NewManager(ctx context.Context, conf Config) (*Manager, error) {
 	if len(conf.StatsdServers) == 0 && len(conf.DogStatsdServers) == 0 {
 		return nil, nil
 	}
@@ -80,7 +74,7 @@ func NewManager(ctx context.Context, conf Config) (Manager, error) {
 
 	addDataChan := make(chan datapoint, dataItemCount)
 
-	mgr := &manager{
+	mgr := &Manager{
 		addDataChan: addDataChan,
 		ctx:         ctx,
 		config:      conf,
@@ -118,7 +112,7 @@ func NewManager(ctx context.Context, conf Config) (Manager, error) {
 	return mgr, nil
 }
 
-func (m *manager) Send(ctx *fiber.Ctx, err error, action string, count int64, status int) {
+func (m *Manager) Send(ctx *fiber.Ctx, err error, action string, count int64, status int) {
 	// In case of Authentication failures, url parsing ...
 	if action == "" {
 		action = ActionUndetected
@@ -174,12 +168,12 @@ func (m *manager) Send(ctx *fiber.Ctx, err error, action string, count int64, st
 }
 
 // increment increments the key by one
-func (m *manager) increment(key string, tags ...Tag) {
+func (m *Manager) increment(key string, tags ...Tag) {
 	m.add(key, 1, tags...)
 }
 
 // add adds value to key
-func (m *manager) add(key string, value int64, tags ...Tag) {
+func (m *Manager) add(key string, value int64, tags ...Tag) {
 	if m.ctx.Err() != nil {
 		return
 	}
@@ -198,7 +192,7 @@ func (m *manager) add(key string, value int64, tags ...Tag) {
 }
 
 // Close closes metrics channels, waits for data to complete, closes all plugins
-func (m *manager) Close() {
+func (m *Manager) Close() {
 	// drain the datapoint channels
 	close(m.addDataChan)
 	m.wg.Wait()
@@ -215,7 +209,7 @@ type publisher interface {
 	Close()
 }
 
-func (m *manager) addForwarder(addChan <-chan datapoint) {
+func (m *Manager) addForwarder(addChan <-chan datapoint) {
 	for data := range addChan {
 		for _, s := range m.publishers {
 			s.Add(data.key, data.value, data.tags...)

plugins/plugins.go

@@ -1,35 +0,0 @@
-// Copyright 2025 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package plugins
-
-import "github.com/versity/versitygw/backend"
-
-// BackendPlugin defines an interface for creating backend
-// implementation instances.
-// Plugins implementing this interface can be built as shared
-// libraries using Go's plugin system (to build use `go build -buildmode=plugin`).
-// The shared library should export an instance of
-// this interface in a variable named `Backend`.
-type BackendPlugin interface {
-	// New creates and initializes a new backend.Backend instance.
-	// The config parameter specifies the path of the file containing
-	// the configuration for the backend.
-	//
-	// Implementations of this method should perform the necessary steps to
-	// establish a connection to the underlying storage system or service
-	// (e.g., network storage system, distributed storage system, cloud storage)
-	//  and configure it according to the provided configuration.
-	New(config string) (backend.Backend, error)
-}

runtests.sh

@@ -5,26 +5,17 @@ rm -rf /tmp/gw
 mkdir /tmp/gw
 rm -rf /tmp/covdata
 mkdir /tmp/covdata
-rm -rf /tmp/versioing.covdata
-mkdir /tmp/versioning.covdata
 rm -rf /tmp/versioningdir
 mkdir /tmp/versioningdir
 
-# setup tls certificate and key
-ECHO "Generating TLS certificate and key in the cert.pem and key.pem files"
-
-openssl genpkey -algorithm RSA -out key.pem -pkeyopt rsa_keygen_bits:2048
-openssl req -new -x509 -key key.pem -out cert.pem -days 365 -subj "/C=US/ST=California/L=San Francisco/O=Versity/OU=Software/CN=versity.com"
-
-ECHO "Running the sdk test over http"
-# run server in background not versioning-enabled
-# port: 7070(default)
-GOCOVERDIR=/tmp/covdata ./versitygw -a user -s pass --iam-dir /tmp/gw posix /tmp/gw &
+# run server in background
+GOCOVERDIR=/tmp/covdata ./versitygw -a user -s pass --iam-dir /tmp/gw posix --versioning-dir /tmp/versioningdir /tmp/gw &
 GW_PID=$!
 
+# wait a second for server to start up
 sleep 1
 
-# check if gateway process is still running
+# check if server is still running
 if ! kill -0 $GW_PID; then
 	echo "server no longer running"
 	exit 1
@@ -32,7 +23,7 @@ fi
 
 # run tests
 # full flow tests
-if ! ./versitygw test -a user -s pass -e http://127.0.0.1:7070 full-flow --parallel; then
+if ! ./versitygw test -a user -s pass -e http://127.0.0.1:7070 full-flow -vs; then
 	echo "full flow tests failed"
 	kill $GW_PID
 	exit 1
@@ -50,109 +41,8 @@ if ! ./versitygw test -a user -s pass -e http://127.0.0.1:7070 iam; then
 	exit 1
 fi
 
+# kill off server
 kill $GW_PID
-
-ECHO "Running the sdk test over https"
-
-# run server in background with TLS certificate
-# port: 7071(default)
-GOCOVERDIR=/tmp/https.covdata ./versitygw --cert "$PWD/cert.pem" --key "$PWD/key.pem" -p :7071 -a user -s pass --iam-dir /tmp/gw posix /tmp/gw &
-GW_HTTPS_PID=$!
-
-sleep 1
-
-# check if https gateway process is still running
-if ! kill -0 $GW_HTTPS_PID; then
-	echo "server no longer running"
-	exit 1
-fi
-
-# run tests
-# full flow tests
-if ! ./versitygw test --allow-insecure -a user -s pass -e https://127.0.0.1:7071 full-flow --parallel; then
-	echo "full flow tests failed"
-	kill $GW_HTTPS_PID
-	exit 1
-fi
-# posix tests
-if ! ./versitygw test --allow-insecure -a user -s pass -e https://127.0.0.1:7071 posix; then
-	echo "posix tests failed"
-	kill $GW_HTTPS_PID
-	exit 1
-fi
-# iam tests
-if ! ./versitygw test --allow-insecure -a user -s pass -e https://127.0.0.1:7071 iam; then
-	echo "iam tests failed"
-	kill $GW_HTTPS_PID
-	exit 1
-fi
-
-kill $GW_HTTPS_PID
-
-ECHO "Running the sdk test over http against the versioning-enabled gateway"
-# run server in background versioning-enabled
-# port: 7072
-GOCOVERDIR=/tmp/versioning.covdata ./versitygw -p :7072 -a user -s pass --iam-dir /tmp/gw posix --versioning-dir /tmp/versioningdir /tmp/gw &
-GW_VS_PID=$!
-
-# wait a second for server to start up
-sleep 1
-
-# check if versioning-enabled gateway process is still running
-if ! kill -0 $GW_VS_PID; then
-	echo "versioning-enabled server no longer running"
-	exit 1
-fi
-
-# run tests
-# full flow tests
-if ! ./versitygw test -a user -s pass -e http://127.0.0.1:7072 full-flow -vs --parallel; then
-	echo "versioning-enabled full-flow tests failed"
-	kill $GW_VS_PID
-	exit 1
-fi
-# posix tests
-if ! ./versitygw test -a user -s pass -e http://127.0.0.1:7072 posix -vs; then
-	echo "versiongin-enabled posix tests failed"
-	kill $GW_VS_PID
-	exit 1
-fi
-
-# kill off server
-kill $GW_VS_PID
-
-ECHO "Running the sdk test over https against the versioning-enabled gateway"
-# run server in background versioning-enabled
-# port: 7073
-GOCOVERDIR=/tmp/versioning.https.covdata ./versitygw --cert "$PWD/cert.pem" --key "$PWD/key.pem" -p :7073 -a user -s pass --iam-dir /tmp/gw posix --versioning-dir /tmp/versioningdir /tmp/gw &
-GW_VS_HTTPS_PID=$!
-
-# wait a second for server to start up
-sleep 1
-
-# check if versioning-enabled gateway process is still running
-if ! kill -0 $GW_VS_HTTPS_PID; then
-	echo "versioning-enabled server no longer running"
-	exit 1
-fi
-
-# run tests
-# full flow tests
-if ! ./versitygw test --allow-insecure -a user -s pass -e https://127.0.0.1:7073 full-flow -vs --parallel; then
-	echo "versioning-enabled full-flow tests failed"
-	kill $GW_VS_HTTPS_PID
-	exit 1
-fi
-# posix tests
-if ! ./versitygw test --allow-insecure -a user -s pass -e https://127.0.0.1:7073 posix -vs; then
-	echo "versiongin-enabled posix tests failed"
-	kill $GW_VS_HTTPS_PID
-	exit 1
-fi
-
-# kill off server
-kill $GW_VS_HTTPS_PID
-
 exit 0
 
 # if the above binary was built with -cover enabled (make testbin),
@@ -160,3 +50,4 @@ exit 0
 # go tool covdata percent -i=/tmp/covdata
 # go tool covdata textfmt -i=/tmp/covdata -o profile.txt
 # go tool cover -html=profile.txt
+

s3api/admin-router.go

@@ -18,101 +18,30 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/metrics"
 	"github.com/versity/versitygw/s3api/controllers"
-	"github.com/versity/versitygw/s3api/middlewares"
 	"github.com/versity/versitygw/s3log"
 )
 
-type S3AdminRouter struct {
-	s3api controllers.S3ApiController
-}
+type S3AdminRouter struct{}
 
-func (ar *S3AdminRouter) Init(app *fiber.App, be backend.Backend, iam auth.IAMService, logger s3log.AuditLogger, root middlewares.RootUserConfig, region string, debug bool, corsAllowOrigin string) {
-	ctrl := controllers.NewAdminController(iam, be, logger, ar.s3api)
-	services := &controllers.Services{
-		Logger: logger,
-	}
+func (ar *S3AdminRouter) Init(app *fiber.App, be backend.Backend, iam auth.IAMService, logger s3log.AuditLogger) {
+	controller := controllers.NewAdminController(iam, be, logger)
 
 	// CreateUser admin api
-	app.Patch("/create-user",
-		controllers.ProcessHandlers(ctrl.CreateUser, metrics.ActionAdminCreateUser, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminCreateUser),
-			middlewares.ApplyDefaultCORS(corsAllowOrigin),
-		))
-	app.Options("/create-user",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
+	app.Patch("/create-user", controller.CreateUser)
 
 	// DeleteUsers admin api
-	app.Patch("/delete-user",
-		controllers.ProcessHandlers(ctrl.DeleteUser, metrics.ActionAdminDeleteUser, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminDeleteUser),
-			middlewares.ApplyDefaultCORS(corsAllowOrigin),
-		))
-	app.Options("/delete-user",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
+	app.Patch("/delete-user", controller.DeleteUser)
 
 	// UpdateUser admin api
-	app.Patch("/update-user",
-		controllers.ProcessHandlers(ctrl.UpdateUser, metrics.ActionAdminUpdateUser, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminUpdateUser),
-			middlewares.ApplyDefaultCORS(corsAllowOrigin),
-		))
-	app.Options("/update-user",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
+	app.Patch("/update-user", controller.UpdateUser)
 
 	// ListUsers admin api
-	app.Patch("/list-users",
-		controllers.ProcessHandlers(ctrl.ListUsers, metrics.ActionAdminListUsers, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminListUsers),
-			middlewares.ApplyDefaultCORS(corsAllowOrigin),
-		))
-	app.Options("/list-users",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
+	app.Patch("/list-users", controller.ListUsers)
 
 	// ChangeBucketOwner admin api
-	app.Patch("/change-bucket-owner",
-		controllers.ProcessHandlers(ctrl.ChangeBucketOwner, metrics.ActionAdminChangeBucketOwner, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminChangeBucketOwner),
-			middlewares.ApplyDefaultCORS(corsAllowOrigin),
-		))
-	app.Options("/change-bucket-owner",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
+	app.Patch("/change-bucket-owner", controller.ChangeBucketOwner)
 
 	// ListBucketsAndOwners admin api
-	app.Patch("/list-buckets",
-		controllers.ProcessHandlers(ctrl.ListBuckets, metrics.ActionAdminListBuckets, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminListBuckets),
-			middlewares.ApplyDefaultCORS(corsAllowOrigin),
-		))
-	app.Options("/list-buckets",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
-
-	app.Patch("/:bucket/create",
-		controllers.ProcessHandlers(ctrl.CreateBucket, metrics.ActionAdminListBuckets, services,
-			middlewares.VerifyV4Signature(root, iam, region, false, true),
-			middlewares.IsAdmin(metrics.ActionAdminCreateBucket),
-		))
-	app.Options("/:bucket/create",
-		middlewares.ApplyDefaultCORSPreflight(corsAllowOrigin),
-		middlewares.ApplyDefaultCORS(corsAllowOrigin),
-	)
+	app.Patch("/list-buckets", controller.ListBuckets)
 }

s3api/admin-server.go

@@ -15,111 +15,58 @@
 package s3api
 
 import (
+	"crypto/tls"
+
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/logger"
-	"github.com/gofiber/fiber/v2/middleware/recover"
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/debuglogger"
-	"github.com/versity/versitygw/s3api/controllers"
 	"github.com/versity/versitygw/s3api/middlewares"
-	"github.com/versity/versitygw/s3api/utils"
 	"github.com/versity/versitygw/s3log"
 )
 
 type S3AdminServer struct {
-	app             *fiber.App
-	backend         backend.Backend
-	router          *S3AdminRouter
-	port            string
-	CertStorage     *utils.CertStorage
-	quiet           bool
-	debug           bool
-	corsAllowOrigin string
+	app     *fiber.App
+	backend backend.Backend
+	router  *S3AdminRouter
+	port    string
+	cert    *tls.Certificate
 }
 
-func NewAdminServer(be backend.Backend, root middlewares.RootUserConfig, port, region string, iam auth.IAMService, l s3log.AuditLogger, ctrl controllers.S3ApiController, opts ...AdminOpt) *S3AdminServer {
+func NewAdminServer(app *fiber.App, be backend.Backend, root middlewares.RootUserConfig, port, region string, iam auth.IAMService, l s3log.AuditLogger, opts ...AdminOpt) *S3AdminServer {
 	server := &S3AdminServer{
+		app:     app,
 		backend: be,
-		router: &S3AdminRouter{
-			s3api: ctrl,
-		},
-		port: port,
+		router:  new(S3AdminRouter),
+		port:    port,
 	}
 
 	for _, opt := range opts {
 		opt(server)
 	}
 
-	app := fiber.New(fiber.Config{
-		AppName:               "versitygw",
-		ServerHeader:          "VERSITYGW",
-		Network:               fiber.NetworkTCP,
-		DisableStartupMessage: true,
-		ErrorHandler:          globalErrorHandler,
-	})
-
-	server.app = app
-
-	app.Use(recover.New(
-		recover.Config{
-			EnableStackTrace:  true,
-			StackTraceHandler: stackTraceHandler,
-		}))
-
 	// Logging middlewares
-	if !server.quiet {
-		app.Use(logger.New(logger.Config{
-			Format: "${time} | adm | ${status} | ${latency} | ${ip} | ${method} | ${path} | ${error} | ${queryParams}\n",
-		}))
-	}
-	app.Use(controllers.WrapMiddleware(middlewares.DecodeURL, l, nil))
+	app.Use(logger.New())
+	app.Use(middlewares.DecodeURL(l, nil))
 
-	// initialize the debug logger in debug mode
-	if debuglogger.IsDebugEnabled() {
-		app.Use(middlewares.DebugLogger())
-	}
+	// Authentication middlewares
+	app.Use(middlewares.VerifyV4Signature(root, iam, l, nil, region, false))
+	app.Use(middlewares.VerifyMD5Body(l))
 
-	server.router.Init(app, be, iam, l, root, region, server.debug, server.corsAllowOrigin)
+	server.router.Init(app, be, iam, l)
 
 	return server
 }
 
 type AdminOpt func(s *S3AdminServer)
 
-func WithAdminSrvTLS(cs *utils.CertStorage) AdminOpt {
-	return func(s *S3AdminServer) { s.CertStorage = cs }
-}
-
-// WithQuiet silences default logging output
-func WithAdminQuiet() AdminOpt {
-	return func(s *S3AdminServer) { s.quiet = true }
-}
-
-// WithAdminDebug enables the debug logging
-func WithAdminDebug() AdminOpt {
-	return func(s *S3AdminServer) { s.debug = true }
-}
-
-// WithAdminCORSAllowOrigin sets the default CORS Access-Control-Allow-Origin value
-// for the standalone admin server.
-func WithAdminCORSAllowOrigin(origin string) AdminOpt {
-	return func(s *S3AdminServer) { s.corsAllowOrigin = origin }
+func WithAdminSrvTLS(cert tls.Certificate) AdminOpt {
+	return func(s *S3AdminServer) { s.cert = &cert }
 }
 
 func (sa *S3AdminServer) Serve() (err error) {
-	if sa.CertStorage != nil {
-		ln, err := utils.NewTLSListener(sa.app.Config().Network, sa.port, sa.CertStorage.GetCertificate)
-		if err != nil {
-			return err
-		}
-
-		return sa.app.Listener(ln)
+	if sa.cert != nil {
+		return sa.app.ListenTLSWithCertificate(sa.port, *sa.cert)
 	}
 	return sa.app.Listen(sa.port)
 }
-
-// ShutDown gracefully shuts down the server with a context timeout
-func (sa S3AdminServer) Shutdown() error {
-	return sa.app.ShutdownWithTimeout(shutDownDuration)
-}

s3api/controllers/admin.go

@@ -15,186 +15,311 @@
 package controllers
 
 import (
-	"encoding/xml"
-	"net/http"
+	"encoding/json"
+	"errors"
+	"fmt"
 	"strings"
 
+	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/gofiber/fiber/v2"
 	"github.com/versity/versitygw/auth"
 	"github.com/versity/versitygw/backend"
-	"github.com/versity/versitygw/s3err"
 	"github.com/versity/versitygw/s3log"
-	"github.com/versity/versitygw/s3response"
 )
 
 type AdminController struct {
-	iam   auth.IAMService
-	be    backend.Backend
-	l     s3log.AuditLogger
-	s3api S3ApiController
+	iam auth.IAMService
+	be  backend.Backend
+	l   s3log.AuditLogger
 }
 
-func NewAdminController(iam auth.IAMService, be backend.Backend, l s3log.AuditLogger, s3api S3ApiController) AdminController {
-	return AdminController{iam: iam, be: be, l: l, s3api: s3api}
+func NewAdminController(iam auth.IAMService, be backend.Backend, l s3log.AuditLogger) AdminController {
+	return AdminController{iam: iam, be: be, l: l}
 }
 
-func (c AdminController) CreateUser(ctx *fiber.Ctx) (*Response, error) {
+func (c AdminController) CreateUser(ctx *fiber.Ctx) error {
+	acct := ctx.Locals("account").(auth.Account)
+	if acct.Role != "admin" {
+		return sendResponse(ctx, errors.New("access denied: only admin users have access to this resource"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusForbidden,
+				action: "admin:CreateUser",
+			})
+	}
 	var usr auth.Account
-	err := xml.Unmarshal(ctx.Body(), &usr)
+	err := json.Unmarshal(ctx.Body(), &usr)
 	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrMalformedXML)
+		return sendResponse(ctx, fmt.Errorf("failed to parse request body: %w", err), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusBadRequest,
+				action: "admin:CreateUser",
+			})
 	}
 
-	if !usr.Role.IsValid() {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrAdminInvalidUserRole)
+	if usr.Role != auth.RoleAdmin && usr.Role != auth.RoleUser && usr.Role != auth.RoleUserPlus {
+		return sendResponse(ctx, errors.New("invalid parameters: user role have to be one of the following: 'user', 'admin', 'userplus'"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusBadRequest,
+				action: "admin:CreateUser",
+			})
 	}
 
 	err = c.iam.CreateAccount(usr)
 	if err != nil {
+		status := fiber.StatusInternalServerError
+		err = fmt.Errorf("failed to create user: %w", err)
+
 		if strings.Contains(err.Error(), "user already exists") {
-			err = s3err.GetAPIError(s3err.ErrAdminUserExists)
+			status = fiber.StatusConflict
 		}
 
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, err
+		return sendResponse(ctx, err, nil,
+			&metaOptions{
+				status: status,
+				logger: c.l,
+				action: "admin:CreateUser",
+			})
 	}
 
-	return &Response{
-		MetaOpts: &MetaOptions{
-			Status: http.StatusCreated,
-		},
-	}, nil
+	return sendResponse(ctx, nil, "The user has been created successfully", &metaOptions{
+		status: fiber.StatusCreated,
+		logger: c.l,
+		action: "admin:CreateUser",
+	})
 }
 
-func (c AdminController) UpdateUser(ctx *fiber.Ctx) (*Response, error) {
+func (c AdminController) UpdateUser(ctx *fiber.Ctx) error {
+	acct := ctx.Locals("account").(auth.Account)
+	if acct.Role != "admin" {
+		return sendResponse(ctx, errors.New("access denied: only admin users have access to this resource"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusForbidden,
+				action: "admin:UpdateUser",
+			})
+	}
+
 	access := ctx.Query("access")
 	if access == "" {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrAdminMissingUserAcess)
+		return sendResponse(ctx, errors.New("missing user access parameter"), nil,
+			&metaOptions{
+				status: fiber.StatusBadRequest,
+				logger: c.l,
+				action: "admin:UpdateUser",
+			})
 	}
 
 	var props auth.MutableProps
-	if err := xml.Unmarshal(ctx.Body(), &props); err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrMalformedXML)
+	if err := json.Unmarshal(ctx.Body(), &props); err != nil {
+		return sendResponse(ctx, fmt.Errorf("invalid request body %w", err), nil,
+			&metaOptions{
+				status: fiber.StatusBadRequest,
+				logger: c.l,
+				action: "admin:UpdateUser",
+			})
 	}
 
-	err := props.Validate()
+	err := c.iam.UpdateUserAccount(access, props)
 	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrAdminInvalidUserRole)
-	}
+		status := fiber.StatusInternalServerError
+		err = fmt.Errorf("failed to update user account: %w", err)
 
-	err = c.iam.UpdateUserAccount(access, props)
-	if err != nil {
 		if strings.Contains(err.Error(), "user not found") {
-			err = s3err.GetAPIError(s3err.ErrAdminUserNotFound)
+			status = fiber.StatusNotFound
 		}
 
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, err
+		return sendResponse(ctx, err, nil,
+			&metaOptions{
+				status: status,
+				logger: c.l,
+				action: "admin:UpdateUser",
+			})
 	}
 
-	return &Response{
-		MetaOpts: &MetaOptions{},
-	}, nil
+	return sendResponse(ctx, nil, "the user has been updated successfully",
+		&metaOptions{
+			logger: c.l,
+			action: "admin:UpdateUser",
+		})
 }
 
-func (c AdminController) DeleteUser(ctx *fiber.Ctx) (*Response, error) {
+func (c AdminController) DeleteUser(ctx *fiber.Ctx) error {
 	access := ctx.Query("access")
-	if access == "" {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrAdminMissingUserAcess)
+	acct := ctx.Locals("account").(auth.Account)
+	if acct.Role != "admin" {
+		return sendResponse(ctx, errors.New("access denied: only admin users have access to this resource"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusForbidden,
+				action: "admin:DeleteUser",
+			})
 	}
 
 	err := c.iam.DeleteUserAccount(access)
-	return &Response{
-		MetaOpts: &MetaOptions{},
-	}, err
+	if err != nil {
+		return sendResponse(ctx, err, nil,
+			&metaOptions{
+				logger: c.l,
+				action: "admin:DeleteUser",
+			})
+	}
+
+	return sendResponse(ctx, nil, "The user has been deleted successfully",
+		&metaOptions{
+			logger: c.l,
+			action: "admin:DeleteUser",
+		})
 }
 
-func (c AdminController) ListUsers(ctx *fiber.Ctx) (*Response, error) {
+func (c AdminController) ListUsers(ctx *fiber.Ctx) error {
+	acct := ctx.Locals("account").(auth.Account)
+	if acct.Role != "admin" {
+		return sendResponse(ctx, errors.New("access denied: only admin users have access to this resource"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusForbidden,
+				action: "admin:ListUsers",
+			})
+	}
 	accs, err := c.iam.ListUserAccounts()
-	return &Response{
-		Data:     auth.ListUserAccountsResult{Accounts: accs},
-		MetaOpts: &MetaOptions{},
-	}, err
+	return sendResponse(ctx, err, accs,
+		&metaOptions{
+			logger: c.l,
+			action: "admin:ListUsers",
+		})
 }
 
-func (c AdminController) ChangeBucketOwner(ctx *fiber.Ctx) (*Response, error) {
+func (c AdminController) ChangeBucketOwner(ctx *fiber.Ctx) error {
+	acct := ctx.Locals("account").(auth.Account)
+	if acct.Role != "admin" {
+		return sendResponse(ctx, errors.New("access denied: only admin users have access to this resource"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusForbidden,
+				action: "admin:ChangeBucketOwner",
+			})
+	}
 	owner := ctx.Query("owner")
 	bucket := ctx.Query("bucket")
 
 	accs, err := auth.CheckIfAccountsExist([]string{owner}, c.iam)
 	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, err
+		return sendResponse(ctx, err, nil,
+			&metaOptions{
+				logger: c.l,
+				action: "admin:ChangeBucketOwner",
+			})
 	}
 	if len(accs) > 0 {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrAdminUserNotFound)
+		return sendResponse(ctx, errors.New("user specified as the new bucket owner does not exist"), nil,
+			&metaOptions{
+				logger: c.l,
+				action: "admin:ChangeBucketOwner",
+				status: fiber.StatusNotFound,
+			})
 	}
 
-	err = c.be.ChangeBucketOwner(ctx.Context(), bucket, owner)
-	return &Response{
-		MetaOpts: &MetaOptions{},
-	}, err
-}
-
-func (c AdminController) ListBuckets(ctx *fiber.Ctx) (*Response, error) {
-	buckets, err := c.be.ListBucketsAndOwners(ctx.Context())
-	return &Response{
-		Data: s3response.ListBucketsResult{
-			Buckets: buckets,
+	acl := auth.ACL{
+		Owner: owner,
+		Grantees: []auth.Grantee{
+			{
+				Permission: types.PermissionFullControl,
+				Access:     owner,
+				Type:       types.TypeCanonicalUser,
+			},
 		},
-		MetaOpts: &MetaOptions{},
-	}, err
-}
-
-func (c AdminController) CreateBucket(ctx *fiber.Ctx) (*Response, error) {
-	owner := ctx.Get("x-vgw-owner")
-	if owner == "" {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, s3err.GetAPIError(s3err.ErrAdminEmptyBucketOwnerHeader)
 	}
 
-	acc, err := c.iam.GetUserAccount(owner)
+	aclParsed, err := json.Marshal(acl)
 	if err != nil {
-		if err == auth.ErrNoSuchUser {
-			err = s3err.GetAPIError(s3err.ErrAdminUserNotFound)
+		return sendResponse(ctx, fmt.Errorf("failed to marshal the bucket acl: %w", err), nil,
+			&metaOptions{
+				logger: c.l,
+				action: "admin:ChangeBucketOwner",
+			})
+	}
+
+	err = c.be.ChangeBucketOwner(ctx.Context(), bucket, aclParsed)
+	return sendResponse(ctx, err, "Bucket owner has been updated successfully",
+		&metaOptions{
+			logger: c.l,
+			action: "admin:ChangeBucketOwner",
+		})
+}
+
+func (c AdminController) ListBuckets(ctx *fiber.Ctx) error {
+	acct := ctx.Locals("account").(auth.Account)
+	if acct.Role != "admin" {
+		return sendResponse(ctx, errors.New("access denied: only admin users have access to this resource"), nil,
+			&metaOptions{
+				logger: c.l,
+				status: fiber.StatusForbidden,
+				action: "admin:ListBuckets",
+			})
+	}
+
+	buckets, err := c.be.ListBucketsAndOwners(ctx.Context())
+	return sendResponse(ctx, err, buckets,
+		&metaOptions{
+			logger: c.l,
+			action: "admin:ListBuckets",
+		})
+}
+
+type metaOptions struct {
+	action string
+	status int
+	logger s3log.AuditLogger
+}
+
+func sendResponse(ctx *fiber.Ctx, err error, data any, m *metaOptions) error {
+	status := m.status
+	if err != nil {
+		if status == 0 {
+			status = fiber.StatusInternalServerError
+		}
+		if m.logger != nil {
+			m.logger.Log(ctx, err, []byte(err.Error()), s3log.LogMeta{
+				Action:     m.action,
+				HttpStatus: status,
+			})
 		}
 
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, err
+		return ctx.Status(status).SendString(err.Error())
 	}
 
-	// store the owner access key id in context
-	ctx.Context().SetUserValue("bucket-owner", acc)
+	if status == 0 {
+		status = fiber.StatusOK
+	}
 
-	_, err = c.s3api.CreateBucket(ctx)
+	msg, ok := data.(string)
+	if ok {
+		if m.logger != nil {
+			m.logger.Log(ctx, nil, []byte(msg), s3log.LogMeta{
+				Action:     m.action,
+				HttpStatus: status,
+			})
+		}
+
+		return ctx.Status(status).SendString(msg)
+	}
+
+	dataJSON, err := json.Marshal(data)
 	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{},
-		}, err
+		return err
 	}
 
-	return &Response{
-		MetaOpts: &MetaOptions{
-			Status: http.StatusCreated,
-		},
-	}, nil
+	if m.logger != nil {
+		m.logger.Log(ctx, nil, dataJSON, s3log.LogMeta{
+			HttpStatus: status,
+			Action:     m.action,
+		})
+	}
+
+	ctx.Set(fiber.HeaderContentType, fiber.MIMEApplicationJSON)
+
+	return ctx.Status(status).Send(dataJSON)
 }

s3api/controllers/backend_moq_test.go

@@ -26,27 +26,24 @@ var _ backend.Backend = &BackendMock{}
 //			AbortMultipartUploadFunc: func(contextMoqParam context.Context, abortMultipartUploadInput *s3.AbortMultipartUploadInput) error {
 //				panic("mock out the AbortMultipartUpload method")
 //			},
-//			ChangeBucketOwnerFunc: func(contextMoqParam context.Context, bucket string, owner string) error {
+//			ChangeBucketOwnerFunc: func(contextMoqParam context.Context, bucket string, acl []byte) error {
 //				panic("mock out the ChangeBucketOwner method")
 //			},
-//			CompleteMultipartUploadFunc: func(contextMoqParam context.Context, completeMultipartUploadInput *s3.CompleteMultipartUploadInput) (s3response.CompleteMultipartUploadResult, string, error) {
+//			CompleteMultipartUploadFunc: func(contextMoqParam context.Context, completeMultipartUploadInput *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error) {
 //				panic("mock out the CompleteMultipartUpload method")
 //			},
-//			CopyObjectFunc: func(contextMoqParam context.Context, copyObjectInput s3response.CopyObjectInput) (s3response.CopyObjectOutput, error) {
+//			CopyObjectFunc: func(contextMoqParam context.Context, copyObjectInput *s3.CopyObjectInput) (*s3.CopyObjectOutput, error) {
 //				panic("mock out the CopyObject method")
 //			},
 //			CreateBucketFunc: func(contextMoqParam context.Context, createBucketInput *s3.CreateBucketInput, defaultACL []byte) error {
 //				panic("mock out the CreateBucket method")
 //			},
-//			CreateMultipartUploadFunc: func(contextMoqParam context.Context, createMultipartUploadInput s3response.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error) {
+//			CreateMultipartUploadFunc: func(contextMoqParam context.Context, createMultipartUploadInput *s3.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error) {
 //				panic("mock out the CreateMultipartUpload method")
 //			},
-//			DeleteBucketFunc: func(contextMoqParam context.Context, bucket string) error {
+//			DeleteBucketFunc: func(contextMoqParam context.Context, deleteBucketInput *s3.DeleteBucketInput) error {
 //				panic("mock out the DeleteBucket method")
 //			},
-//			DeleteBucketCorsFunc: func(contextMoqParam context.Context, bucket string) error {
-//				panic("mock out the DeleteBucketCors method")
-//			},
 //			DeleteBucketOwnershipControlsFunc: func(contextMoqParam context.Context, bucket string) error {
 //				panic("mock out the DeleteBucketOwnershipControls method")
 //			},
@@ -59,7 +56,7 @@ var _ backend.Backend = &BackendMock{}
 //			DeleteObjectFunc: func(contextMoqParam context.Context, deleteObjectInput *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error) {
 //				panic("mock out the DeleteObject method")
 //			},
-//			DeleteObjectTaggingFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string) error {
+//			DeleteObjectTaggingFunc: func(contextMoqParam context.Context, bucket string, object string) error {
 //				panic("mock out the DeleteObjectTagging method")
 //			},
 //			DeleteObjectsFunc: func(contextMoqParam context.Context, deleteObjectsInput *s3.DeleteObjectsInput) (s3response.DeleteResult, error) {
@@ -68,9 +65,6 @@ var _ backend.Backend = &BackendMock{}
 //			GetBucketAclFunc: func(contextMoqParam context.Context, getBucketAclInput *s3.GetBucketAclInput) ([]byte, error) {
 //				panic("mock out the GetBucketAcl method")
 //			},
-//			GetBucketCorsFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-//				panic("mock out the GetBucketCors method")
-//			},
 //			GetBucketOwnershipControlsFunc: func(contextMoqParam context.Context, bucket string) (types.ObjectOwnership, error) {
 //				panic("mock out the GetBucketOwnershipControls method")
 //			},
@@ -80,7 +74,7 @@ var _ backend.Backend = &BackendMock{}
 //			GetBucketTaggingFunc: func(contextMoqParam context.Context, bucket string) (map[string]string, error) {
 //				panic("mock out the GetBucketTagging method")
 //			},
-//			GetBucketVersioningFunc: func(contextMoqParam context.Context, bucket string) (s3response.GetBucketVersioningOutput, error) {
+//			GetBucketVersioningFunc: func(contextMoqParam context.Context, bucket string) (*s3.GetBucketVersioningOutput, error) {
 //				panic("mock out the GetBucketVersioning method")
 //			},
 //			GetObjectFunc: func(contextMoqParam context.Context, getObjectInput *s3.GetObjectInput) (*s3.GetObjectOutput, error) {
@@ -89,7 +83,7 @@ var _ backend.Backend = &BackendMock{}
 //			GetObjectAclFunc: func(contextMoqParam context.Context, getObjectAclInput *s3.GetObjectAclInput) (*s3.GetObjectAclOutput, error) {
 //				panic("mock out the GetObjectAcl method")
 //			},
-//			GetObjectAttributesFunc: func(contextMoqParam context.Context, getObjectAttributesInput *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResponse, error) {
+//			GetObjectAttributesFunc: func(contextMoqParam context.Context, getObjectAttributesInput *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResult, error) {
 //				panic("mock out the GetObjectAttributes method")
 //			},
 //			GetObjectLegalHoldFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string) (*bool, error) {
@@ -101,7 +95,7 @@ var _ backend.Backend = &BackendMock{}
 //			GetObjectRetentionFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string) ([]byte, error) {
 //				panic("mock out the GetObjectRetention method")
 //			},
-//			GetObjectTaggingFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string) (map[string]string, error) {
+//			GetObjectTaggingFunc: func(contextMoqParam context.Context, bucket string, object string) (map[string]string, error) {
 //				panic("mock out the GetObjectTagging method")
 //			},
 //			HeadBucketFunc: func(contextMoqParam context.Context, headBucketInput *s3.HeadBucketInput) (*s3.HeadBucketOutput, error) {
@@ -110,7 +104,7 @@ var _ backend.Backend = &BackendMock{}
 //			HeadObjectFunc: func(contextMoqParam context.Context, headObjectInput *s3.HeadObjectInput) (*s3.HeadObjectOutput, error) {
 //				panic("mock out the HeadObject method")
 //			},
-//			ListBucketsFunc: func(contextMoqParam context.Context, listBucketsInput s3response.ListBucketsInput) (s3response.ListAllMyBucketsResult, error) {
+//			ListBucketsFunc: func(contextMoqParam context.Context, owner string, isAdmin bool) (s3response.ListAllMyBucketsResult, error) {
 //				panic("mock out the ListBuckets method")
 //			},
 //			ListBucketsAndOwnersFunc: func(contextMoqParam context.Context) ([]s3response.Bucket, error) {
@@ -134,9 +128,6 @@ var _ backend.Backend = &BackendMock{}
 //			PutBucketAclFunc: func(contextMoqParam context.Context, bucket string, data []byte) error {
 //				panic("mock out the PutBucketAcl method")
 //			},
-//			PutBucketCorsFunc: func(contextMoqParam context.Context, bucket string, cors []byte) error {
-//				panic("mock out the PutBucketCors method")
-//			},
 //			PutBucketOwnershipControlsFunc: func(contextMoqParam context.Context, bucket string, ownership types.ObjectOwnership) error {
 //				panic("mock out the PutBucketOwnershipControls method")
 //			},
@@ -149,7 +140,7 @@ var _ backend.Backend = &BackendMock{}
 //			PutBucketVersioningFunc: func(contextMoqParam context.Context, bucket string, status types.BucketVersioningStatus) error {
 //				panic("mock out the PutBucketVersioning method")
 //			},
-//			PutObjectFunc: func(contextMoqParam context.Context, putObjectInput s3response.PutObjectInput) (s3response.PutObjectOutput, error) {
+//			PutObjectFunc: func(contextMoqParam context.Context, putObjectInput *s3.PutObjectInput) (s3response.PutObjectOutput, error) {
 //				panic("mock out the PutObject method")
 //			},
 //			PutObjectAclFunc: func(contextMoqParam context.Context, putObjectAclInput *s3.PutObjectAclInput) error {
@@ -161,10 +152,10 @@ var _ backend.Backend = &BackendMock{}
 //			PutObjectLockConfigurationFunc: func(contextMoqParam context.Context, bucket string, config []byte) error {
 //				panic("mock out the PutObjectLockConfiguration method")
 //			},
-//			PutObjectRetentionFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string, retention []byte) error {
+//			PutObjectRetentionFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string, bypass bool, retention []byte) error {
 //				panic("mock out the PutObjectRetention method")
 //			},
-//			PutObjectTaggingFunc: func(contextMoqParam context.Context, bucket string, object string, versionId string, tags map[string]string) error {
+//			PutObjectTaggingFunc: func(contextMoqParam context.Context, bucket string, object string, tags map[string]string) error {
 //				panic("mock out the PutObjectTagging method")
 //			},
 //			RestoreObjectFunc: func(contextMoqParam context.Context, restoreObjectInput *s3.RestoreObjectInput) error {
@@ -179,10 +170,10 @@ var _ backend.Backend = &BackendMock{}
 //			StringFunc: func() string {
 //				panic("mock out the String method")
 //			},
-//			UploadPartFunc: func(contextMoqParam context.Context, uploadPartInput *s3.UploadPartInput) (*s3.UploadPartOutput, error) {
+//			UploadPartFunc: func(contextMoqParam context.Context, uploadPartInput *s3.UploadPartInput) (string, error) {
 //				panic("mock out the UploadPart method")
 //			},
-//			UploadPartCopyFunc: func(contextMoqParam context.Context, uploadPartCopyInput *s3.UploadPartCopyInput) (s3response.CopyPartResult, error) {
+//			UploadPartCopyFunc: func(contextMoqParam context.Context, uploadPartCopyInput *s3.UploadPartCopyInput) (s3response.CopyObjectResult, error) {
 //				panic("mock out the UploadPartCopy method")
 //			},
 //		}
@@ -196,25 +187,22 @@ type BackendMock struct {
 	AbortMultipartUploadFunc func(contextMoqParam context.Context, abortMultipartUploadInput *s3.AbortMultipartUploadInput) error
 
 	// ChangeBucketOwnerFunc mocks the ChangeBucketOwner method.
-	ChangeBucketOwnerFunc func(contextMoqParam context.Context, bucket string, owner string) error
+	ChangeBucketOwnerFunc func(contextMoqParam context.Context, bucket string, acl []byte) error
 
 	// CompleteMultipartUploadFunc mocks the CompleteMultipartUpload method.
-	CompleteMultipartUploadFunc func(contextMoqParam context.Context, completeMultipartUploadInput *s3.CompleteMultipartUploadInput) (s3response.CompleteMultipartUploadResult, string, error)
+	CompleteMultipartUploadFunc func(contextMoqParam context.Context, completeMultipartUploadInput *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error)
 
 	// CopyObjectFunc mocks the CopyObject method.
-	CopyObjectFunc func(contextMoqParam context.Context, copyObjectInput s3response.CopyObjectInput) (s3response.CopyObjectOutput, error)
+	CopyObjectFunc func(contextMoqParam context.Context, copyObjectInput *s3.CopyObjectInput) (*s3.CopyObjectOutput, error)
 
 	// CreateBucketFunc mocks the CreateBucket method.
 	CreateBucketFunc func(contextMoqParam context.Context, createBucketInput *s3.CreateBucketInput, defaultACL []byte) error
 
 	// CreateMultipartUploadFunc mocks the CreateMultipartUpload method.
-	CreateMultipartUploadFunc func(contextMoqParam context.Context, createMultipartUploadInput s3response.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error)
+	CreateMultipartUploadFunc func(contextMoqParam context.Context, createMultipartUploadInput *s3.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error)
 
 	// DeleteBucketFunc mocks the DeleteBucket method.
-	DeleteBucketFunc func(contextMoqParam context.Context, bucket string) error
-
-	// DeleteBucketCorsFunc mocks the DeleteBucketCors method.
-	DeleteBucketCorsFunc func(contextMoqParam context.Context, bucket string) error
+	DeleteBucketFunc func(contextMoqParam context.Context, deleteBucketInput *s3.DeleteBucketInput) error
 
 	// DeleteBucketOwnershipControlsFunc mocks the DeleteBucketOwnershipControls method.
 	DeleteBucketOwnershipControlsFunc func(contextMoqParam context.Context, bucket string) error
@@ -229,7 +217,7 @@ type BackendMock struct {
 	DeleteObjectFunc func(contextMoqParam context.Context, deleteObjectInput *s3.DeleteObjectInput) (*s3.DeleteObjectOutput, error)
 
 	// DeleteObjectTaggingFunc mocks the DeleteObjectTagging method.
-	DeleteObjectTaggingFunc func(contextMoqParam context.Context, bucket string, object string, versionId string) error
+	DeleteObjectTaggingFunc func(contextMoqParam context.Context, bucket string, object string) error
 
 	// DeleteObjectsFunc mocks the DeleteObjects method.
 	DeleteObjectsFunc func(contextMoqParam context.Context, deleteObjectsInput *s3.DeleteObjectsInput) (s3response.DeleteResult, error)
@@ -237,9 +225,6 @@ type BackendMock struct {
 	// GetBucketAclFunc mocks the GetBucketAcl method.
 	GetBucketAclFunc func(contextMoqParam context.Context, getBucketAclInput *s3.GetBucketAclInput) ([]byte, error)
 
-	// GetBucketCorsFunc mocks the GetBucketCors method.
-	GetBucketCorsFunc func(contextMoqParam context.Context, bucket string) ([]byte, error)
-
 	// GetBucketOwnershipControlsFunc mocks the GetBucketOwnershipControls method.
 	GetBucketOwnershipControlsFunc func(contextMoqParam context.Context, bucket string) (types.ObjectOwnership, error)
 
@@ -250,7 +235,7 @@ type BackendMock struct {
 	GetBucketTaggingFunc func(contextMoqParam context.Context, bucket string) (map[string]string, error)
 
 	// GetBucketVersioningFunc mocks the GetBucketVersioning method.
-	GetBucketVersioningFunc func(contextMoqParam context.Context, bucket string) (s3response.GetBucketVersioningOutput, error)
+	GetBucketVersioningFunc func(contextMoqParam context.Context, bucket string) (*s3.GetBucketVersioningOutput, error)
 
 	// GetObjectFunc mocks the GetObject method.
 	GetObjectFunc func(contextMoqParam context.Context, getObjectInput *s3.GetObjectInput) (*s3.GetObjectOutput, error)
@@ -259,7 +244,7 @@ type BackendMock struct {
 	GetObjectAclFunc func(contextMoqParam context.Context, getObjectAclInput *s3.GetObjectAclInput) (*s3.GetObjectAclOutput, error)
 
 	// GetObjectAttributesFunc mocks the GetObjectAttributes method.
-	GetObjectAttributesFunc func(contextMoqParam context.Context, getObjectAttributesInput *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResponse, error)
+	GetObjectAttributesFunc func(contextMoqParam context.Context, getObjectAttributesInput *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResult, error)
 
 	// GetObjectLegalHoldFunc mocks the GetObjectLegalHold method.
 	GetObjectLegalHoldFunc func(contextMoqParam context.Context, bucket string, object string, versionId string) (*bool, error)
@@ -271,7 +256,7 @@ type BackendMock struct {
 	GetObjectRetentionFunc func(contextMoqParam context.Context, bucket string, object string, versionId string) ([]byte, error)
 
 	// GetObjectTaggingFunc mocks the GetObjectTagging method.
-	GetObjectTaggingFunc func(contextMoqParam context.Context, bucket string, object string, versionId string) (map[string]string, error)
+	GetObjectTaggingFunc func(contextMoqParam context.Context, bucket string, object string) (map[string]string, error)
 
 	// HeadBucketFunc mocks the HeadBucket method.
 	HeadBucketFunc func(contextMoqParam context.Context, headBucketInput *s3.HeadBucketInput) (*s3.HeadBucketOutput, error)
@@ -280,7 +265,7 @@ type BackendMock struct {
 	HeadObjectFunc func(contextMoqParam context.Context, headObjectInput *s3.HeadObjectInput) (*s3.HeadObjectOutput, error)
 
 	// ListBucketsFunc mocks the ListBuckets method.
-	ListBucketsFunc func(contextMoqParam context.Context, listBucketsInput s3response.ListBucketsInput) (s3response.ListAllMyBucketsResult, error)
+	ListBucketsFunc func(contextMoqParam context.Context, owner string, isAdmin bool) (s3response.ListAllMyBucketsResult, error)
 
 	// ListBucketsAndOwnersFunc mocks the ListBucketsAndOwners method.
 	ListBucketsAndOwnersFunc func(contextMoqParam context.Context) ([]s3response.Bucket, error)
@@ -303,9 +288,6 @@ type BackendMock struct {
 	// PutBucketAclFunc mocks the PutBucketAcl method.
 	PutBucketAclFunc func(contextMoqParam context.Context, bucket string, data []byte) error
 
-	// PutBucketCorsFunc mocks the PutBucketCors method.
-	PutBucketCorsFunc func(contextMoqParam context.Context, bucket string, cors []byte) error
-
 	// PutBucketOwnershipControlsFunc mocks the PutBucketOwnershipControls method.
 	PutBucketOwnershipControlsFunc func(contextMoqParam context.Context, bucket string, ownership types.ObjectOwnership) error
 
@@ -319,7 +301,7 @@ type BackendMock struct {
 	PutBucketVersioningFunc func(contextMoqParam context.Context, bucket string, status types.BucketVersioningStatus) error
 
 	// PutObjectFunc mocks the PutObject method.
-	PutObjectFunc func(contextMoqParam context.Context, putObjectInput s3response.PutObjectInput) (s3response.PutObjectOutput, error)
+	PutObjectFunc func(contextMoqParam context.Context, putObjectInput *s3.PutObjectInput) (s3response.PutObjectOutput, error)
 
 	// PutObjectAclFunc mocks the PutObjectAcl method.
 	PutObjectAclFunc func(contextMoqParam context.Context, putObjectAclInput *s3.PutObjectAclInput) error
@@ -331,10 +313,10 @@ type BackendMock struct {
 	PutObjectLockConfigurationFunc func(contextMoqParam context.Context, bucket string, config []byte) error
 
 	// PutObjectRetentionFunc mocks the PutObjectRetention method.
-	PutObjectRetentionFunc func(contextMoqParam context.Context, bucket string, object string, versionId string, retention []byte) error
+	PutObjectRetentionFunc func(contextMoqParam context.Context, bucket string, object string, versionId string, bypass bool, retention []byte) error
 
 	// PutObjectTaggingFunc mocks the PutObjectTagging method.
-	PutObjectTaggingFunc func(contextMoqParam context.Context, bucket string, object string, versionId string, tags map[string]string) error
+	PutObjectTaggingFunc func(contextMoqParam context.Context, bucket string, object string, tags map[string]string) error
 
 	// RestoreObjectFunc mocks the RestoreObject method.
 	RestoreObjectFunc func(contextMoqParam context.Context, restoreObjectInput *s3.RestoreObjectInput) error
@@ -349,10 +331,10 @@ type BackendMock struct {
 	StringFunc func() string
 
 	// UploadPartFunc mocks the UploadPart method.
-	UploadPartFunc func(contextMoqParam context.Context, uploadPartInput *s3.UploadPartInput) (*s3.UploadPartOutput, error)
+	UploadPartFunc func(contextMoqParam context.Context, uploadPartInput *s3.UploadPartInput) (string, error)
 
 	// UploadPartCopyFunc mocks the UploadPartCopy method.
-	UploadPartCopyFunc func(contextMoqParam context.Context, uploadPartCopyInput *s3.UploadPartCopyInput) (s3response.CopyPartResult, error)
+	UploadPartCopyFunc func(contextMoqParam context.Context, uploadPartCopyInput *s3.UploadPartCopyInput) (s3response.CopyObjectResult, error)
 
 	// calls tracks calls to the methods.
 	calls struct {
@@ -369,8 +351,8 @@ type BackendMock struct {
 			ContextMoqParam context.Context
 			// Bucket is the bucket argument value.
 			Bucket string
-			// Owner is the owner argument value.
-			Owner string
+			// ACL is the acl argument value.
+			ACL []byte
 		}
 		// CompleteMultipartUpload holds details about calls to the CompleteMultipartUpload method.
 		CompleteMultipartUpload []struct {
@@ -384,7 +366,7 @@ type BackendMock struct {
 			// ContextMoqParam is the contextMoqParam argument value.
 			ContextMoqParam context.Context
 			// CopyObjectInput is the copyObjectInput argument value.
-			CopyObjectInput s3response.CopyObjectInput
+			CopyObjectInput *s3.CopyObjectInput
 		}
 		// CreateBucket holds details about calls to the CreateBucket method.
 		CreateBucket []struct {
@@ -400,21 +382,14 @@ type BackendMock struct {
 			// ContextMoqParam is the contextMoqParam argument value.
 			ContextMoqParam context.Context
 			// CreateMultipartUploadInput is the createMultipartUploadInput argument value.
-			CreateMultipartUploadInput s3response.CreateMultipartUploadInput
+			CreateMultipartUploadInput *s3.CreateMultipartUploadInput
 		}
 		// DeleteBucket holds details about calls to the DeleteBucket method.
 		DeleteBucket []struct {
 			// ContextMoqParam is the contextMoqParam argument value.
 			ContextMoqParam context.Context
-			// Bucket is the bucket argument value.
-			Bucket string
-		}
-		// DeleteBucketCors holds details about calls to the DeleteBucketCors method.
-		DeleteBucketCors []struct {
-			// ContextMoqParam is the contextMoqParam argument value.
-			ContextMoqParam context.Context
-			// Bucket is the bucket argument value.
-			Bucket string
+			// DeleteBucketInput is the deleteBucketInput argument value.
+			DeleteBucketInput *s3.DeleteBucketInput
 		}
 		// DeleteBucketOwnershipControls holds details about calls to the DeleteBucketOwnershipControls method.
 		DeleteBucketOwnershipControls []struct {
@@ -452,8 +427,6 @@ type BackendMock struct {
 			Bucket string
 			// Object is the object argument value.
 			Object string
-			// VersionId is the versionId argument value.
-			VersionId string
 		}
 		// DeleteObjects holds details about calls to the DeleteObjects method.
 		DeleteObjects []struct {
@@ -469,13 +442,6 @@ type BackendMock struct {
 			// GetBucketAclInput is the getBucketAclInput argument value.
 			GetBucketAclInput *s3.GetBucketAclInput
 		}
-		// GetBucketCors holds details about calls to the GetBucketCors method.
-		GetBucketCors []struct {
-			// ContextMoqParam is the contextMoqParam argument value.
-			ContextMoqParam context.Context
-			// Bucket is the bucket argument value.
-			Bucket string
-		}
 		// GetBucketOwnershipControls holds details about calls to the GetBucketOwnershipControls method.
 		GetBucketOwnershipControls []struct {
 			// ContextMoqParam is the contextMoqParam argument value.
@@ -562,8 +528,6 @@ type BackendMock struct {
 			Bucket string
 			// Object is the object argument value.
 			Object string
-			// VersionId is the versionId argument value.
-			VersionId string
 		}
 		// HeadBucket holds details about calls to the HeadBucket method.
 		HeadBucket []struct {
@@ -583,8 +547,10 @@ type BackendMock struct {
 		ListBuckets []struct {
 			// ContextMoqParam is the contextMoqParam argument value.
 			ContextMoqParam context.Context
-			// ListBucketsInput is the listBucketsInput argument value.
-			ListBucketsInput s3response.ListBucketsInput
+			// Owner is the owner argument value.
+			Owner string
+			// IsAdmin is the isAdmin argument value.
+			IsAdmin bool
 		}
 		// ListBucketsAndOwners holds details about calls to the ListBucketsAndOwners method.
 		ListBucketsAndOwners []struct {
@@ -635,15 +601,6 @@ type BackendMock struct {
 			// Data is the data argument value.
 			Data []byte
 		}
-		// PutBucketCors holds details about calls to the PutBucketCors method.
-		PutBucketCors []struct {
-			// ContextMoqParam is the contextMoqParam argument value.
-			ContextMoqParam context.Context
-			// Bucket is the bucket argument value.
-			Bucket string
-			// Cors is the cors argument value.
-			Cors []byte
-		}
 		// PutBucketOwnershipControls holds details about calls to the PutBucketOwnershipControls method.
 		PutBucketOwnershipControls []struct {
 			// ContextMoqParam is the contextMoqParam argument value.
@@ -685,7 +642,7 @@ type BackendMock struct {
 			// ContextMoqParam is the contextMoqParam argument value.
 			ContextMoqParam context.Context
 			// PutObjectInput is the putObjectInput argument value.
-			PutObjectInput s3response.PutObjectInput
+			PutObjectInput *s3.PutObjectInput
 		}
 		// PutObjectAcl holds details about calls to the PutObjectAcl method.
 		PutObjectAcl []struct {
@@ -726,6 +683,8 @@ type BackendMock struct {
 			Object string
 			// VersionId is the versionId argument value.
 			VersionId string
+			// Bypass is the bypass argument value.
+			Bypass bool
 			// Retention is the retention argument value.
 			Retention []byte
 		}
@@ -737,8 +696,6 @@ type BackendMock struct {
 			Bucket string
 			// Object is the object argument value.
 			Object string
-			// VersionId is the versionId argument value.
-			VersionId string
 			// Tags is the tags argument value.
 			Tags map[string]string
 		}
@@ -784,7 +741,6 @@ type BackendMock struct {
 	lockCreateBucket                  sync.RWMutex
 	lockCreateMultipartUpload         sync.RWMutex
 	lockDeleteBucket                  sync.RWMutex
-	lockDeleteBucketCors              sync.RWMutex
 	lockDeleteBucketOwnershipControls sync.RWMutex
 	lockDeleteBucketPolicy            sync.RWMutex
 	lockDeleteBucketTagging           sync.RWMutex
@@ -792,7 +748,6 @@ type BackendMock struct {
 	lockDeleteObjectTagging           sync.RWMutex
 	lockDeleteObjects                 sync.RWMutex
 	lockGetBucketAcl                  sync.RWMutex
-	lockGetBucketCors                 sync.RWMutex
 	lockGetBucketOwnershipControls    sync.RWMutex
 	lockGetBucketPolicy               sync.RWMutex
 	lockGetBucketTagging              sync.RWMutex
@@ -814,7 +769,6 @@ type BackendMock struct {
 	lockListObjectsV2                 sync.RWMutex
 	lockListParts                     sync.RWMutex
 	lockPutBucketAcl                  sync.RWMutex
-	lockPutBucketCors                 sync.RWMutex
 	lockPutBucketOwnershipControls    sync.RWMutex
 	lockPutBucketPolicy               sync.RWMutex
 	lockPutBucketTagging              sync.RWMutex
@@ -870,23 +824,23 @@ func (mock *BackendMock) AbortMultipartUploadCalls() []struct {
 }
 
 // ChangeBucketOwner calls ChangeBucketOwnerFunc.
-func (mock *BackendMock) ChangeBucketOwner(contextMoqParam context.Context, bucket string, owner string) error {
+func (mock *BackendMock) ChangeBucketOwner(contextMoqParam context.Context, bucket string, acl []byte) error {
 	if mock.ChangeBucketOwnerFunc == nil {
 		panic("BackendMock.ChangeBucketOwnerFunc: method is nil but Backend.ChangeBucketOwner was just called")
 	}
 	callInfo := struct {
 		ContextMoqParam context.Context
 		Bucket          string
-		Owner           string
+		ACL             []byte
 	}{
 		ContextMoqParam: contextMoqParam,
 		Bucket:          bucket,
-		Owner:           owner,
+		ACL:             acl,
 	}
 	mock.lockChangeBucketOwner.Lock()
 	mock.calls.ChangeBucketOwner = append(mock.calls.ChangeBucketOwner, callInfo)
 	mock.lockChangeBucketOwner.Unlock()
-	return mock.ChangeBucketOwnerFunc(contextMoqParam, bucket, owner)
+	return mock.ChangeBucketOwnerFunc(contextMoqParam, bucket, acl)
 }
 
 // ChangeBucketOwnerCalls gets all the calls that were made to ChangeBucketOwner.
@@ -896,12 +850,12 @@ func (mock *BackendMock) ChangeBucketOwner(contextMoqParam context.Context, buck
 func (mock *BackendMock) ChangeBucketOwnerCalls() []struct {
 	ContextMoqParam context.Context
 	Bucket          string
-	Owner           string
+	ACL             []byte
 } {
 	var calls []struct {
 		ContextMoqParam context.Context
 		Bucket          string
-		Owner           string
+		ACL             []byte
 	}
 	mock.lockChangeBucketOwner.RLock()
 	calls = mock.calls.ChangeBucketOwner
@@ -910,7 +864,7 @@ func (mock *BackendMock) ChangeBucketOwnerCalls() []struct {
 }
 
 // CompleteMultipartUpload calls CompleteMultipartUploadFunc.
-func (mock *BackendMock) CompleteMultipartUpload(contextMoqParam context.Context, completeMultipartUploadInput *s3.CompleteMultipartUploadInput) (s3response.CompleteMultipartUploadResult, string, error) {
+func (mock *BackendMock) CompleteMultipartUpload(contextMoqParam context.Context, completeMultipartUploadInput *s3.CompleteMultipartUploadInput) (*s3.CompleteMultipartUploadOutput, error) {
 	if mock.CompleteMultipartUploadFunc == nil {
 		panic("BackendMock.CompleteMultipartUploadFunc: method is nil but Backend.CompleteMultipartUpload was just called")
 	}
@@ -946,13 +900,13 @@ func (mock *BackendMock) CompleteMultipartUploadCalls() []struct {
 }
 
 // CopyObject calls CopyObjectFunc.
-func (mock *BackendMock) CopyObject(contextMoqParam context.Context, copyObjectInput s3response.CopyObjectInput) (s3response.CopyObjectOutput, error) {
+func (mock *BackendMock) CopyObject(contextMoqParam context.Context, copyObjectInput *s3.CopyObjectInput) (*s3.CopyObjectOutput, error) {
 	if mock.CopyObjectFunc == nil {
 		panic("BackendMock.CopyObjectFunc: method is nil but Backend.CopyObject was just called")
 	}
 	callInfo := struct {
 		ContextMoqParam context.Context
-		CopyObjectInput s3response.CopyObjectInput
+		CopyObjectInput *s3.CopyObjectInput
 	}{
 		ContextMoqParam: contextMoqParam,
 		CopyObjectInput: copyObjectInput,
@@ -969,11 +923,11 @@ func (mock *BackendMock) CopyObject(contextMoqParam context.Context, copyObjectI
 //	len(mockedBackend.CopyObjectCalls())
 func (mock *BackendMock) CopyObjectCalls() []struct {
 	ContextMoqParam context.Context
-	CopyObjectInput s3response.CopyObjectInput
+	CopyObjectInput *s3.CopyObjectInput
 } {
 	var calls []struct {
 		ContextMoqParam context.Context
-		CopyObjectInput s3response.CopyObjectInput
+		CopyObjectInput *s3.CopyObjectInput
 	}
 	mock.lockCopyObject.RLock()
 	calls = mock.calls.CopyObject
@@ -1022,13 +976,13 @@ func (mock *BackendMock) CreateBucketCalls() []struct {
 }
 
 // CreateMultipartUpload calls CreateMultipartUploadFunc.
-func (mock *BackendMock) CreateMultipartUpload(contextMoqParam context.Context, createMultipartUploadInput s3response.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error) {
+func (mock *BackendMock) CreateMultipartUpload(contextMoqParam context.Context, createMultipartUploadInput *s3.CreateMultipartUploadInput) (s3response.InitiateMultipartUploadResult, error) {
 	if mock.CreateMultipartUploadFunc == nil {
 		panic("BackendMock.CreateMultipartUploadFunc: method is nil but Backend.CreateMultipartUpload was just called")
 	}
 	callInfo := struct {
 		ContextMoqParam            context.Context
-		CreateMultipartUploadInput s3response.CreateMultipartUploadInput
+		CreateMultipartUploadInput *s3.CreateMultipartUploadInput
 	}{
 		ContextMoqParam:            contextMoqParam,
 		CreateMultipartUploadInput: createMultipartUploadInput,
@@ -1045,11 +999,11 @@ func (mock *BackendMock) CreateMultipartUpload(contextMoqParam context.Context,
 //	len(mockedBackend.CreateMultipartUploadCalls())
 func (mock *BackendMock) CreateMultipartUploadCalls() []struct {
 	ContextMoqParam            context.Context
-	CreateMultipartUploadInput s3response.CreateMultipartUploadInput
+	CreateMultipartUploadInput *s3.CreateMultipartUploadInput
 } {
 	var calls []struct {
 		ContextMoqParam            context.Context
-		CreateMultipartUploadInput s3response.CreateMultipartUploadInput
+		CreateMultipartUploadInput *s3.CreateMultipartUploadInput
 	}
 	mock.lockCreateMultipartUpload.RLock()
 	calls = mock.calls.CreateMultipartUpload
@@ -1058,21 +1012,21 @@ func (mock *BackendMock) CreateMultipartUploadCalls() []struct {
 }
 
 // DeleteBucket calls DeleteBucketFunc.
-func (mock *BackendMock) DeleteBucket(contextMoqParam context.Context, bucket string) error {
+func (mock *BackendMock) DeleteBucket(contextMoqParam context.Context, deleteBucketInput *s3.DeleteBucketInput) error {
 	if mock.DeleteBucketFunc == nil {
 		panic("BackendMock.DeleteBucketFunc: method is nil but Backend.DeleteBucket was just called")
 	}
 	callInfo := struct {
-		ContextMoqParam context.Context
-		Bucket          string
+		ContextMoqParam   context.Context
+		DeleteBucketInput *s3.DeleteBucketInput
 	}{
-		ContextMoqParam: contextMoqParam,
-		Bucket:          bucket,
+		ContextMoqParam:   contextMoqParam,
+		DeleteBucketInput: deleteBucketInput,
 	}
 	mock.lockDeleteBucket.Lock()
 	mock.calls.DeleteBucket = append(mock.calls.DeleteBucket, callInfo)
 	mock.lockDeleteBucket.Unlock()
-	return mock.DeleteBucketFunc(contextMoqParam, bucket)
+	return mock.DeleteBucketFunc(contextMoqParam, deleteBucketInput)
 }
 
 // DeleteBucketCalls gets all the calls that were made to DeleteBucket.
@@ -1080,12 +1034,12 @@ func (mock *BackendMock) DeleteBucket(contextMoqParam context.Context, bucket st
 //
 //	len(mockedBackend.DeleteBucketCalls())
 func (mock *BackendMock) DeleteBucketCalls() []struct {
-	ContextMoqParam context.Context
-	Bucket          string
+	ContextMoqParam   context.Context
+	DeleteBucketInput *s3.DeleteBucketInput
 } {
 	var calls []struct {
-		ContextMoqParam context.Context
-		Bucket          string
+		ContextMoqParam   context.Context
+		DeleteBucketInput *s3.DeleteBucketInput
 	}
 	mock.lockDeleteBucket.RLock()
 	calls = mock.calls.DeleteBucket
@@ -1093,42 +1047,6 @@ func (mock *BackendMock) DeleteBucketCalls() []struct {
 	return calls
 }
 
-// DeleteBucketCors calls DeleteBucketCorsFunc.
-func (mock *BackendMock) DeleteBucketCors(contextMoqParam context.Context, bucket string) error {
-	if mock.DeleteBucketCorsFunc == nil {
-		panic("BackendMock.DeleteBucketCorsFunc: method is nil but Backend.DeleteBucketCors was just called")
-	}
-	callInfo := struct {
-		ContextMoqParam context.Context
-		Bucket          string
-	}{
-		ContextMoqParam: contextMoqParam,
-		Bucket:          bucket,
-	}
-	mock.lockDeleteBucketCors.Lock()
-	mock.calls.DeleteBucketCors = append(mock.calls.DeleteBucketCors, callInfo)
-	mock.lockDeleteBucketCors.Unlock()
-	return mock.DeleteBucketCorsFunc(contextMoqParam, bucket)
-}
-
-// DeleteBucketCorsCalls gets all the calls that were made to DeleteBucketCors.
-// Check the length with:
-//
-//	len(mockedBackend.DeleteBucketCorsCalls())
-func (mock *BackendMock) DeleteBucketCorsCalls() []struct {
-	ContextMoqParam context.Context
-	Bucket          string
-} {
-	var calls []struct {
-		ContextMoqParam context.Context
-		Bucket          string
-	}
-	mock.lockDeleteBucketCors.RLock()
-	calls = mock.calls.DeleteBucketCors
-	mock.lockDeleteBucketCors.RUnlock()
-	return calls
-}
-
 // DeleteBucketOwnershipControls calls DeleteBucketOwnershipControlsFunc.
 func (mock *BackendMock) DeleteBucketOwnershipControls(contextMoqParam context.Context, bucket string) error {
 	if mock.DeleteBucketOwnershipControlsFunc == nil {
@@ -1274,7 +1192,7 @@ func (mock *BackendMock) DeleteObjectCalls() []struct {
 }
 
 // DeleteObjectTagging calls DeleteObjectTaggingFunc.
-func (mock *BackendMock) DeleteObjectTagging(contextMoqParam context.Context, bucket string, object string, versionId string) error {
+func (mock *BackendMock) DeleteObjectTagging(contextMoqParam context.Context, bucket string, object string) error {
 	if mock.DeleteObjectTaggingFunc == nil {
 		panic("BackendMock.DeleteObjectTaggingFunc: method is nil but Backend.DeleteObjectTagging was just called")
 	}
@@ -1282,17 +1200,15 @@ func (mock *BackendMock) DeleteObjectTagging(contextMoqParam context.Context, bu
 		ContextMoqParam context.Context
 		Bucket          string
 		Object          string
-		VersionId       string
 	}{
 		ContextMoqParam: contextMoqParam,
 		Bucket:          bucket,
 		Object:          object,
-		VersionId:       versionId,
 	}
 	mock.lockDeleteObjectTagging.Lock()
 	mock.calls.DeleteObjectTagging = append(mock.calls.DeleteObjectTagging, callInfo)
 	mock.lockDeleteObjectTagging.Unlock()
-	return mock.DeleteObjectTaggingFunc(contextMoqParam, bucket, object, versionId)
+	return mock.DeleteObjectTaggingFunc(contextMoqParam, bucket, object)
 }
 
 // DeleteObjectTaggingCalls gets all the calls that were made to DeleteObjectTagging.
@@ -1303,13 +1219,11 @@ func (mock *BackendMock) DeleteObjectTaggingCalls() []struct {
 	ContextMoqParam context.Context
 	Bucket          string
 	Object          string
-	VersionId       string
 } {
 	var calls []struct {
 		ContextMoqParam context.Context
 		Bucket          string
 		Object          string
-		VersionId       string
 	}
 	mock.lockDeleteObjectTagging.RLock()
 	calls = mock.calls.DeleteObjectTagging
@@ -1389,42 +1303,6 @@ func (mock *BackendMock) GetBucketAclCalls() []struct {
 	return calls
 }
 
-// GetBucketCors calls GetBucketCorsFunc.
-func (mock *BackendMock) GetBucketCors(contextMoqParam context.Context, bucket string) ([]byte, error) {
-	if mock.GetBucketCorsFunc == nil {
-		panic("BackendMock.GetBucketCorsFunc: method is nil but Backend.GetBucketCors was just called")
-	}
-	callInfo := struct {
-		ContextMoqParam context.Context
-		Bucket          string
-	}{
-		ContextMoqParam: contextMoqParam,
-		Bucket:          bucket,
-	}
-	mock.lockGetBucketCors.Lock()
-	mock.calls.GetBucketCors = append(mock.calls.GetBucketCors, callInfo)
-	mock.lockGetBucketCors.Unlock()
-	return mock.GetBucketCorsFunc(contextMoqParam, bucket)
-}
-
-// GetBucketCorsCalls gets all the calls that were made to GetBucketCors.
-// Check the length with:
-//
-//	len(mockedBackend.GetBucketCorsCalls())
-func (mock *BackendMock) GetBucketCorsCalls() []struct {
-	ContextMoqParam context.Context
-	Bucket          string
-} {
-	var calls []struct {
-		ContextMoqParam context.Context
-		Bucket          string
-	}
-	mock.lockGetBucketCors.RLock()
-	calls = mock.calls.GetBucketCors
-	mock.lockGetBucketCors.RUnlock()
-	return calls
-}
-
 // GetBucketOwnershipControls calls GetBucketOwnershipControlsFunc.
 func (mock *BackendMock) GetBucketOwnershipControls(contextMoqParam context.Context, bucket string) (types.ObjectOwnership, error) {
 	if mock.GetBucketOwnershipControlsFunc == nil {
@@ -1534,7 +1412,7 @@ func (mock *BackendMock) GetBucketTaggingCalls() []struct {
 }
 
 // GetBucketVersioning calls GetBucketVersioningFunc.
-func (mock *BackendMock) GetBucketVersioning(contextMoqParam context.Context, bucket string) (s3response.GetBucketVersioningOutput, error) {
+func (mock *BackendMock) GetBucketVersioning(contextMoqParam context.Context, bucket string) (*s3.GetBucketVersioningOutput, error) {
 	if mock.GetBucketVersioningFunc == nil {
 		panic("BackendMock.GetBucketVersioningFunc: method is nil but Backend.GetBucketVersioning was just called")
 	}
@@ -1642,7 +1520,7 @@ func (mock *BackendMock) GetObjectAclCalls() []struct {
 }
 
 // GetObjectAttributes calls GetObjectAttributesFunc.
-func (mock *BackendMock) GetObjectAttributes(contextMoqParam context.Context, getObjectAttributesInput *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResponse, error) {
+func (mock *BackendMock) GetObjectAttributes(contextMoqParam context.Context, getObjectAttributesInput *s3.GetObjectAttributesInput) (s3response.GetObjectAttributesResult, error) {
 	if mock.GetObjectAttributesFunc == nil {
 		panic("BackendMock.GetObjectAttributesFunc: method is nil but Backend.GetObjectAttributes was just called")
 	}
@@ -1802,7 +1680,7 @@ func (mock *BackendMock) GetObjectRetentionCalls() []struct {
 }
 
 // GetObjectTagging calls GetObjectTaggingFunc.
-func (mock *BackendMock) GetObjectTagging(contextMoqParam context.Context, bucket string, object string, versionId string) (map[string]string, error) {
+func (mock *BackendMock) GetObjectTagging(contextMoqParam context.Context, bucket string, object string) (map[string]string, error) {
 	if mock.GetObjectTaggingFunc == nil {
 		panic("BackendMock.GetObjectTaggingFunc: method is nil but Backend.GetObjectTagging was just called")
 	}
@@ -1810,17 +1688,15 @@ func (mock *BackendMock) GetObjectTagging(contextMoqParam context.Context, bucke
 		ContextMoqParam context.Context
 		Bucket          string
 		Object          string
-		VersionId       string
 	}{
 		ContextMoqParam: contextMoqParam,
 		Bucket:          bucket,
 		Object:          object,
-		VersionId:       versionId,
 	}
 	mock.lockGetObjectTagging.Lock()
 	mock.calls.GetObjectTagging = append(mock.calls.GetObjectTagging, callInfo)
 	mock.lockGetObjectTagging.Unlock()
-	return mock.GetObjectTaggingFunc(contextMoqParam, bucket, object, versionId)
+	return mock.GetObjectTaggingFunc(contextMoqParam, bucket, object)
 }
 
 // GetObjectTaggingCalls gets all the calls that were made to GetObjectTagging.
@@ -1831,13 +1707,11 @@ func (mock *BackendMock) GetObjectTaggingCalls() []struct {
 	ContextMoqParam context.Context
 	Bucket          string
 	Object          string
-	VersionId       string
 } {
 	var calls []struct {
 		ContextMoqParam context.Context
 		Bucket          string
 		Object          string
-		VersionId       string
 	}
 	mock.lockGetObjectTagging.RLock()
 	calls = mock.calls.GetObjectTagging
@@ -1918,21 +1792,23 @@ func (mock *BackendMock) HeadObjectCalls() []struct {
 }
 
 // ListBuckets calls ListBucketsFunc.
-func (mock *BackendMock) ListBuckets(contextMoqParam context.Context, listBucketsInput s3response.ListBucketsInput) (s3response.ListAllMyBucketsResult, error) {
+func (mock *BackendMock) ListBuckets(contextMoqParam context.Context, owner string, isAdmin bool) (s3response.ListAllMyBucketsResult, error) {
 	if mock.ListBucketsFunc == nil {
 		panic("BackendMock.ListBucketsFunc: method is nil but Backend.ListBuckets was just called")
 	}
 	callInfo := struct {
-		ContextMoqParam  context.Context
-		ListBucketsInput s3response.ListBucketsInput
+		ContextMoqParam context.Context
+		Owner           string
+		IsAdmin         bool
 	}{
-		ContextMoqParam:  contextMoqParam,
-		ListBucketsInput: listBucketsInput,
+		ContextMoqParam: contextMoqParam,
+		Owner:           owner,
+		IsAdmin:         isAdmin,
 	}
 	mock.lockListBuckets.Lock()
 	mock.calls.ListBuckets = append(mock.calls.ListBuckets, callInfo)
 	mock.lockListBuckets.Unlock()
-	return mock.ListBucketsFunc(contextMoqParam, listBucketsInput)
+	return mock.ListBucketsFunc(contextMoqParam, owner, isAdmin)
 }
 
 // ListBucketsCalls gets all the calls that were made to ListBuckets.
@@ -1940,12 +1816,14 @@ func (mock *BackendMock) ListBuckets(contextMoqParam context.Context, listBucket
 //
 //	len(mockedBackend.ListBucketsCalls())
 func (mock *BackendMock) ListBucketsCalls() []struct {
-	ContextMoqParam  context.Context
-	ListBucketsInput s3response.ListBucketsInput
+	ContextMoqParam context.Context
+	Owner           string
+	IsAdmin         bool
 } {
 	var calls []struct {
-		ContextMoqParam  context.Context
-		ListBucketsInput s3response.ListBucketsInput
+		ContextMoqParam context.Context
+		Owner           string
+		IsAdmin         bool
 	}
 	mock.lockListBuckets.RLock()
 	calls = mock.calls.ListBuckets
@@ -2205,46 +2083,6 @@ func (mock *BackendMock) PutBucketAclCalls() []struct {
 	return calls
 }
 
-// PutBucketCors calls PutBucketCorsFunc.
-func (mock *BackendMock) PutBucketCors(contextMoqParam context.Context, bucket string, cors []byte) error {
-	if mock.PutBucketCorsFunc == nil {
-		panic("BackendMock.PutBucketCorsFunc: method is nil but Backend.PutBucketCors was just called")
-	}
-	callInfo := struct {
-		ContextMoqParam context.Context
-		Bucket          string
-		Cors            []byte
-	}{
-		ContextMoqParam: contextMoqParam,
-		Bucket:          bucket,
-		Cors:            cors,
-	}
-	mock.lockPutBucketCors.Lock()
-	mock.calls.PutBucketCors = append(mock.calls.PutBucketCors, callInfo)
-	mock.lockPutBucketCors.Unlock()
-	return mock.PutBucketCorsFunc(contextMoqParam, bucket, cors)
-}
-
-// PutBucketCorsCalls gets all the calls that were made to PutBucketCors.
-// Check the length with:
-//
-//	len(mockedBackend.PutBucketCorsCalls())
-func (mock *BackendMock) PutBucketCorsCalls() []struct {
-	ContextMoqParam context.Context
-	Bucket          string
-	Cors            []byte
-} {
-	var calls []struct {
-		ContextMoqParam context.Context
-		Bucket          string
-		Cors            []byte
-	}
-	mock.lockPutBucketCors.RLock()
-	calls = mock.calls.PutBucketCors
-	mock.lockPutBucketCors.RUnlock()
-	return calls
-}
-
 // PutBucketOwnershipControls calls PutBucketOwnershipControlsFunc.
 func (mock *BackendMock) PutBucketOwnershipControls(contextMoqParam context.Context, bucket string, ownership types.ObjectOwnership) error {
 	if mock.PutBucketOwnershipControlsFunc == nil {
@@ -2406,13 +2244,13 @@ func (mock *BackendMock) PutBucketVersioningCalls() []struct {
 }
 
 // PutObject calls PutObjectFunc.
-func (mock *BackendMock) PutObject(contextMoqParam context.Context, putObjectInput s3response.PutObjectInput) (s3response.PutObjectOutput, error) {
+func (mock *BackendMock) PutObject(contextMoqParam context.Context, putObjectInput *s3.PutObjectInput) (s3response.PutObjectOutput, error) {
 	if mock.PutObjectFunc == nil {
 		panic("BackendMock.PutObjectFunc: method is nil but Backend.PutObject was just called")
 	}
 	callInfo := struct {
 		ContextMoqParam context.Context
-		PutObjectInput  s3response.PutObjectInput
+		PutObjectInput  *s3.PutObjectInput
 	}{
 		ContextMoqParam: contextMoqParam,
 		PutObjectInput:  putObjectInput,
@@ -2429,11 +2267,11 @@ func (mock *BackendMock) PutObject(contextMoqParam context.Context, putObjectInp
 //	len(mockedBackend.PutObjectCalls())
 func (mock *BackendMock) PutObjectCalls() []struct {
 	ContextMoqParam context.Context
-	PutObjectInput  s3response.PutObjectInput
+	PutObjectInput  *s3.PutObjectInput
 } {
 	var calls []struct {
 		ContextMoqParam context.Context
-		PutObjectInput  s3response.PutObjectInput
+		PutObjectInput  *s3.PutObjectInput
 	}
 	mock.lockPutObject.RLock()
 	calls = mock.calls.PutObject
@@ -2566,7 +2404,7 @@ func (mock *BackendMock) PutObjectLockConfigurationCalls() []struct {
 }
 
 // PutObjectRetention calls PutObjectRetentionFunc.
-func (mock *BackendMock) PutObjectRetention(contextMoqParam context.Context, bucket string, object string, versionId string, retention []byte) error {
+func (mock *BackendMock) PutObjectRetention(contextMoqParam context.Context, bucket string, object string, versionId string, bypass bool, retention []byte) error {
 	if mock.PutObjectRetentionFunc == nil {
 		panic("BackendMock.PutObjectRetentionFunc: method is nil but Backend.PutObjectRetention was just called")
 	}
@@ -2575,18 +2413,20 @@ func (mock *BackendMock) PutObjectRetention(contextMoqParam context.Context, buc
 		Bucket          string
 		Object          string
 		VersionId       string
+		Bypass          bool
 		Retention       []byte
 	}{
 		ContextMoqParam: contextMoqParam,
 		Bucket:          bucket,
 		Object:          object,
 		VersionId:       versionId,
+		Bypass:          bypass,
 		Retention:       retention,
 	}
 	mock.lockPutObjectRetention.Lock()
 	mock.calls.PutObjectRetention = append(mock.calls.PutObjectRetention, callInfo)
 	mock.lockPutObjectRetention.Unlock()
-	return mock.PutObjectRetentionFunc(contextMoqParam, bucket, object, versionId, retention)
+	return mock.PutObjectRetentionFunc(contextMoqParam, bucket, object, versionId, bypass, retention)
 }
 
 // PutObjectRetentionCalls gets all the calls that were made to PutObjectRetention.
@@ -2598,6 +2438,7 @@ func (mock *BackendMock) PutObjectRetentionCalls() []struct {
 	Bucket          string
 	Object          string
 	VersionId       string
+	Bypass          bool
 	Retention       []byte
 } {
 	var calls []struct {
@@ -2605,6 +2446,7 @@ func (mock *BackendMock) PutObjectRetentionCalls() []struct {
 		Bucket          string
 		Object          string
 		VersionId       string
+		Bypass          bool
 		Retention       []byte
 	}
 	mock.lockPutObjectRetention.RLock()
@@ -2614,7 +2456,7 @@ func (mock *BackendMock) PutObjectRetentionCalls() []struct {
 }
 
 // PutObjectTagging calls PutObjectTaggingFunc.
-func (mock *BackendMock) PutObjectTagging(contextMoqParam context.Context, bucket string, object string, versionId string, tags map[string]string) error {
+func (mock *BackendMock) PutObjectTagging(contextMoqParam context.Context, bucket string, object string, tags map[string]string) error {
 	if mock.PutObjectTaggingFunc == nil {
 		panic("BackendMock.PutObjectTaggingFunc: method is nil but Backend.PutObjectTagging was just called")
 	}
@@ -2622,19 +2464,17 @@ func (mock *BackendMock) PutObjectTagging(contextMoqParam context.Context, bucke
 		ContextMoqParam context.Context
 		Bucket          string
 		Object          string
-		VersionId       string
 		Tags            map[string]string
 	}{
 		ContextMoqParam: contextMoqParam,
 		Bucket:          bucket,
 		Object:          object,
-		VersionId:       versionId,
 		Tags:            tags,
 	}
 	mock.lockPutObjectTagging.Lock()
 	mock.calls.PutObjectTagging = append(mock.calls.PutObjectTagging, callInfo)
 	mock.lockPutObjectTagging.Unlock()
-	return mock.PutObjectTaggingFunc(contextMoqParam, bucket, object, versionId, tags)
+	return mock.PutObjectTaggingFunc(contextMoqParam, bucket, object, tags)
 }
 
 // PutObjectTaggingCalls gets all the calls that were made to PutObjectTagging.
@@ -2645,14 +2485,12 @@ func (mock *BackendMock) PutObjectTaggingCalls() []struct {
 	ContextMoqParam context.Context
 	Bucket          string
 	Object          string
-	VersionId       string
 	Tags            map[string]string
 } {
 	var calls []struct {
 		ContextMoqParam context.Context
 		Bucket          string
 		Object          string
-		VersionId       string
 		Tags            map[string]string
 	}
 	mock.lockPutObjectTagging.RLock()
@@ -2788,7 +2626,7 @@ func (mock *BackendMock) StringCalls() []struct {
 }
 
 // UploadPart calls UploadPartFunc.
-func (mock *BackendMock) UploadPart(contextMoqParam context.Context, uploadPartInput *s3.UploadPartInput) (*s3.UploadPartOutput, error) {
+func (mock *BackendMock) UploadPart(contextMoqParam context.Context, uploadPartInput *s3.UploadPartInput) (string, error) {
 	if mock.UploadPartFunc == nil {
 		panic("BackendMock.UploadPartFunc: method is nil but Backend.UploadPart was just called")
 	}
@@ -2824,7 +2662,7 @@ func (mock *BackendMock) UploadPartCalls() []struct {
 }
 
 // UploadPartCopy calls UploadPartCopyFunc.
-func (mock *BackendMock) UploadPartCopy(contextMoqParam context.Context, uploadPartCopyInput *s3.UploadPartCopyInput) (s3response.CopyPartResult, error) {
+func (mock *BackendMock) UploadPartCopy(contextMoqParam context.Context, uploadPartCopyInput *s3.UploadPartCopyInput) (s3response.CopyObjectResult, error) {
 	if mock.UploadPartCopyFunc == nil {
 		panic("BackendMock.UploadPartCopyFunc: method is nil but Backend.UploadPartCopy was just called")
 	}

s3api/controllers/bucket-delete.go

@@ -1,194 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package controllers
-
-import (
-	"net/http"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/versity/versitygw/auth"
-	"github.com/versity/versitygw/s3api/utils"
-)
-
-func (c S3ApiController) DeleteBucketTagging(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-	IsBucketPublic := utils.ContextKeyPublicBucket.IsSet(ctx)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be,
-		auth.AccessOptions{
-			Readonly:        c.readonly,
-			Acl:             parsedAcl,
-			AclPermission:   auth.PermissionWrite,
-			IsRoot:          isRoot,
-			Acc:             acct,
-			Bucket:          bucket,
-			Action:          auth.PutBucketTaggingAction,
-			IsPublicRequest: IsBucketPublic,
-		})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	err = c.be.DeleteBucketTagging(ctx.Context(), bucket)
-	return &Response{
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-			Status:      http.StatusNoContent,
-		},
-	}, err
-}
-
-func (c S3ApiController) DeleteBucketOwnershipControls(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be,
-		auth.AccessOptions{
-			Readonly:      c.readonly,
-			Acl:           parsedAcl,
-			AclPermission: auth.PermissionWrite,
-			IsRoot:        isRoot,
-			Acc:           acct,
-			Bucket:        bucket,
-			Action:        auth.PutBucketOwnershipControlsAction,
-		})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	err = c.be.DeleteBucketOwnershipControls(ctx.Context(), bucket)
-	return &Response{
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-			Status:      http.StatusNoContent,
-		},
-	}, err
-}
-
-func (c S3ApiController) DeleteBucketPolicy(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be,
-		auth.AccessOptions{
-			Readonly:      c.readonly,
-			Acl:           parsedAcl,
-			AclPermission: auth.PermissionWrite,
-			IsRoot:        isRoot,
-			Acc:           acct,
-			Bucket:        bucket,
-			Action:        auth.DeleteBucketPolicyAction,
-		})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	err = c.be.DeleteBucketPolicy(ctx.Context(), bucket)
-	return &Response{
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-			Status:      http.StatusNoContent,
-		},
-	}, err
-}
-
-func (c S3ApiController) DeleteBucketCors(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-	IsBucketPublic := utils.ContextKeyPublicBucket.IsSet(ctx)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be,
-		auth.AccessOptions{
-			Readonly:        c.readonly,
-			Acl:             parsedAcl,
-			AclPermission:   auth.PermissionWrite,
-			IsRoot:          isRoot,
-			Acc:             acct,
-			Bucket:          bucket,
-			Action:          auth.PutBucketCorsAction,
-			IsPublicRequest: IsBucketPublic,
-		})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	err = c.be.DeleteBucketCors(ctx.Context(), bucket)
-	return &Response{
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-			Status:      http.StatusNoContent,
-		},
-	}, err
-}
-
-func (c S3ApiController) DeleteBucket(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-	IsBucketPublic := utils.ContextKeyPublicBucket.IsSet(ctx)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be,
-		auth.AccessOptions{
-			Readonly:        c.readonly,
-			Acl:             parsedAcl,
-			AclPermission:   auth.PermissionWrite,
-			IsRoot:          isRoot,
-			Acc:             acct,
-			Bucket:          bucket,
-			Action:          auth.DeleteBucketAction,
-			IsPublicRequest: IsBucketPublic,
-		})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	err = c.be.DeleteBucket(ctx.Context(), bucket)
-	return &Response{
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-			Status:      http.StatusNoContent,
-		},
-	}, err
-}

s3api/controllers/bucket-delete_test.go

@@ -1,413 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package controllers
-
-import (
-	"context"
-	"net/http"
-	"testing"
-
-	"github.com/versity/versitygw/s3err"
-)
-
-func TestS3ApiController_DeleteBucketTagging(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  testInput
-		output testOutput
-	}{
-		{
-			name: "verify access fails",
-			input: testInput{
-				locals: accessDeniedLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAccessDenied),
-			},
-		},
-		{
-			name: "backend returns error",
-			input: testInput{
-				locals: defaultLocals,
-				beErr:  s3err.GetAPIError(s3err.ErrAclNotSupported),
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAclNotSupported),
-			},
-		},
-		{
-			name: "successful response",
-			input: testInput{
-				locals: defaultLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			be := &BackendMock{
-				DeleteBucketTaggingFunc: func(_ context.Context, _ string) error {
-					return tt.input.beErr
-				},
-				GetBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-					return nil, s3err.GetAPIError(s3err.ErrAccessDenied)
-				},
-			}
-
-			ctrl := S3ApiController{
-				be: be,
-			}
-
-			testController(
-				t,
-				ctrl.DeleteBucketTagging,
-				tt.output.response,
-				tt.output.err,
-				ctxInputs{
-					locals: tt.input.locals,
-				})
-		})
-	}
-}
-
-func TestS3ApiController_DeleteBucketOwnershipControls(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  testInput
-		output testOutput
-	}{
-		{
-			name: "verify access fails",
-			input: testInput{
-				locals: accessDeniedLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAccessDenied),
-			},
-		},
-		{
-			name: "backend returns error",
-			input: testInput{
-				locals: defaultLocals,
-				beErr:  s3err.GetAPIError(s3err.ErrInvalidAccessKeyID),
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrInvalidAccessKeyID),
-			},
-		},
-		{
-			name: "successful response",
-			input: testInput{
-				locals: defaultLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			be := &BackendMock{
-				DeleteBucketOwnershipControlsFunc: func(contextMoqParam context.Context, bucket string) error {
-					return tt.input.beErr
-				},
-				GetBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-					return nil, s3err.GetAPIError(s3err.ErrAccessDenied)
-				},
-			}
-
-			ctrl := S3ApiController{
-				be: be,
-			}
-
-			testController(
-				t,
-				ctrl.DeleteBucketOwnershipControls,
-				tt.output.response,
-				tt.output.err,
-				ctxInputs{
-					locals: tt.input.locals,
-				})
-		})
-	}
-}
-
-func TestS3ApiController_DeleteBucketPolicy(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  testInput
-		output testOutput
-	}{
-		{
-			name: "verify access fails",
-			input: testInput{
-				locals: accessDeniedLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAccessDenied),
-			},
-		},
-		{
-			name: "backend returns error",
-			input: testInput{
-				locals: defaultLocals,
-				beErr:  s3err.GetAPIError(s3err.ErrInvalidDigest),
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrInvalidDigest),
-			},
-		},
-		{
-			name: "successful response",
-			input: testInput{
-				locals: defaultLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			be := &BackendMock{
-				DeleteBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) error {
-					return tt.input.beErr
-				},
-				GetBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-					return nil, s3err.GetAPIError(s3err.ErrAccessDenied)
-				},
-			}
-
-			ctrl := S3ApiController{
-				be: be,
-			}
-
-			testController(
-				t,
-				ctrl.DeleteBucketPolicy,
-				tt.output.response,
-				tt.output.err,
-				ctxInputs{
-					locals: tt.input.locals,
-				})
-		})
-	}
-}
-
-func TestS3ApiController_DeleteBucketCors(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  testInput
-		output testOutput
-	}{
-		{
-			name: "verify access fails",
-			input: testInput{
-				locals: accessDeniedLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAccessDenied),
-			},
-		},
-		{
-			name: "backend returns error",
-			input: testInput{
-				locals: defaultLocals,
-				beErr:  s3err.GetAPIError(s3err.ErrAdminMethodNotSupported),
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAdminMethodNotSupported),
-			},
-		},
-		{
-			name: "successful response",
-			input: testInput{
-				locals: defaultLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			be := &BackendMock{
-				DeleteBucketCorsFunc: func(contextMoqParam context.Context, bucket string) error {
-					return tt.input.beErr
-				},
-				GetBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-					return nil, s3err.GetAPIError(s3err.ErrAccessDenied)
-				},
-			}
-
-			ctrl := S3ApiController{
-				be: be,
-			}
-
-			testController(
-				t,
-				ctrl.DeleteBucketCors,
-				tt.output.response,
-				tt.output.err,
-				ctxInputs{
-					locals: tt.input.locals,
-				})
-		})
-	}
-}
-
-func TestS3ApiController_DeleteBucket(t *testing.T) {
-	tests := []struct {
-		name   string
-		input  testInput
-		output testOutput
-	}{
-		{
-			name: "verify access fails",
-			input: testInput{
-				locals: accessDeniedLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAccessDenied),
-			},
-		},
-		{
-			name: "backend returns error",
-			input: testInput{
-				locals: defaultLocals,
-				beErr:  s3err.GetAPIError(s3err.ErrInvalidDigest),
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrInvalidDigest),
-			},
-		},
-		{
-			name: "successful response",
-			input: testInput{
-				locals: defaultLocals,
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-						Status:      http.StatusNoContent,
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			be := &BackendMock{
-				DeleteBucketFunc: func(contextMoqParam context.Context, bucket string) error {
-					return tt.input.beErr
-				},
-				GetBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-					return nil, s3err.GetAPIError(s3err.ErrAccessDenied)
-				},
-			}
-
-			ctrl := S3ApiController{
-				be: be,
-			}
-
-			testController(
-				t,
-				ctrl.DeleteBucket,
-				tt.output.response,
-				tt.output.err,
-				ctxInputs{
-					locals: tt.input.locals,
-				})
-		})
-	}
-}

s3api/controllers/bucket-get.go

@@ -1,674 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package controllers
-
-import (
-	"strings"
-
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/gofiber/fiber/v2"
-	"github.com/versity/versitygw/auth"
-	"github.com/versity/versitygw/debuglogger"
-	"github.com/versity/versitygw/s3api/utils"
-	"github.com/versity/versitygw/s3err"
-	"github.com/versity/versitygw/s3response"
-)
-
-func (c S3ApiController) GetBucketTagging(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketTaggingAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	tags, err := c.be.GetBucketTagging(ctx.Context(), bucket)
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-	resp := s3response.Tagging{
-		TagSet: s3response.TagSet{
-			Tags: make([]s3response.Tag, 0, len(tags)),
-		},
-	}
-
-	for key, val := range tags {
-		resp.TagSet.Tags = append(resp.TagSet.Tags,
-			s3response.Tag{Key: key, Value: val})
-	}
-
-	return &Response{
-		Data: resp,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetBucketOwnershipControls(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketOwnershipControlsAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	data, err := c.be.GetBucketOwnershipControls(ctx.Context(), bucket)
-	return &Response{
-		Data: s3response.OwnershipControls{
-			Rules: []types.OwnershipControlsRule{
-				{
-					ObjectOwnership: data,
-				},
-			},
-		},
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetBucketVersioning(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketVersioningAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-	// Only admin users and the bucket owner are allowed to get the versioning state of a bucket.
-	if err := auth.IsAdminOrOwner(acct, isRoot, parsedAcl); err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	data, err := c.be.GetBucketVersioning(ctx.Context(), bucket)
-	return &Response{
-		Data: data,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetBucketCors(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketCorsAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	data, err := c.be.GetBucketCors(ctx.Context(), bucket)
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	output, err := auth.ParseCORSOutput(data)
-	return &Response{
-		Data: output,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetBucketPolicy(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketPolicyAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	data, err := c.be.GetBucketPolicy(ctx.Context(), bucket)
-	return &Response{
-		Data: data,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetBucketPolicyStatus(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketPolicyStatusAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	policyRaw, err := c.be.GetBucketPolicy(ctx.Context(), bucket)
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	policy, err := auth.ParsePolicyDocument(policyRaw)
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-	isPublic := policy.IsPublic()
-
-	return &Response{
-		Data: types.PolicyStatus{
-			IsPublic: &isPublic,
-		},
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, nil
-}
-
-func (c S3ApiController) ListObjectVersions(ctx *fiber.Ctx) (*Response, error) {
-	// url values
-	bucket := ctx.Params("bucket")
-	prefix := ctx.Query("prefix")
-	delimiter := ctx.Query("delimiter")
-	maxkeysStr := ctx.Query("max-keys")
-	keyMarker := ctx.Query("key-marker")
-	versionIdMarker := ctx.Query("version-id-marker")
-	// context keys
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.ListBucketVersionsAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	maxkeys, err := utils.ParseUint(maxkeysStr)
-	if err != nil {
-		debuglogger.Logf("error parsing max keys %q: %v",
-			maxkeysStr, err)
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, s3err.GetAPIError(s3err.ErrInvalidMaxKeys)
-	}
-
-	data, err := c.be.ListObjectVersions(ctx.Context(),
-		&s3.ListObjectVersionsInput{
-			Bucket:          &bucket,
-			Delimiter:       &delimiter,
-			KeyMarker:       &keyMarker,
-			MaxKeys:         &maxkeys,
-			Prefix:          &prefix,
-			VersionIdMarker: &versionIdMarker,
-		})
-	return &Response{
-		Data: data,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetObjectLockConfiguration(ctx *fiber.Ctx) (*Response, error) {
-	// url values
-	bucket := ctx.Params("bucket")
-	// context keys
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketObjectLockConfigurationAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	data, err := c.be.GetObjectLockConfiguration(ctx.Context(), bucket)
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	resp, err := auth.ParseBucketLockConfigurationOutput(data)
-	return &Response{
-		Data: resp,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) GetBucketAcl(ctx *fiber.Ctx) (*Response, error) {
-	// url values
-	bucket := ctx.Params("bucket")
-	// context keys
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionReadAcp,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketAclAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	data, err := c.be.GetBucketAcl(ctx.Context(),
-		&s3.GetBucketAclInput{Bucket: &bucket})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	res, err := auth.ParseACLOutput(data, parsedAcl.Owner)
-	return &Response{
-		Data: res,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) ListMultipartUploads(ctx *fiber.Ctx) (*Response, error) {
-	// url values
-	bucket := ctx.Params("bucket")
-	prefix := ctx.Query("prefix")
-	delimiter := ctx.Query("delimiter")
-	keyMarker := ctx.Query("key-marker")
-	maxUploadsStr := ctx.Query("max-uploads")
-	uploadIdMarker := ctx.Query("upload-id-marker")
-	// context keys
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.ListBucketMultipartUploadsAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-	maxUploads, err := utils.ParseUint(maxUploadsStr)
-	if err != nil {
-		debuglogger.Logf("error parsing max uploads %q: %v",
-			maxUploadsStr, err)
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, s3err.GetAPIError(s3err.ErrInvalidMaxUploads)
-	}
-	res, err := c.be.ListMultipartUploads(ctx.Context(),
-		&s3.ListMultipartUploadsInput{
-			Bucket:         &bucket,
-			Delimiter:      &delimiter,
-			Prefix:         &prefix,
-			UploadIdMarker: &uploadIdMarker,
-			MaxUploads:     &maxUploads,
-			KeyMarker:      &keyMarker,
-		})
-	return &Response{
-		Data: res,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) ListObjectsV2(ctx *fiber.Ctx) (*Response, error) {
-	// url values
-	bucket := ctx.Params("bucket")
-	prefix := ctx.Query("prefix")
-	cToken := ctx.Query("continuation-token")
-	sAfter := ctx.Query("start-after")
-	delimiter := ctx.Query("delimiter")
-	maxkeysStr := ctx.Query("max-keys")
-	fetchOwner := strings.EqualFold(ctx.Query("fetch-owner"), "true")
-	// context locals
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.ListBucketAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-	maxkeys, err := utils.ParseUint(maxkeysStr)
-	if err != nil {
-		debuglogger.Logf("error parsing max keys %q: %v",
-			maxkeysStr, err)
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, s3err.GetAPIError(s3err.ErrInvalidMaxKeys)
-	}
-
-	res, err := c.be.ListObjectsV2(ctx.Context(),
-		&s3.ListObjectsV2Input{
-			Bucket:            &bucket,
-			Prefix:            &prefix,
-			ContinuationToken: &cToken,
-			Delimiter:         &delimiter,
-			MaxKeys:           &maxkeys,
-			StartAfter:        &sAfter,
-			FetchOwner:        &fetchOwner,
-		})
-	return &Response{
-		Data: res,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-func (c S3ApiController) ListObjects(ctx *fiber.Ctx) (*Response, error) {
-	// url values
-	bucket := ctx.Params("bucket")
-	prefix := ctx.Query("prefix")
-	marker := ctx.Query("marker")
-	delimiter := ctx.Query("delimiter")
-	maxkeysStr := ctx.Query("max-keys")
-	// context locals
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.ListBucketAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	maxkeys, err := utils.ParseUint(maxkeysStr)
-	if err != nil {
-		debuglogger.Logf("error parsing max keys %q: %v",
-			maxkeysStr, err)
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, s3err.GetAPIError(s3err.ErrInvalidMaxKeys)
-	}
-
-	res, err := c.be.ListObjects(ctx.Context(),
-		&s3.ListObjectsInput{
-			Bucket:    &bucket,
-			Prefix:    &prefix,
-			Marker:    &marker,
-			Delimiter: &delimiter,
-			MaxKeys:   &maxkeys,
-		})
-	return &Response{
-		Data: res,
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, err
-}
-
-// GetBucketLocation handles GET /:bucket?location
-func (c S3ApiController) GetBucketLocation(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be, auth.AccessOptions{
-		Readonly:        c.readonly,
-		Acl:             parsedAcl,
-		AclPermission:   auth.PermissionRead,
-		IsRoot:          isRoot,
-		Acc:             acct,
-		Bucket:          bucket,
-		Action:          auth.GetBucketLocationAction,
-		IsPublicRequest: isPublicBucket,
-	})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	// verify bucket existence/access via backend HeadBucket
-	_, err = c.be.HeadBucket(ctx.Context(), &s3.HeadBucketInput{Bucket: &bucket})
-	if err != nil {
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	// pick up configured region from locals (set by router middleware)
-	region, _ := ctx.Locals("region").(string)
-	value := &region
-	if region == "us-east-1" {
-		value = nil
-	}
-
-	return &Response{
-		Data: s3response.LocationConstraint{
-			Value: value,
-		},
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, nil
-}

s3api/controllers/bucket-head.go

@@ -1,90 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package controllers
-
-import (
-	"errors"
-
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/gofiber/fiber/v2"
-	"github.com/versity/versitygw/auth"
-	"github.com/versity/versitygw/s3api/utils"
-	"github.com/versity/versitygw/s3err"
-)
-
-func (c S3ApiController) HeadBucket(ctx *fiber.Ctx) (*Response, error) {
-	bucket := ctx.Params("bucket")
-	acct := utils.ContextKeyAccount.Get(ctx).(auth.Account)
-	isRoot := utils.ContextKeyIsRoot.Get(ctx).(bool)
-	region := utils.ContextKeyRegion.Get(ctx).(string)
-	parsedAcl := utils.ContextKeyParsedAcl.Get(ctx).(auth.ACL)
-	isPublicBucket := utils.ContextKeyPublicBucket.IsSet(ctx)
-
-	err := auth.VerifyAccess(ctx.Context(), c.be,
-		auth.AccessOptions{
-			Readonly:        c.readonly,
-			Acl:             parsedAcl,
-			AclPermission:   auth.PermissionRead,
-			IsRoot:          isRoot,
-			Acc:             acct,
-			Bucket:          bucket,
-			Action:          auth.ListBucketAction,
-			IsPublicRequest: isPublicBucket,
-		})
-	if err != nil {
-		return &Response{
-			Headers: map[string]*string{
-				"x-amz-bucket-region": utils.GetStringPtr(region),
-			},
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	_, err = c.be.HeadBucket(ctx.Context(),
-		&s3.HeadBucketInput{
-			Bucket: &bucket,
-		})
-
-	if err != nil {
-		if errors.Is(err, s3err.GetAPIError(s3err.ErrAccessDenied)) {
-			return &Response{
-				// access denied for head object still returns region header
-				Headers: map[string]*string{
-					"x-amz-bucket-region": utils.GetStringPtr(region),
-				},
-				MetaOpts: &MetaOptions{
-					BucketOwner: parsedAcl.Owner,
-				},
-			}, err
-		}
-		return &Response{
-			MetaOpts: &MetaOptions{
-				BucketOwner: parsedAcl.Owner,
-			},
-		}, err
-	}
-
-	return &Response{
-		Headers: map[string]*string{
-			"x-amz-access-point-alias": utils.GetStringPtr("false"),
-			"x-amz-bucket-region":      utils.GetStringPtr(region),
-		},
-		MetaOpts: &MetaOptions{
-			BucketOwner: parsedAcl.Owner,
-		},
-	}, nil
-}

s3api/controllers/bucket-head_test.go

@@ -1,139 +0,0 @@
-// Copyright 2023 Versity Software
-// This file is licensed under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package controllers
-
-import (
-	"context"
-	"testing"
-
-	"github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/versity/versitygw/auth"
-	"github.com/versity/versitygw/s3api/utils"
-	"github.com/versity/versitygw/s3err"
-)
-
-func TestS3ApiController_HeadBucket(t *testing.T) {
-	region := "us-east-1"
-	tests := []struct {
-		name   string
-		input  testInput
-		output testOutput
-	}{
-		{
-			name: "verify access fails",
-			input: testInput{
-				locals: map[utils.ContextKey]any{
-					utils.ContextKeyIsRoot: false,
-					utils.ContextKeyParsedAcl: auth.ACL{
-						Owner: "root",
-					},
-					utils.ContextKeyAccount: auth.Account{
-						Access: "user",
-						Role:   auth.RoleUser,
-					},
-					utils.ContextKeyRegion: region,
-				},
-			},
-			output: testOutput{
-				response: &Response{
-					Headers: map[string]*string{
-						"x-amz-bucket-region": utils.GetStringPtr(region),
-					},
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrAccessDenied),
-			},
-		},
-		{
-			name: "backend returns error",
-			input: testInput{
-				locals: map[utils.ContextKey]any{
-					utils.ContextKeyIsRoot: true,
-					utils.ContextKeyParsedAcl: auth.ACL{
-						Owner: "root",
-					},
-					utils.ContextKeyAccount: auth.Account{
-						Access: "root",
-						Role:   auth.RoleAdmin,
-					},
-					utils.ContextKeyRegion: region,
-				},
-				beErr: s3err.GetAPIError(s3err.ErrInvalidAccessKeyID),
-			},
-			output: testOutput{
-				response: &Response{
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-				err: s3err.GetAPIError(s3err.ErrInvalidAccessKeyID),
-			},
-		},
-		{
-			name: "successful response",
-			input: testInput{
-				locals: map[utils.ContextKey]any{
-					utils.ContextKeyIsRoot: true,
-					utils.ContextKeyParsedAcl: auth.ACL{
-						Owner: "root",
-					},
-					utils.ContextKeyAccount: auth.Account{
-						Access: "root",
-						Role:   auth.RoleAdmin,
-					},
-					utils.ContextKeyRegion: region,
-				},
-			},
-			output: testOutput{
-				response: &Response{
-					Headers: map[string]*string{
-						"x-amz-access-point-alias": utils.GetStringPtr("false"),
-						"x-amz-bucket-region":      utils.GetStringPtr(region),
-					},
-					MetaOpts: &MetaOptions{
-						BucketOwner: "root",
-					},
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			be := &BackendMock{
-				HeadBucketFunc: func(contextMoqParam context.Context, headBucketInput *s3.HeadBucketInput) (*s3.HeadBucketOutput, error) {
-					return &s3.HeadBucketOutput{}, tt.input.beErr
-				},
-				GetBucketPolicyFunc: func(contextMoqParam context.Context, bucket string) ([]byte, error) {
-					return nil, s3err.GetAPIError(s3err.ErrAccessDenied)
-				},
-			}
-
-			ctrl := S3ApiController{
-				be: be,
-			}
-
-			testController(
-				t,
-				ctrl.HeadBucket,
-				tt.output.response,
-				tt.output.err,
-				ctxInputs{
-					locals: tt.input.locals,
-				})
-		})
-	}
-}