Update terraform.mdx

.github/workflows/build-docker-image-to-prod.yml

@@ -0,0 +1,123 @@
+name: Release production images (frontend, backend)
+on:
+  push:
+    tags:
+      - "infisical/v*.*.*"
+      - "!infisical/v*.*.*-postgres"
+
+jobs:
+  backend-image:
+    name: Build backend image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract version from tag
+        id: extract_version
+        run: echo "::set-output name=version::${GITHUB_REF_NAME#infisical/}"
+      - name: ☁️ Checkout source
+        uses: actions/checkout@v3
+      - name: 📦 Install dependencies to test all dependencies
+        run: npm ci --only-production
+        working-directory: backend
+      # - name: 🧪 Run tests
+      #   run: npm run test:ci
+      #   working-directory: backend
+      - name: Save commit hashes for tag
+        id: commit
+        uses: pr-mpt/actions-commit-hash@v2
+      - name: 🔧 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: 🐋 Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up Depot CLI
+        uses: depot/setup-action@v1
+      - name: 📦 Build backend and export to Docker
+        uses: depot/build-push-action@v1
+        with:
+          project: 64mmf0n610
+          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
+          load: true
+          context: backend
+          tags: infisical/infisical:test
+          platforms: linux/amd64,linux/arm64
+      - name: ⏻ Spawn backend container and dependencies
+        run: |
+          docker compose -f .github/resources/docker-compose.be-test.yml up --wait --quiet-pull
+      - name: 🧪 Test backend image
+        run: |
+          ./.github/resources/healthcheck.sh infisical-backend-test
+      - name: ⏻ Shut down backend container and dependencies
+        run: |
+          docker compose -f .github/resources/docker-compose.be-test.yml down
+      - name: 🏗️ Build backend and push
+        uses: depot/build-push-action@v1
+        with:
+          project: 64mmf0n610
+          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
+          push: true
+          context: backend
+          tags: |
+            infisical/backend:${{ steps.commit.outputs.short }}
+            infisical/backend:latest
+            infisical/backend:${{ steps.extract_version.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+
+  frontend-image:
+    name: Build frontend image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract version from tag
+        id: extract_version
+        run: echo "::set-output name=version::${GITHUB_REF_NAME#infisical/}"
+      - name: ☁️ Checkout source
+        uses: actions/checkout@v3
+      - name: Save commit hashes for tag
+        id: commit
+        uses: pr-mpt/actions-commit-hash@v2
+      - name: 🔧 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: 🐋 Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up Depot CLI
+        uses: depot/setup-action@v1
+      - name: 📦 Build frontend and export to Docker
+        uses: depot/build-push-action@v1
+        with:
+          load: true
+          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
+          project: 64mmf0n610
+          context: frontend
+          tags: infisical/frontend:test
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }}
+            NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }}
+      - name: ⏻ Spawn frontend container
+        run: |
+          docker run -d --rm --name infisical-frontend-test infisical/frontend:test
+      - name: 🧪 Test frontend image
+        run: |
+          ./.github/resources/healthcheck.sh infisical-frontend-test
+      - name: ⏻ Shut down frontend container
+        run: |
+          docker stop infisical-frontend-test
+      - name: 🏗️ Build frontend and push
+        uses: depot/build-push-action@v1
+        with:
+          project: 64mmf0n610
+          push: true
+          token: ${{ secrets.DEPOT_PROJECT_TOKEN }}
+          context: frontend
+          tags: |
+            infisical/frontend:${{ steps.commit.outputs.short }}
+            infisical/frontend:latest
+            infisical/frontend:${{ steps.extract_version.outputs.version }}
+          platforms: linux/amd64,linux/arm64
+          build-args: |
+            POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }}
+            NEXT_INFISICAL_PLATFORM_VERSION=${{ steps.extract_version.outputs.version }}

.github/workflows/nightly-tag-generation.yml

@@ -1,82 +0,0 @@
-name: Generate Nightly Tag
-
-on:
-  schedule:
-    - cron: '0 0 * * *'  # Run daily at midnight UTC
-  workflow_dispatch:  # Allow manual triggering for testing
-
-permissions:
-  contents: write
-
-jobs:
-  create-nightly-tag:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Fetch all history for tags
-          token: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
-      
-      - name: Configure Git
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-      
-      - name: Generate nightly tag
-        run: |
-          # Get the latest infisical production tag
-          LATEST_STABLE_TAG=$(git tag --list | grep "^v[0-9].*$" | grep -v "nightly" | sort -V | tail -n1)
-          
-          if [ -z "$LATEST_STABLE_TAG" ]; then
-            echo "No infisical production tags found, using v0.1.0"
-            LATEST_STABLE_TAG="v0.1.0"
-          fi
-          
-          echo "Latest production tag: $LATEST_STABLE_TAG"
-          
-          # Get current date in YYYYMMDD format
-          DATE=$(date +%Y%m%d)
-          
-          # Base nightly tag name
-          BASE_TAG="${LATEST_STABLE_TAG}-nightly-${DATE}"
-          
-          # Check if this exact tag already exists
-          if git tag --list | grep -q "^${BASE_TAG}$"; then
-            echo "Base tag ${BASE_TAG} already exists, finding next increment"
-            
-            # Find existing tags for this date and get the highest increment
-            EXISTING_TAGS=$(git tag --list | grep "^${BASE_TAG}" | grep -E '\.[0-9]+$' || true)
-            
-            if [ -z "$EXISTING_TAGS" ]; then
-              # No incremental tags exist, create .1
-              NIGHTLY_TAG="${BASE_TAG}.1"
-            else
-              # Find the highest increment
-              HIGHEST_INCREMENT=$(echo "$EXISTING_TAGS" | sed "s|^${BASE_TAG}\.||" | sort -n | tail -n1)
-              NEXT_INCREMENT=$((HIGHEST_INCREMENT + 1))
-              NIGHTLY_TAG="${BASE_TAG}.${NEXT_INCREMENT}"
-            fi
-          else
-            # Base tag doesn't exist, use it
-            NIGHTLY_TAG="$BASE_TAG"
-          fi
-          
-          echo "Generated nightly tag: $NIGHTLY_TAG"
-          echo "NIGHTLY_TAG=$NIGHTLY_TAG" >> $GITHUB_ENV
-          echo "LATEST_PRODUCTION_TAG=$LATEST_STABLE_TAG" >> $GITHUB_ENV
-
-          git tag "$NIGHTLY_TAG"
-          git push origin "$NIGHTLY_TAG"
-          echo "✅ Created and pushed nightly tag: $NIGHTLY_TAG"
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ env.NIGHTLY_TAG }}
-          name: ${{ env.NIGHTLY_TAG }}
-          draft: false
-          prerelease: true
-          generate_release_notes: true
-          make_latest: false

.github/workflows/release-standalone-docker-img-postgres-offical.yml

@@ -2,9 +2,7 @@ name: Release standalone docker image
 on:
     push:
         tags:
-            - "v*.*.*"
-            - "v*.*.*-nightly-*"
-            - "v*.*.*-nightly-*.*"
+            - "infisical/v*.*.*-postgres"
 
 jobs:
     infisical-tests:
@@ -19,7 +17,7 @@ jobs:
         steps:
             - name: Extract version from tag
               id: extract_version
-              run: echo "::set-output name=version::${GITHUB_REF_NAME}"
+              run: echo "::set-output name=version::${GITHUB_REF_NAME#infisical/}"
             - name: ☁️ Checkout source
               uses: actions/checkout@v3
               with:
@@ -55,7 +53,7 @@ jobs:
                   push: true
                   context: .
                   tags: |
-                      infisical/infisical:latest
+                      infisical/infisical:latest-postgres
                       infisical/infisical:${{ steps.commit.outputs.short }}
                       infisical/infisical:${{ steps.extract_version.outputs.version }}
                   platforms: linux/amd64,linux/arm64
@@ -71,7 +69,7 @@ jobs:
         steps:
             - name: Extract version from tag
               id: extract_version
-              run: echo "::set-output name=version::${GITHUB_REF_NAME}"
+              run: echo "::set-output name=version::${GITHUB_REF_NAME#infisical/}"
             - name: ☁️ Checkout source
               uses: actions/checkout@v3
               with:
@@ -107,7 +105,7 @@ jobs:
                   push: true
                   context: .
                   tags: |
-                      infisical/infisical-fips:latest
+                      infisical/infisical-fips:latest-postgres
                       infisical/infisical-fips:${{ steps.commit.outputs.short }}
                       infisical/infisical-fips:${{ steps.extract_version.outputs.version }}
                   platforms: linux/amd64,linux/arm64

.github/workflows/release_build_infisical_cli.yml

@@ -0,0 +1,153 @@
+name: Build and release CLI
+
+on:
+  workflow_dispatch:
+
+  push:
+    # run only against tags
+    tags:
+      - "infisical-cli/v*.*.*"
+
+permissions:
+  contents: write
+
+jobs:
+  cli-integration-tests:
+    name: Run tests before deployment
+    uses: ./.github/workflows/run-cli-tests.yml
+    secrets:
+      CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
+      CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
+      CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
+      CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
+      CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
+      CLI_TESTS_USER_EMAIL: ${{ secrets.CLI_TESTS_USER_EMAIL }}
+      CLI_TESTS_USER_PASSWORD: ${{ secrets.CLI_TESTS_USER_PASSWORD }}
+      CLI_TESTS_INFISICAL_VAULT_FILE_PASSPHRASE: ${{ secrets.CLI_TESTS_INFISICAL_VAULT_FILE_PASSPHRASE }}
+
+  npm-release:
+    runs-on: ubuntu-latest
+    env:
+      working-directory: ./npm
+    needs:
+      - cli-integration-tests
+      - goreleaser
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Extract version
+        run: |
+          VERSION=$(echo ${{ github.ref_name }} | sed 's/infisical-cli\/v//')
+          echo "Version extracted: $VERSION"
+          echo "CLI_VERSION=$VERSION" >> $GITHUB_ENV
+
+      - name: Print version
+        run: echo ${{ env.CLI_VERSION }}
+
+      - name: Setup Node
+        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0
+        with:
+          node-version: 20
+          cache: "npm"
+          cache-dependency-path: ./npm/package-lock.json
+      - name: Install dependencies
+        working-directory: ${{ env.working-directory }}
+        run: npm install --ignore-scripts
+
+      - name: Set NPM version
+        working-directory: ${{ env.working-directory }}
+        run: npm version ${{ env.CLI_VERSION }} --allow-same-version --no-git-tag-version
+
+      - name: Setup NPM
+        working-directory: ${{ env.working-directory }}
+        run: |
+          echo 'registry="https://registry.npmjs.org/"' > ./.npmrc
+          echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ./.npmrc
+
+          echo 'registry="https://registry.npmjs.org/"' > ~/.npmrc
+          echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Pack NPM
+        working-directory: ${{ env.working-directory }}
+        run: npm pack
+
+      - name: Publish NPM
+        working-directory: ${{ env.working-directory }}
+        run: npm publish --tarball=./infisical-sdk-${{github.ref_name}} --access public --registry=https://registry.npmjs.org/
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  goreleaser:
+    runs-on: ubuntu-latest-8-cores
+    needs: [cli-integration-tests]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: 🐋 Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: 🔧 Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - run: git fetch --force --tags
+      - run: echo "Ref name ${{github.ref_name}}"
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ">=1.19.3"
+          cache: true
+          cache-dependency-path: cli/go.sum
+      - name: Setup for libssl1.0-dev
+        run: |
+          echo 'deb http://security.ubuntu.com/ubuntu bionic-security main' | sudo tee -a /etc/apt/sources.list
+          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
+          sudo apt update
+          sudo apt-get install -y libssl1.0-dev
+      - name: OSXCross for CGO Support
+        run: |
+          mkdir ../../osxcross
+          git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target
+      - uses: goreleaser/goreleaser-action@v4
+        with:
+          distribution: goreleaser-pro
+          version: v1.26.2-pro
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
+          POSTHOG_API_KEY_FOR_CLI: ${{ secrets.POSTHOG_API_KEY_FOR_CLI }}
+          FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}
+          AUR_KEY: ${{ secrets.AUR_KEY }}
+          GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
+      - uses: actions/setup-python@v4
+      - run: pip install --upgrade cloudsmith-cli
+      - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252
+        with:
+          ruby-version: "3.3" # Not needed with a .ruby-version, .tool-versions or mise.toml
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install deb-s3
+        run: gem install deb-s3
+      - name: Configure GPG Key
+        run: echo -n "$GPG_SIGNING_KEY" | base64 --decode | gpg --batch --import
+        env:
+          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+          GPG_SIGNING_KEY_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSPHRASE }}
+      - name: Publish to CloudSmith
+        run: sh cli/upload_to_cloudsmith.sh
+        env:
+          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
+          INFISICAL_CLI_S3_BUCKET: ${{ secrets.INFISICAL_CLI_S3_BUCKET }}
+          INFISICAL_CLI_REPO_SIGNING_KEY_ID: ${{ secrets.INFISICAL_CLI_REPO_SIGNING_KEY_ID }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.INFISICAL_CLI_REPO_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.INFISICAL_CLI_REPO_AWS_SECRET_ACCESS_KEY }}
+      - name: Invalidate Cloudfront cache
+        run: aws cloudfront create-invalidation --distribution-id $CLOUDFRONT_DISTRIBUTION_ID --paths '/deb/dists/stable/*'
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.INFISICAL_CLI_REPO_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.INFISICAL_CLI_REPO_AWS_SECRET_ACCESS_KEY }}
+          CLOUDFRONT_DISTRIBUTION_ID: ${{ secrets.INFISICAL_CLI_REPO_CLOUDFRONT_DISTRIBUTION_ID }}

.github/workflows/release_docker_k8_operator.yaml

@@ -44,7 +44,10 @@ jobs:
 
             - name: Generate Helm Chart
               working-directory: k8-operator
-              run: make helm VERSION=${{ steps.extract_version.outputs.version }}
+              run: make helm
+
+            - name: Update Helm Chart Version
+              run: ./k8-operator/scripts/update-version.sh ${{ steps.extract_version.outputs.version }}
 
             - name: Debug - Check file changes
               run: |

.github/workflows/run-backend-tests.yml

@@ -16,16 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-
-
-      - name: Free up disk space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-          docker system prune -af
-          
       - name: ☁️ Checkout source
         uses: actions/checkout@v3
       - uses: KengoTODA/actions-setup-docker-compose@v1
@@ -44,8 +34,6 @@ jobs:
         working-directory: backend
       - name: Start postgres and redis
         run: touch .env && docker compose -f docker-compose.dev.yml up -d db redis
-      - name: Start Secret Rotation testing databases
-        run: docker compose -f docker-compose.e2e-dbs.yml up -d --wait --wait-timeout 300
       - name: Run unit test
         run: npm run test:unit
         working-directory: backend
@@ -53,9 +41,6 @@ jobs:
         run: npm run test:e2e
         working-directory: backend
         env:
-          E2E_TEST_ORACLE_DB_19_HOST: ${{ secrets.E2E_TEST_ORACLE_DB_19_HOST }}
-          E2E_TEST_ORACLE_DB_19_USERNAME: ${{ secrets.E2E_TEST_ORACLE_DB_19_USERNAME }}
-          E2E_TEST_ORACLE_DB_19_PASSWORD: ${{ secrets.E2E_TEST_ORACLE_DB_19_PASSWORD }}
           REDIS_URL: redis://172.17.0.1:6379
           DB_CONNECTION_URI: postgres://infisical:infisical@172.17.0.1:5432/infisical?sslmode=disable
           AUTH_SECRET: something-random

.github/workflows/run-cli-tests.yml

@@ -0,0 +1,55 @@
+name: Go CLI Tests
+
+on:
+    pull_request:
+        types: [opened, synchronize]
+        paths:
+            - "cli/**"
+
+    workflow_dispatch:
+
+    workflow_call:
+        secrets:
+            CLI_TESTS_UA_CLIENT_ID:
+                required: true
+            CLI_TESTS_UA_CLIENT_SECRET:
+                required: true
+            CLI_TESTS_SERVICE_TOKEN:
+                required: true
+            CLI_TESTS_PROJECT_ID:
+                required: true
+            CLI_TESTS_ENV_SLUG:
+                required: true
+            CLI_TESTS_USER_EMAIL:
+                required: true
+            CLI_TESTS_USER_PASSWORD:
+                required: true
+            CLI_TESTS_INFISICAL_VAULT_FILE_PASSPHRASE:
+                required: true
+jobs:
+    test:
+        defaults:
+            run:
+                working-directory: ./cli
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v4
+            - name: Setup Go
+              uses: actions/setup-go@v4
+              with:
+                  go-version: "1.21.x"
+            - name: Install dependencies
+              run: go get .
+            - name: Test with the Go CLI
+              env:
+                  CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
+                  CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
+                  CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
+                  CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
+                  CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
+                  CLI_TESTS_USER_EMAIL: ${{ secrets.CLI_TESTS_USER_EMAIL }}
+                  CLI_TESTS_USER_PASSWORD: ${{ secrets.CLI_TESTS_USER_PASSWORD }}
+                #   INFISICAL_VAULT_FILE_PASSPHRASE: ${{ secrets.CLI_TESTS_INFISICAL_VAULT_FILE_PASSPHRASE }}
+
+              run: go test -v -count=1 ./test

.goreleaser.yaml

@@ -0,0 +1,241 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
+# Make sure to check the documentation at https://goreleaser.com
+# before:
+#   hooks:
+#     # You may remove this if you don't use go modules.
+#     - cd cli && go mod tidy
+#     # you may remove this if you don't need go generate
+#     - cd cli && go generate ./...
+before:
+  hooks:
+    - ./cli/scripts/completions.sh
+    - ./cli/scripts/manpages.sh
+
+monorepo:
+  tag_prefix: infisical-cli/
+  dir: cli
+
+builds:
+  - id: darwin-build
+    binary: infisical
+    ldflags:
+      - -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
+      - -X github.com/Infisical/infisical-merge/packages/telemetry.POSTHOG_API_KEY_FOR_CLI={{ .Env.POSTHOG_API_KEY_FOR_CLI }}
+    flags:
+      - -trimpath
+    env:
+      - CGO_ENABLED=1
+      - CC=/home/runner/work/osxcross/target/bin/o64-clang
+      - CXX=/home/runner/work/osxcross/target/bin/o64-clang++
+    goos:
+      - darwin
+    ignore:
+      - goos: darwin
+        goarch: "386"
+    dir: ./cli
+
+  - id: all-other-builds
+    env:
+      - CGO_ENABLED=0
+    binary: infisical
+    ldflags:
+      - -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
+      - -X github.com/Infisical/infisical-merge/packages/telemetry.POSTHOG_API_KEY_FOR_CLI={{ .Env.POSTHOG_API_KEY_FOR_CLI }}
+    flags:
+      - -trimpath
+    goos:
+      - freebsd
+      - linux
+      - netbsd
+      - openbsd
+      - windows
+    goarch:
+      - "386"
+      - amd64
+      - arm
+      - arm64
+    goarm:
+      - "6"
+      - "7"
+    ignore:
+      - goos: windows
+        goarch: "386"
+      - goos: freebsd
+        goarch: "386"
+    dir: ./cli
+
+archives:
+  - format_overrides:
+      - goos: windows
+        format: zip
+    files:
+      - ../README*
+      - ../LICENSE*
+      - ../manpages/*
+      - ../completions/*
+
+release:
+  replace_existing_draft: true
+  mode: "replace"
+
+checksum:
+  name_template: "checksums.txt"
+
+snapshot:
+  name_template: "{{ .Version }}-devel"
+
+# publishers:
+#   - name: fury.io
+#     ids:
+#       - infisical
+#     dir: "{{ dir .ArtifactPath }}"
+#     cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/
+
+brews:
+  - name: infisical
+    tap:
+      owner: Infisical
+      name: homebrew-get-cli
+    commit_author:
+      name: "Infisical"
+      email: ai@infisical.com
+    folder: Formula
+    homepage: "https://infisical.com"
+    description: "The official Infisical CLI"
+    install: |-
+      bin.install "infisical"
+      bash_completion.install "completions/infisical.bash" => "infisical"
+      zsh_completion.install "completions/infisical.zsh" => "_infisical"
+      fish_completion.install "completions/infisical.fish"
+      man1.install "manpages/infisical.1.gz"
+  - name: "infisical@{{.Version}}"
+    tap:
+      owner: Infisical
+      name: homebrew-get-cli
+    commit_author:
+      name: "Infisical"
+      email: ai@infisical.com
+    folder: Formula
+    homepage: "https://infisical.com"
+    description: "The official Infisical CLI"
+    install: |-
+      bin.install "infisical"
+      bash_completion.install "completions/infisical.bash" => "infisical"
+      zsh_completion.install "completions/infisical.zsh" => "_infisical"
+      fish_completion.install "completions/infisical.fish"
+      man1.install "manpages/infisical.1.gz"
+
+nfpms:
+  - id: infisical
+    package_name: infisical
+    builds:
+      - all-other-builds
+    vendor: Infisical, Inc
+    homepage: https://infisical.com/
+    maintainer: Infisical, Inc
+    description: The offical Infisical CLI
+    license: MIT
+    formats:
+      - rpm
+      - deb
+      - apk
+      - archlinux
+    bindir: /usr/bin
+    contents:
+      - src: ./completions/infisical.bash
+        dst: /etc/bash_completion.d/infisical
+      - src: ./completions/infisical.fish
+        dst: /usr/share/fish/vendor_completions.d/infisical.fish
+      - src: ./completions/infisical.zsh
+        dst: /usr/share/zsh/site-functions/_infisical
+      - src: ./manpages/infisical.1.gz
+        dst: /usr/share/man/man1/infisical.1.gz
+
+scoop:
+  bucket:
+    owner: Infisical
+    name: scoop-infisical
+  commit_author:
+    name: "Infisical"
+    email: ai@infisical.com
+  homepage: "https://infisical.com"
+  description: "The official Infisical CLI"
+  license: MIT
+
+winget:
+  - name: infisical
+    publisher: infisical
+    license: MIT
+    homepage: https://infisical.com
+    short_description: "The official Infisical CLI"
+    repository:
+      owner: infisical
+      name: winget-pkgs
+      branch: "infisical-{{.Version}}"
+      pull_request:
+        enabled: true
+        draft: false
+        base:
+          owner: microsoft
+          name: winget-pkgs
+          branch: master
+
+aurs:
+  - name: infisical-bin
+    homepage: "https://infisical.com"
+    description: "The official Infisical CLI"
+    maintainers:
+      - Infisical, Inc <support@infisical.com>
+    license: MIT
+    private_key: "{{ .Env.AUR_KEY }}"
+    git_url: "ssh://aur@aur.archlinux.org/infisical-bin.git"
+    package: |-
+      # bin
+      install -Dm755 "./infisical" "${pkgdir}/usr/bin/infisical"
+      # license
+      install -Dm644 "./LICENSE" "${pkgdir}/usr/share/licenses/infisical/LICENSE"
+      # completions
+      mkdir -p "${pkgdir}/usr/share/bash-completion/completions/"
+      mkdir -p "${pkgdir}/usr/share/zsh/site-functions/"
+      mkdir -p "${pkgdir}/usr/share/fish/vendor_completions.d/"
+      install -Dm644 "./completions/infisical.bash" "${pkgdir}/usr/share/bash-completion/completions/infisical"
+      install -Dm644 "./completions/infisical.zsh" "${pkgdir}/usr/share/zsh/site-functions/_infisical"
+      install -Dm644 "./completions/infisical.fish" "${pkgdir}/usr/share/fish/vendor_completions.d/infisical.fish"
+      # man pages
+      install -Dm644 "./manpages/infisical.1.gz" "${pkgdir}/usr/share/man/man1/infisical.1.gz"
+
+dockers:
+  - dockerfile: docker/alpine
+    goos: linux
+    goarch: amd64
+    use: buildx
+    ids:
+      - all-other-builds
+    image_templates:
+      - "infisical/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64"
+      - "infisical/cli:latest-amd64"
+    build_flag_templates:
+      - "--pull"
+      - "--platform=linux/amd64"
+  - dockerfile: docker/alpine
+    goos: linux
+    goarch: amd64
+    use: buildx
+    ids:
+      - all-other-builds
+    image_templates:
+      - "infisical/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64"
+      - "infisical/cli:latest-arm64"
+    build_flag_templates:
+      - "--pull"
+      - "--platform=linux/arm64"
+
+docker_manifests:
+  - name_template: "infisical/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
+    image_templates:
+      - "infisical/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-amd64"
+      - "infisical/cli:{{ .Major }}.{{ .Minor }}.{{ .Patch }}-arm64"
+  - name_template: "infisical/cli:latest"
+    image_templates:
+      - "infisical/cli:latest-amd64"
+      - "infisical/cli:latest-arm64"

.infisicalignore

@@ -50,4 +50,3 @@ docs/integrations/app-connections/zabbix.mdx:generic-api-key:91
 docs/integrations/app-connections/bitbucket.mdx:generic-api-key:123
 docs/integrations/app-connections/railway.mdx:generic-api-key:156
 .github/workflows/validate-db-schemas.yml:generic-api-key:21
-k8-operator/config/samples/universalAuthIdentitySecret.yaml:generic-api-key:8

Dockerfile.fips.standalone-infisical

@@ -34,8 +34,6 @@ ENV VITE_INFISICAL_PLATFORM_VERSION $INFISICAL_PLATFORM_VERSION
 ARG CAPTCHA_SITE_KEY
 ENV VITE_CAPTCHA_SITE_KEY $CAPTCHA_SITE_KEY
 
-ENV NODE_OPTIONS="--max-old-space-size=8192"
-
 # Build
 RUN npm run build
 
@@ -211,11 +209,6 @@ EXPOSE 443
 RUN grep -v 'import "./lib/telemetry/instrumentation.mjs";' dist/main.mjs > dist/main.mjs.tmp && \
     mv dist/main.mjs.tmp dist/main.mjs
 
-# The OpenSSL library is installed in different locations in different architectures (x86_64 and arm64).
-# This is a workaround to avoid errors when the library is not found.
-RUN ln -sf /usr/local/lib64/ossl-modules /usr/local/lib/ossl-modules || \
-    ln -sf /usr/local/lib/ossl-modules /usr/local/lib64/ossl-modules
-
 USER non-root-user
 
 CMD ["./standalone-entrypoint.sh"]

Dockerfile.standalone-infisical

@@ -55,8 +55,6 @@ USER non-root-user
 ##
 FROM base AS backend-build
 
-ENV ChrystokiConfigurationPath=/usr/safenet/lunaclient/
-
 WORKDIR /app
 
 # Install all required dependencies for build
@@ -86,8 +84,6 @@ RUN npm run build
 # Production stage
 FROM base AS backend-runner
 
-ENV ChrystokiConfigurationPath=/usr/safenet/lunaclient/
-
 WORKDIR /app
 
 # Install all required dependencies for runtime
@@ -116,11 +112,6 @@ RUN mkdir frontend-build
 FROM base AS production
 
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    autoconf \
-    automake \
-    libtool \
-    libssl-dev \
     ca-certificates \
     bash \
     curl \
@@ -180,7 +171,6 @@ ENV NODE_ENV production
 ENV STANDALONE_BUILD true
 ENV STANDALONE_MODE true
 ENV NODE_OPTIONS="--max-old-space-size=1024"
-ENV ChrystokiConfigurationPath=/usr/safenet/lunaclient/
 
 WORKDIR /backend
 

backend/e2e-test/mocks/queue.ts

@@ -0,0 +1,34 @@
+import { TQueueServiceFactory } from "@app/queue";
+
+export const mockQueue = (): TQueueServiceFactory => {
+  const queues: Record<string, unknown> = {};
+  const workers: Record<string, unknown> = {};
+  const job: Record<string, unknown> = {};
+  const events: Record<string, unknown> = {};
+
+  return {
+    queue: async (name, jobData) => {
+      job[name] = jobData;
+    },
+    queuePg: async () => {},
+    schedulePg: async () => {},
+    initialize: async () => {},
+    shutdown: async () => undefined,
+    stopRepeatableJob: async () => true,
+    start: (name, jobFn) => {
+      queues[name] = jobFn;
+      workers[name] = jobFn;
+    },
+    startPg: async () => {},
+    listen: (name, event) => {
+      events[name] = event;
+    },
+    getRepeatableJobs: async () => [],
+    getDelayedJobs: async () => [],
+    clearQueue: async () => {},
+    stopJobById: async () => {},
+    stopJobByIdPg: async () => {},
+    stopRepeatableJobByJobId: async () => true,
+    stopRepeatableJobByKey: async () => true
+  };
+};

backend/e2e-test/routes/v3/secret-rotations.spec.ts

@@ -1,726 +0,0 @@
-/* eslint-disable no-promise-executor-return */
-/* eslint-disable no-await-in-loop */
-import knex from "knex";
-import { v4 as uuidv4 } from "uuid";
-
-import { seedData1 } from "@app/db/seed-data";
-
-enum SecretRotationType {
-  OracleDb = "oracledb",
-  MySQL = "mysql",
-  Postgres = "postgres"
-}
-
-type TGenericSqlCredentials = {
-  host: string;
-  port: number;
-  username: string;
-  password: string;
-  database: string;
-};
-
-type TSecretMapping = {
-  username: string;
-  password: string;
-};
-
-type TDatabaseUserCredentials = {
-  username: string;
-};
-
-const formatSqlUsername = (username: string) => `${username}_${uuidv4().slice(0, 8).replace(/-/g, "").toUpperCase()}`;
-
-const getSecretValue = async (secretKey: string) => {
-  const passwordSecret = await testServer.inject({
-    url: `/api/v3/secrets/raw/${secretKey}`,
-    method: "GET",
-    query: {
-      workspaceId: seedData1.projectV3.id,
-      environment: seedData1.environment.slug
-    },
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    }
-  });
-
-  expect(passwordSecret.statusCode).toBe(200);
-  expect(passwordSecret.json().secret).toBeDefined();
-
-  const passwordSecretJson = JSON.parse(passwordSecret.payload);
-
-  return passwordSecretJson.secret.secretValue as string;
-};
-
-const deleteSecretRotation = async (id: string, type: SecretRotationType) => {
-  const res = await testServer.inject({
-    method: "DELETE",
-    query: {
-      deleteSecrets: "true",
-      revokeGeneratedCredentials: "true"
-    },
-    url: `/api/v2/secret-rotations/${type}-credentials/${id}`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    }
-  });
-
-  expect(res.statusCode).toBe(200);
-};
-
-const deleteAppConnection = async (id: string, type: SecretRotationType) => {
-  const res = await testServer.inject({
-    method: "DELETE",
-    url: `/api/v1/app-connections/${type}/${id}`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    }
-  });
-
-  expect(res.statusCode).toBe(200);
-};
-
-const createOracleDBAppConnection = async (credentials: TGenericSqlCredentials) => {
-  const createOracleDBAppConnectionReqBody = {
-    credentials: {
-      database: credentials.database,
-      host: credentials.host,
-      username: credentials.username,
-      password: credentials.password,
-      port: credentials.port,
-      sslEnabled: true,
-      sslRejectUnauthorized: true
-    },
-    name: `oracle-db-${uuidv4()}`,
-    description: "Test OracleDB App Connection",
-    gatewayId: null,
-    isPlatformManagedCredentials: false,
-    method: "username-and-password"
-  };
-
-  const res = await testServer.inject({
-    method: "POST",
-    url: `/api/v1/app-connections/oracledb`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    },
-    body: createOracleDBAppConnectionReqBody
-  });
-
-  const json = JSON.parse(res.payload);
-
-  expect(res.statusCode).toBe(200);
-  expect(json.appConnection).toBeDefined();
-
-  return json.appConnection.id as string;
-};
-
-const createMySQLAppConnection = async (credentials: TGenericSqlCredentials) => {
-  const createMySQLAppConnectionReqBody = {
-    name: `mysql-test-${uuidv4()}`,
-    description: "test-mysql",
-    gatewayId: null,
-    method: "username-and-password",
-    credentials: {
-      host: credentials.host,
-      port: credentials.port,
-      database: credentials.database,
-      username: credentials.username,
-      password: credentials.password,
-      sslEnabled: false,
-      sslRejectUnauthorized: true
-    }
-  };
-
-  const res = await testServer.inject({
-    method: "POST",
-    url: `/api/v1/app-connections/mysql`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    },
-    body: createMySQLAppConnectionReqBody
-  });
-
-  const json = JSON.parse(res.payload);
-
-  expect(res.statusCode).toBe(200);
-  expect(json.appConnection).toBeDefined();
-
-  return json.appConnection.id as string;
-};
-
-const createPostgresAppConnection = async (credentials: TGenericSqlCredentials) => {
-  const createPostgresAppConnectionReqBody = {
-    credentials: {
-      host: credentials.host,
-      port: credentials.port,
-      database: credentials.database,
-      username: credentials.username,
-      password: credentials.password,
-      sslEnabled: false,
-      sslRejectUnauthorized: true
-    },
-    name: `postgres-test-${uuidv4()}`,
-    description: "test-postgres",
-    gatewayId: null,
-    method: "username-and-password"
-  };
-
-  const res = await testServer.inject({
-    method: "POST",
-    url: `/api/v1/app-connections/postgres`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    },
-    body: createPostgresAppConnectionReqBody
-  });
-
-  const json = JSON.parse(res.payload);
-
-  expect(res.statusCode).toBe(200);
-  expect(json.appConnection).toBeDefined();
-
-  return json.appConnection.id as string;
-};
-
-const createOracleInfisicalUsers = async (
-  credentials: TGenericSqlCredentials,
-  userCredentials: TDatabaseUserCredentials[]
-) => {
-  const client = knex({
-    client: "oracledb",
-    connection: {
-      database: credentials.database,
-      port: credentials.port,
-      host: credentials.host,
-      user: credentials.username,
-      password: credentials.password,
-      connectionTimeoutMillis: 10000,
-      ssl: {
-        // @ts-expect-error - this is a valid property for the ssl object
-        sslServerDNMatch: true
-      }
-    }
-  });
-
-  for await (const { username } of userCredentials) {
-    // check if user exists, and if it does, don't create it
-    const existingUser = await client.raw(`SELECT * FROM all_users WHERE username = '${username}'`);
-
-    if (!existingUser.length) {
-      await client.raw(`CREATE USER ${username} IDENTIFIED BY "temporary_password"`);
-    }
-    await client.raw(`GRANT ALL PRIVILEGES TO ${username} WITH ADMIN OPTION`);
-  }
-
-  await client.destroy();
-};
-
-const createMySQLInfisicalUsers = async (
-  credentials: TGenericSqlCredentials,
-  userCredentials: TDatabaseUserCredentials[]
-) => {
-  const client = knex({
-    client: "mysql2",
-    connection: {
-      database: credentials.database,
-      port: credentials.port,
-      host: credentials.host,
-      user: credentials.username,
-      password: credentials.password,
-      connectionTimeoutMillis: 10000
-    }
-  });
-
-  // Fix: Ensure root has GRANT OPTION privileges
-  try {
-    await client.raw("GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;");
-    await client.raw("FLUSH PRIVILEGES;");
-  } catch (error) {
-    // Ignore if already has privileges
-  }
-
-  for await (const { username } of userCredentials) {
-    // check if user exists, and if it does, dont create it
-
-    const existingUser = await client.raw(`SELECT * FROM mysql.user WHERE user = '${username}'`);
-
-    if (!existingUser[0].length) {
-      await client.raw(`CREATE USER '${username}'@'%' IDENTIFIED BY 'temporary_password';`);
-    }
-
-    await client.raw(`GRANT ALL PRIVILEGES ON \`${credentials.database}\`.* TO '${username}'@'%';`);
-    await client.raw("FLUSH PRIVILEGES;");
-  }
-
-  await client.destroy();
-};
-
-const createPostgresInfisicalUsers = async (
-  credentials: TGenericSqlCredentials,
-  userCredentials: TDatabaseUserCredentials[]
-) => {
-  const client = knex({
-    client: "pg",
-    connection: {
-      database: credentials.database,
-      port: credentials.port,
-      host: credentials.host,
-      user: credentials.username,
-      password: credentials.password,
-      connectionTimeoutMillis: 10000
-    }
-  });
-
-  for await (const { username } of userCredentials) {
-    // check if user exists, and if it does, don't create it
-    const existingUser = await client.raw("SELECT * FROM pg_catalog.pg_user WHERE usename = ?", [username]);
-
-    if (!existingUser.rows.length) {
-      await client.raw(`CREATE USER "${username}" WITH PASSWORD 'temporary_password'`);
-    }
-
-    await client.raw("GRANT ALL PRIVILEGES ON DATABASE ?? TO ??", [credentials.database, username]);
-  }
-
-  await client.destroy();
-};
-
-const createOracleDBSecretRotation = async (
-  appConnectionId: string,
-  credentials: TGenericSqlCredentials,
-  userCredentials: TDatabaseUserCredentials[],
-  secretMapping: TSecretMapping
-) => {
-  const now = new Date();
-  const rotationTime = new Date(now.getTime() - 2 * 60 * 1000); // 2 minutes ago
-
-  await createOracleInfisicalUsers(credentials, userCredentials);
-
-  const createOracleDBSecretRotationReqBody = {
-    parameters: userCredentials.reduce(
-      (acc, user, index) => {
-        acc[`username${index + 1}`] = user.username;
-        return acc;
-      },
-      {} as Record<string, string>
-    ),
-    secretsMapping: {
-      username: secretMapping.username,
-      password: secretMapping.password
-    },
-    name: `test-oracle-${uuidv4()}`,
-    description: "Test OracleDB Secret Rotation",
-    secretPath: "/",
-    isAutoRotationEnabled: true,
-    rotationInterval: 5, // 5 seconds for testing
-    rotateAtUtc: {
-      hours: rotationTime.getUTCHours(),
-      minutes: rotationTime.getUTCMinutes()
-    },
-    connectionId: appConnectionId,
-    environment: seedData1.environment.slug,
-    projectId: seedData1.projectV3.id
-  };
-
-  const res = await testServer.inject({
-    method: "POST",
-    url: `/api/v2/secret-rotations/oracledb-credentials`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    },
-    body: createOracleDBSecretRotationReqBody
-  });
-
-  expect(res.statusCode).toBe(200);
-  expect(res.json().secretRotation).toBeDefined();
-
-  return res;
-};
-
-const createMySQLSecretRotation = async (
-  appConnectionId: string,
-  credentials: TGenericSqlCredentials,
-  userCredentials: TDatabaseUserCredentials[],
-  secretMapping: TSecretMapping
-) => {
-  const now = new Date();
-  const rotationTime = new Date(now.getTime() - 2 * 60 * 1000); // 2 minutes ago
-
-  await createMySQLInfisicalUsers(credentials, userCredentials);
-
-  const createMySQLSecretRotationReqBody = {
-    parameters: userCredentials.reduce(
-      (acc, user, index) => {
-        acc[`username${index + 1}`] = user.username;
-        return acc;
-      },
-      {} as Record<string, string>
-    ),
-    secretsMapping: {
-      username: secretMapping.username,
-      password: secretMapping.password
-    },
-    name: `test-mysql-rotation-${uuidv4()}`,
-    description: "Test MySQL Secret Rotation",
-    secretPath: "/",
-    isAutoRotationEnabled: true,
-    rotationInterval: 5,
-    rotateAtUtc: {
-      hours: rotationTime.getUTCHours(),
-      minutes: rotationTime.getUTCMinutes()
-    },
-    connectionId: appConnectionId,
-    environment: seedData1.environment.slug,
-    projectId: seedData1.projectV3.id
-  };
-
-  const res = await testServer.inject({
-    method: "POST",
-    url: `/api/v2/secret-rotations/mysql-credentials`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    },
-    body: createMySQLSecretRotationReqBody
-  });
-
-  expect(res.statusCode).toBe(200);
-  expect(res.json().secretRotation).toBeDefined();
-
-  return res;
-};
-
-const createPostgresSecretRotation = async (
-  appConnectionId: string,
-  credentials: TGenericSqlCredentials,
-  userCredentials: TDatabaseUserCredentials[],
-  secretMapping: TSecretMapping
-) => {
-  const now = new Date();
-  const rotationTime = new Date(now.getTime() - 2 * 60 * 1000); // 2 minutes ago
-
-  await createPostgresInfisicalUsers(credentials, userCredentials);
-
-  const createPostgresSecretRotationReqBody = {
-    parameters: userCredentials.reduce(
-      (acc, user, index) => {
-        acc[`username${index + 1}`] = user.username;
-        return acc;
-      },
-      {} as Record<string, string>
-    ),
-    secretsMapping: {
-      username: secretMapping.username,
-      password: secretMapping.password
-    },
-    name: `test-postgres-rotation-${uuidv4()}`,
-    description: "Test Postgres Secret Rotation",
-    secretPath: "/",
-    isAutoRotationEnabled: true,
-    rotationInterval: 5,
-    rotateAtUtc: {
-      hours: rotationTime.getUTCHours(),
-      minutes: rotationTime.getUTCMinutes()
-    },
-    connectionId: appConnectionId,
-    environment: seedData1.environment.slug,
-    projectId: seedData1.projectV3.id
-  };
-
-  const res = await testServer.inject({
-    method: "POST",
-    url: `/api/v2/secret-rotations/postgres-credentials`,
-    headers: {
-      authorization: `Bearer ${jwtAuthToken}`
-    },
-    body: createPostgresSecretRotationReqBody
-  });
-
-  expect(res.statusCode).toBe(200);
-  expect(res.json().secretRotation).toBeDefined();
-
-  return res;
-};
-
-describe("Secret Rotations", async () => {
-  const testCases = [
-    {
-      type: SecretRotationType.MySQL,
-      name: "MySQL (8.4.6) Secret Rotation",
-      dbCredentials: {
-        database: "mysql-test",
-        host: "127.0.0.1",
-        username: "root",
-        password: "mysql-test",
-        port: 3306
-      },
-      secretMapping: {
-        username: formatSqlUsername("MYSQL_USERNAME"),
-        password: formatSqlUsername("MYSQL_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("MYSQL_USER_1")
-        },
-        {
-          username: formatSqlUsername("MYSQL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.MySQL,
-      name: "MySQL (8.0.29) Secret Rotation",
-      dbCredentials: {
-        database: "mysql-test",
-        host: "127.0.0.1",
-        username: "root",
-        password: "mysql-test",
-        port: 3307
-      },
-      secretMapping: {
-        username: formatSqlUsername("MYSQL_USERNAME"),
-        password: formatSqlUsername("MYSQL_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("MYSQL_USER_1")
-        },
-        {
-          username: formatSqlUsername("MYSQL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.MySQL,
-      name: "MySQL (5.7.31) Secret Rotation",
-      dbCredentials: {
-        database: "mysql-test",
-        host: "127.0.0.1",
-        username: "root",
-        password: "mysql-test",
-        port: 3308
-      },
-      secretMapping: {
-        username: formatSqlUsername("MYSQL_USERNAME"),
-        password: formatSqlUsername("MYSQL_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("MYSQL_USER_1")
-        },
-        {
-          username: formatSqlUsername("MYSQL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.OracleDb,
-      name: "OracleDB (23.8) Secret Rotation",
-      dbCredentials: {
-        database: "FREEPDB1",
-        host: "127.0.0.1",
-        username: "system",
-        password: "pdb-password",
-        port: 1521
-      },
-      secretMapping: {
-        username: formatSqlUsername("ORACLEDB_USERNAME"),
-        password: formatSqlUsername("ORACLEDB_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("INFISICAL_USER_1")
-        },
-        {
-          username: formatSqlUsername("INFISICAL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.OracleDb,
-      name: "OracleDB (19.3) Secret Rotation",
-      skippable: true,
-      dbCredentials: {
-        password: process.env.E2E_TEST_ORACLE_DB_19_PASSWORD!,
-        host: process.env.E2E_TEST_ORACLE_DB_19_HOST!,
-        username: process.env.E2E_TEST_ORACLE_DB_19_USERNAME!,
-        port: 1521,
-        database: "ORCLPDB1"
-      },
-      secretMapping: {
-        username: formatSqlUsername("ORACLEDB_USERNAME"),
-        password: formatSqlUsername("ORACLEDB_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("INFISICAL_USER_1")
-        },
-        {
-          username: formatSqlUsername("INFISICAL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.Postgres,
-      name: "Postgres (17) Secret Rotation",
-      dbCredentials: {
-        database: "postgres-test",
-        host: "127.0.0.1",
-        username: "postgres-test",
-        password: "postgres-test",
-        port: 5433
-      },
-      secretMapping: {
-        username: formatSqlUsername("POSTGRES_USERNAME"),
-        password: formatSqlUsername("POSTGRES_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("INFISICAL_USER_1")
-        },
-        {
-          username: formatSqlUsername("INFISICAL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.Postgres,
-      name: "Postgres (16) Secret Rotation",
-      dbCredentials: {
-        database: "postgres-test",
-        host: "127.0.0.1",
-        username: "postgres-test",
-        password: "postgres-test",
-        port: 5434
-      },
-      secretMapping: {
-        username: formatSqlUsername("POSTGRES_USERNAME"),
-        password: formatSqlUsername("POSTGRES_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("INFISICAL_USER_1")
-        },
-        {
-          username: formatSqlUsername("INFISICAL_USER_2")
-        }
-      ]
-    },
-    {
-      type: SecretRotationType.Postgres,
-      name: "Postgres (10.12) Secret Rotation",
-      dbCredentials: {
-        database: "postgres-test",
-        host: "127.0.0.1",
-        username: "postgres-test",
-        password: "postgres-test",
-        port: 5435
-      },
-      secretMapping: {
-        username: formatSqlUsername("POSTGRES_USERNAME"),
-        password: formatSqlUsername("POSTGRES_PASSWORD")
-      },
-      userCredentials: [
-        {
-          username: formatSqlUsername("INFISICAL_USER_1")
-        },
-        {
-          username: formatSqlUsername("INFISICAL_USER_2")
-        }
-      ]
-    }
-  ] as {
-    skippable?: boolean;
-    type: SecretRotationType;
-    name: string;
-    dbCredentials: TGenericSqlCredentials;
-    secretMapping: TSecretMapping;
-    userCredentials: TDatabaseUserCredentials[];
-  }[];
-
-  const createAppConnectionMap = {
-    [SecretRotationType.OracleDb]: createOracleDBAppConnection,
-    [SecretRotationType.MySQL]: createMySQLAppConnection,
-    [SecretRotationType.Postgres]: createPostgresAppConnection
-  };
-
-  const createRotationMap = {
-    [SecretRotationType.OracleDb]: createOracleDBSecretRotation,
-    [SecretRotationType.MySQL]: createMySQLSecretRotation,
-    [SecretRotationType.Postgres]: createPostgresSecretRotation
-  };
-
-  const appConnectionIds: { id: string; type: SecretRotationType }[] = [];
-  const secretRotationIds: { id: string; type: SecretRotationType }[] = [];
-
-  afterAll(async () => {
-    for (const { id, type } of secretRotationIds) {
-      await deleteSecretRotation(id, type);
-    }
-
-    for (const { id, type } of appConnectionIds) {
-      await deleteAppConnection(id, type);
-    }
-  });
-
-  testCases.forEach(({ skippable, dbCredentials, secretMapping, userCredentials, type, name }) => {
-    const shouldSkip = () => {
-      if (skippable) {
-        if (type === SecretRotationType.OracleDb) {
-          if (!process.env.E2E_TEST_ORACLE_DB_19_HOST) {
-            return true;
-          }
-        }
-      }
-
-      return false;
-    };
-
-    if (shouldSkip()) {
-      test.skip(`Skipping Secret Rotation for ${type} (${name}) because E2E_TEST_ORACLE_DB_19_HOST is not set`);
-    } else {
-      test.concurrent(
-        `Create secret rotation for ${name}`,
-        async () => {
-          const appConnectionId = await createAppConnectionMap[type](dbCredentials);
-
-          if (appConnectionId) {
-            appConnectionIds.push({ id: appConnectionId, type });
-          }
-
-          const res = await createRotationMap[type](appConnectionId, dbCredentials, userCredentials, secretMapping);
-
-          const resJson = JSON.parse(res.payload);
-
-          if (resJson.secretRotation) {
-            secretRotationIds.push({ id: resJson.secretRotation.id, type });
-          }
-
-          const startSecretValue = await getSecretValue(secretMapping.password);
-          expect(startSecretValue).toBeDefined();
-
-          let attempts = 0;
-          while (attempts < 60) {
-            const currentSecretValue = await getSecretValue(secretMapping.password);
-
-            if (currentSecretValue !== startSecretValue) {
-              break;
-            }
-
-            attempts += 1;
-            await new Promise((resolve) => setTimeout(resolve, 2_500));
-          }
-
-          if (attempts >= 60) {
-            throw new Error("Secret rotation failed to rotate after 60 attempts");
-          }
-
-          const finalSecretValue = await getSecretValue(secretMapping.password);
-          expect(finalSecretValue).not.toBe(startSecretValue);
-        },
-        {
-          timeout: 300_000
-        }
-      );
-    }
-  });
-});

backend/e2e-test/vitest-environment-knex.ts

@@ -18,7 +18,6 @@ import { keyStoreFactory } from "@app/keystore/keystore";
 import { initializeHsmModule } from "@app/ee/services/hsm/hsm-fns";
 import { buildRedisFromConfig } from "@app/lib/config/redis";
 import { superAdminDALFactory } from "@app/services/super-admin/super-admin-dal";
-import { bootstrapCheck } from "@app/server/boot-strap-check";
 
 dotenv.config({ path: path.join(__dirname, "../../.env.test"), debug: true });
 export default {
@@ -64,8 +63,6 @@ export default {
       const queue = queueServiceFactory(envCfg, { dbConnectionUrl: envCfg.DB_CONNECTION_URI });
       const keyStore = keyStoreFactory(envCfg);
 
-      await queue.initialize();
-
       const hsmModule = initializeHsmModule(envCfg);
       hsmModule.initialize();
 
@@ -81,13 +78,9 @@ export default {
         envConfig: envCfg
       });
 
-      await bootstrapCheck({ db });
-
       // @ts-expect-error type
       globalThis.testServer = server;
       // @ts-expect-error type
-      globalThis.testQueue = queue;
-      // @ts-expect-error type
       globalThis.testSuperAdminDAL = superAdminDAL;
       // @ts-expect-error type
       globalThis.jwtAuthToken = crypto.jwt().sign(
@@ -112,8 +105,6 @@ export default {
     // custom setup
     return {
       async teardown() {
-        // @ts-expect-error type
-        await globalThis.testQueue.shutdown();
         // @ts-expect-error type
         await globalThis.testServer.close();
         // @ts-expect-error type
@@ -121,9 +112,7 @@ export default {
         // @ts-expect-error type
         delete globalThis.testSuperAdminDAL;
         // @ts-expect-error type
-        delete globalThis.jwtAuthToken;
-        // @ts-expect-error type
-        delete globalThis.testQueue;
+        delete globalThis.jwtToken;
         // called after all tests with this env have been run
         await db.migrate.rollback(
           {

backend/package-lock.json

@@ -7,6 +7,7 @@
     "": {
       "name": "backend",
       "version": "1.0.0",
+      "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
         "@aws-sdk/client-elasticache": "^3.637.0",
@@ -33,12 +34,11 @@
         "@gitbeaker/rest": "^42.5.0",
         "@google-cloud/kms": "^4.5.0",
         "@infisical/quic": "^1.0.8",
-        "@node-saml/passport-saml": "^5.1.0",
+        "@node-saml/passport-saml": "^5.0.1",
         "@octokit/auth-app": "^7.1.1",
         "@octokit/core": "^5.2.1",
         "@octokit/plugin-paginate-graphql": "^4.0.1",
         "@octokit/plugin-retry": "^5.0.5",
-        "@octokit/request": "8.4.1",
         "@octokit/rest": "^20.0.2",
         "@octokit/webhooks-types": "^7.3.1",
         "@octopusdeploy/api-client": "^3.4.1",
@@ -9574,20 +9574,20 @@
       }
     },
     "node_modules/@node-saml/node-saml": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@node-saml/node-saml/-/node-saml-5.1.0.tgz",
-      "integrity": "sha512-t3cJnZ4aC7HhPZ6MGylGZULvUtBOZ6FzuUndaHGXjmIZHXnLfC/7L8a57O9Q9V7AxJGKAiRM5zu2wNm9EsvQpw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@node-saml/node-saml/-/node-saml-5.0.1.tgz",
+      "integrity": "sha512-YQzFPEC+CnsfO9AFYnwfYZKIzOLx3kITaC1HrjHVLTo6hxcQhc+LgHODOMvW4VCV95Gwrz1MshRUWCPzkDqmnA==",
       "license": "MIT",
       "dependencies": {
         "@types/debug": "^4.1.12",
-        "@types/qs": "^6.9.18",
+        "@types/qs": "^6.9.11",
         "@types/xml-encryption": "^1.2.4",
         "@types/xml2js": "^0.4.14",
         "@xmldom/is-dom-node": "^1.0.1",
         "@xmldom/xmldom": "^0.8.10",
-        "debug": "^4.4.0",
-        "xml-crypto": "^6.1.2",
-        "xml-encryption": "^3.1.0",
+        "debug": "^4.3.4",
+        "xml-crypto": "^6.0.1",
+        "xml-encryption": "^3.0.2",
         "xml2js": "^0.6.2",
         "xmlbuilder": "^15.1.1",
         "xpath": "^0.0.34"
@@ -9597,9 +9597,9 @@
       }
     },
     "node_modules/@node-saml/node-saml/node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -9636,14 +9636,14 @@
       }
     },
     "node_modules/@node-saml/passport-saml": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@node-saml/passport-saml/-/passport-saml-5.1.0.tgz",
-      "integrity": "sha512-pBm+iFjv9eihcgeJuSUs4c0AuX1QEFdHwP8w1iaWCfDzXdeWZxUBU5HT2bY2S4dvNutcy+A9hYsH7ZLBGtgwDg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@node-saml/passport-saml/-/passport-saml-5.0.1.tgz",
+      "integrity": "sha512-fMztg3zfSnjLEgxvpl6HaDMNeh0xeQX4QHiF9e2Lsie2dc4qFE37XYbQZhVmn8XJ2awPpSWLQ736UskYgGU8lQ==",
       "license": "MIT",
       "dependencies": {
-        "@node-saml/node-saml": "^5.1.0",
-        "@types/express": "^4.17.23",
-        "@types/passport": "^1.0.17",
+        "@node-saml/node-saml": "^5.0.1",
+        "@types/express": "^4.17.21",
+        "@types/passport": "^1.0.16",
         "@types/passport-strategy": "^0.2.38",
         "passport": "^0.7.0",
         "passport-strategy": "^1.0.0"
@@ -9778,6 +9778,18 @@
         "node": ">= 18"
       }
     },
+    "node_modules/@octokit/auth-app/node_modules/@octokit/endpoint": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+      "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/@octokit/auth-app/node_modules/@octokit/openapi-types": {
       "version": "22.2.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
@@ -9824,6 +9836,11 @@
         "node": "14 || >=16.14"
       }
     },
+    "node_modules/@octokit/auth-app/node_modules/universal-user-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
+    },
     "node_modules/@octokit/auth-oauth-app": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-app/-/auth-oauth-app-8.1.1.tgz",
@@ -9839,6 +9856,18 @@
         "node": ">= 18"
       }
     },
+    "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/endpoint": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+      "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/@octokit/auth-oauth-app/node_modules/@octokit/openapi-types": {
       "version": "22.2.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
@@ -9877,6 +9906,11 @@
         "@octokit/openapi-types": "^22.2.0"
       }
     },
+    "node_modules/@octokit/auth-oauth-app/node_modules/universal-user-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
+    },
     "node_modules/@octokit/auth-oauth-device": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-device/-/auth-oauth-device-7.1.1.tgz",
@@ -9891,6 +9925,18 @@
         "node": ">= 18"
       }
     },
+    "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/endpoint": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+      "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/@octokit/auth-oauth-device/node_modules/@octokit/openapi-types": {
       "version": "22.2.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
@@ -9929,6 +9975,11 @@
         "@octokit/openapi-types": "^22.2.0"
       }
     },
+    "node_modules/@octokit/auth-oauth-device/node_modules/universal-user-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
+    },
     "node_modules/@octokit/auth-oauth-user": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/@octokit/auth-oauth-user/-/auth-oauth-user-5.1.1.tgz",
@@ -9944,6 +9995,18 @@
         "node": ">= 18"
       }
     },
+    "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/endpoint": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+      "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/@octokit/auth-oauth-user/node_modules/@octokit/openapi-types": {
       "version": "22.2.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
@@ -9982,6 +10045,11 @@
         "@octokit/openapi-types": "^22.2.0"
       }
     },
+    "node_modules/@octokit/auth-oauth-user/node_modules/universal-user-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
+    },
     "node_modules/@octokit/auth-token": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
@@ -10035,38 +10103,32 @@
         "@octokit/openapi-types": "^24.2.0"
       }
     },
-    "node_modules/@octokit/core/node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-      "license": "ISC"
-    },
     "node_modules/@octokit/endpoint": {
-      "version": "10.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz",
-      "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==",
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.2"
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
       },
       "engines": {
         "node": ">= 18"
       }
     },
     "node_modules/@octokit/endpoint/node_modules/@octokit/openapi-types": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
-      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
       "license": "MIT"
     },
     "node_modules/@octokit/endpoint/node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
       "license": "MIT",
       "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
+        "@octokit/openapi-types": "^24.2.0"
       }
     },
     "node_modules/@octokit/graphql": {
@@ -10098,12 +10160,6 @@
         "@octokit/openapi-types": "^24.2.0"
       }
     },
-    "node_modules/@octokit/graphql/node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-      "license": "ISC"
-    },
     "node_modules/@octokit/oauth-authorization-url": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@octokit/oauth-authorization-url/-/oauth-authorization-url-7.1.1.tgz",
@@ -10126,6 +10182,18 @@
         "node": ">= 18"
       }
     },
+    "node_modules/@octokit/oauth-methods/node_modules/@octokit/endpoint": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+      "integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
+      "dependencies": {
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^7.0.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
     "node_modules/@octokit/oauth-methods/node_modules/@octokit/openapi-types": {
       "version": "22.2.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
@@ -10164,6 +10232,11 @@
         "@octokit/openapi-types": "^22.2.0"
       }
     },
+    "node_modules/@octokit/oauth-methods/node_modules/universal-user-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+      "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
+    },
     "node_modules/@octokit/openapi-types": {
       "version": "19.1.0",
       "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-19.1.0.tgz",
@@ -10304,54 +10377,31 @@
       }
     },
     "node_modules/@octokit/request-error/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg=="
     },
     "node_modules/@octokit/request-error/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "license": "MIT",
+      "version": "13.6.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz",
+      "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==",
       "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
-      }
-    },
-    "node_modules/@octokit/request/node_modules/@octokit/endpoint": {
-      "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
-      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.1.0",
-        "universal-user-agent": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
+        "@octokit/openapi-types": "^22.2.0"
       }
     },
     "node_modules/@octokit/request/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
+      "version": "22.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz",
+      "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg=="
     },
     "node_modules/@octokit/request/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "license": "MIT",
+      "version": "13.6.1",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.1.tgz",
+      "integrity": "sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==",
       "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
+        "@octokit/openapi-types": "^22.2.0"
       }
     },
-    "node_modules/@octokit/request/node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-      "license": "ISC"
-    },
     "node_modules/@octokit/rest": {
       "version": "20.0.2",
       "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.0.2.tgz",
@@ -13301,10 +13351,9 @@
       "license": "MIT"
     },
     "node_modules/@types/express": {
-      "version": "4.17.23",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",
-      "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==",
-      "license": "MIT",
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
       "dependencies": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "^4.17.33",
@@ -13474,10 +13523,9 @@
       }
     },
     "node_modules/@types/passport": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.17.tgz",
-      "integrity": "sha512-aciLyx+wDwT2t2/kJGJR2AEeBz0nJU4WuRX04Wu9Dqc5lSUtwu0WERPHYsLhF9PtseiAMPBGNUOtFjxZ56prsg==",
-      "license": "MIT",
+      "version": "1.0.16",
+      "resolved": "https://registry.npmjs.org/@types/passport/-/passport-1.0.16.tgz",
+      "integrity": "sha512-FD0qD5hbPWQzaM0wHUnJ/T0BBCJBxCeemtnCwc/ThhTg3x9jfrAcRUmj5Dopza+MfFS9acTe3wk7rcVnRIp/0A==",
       "dependencies": {
         "@types/express": "*"
       }
@@ -18239,8 +18287,7 @@
     "node_modules/fast-content-type-parse": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-1.1.0.tgz",
-      "integrity": "sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ==",
-      "license": "MIT"
+      "integrity": "sha512-fBHHqSTFLVnR61C+gltJuE5GkVQMV0S2nqUO8TJ+5Z3qAKG8vAx4FKai1s5jq/inV1+sREynIWSuQ6HgoSXpDQ=="
     },
     "node_modules/fast-copy": {
       "version": "3.0.1",
@@ -24728,12 +24775,6 @@
         "jsonwebtoken": "^9.0.2"
       }
     },
-    "node_modules/octokit-auth-probot/node_modules/universal-user-agent": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-      "license": "ISC"
-    },
     "node_modules/odbc": {
       "version": "2.4.9",
       "resolved": "https://registry.npmjs.org/odbc/-/odbc-2.4.9.tgz",
@@ -30663,10 +30704,9 @@
       "integrity": "sha512-G5o6f95b5BggDGuUfKDApKaCgNYy2x7OdHY0zSMF081O0EJobw+1130VONhrA7ezGSV2FNOGyM+KQpQZAr9bIQ=="
     },
     "node_modules/universal-user-agent": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
-      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
-      "license": "ISC"
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="
     },
     "node_modules/universalify": {
       "version": "2.0.1",
@@ -31913,9 +31953,9 @@
       "license": "MIT"
     },
     "node_modules/xml-crypto": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-6.1.2.tgz",
-      "integrity": "sha512-leBOVQdVi8FvPJrMYoum7Ici9qyxfE4kVi+AkpUoYCSXaQF4IlBm1cneTK9oAxR61LpYxTx7lNcsnBIeRpGW2w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-6.0.1.tgz",
+      "integrity": "sha512-v05aU7NS03z4jlZ0iZGRFeZsuKO1UfEbbYiaeRMiATBFs6Jq9+wqKquEMTn4UTrYZ9iGD8yz3KT4L9o2iF682w==",
       "license": "MIT",
       "dependencies": {
         "@xmldom/is-dom-node": "^1.0.1",

backend/package.json

@@ -153,12 +153,11 @@
     "@gitbeaker/rest": "^42.5.0",
     "@google-cloud/kms": "^4.5.0",
     "@infisical/quic": "^1.0.8",
-    "@node-saml/passport-saml": "^5.1.0",
+    "@node-saml/passport-saml": "^5.0.1",
     "@octokit/auth-app": "^7.1.1",
     "@octokit/core": "^5.2.1",
     "@octokit/plugin-paginate-graphql": "^4.0.1",
     "@octokit/plugin-retry": "^5.0.5",
-    "@octokit/request": "8.4.1",
     "@octokit/rest": "^20.0.2",
     "@octokit/webhooks-types": "^7.3.1",
     "@octopusdeploy/api-client": "^3.4.1",

backend/scripts/generate-schema-types.ts

@@ -99,7 +99,6 @@ const main = async () => {
     (el) =>
       !el.tableName.includes("_migrations") &&
       !el.tableName.includes("audit_logs_") &&
-      !el.tableName.includes("active_locks") &&
       el.tableName !== "intermediate_audit_logs"
   );
 

backend/src/@types/fastify.d.ts

@@ -12,13 +12,10 @@ import { TCertificateAuthorityCrlServiceFactory } from "@app/ee/services/certifi
 import { TCertificateEstServiceFactory } from "@app/ee/services/certificate-est/certificate-est-service";
 import { TDynamicSecretServiceFactory } from "@app/ee/services/dynamic-secret/dynamic-secret-types";
 import { TDynamicSecretLeaseServiceFactory } from "@app/ee/services/dynamic-secret-lease/dynamic-secret-lease-types";
-import { TEventBusService } from "@app/ee/services/event/event-bus-service";
-import { TServerSentEventsService } from "@app/ee/services/event/event-sse-service";
 import { TExternalKmsServiceFactory } from "@app/ee/services/external-kms/external-kms-service";
 import { TGatewayServiceFactory } from "@app/ee/services/gateway/gateway-service";
 import { TGithubOrgSyncServiceFactory } from "@app/ee/services/github-org-sync/github-org-sync-service";
 import { TGroupServiceFactory } from "@app/ee/services/group/group-service";
-import { TIdentityAuthTemplateServiceFactory } from "@app/ee/services/identity-auth-template";
 import { TIdentityProjectAdditionalPrivilegeServiceFactory } from "@app/ee/services/identity-project-additional-privilege/identity-project-additional-privilege-service";
 import { TIdentityProjectAdditionalPrivilegeV2ServiceFactory } from "@app/ee/services/identity-project-additional-privilege-v2/identity-project-additional-privilege-v2-service";
 import { TKmipClientDALFactory } from "@app/ee/services/kmip/kmip-client-dal";
@@ -299,9 +296,6 @@ declare module "fastify" {
       internalCertificateAuthority: TInternalCertificateAuthorityServiceFactory;
       pkiTemplate: TPkiTemplatesServiceFactory;
       reminder: TReminderServiceFactory;
-      bus: TEventBusService;
-      sse: TServerSentEventsService;
-      identityAuthTemplate: TIdentityAuthTemplateServiceFactory;
     };
     // this is exclusive use for middlewares in which we need to inject data
     // everywhere else access using service layer

backend/src/@types/knex.d.ts

@@ -494,11 +494,6 @@ import {
   TAccessApprovalPoliciesEnvironmentsInsert,
   TAccessApprovalPoliciesEnvironmentsUpdate
 } from "@app/db/schemas/access-approval-policies-environments";
-import {
-  TIdentityAuthTemplates,
-  TIdentityAuthTemplatesInsert,
-  TIdentityAuthTemplatesUpdate
-} from "@app/db/schemas/identity-auth-templates";
 import {
   TIdentityLdapAuths,
   TIdentityLdapAuthsInsert,
@@ -883,11 +878,6 @@ declare module "knex/types/tables" {
       TIdentityProjectAdditionalPrivilegeInsert,
       TIdentityProjectAdditionalPrivilegeUpdate
     >;
-    [TableName.IdentityAuthTemplate]: KnexOriginal.CompositeTableType<
-      TIdentityAuthTemplates,
-      TIdentityAuthTemplatesInsert,
-      TIdentityAuthTemplatesUpdate
-    >;
 
     [TableName.AccessApprovalPolicy]: KnexOriginal.CompositeTableType<
       TAccessApprovalPolicies,

backend/src/db/migrations/20250723220500_remove-srp.ts

@@ -1,18 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  await knex.schema.alterTable(TableName.UserEncryptionKey, (table) => {
-    table.text("encryptedPrivateKey").nullable().alter();
-    table.text("publicKey").nullable().alter();
-    table.text("iv").nullable().alter();
-    table.text("tag").nullable().alter();
-    table.text("salt").nullable().alter();
-    table.text("verifier").nullable().alter();
-  });
-}
-
-export async function down(): Promise<void> {
-  // do nothing for now to avoid breaking down migrations
-}

backend/src/db/migrations/20250725144940_fix-secret-reminders-migration.ts

@@ -2,7 +2,7 @@
 import { Knex } from "knex";
 
 import { chunkArray } from "@app/lib/fn";
-import { initLogger, logger } from "@app/lib/logger";
+import { logger } from "@app/lib/logger";
 
 import { TableName } from "../schemas";
 import { TReminders, TRemindersInsert } from "../schemas/reminders";
@@ -107,6 +107,5 @@ export async function up(knex: Knex): Promise<void> {
 }
 
 export async function down(): Promise<void> {
-  initLogger();
   logger.info("Rollback not implemented for secret reminders fix migration");
 }

backend/src/db/migrations/20250725171821_add-secret-detection-ignore-values.ts

@@ -1,19 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  if (!(await knex.schema.hasColumn(TableName.Project, "secretDetectionIgnoreValues"))) {
-    await knex.schema.alterTable(TableName.Project, (t) => {
-      t.specificType("secretDetectionIgnoreValues", "text[]");
-    });
-  }
-}
-
-export async function down(knex: Knex): Promise<void> {
-  if (await knex.schema.hasColumn(TableName.Project, "secretDetectionIgnoreValues")) {
-    await knex.schema.alterTable(TableName.Project, (t) => {
-      t.dropColumn("secretDetectionIgnoreValues");
-    });
-  }
-}

backend/src/db/migrations/20250730162101_add-start-from-reminder.ts

@@ -1,19 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  if (!(await knex.schema.hasColumn(TableName.Reminder, "fromDate"))) {
-    await knex.schema.alterTable(TableName.Reminder, (t) => {
-      t.timestamp("fromDate", { useTz: true }).nullable();
-    });
-  }
-}
-
-export async function down(knex: Knex): Promise<void> {
-  if (await knex.schema.hasColumn(TableName.Reminder, "fromDate")) {
-    await knex.schema.alterTable(TableName.Reminder, (t) => {
-      t.dropColumn("fromDate");
-    });
-  }
-}

backend/src/db/migrations/20250801170240_add-identity-auth-template.ts

@@ -1,36 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-import { createOnUpdateTrigger, dropOnUpdateTrigger } from "../utils";
-
-export async function up(knex: Knex): Promise<void> {
-  if (!(await knex.schema.hasTable(TableName.IdentityAuthTemplate))) {
-    await knex.schema.createTable(TableName.IdentityAuthTemplate, (t) => {
-      t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
-      t.binary("templateFields").notNullable();
-      t.uuid("orgId").notNullable();
-      t.foreign("orgId").references("id").inTable(TableName.Organization).onDelete("CASCADE");
-      t.string("name", 64).notNullable();
-      t.string("authMethod").notNullable();
-      t.timestamps(true, true, true);
-    });
-    await createOnUpdateTrigger(knex, TableName.IdentityAuthTemplate);
-  }
-  if (!(await knex.schema.hasColumn(TableName.IdentityLdapAuth, "templateId"))) {
-    await knex.schema.alterTable(TableName.IdentityLdapAuth, (t) => {
-      t.uuid("templateId").nullable();
-      t.foreign("templateId").references("id").inTable(TableName.IdentityAuthTemplate).onDelete("SET NULL");
-    });
-  }
-}
-
-export async function down(knex: Knex): Promise<void> {
-  if (await knex.schema.hasColumn(TableName.IdentityLdapAuth, "templateId")) {
-    await knex.schema.alterTable(TableName.IdentityLdapAuth, (t) => {
-      t.dropForeign(["templateId"]);
-      t.dropColumn("templateId");
-    });
-  }
-  await knex.schema.dropTableIfExists(TableName.IdentityAuthTemplate);
-  await dropOnUpdateTrigger(knex, TableName.IdentityAuthTemplate);
-}

backend/src/db/migrations/20250805151349_last-logged-auth-method.ts

@@ -1,65 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas";
-
-export async function up(knex: Knex): Promise<void> {
-  const lastUserLoggedInAuthMethod = await knex.schema.hasColumn(TableName.OrgMembership, "lastLoginAuthMethod");
-  const lastIdentityLoggedInAuthMethod = await knex.schema.hasColumn(
-    TableName.IdentityOrgMembership,
-    "lastLoginAuthMethod"
-  );
-  const lastUserLoggedInTime = await knex.schema.hasColumn(TableName.OrgMembership, "lastLoginTime");
-  const lastIdentityLoggedInTime = await knex.schema.hasColumn(TableName.IdentityOrgMembership, "lastLoginTime");
-  if (!lastUserLoggedInAuthMethod || !lastUserLoggedInTime) {
-    await knex.schema.alterTable(TableName.OrgMembership, (t) => {
-      if (!lastUserLoggedInAuthMethod) {
-        t.string("lastLoginAuthMethod").nullable();
-      }
-      if (!lastUserLoggedInTime) {
-        t.datetime("lastLoginTime").nullable();
-      }
-    });
-  }
-
-  if (!lastIdentityLoggedInAuthMethod || !lastIdentityLoggedInTime) {
-    await knex.schema.alterTable(TableName.IdentityOrgMembership, (t) => {
-      if (!lastIdentityLoggedInAuthMethod) {
-        t.string("lastLoginAuthMethod").nullable();
-      }
-      if (!lastIdentityLoggedInTime) {
-        t.datetime("lastLoginTime").nullable();
-      }
-    });
-  }
-}
-
-export async function down(knex: Knex): Promise<void> {
-  const lastUserLoggedInAuthMethod = await knex.schema.hasColumn(TableName.OrgMembership, "lastLoginAuthMethod");
-  const lastIdentityLoggedInAuthMethod = await knex.schema.hasColumn(
-    TableName.IdentityOrgMembership,
-    "lastLoginAuthMethod"
-  );
-  const lastUserLoggedInTime = await knex.schema.hasColumn(TableName.OrgMembership, "lastLoginTime");
-  const lastIdentityLoggedInTime = await knex.schema.hasColumn(TableName.IdentityOrgMembership, "lastLoginTime");
-  if (lastUserLoggedInAuthMethod || lastUserLoggedInTime) {
-    await knex.schema.alterTable(TableName.OrgMembership, (t) => {
-      if (lastUserLoggedInAuthMethod) {
-        t.dropColumn("lastLoginAuthMethod");
-      }
-      if (lastUserLoggedInTime) {
-        t.dropColumn("lastLoginTime");
-      }
-    });
-  }
-
-  if (lastIdentityLoggedInAuthMethod || lastIdentityLoggedInTime) {
-    await knex.schema.alterTable(TableName.IdentityOrgMembership, (t) => {
-      if (lastIdentityLoggedInAuthMethod) {
-        t.dropColumn("lastLoginAuthMethod");
-      }
-      if (lastIdentityLoggedInTime) {
-        t.dropColumn("lastLoginTime");
-      }
-    });
-  }
-}

backend/src/db/migrations/20250808021941_access-policy-max-time-period.ts

@@ -1,19 +0,0 @@
-import { Knex } from "knex";
-
-import { TableName } from "../schemas/models";
-
-export async function up(knex: Knex): Promise<void> {
-  if (!(await knex.schema.hasColumn(TableName.AccessApprovalPolicy, "maxTimePeriod"))) {
-    await knex.schema.alterTable(TableName.AccessApprovalPolicy, (t) => {
-      t.string("maxTimePeriod").nullable(); // Ex: 1h - Null is permanent
-    });
-  }
-}
-
-export async function down(knex: Knex): Promise<void> {
-  if (await knex.schema.hasColumn(TableName.AccessApprovalPolicy, "maxTimePeriod")) {
-    await knex.schema.alterTable(TableName.AccessApprovalPolicy, (t) => {
-      t.dropColumn("maxTimePeriod");
-    });
-  }
-}

backend/src/db/schemas/access-approval-policies.ts

@@ -17,8 +17,7 @@ export const AccessApprovalPoliciesSchema = z.object({
   updatedAt: z.date(),
   enforcementLevel: z.string().default("hard"),
   deletedAt: z.date().nullable().optional(),
-  allowedSelfApprovals: z.boolean().default(true),
-  maxTimePeriod: z.string().nullable().optional()
+  allowedSelfApprovals: z.boolean().default(true)
 });
 
 export type TAccessApprovalPolicies = z.infer<typeof AccessApprovalPoliciesSchema>;

backend/src/db/schemas/identity-auth-templates.ts

@@ -1,24 +0,0 @@
-// Code generated by automation script, DO NOT EDIT.
-// Automated by pulling database and generating zod schema
-// To update. Just run npm run generate:schema
-// Written by akhilmhdh.
-
-import { z } from "zod";
-
-import { zodBuffer } from "@app/lib/zod";
-
-import { TImmutableDBKeys } from "./models";
-
-export const IdentityAuthTemplatesSchema = z.object({
-  id: z.string().uuid(),
-  templateFields: zodBuffer,
-  orgId: z.string().uuid(),
-  name: z.string(),
-  authMethod: z.string(),
-  createdAt: z.date(),
-  updatedAt: z.date()
-});
-
-export type TIdentityAuthTemplates = z.infer<typeof IdentityAuthTemplatesSchema>;
-export type TIdentityAuthTemplatesInsert = Omit<z.input<typeof IdentityAuthTemplatesSchema>, TImmutableDBKeys>;
-export type TIdentityAuthTemplatesUpdate = Partial<Omit<z.input<typeof IdentityAuthTemplatesSchema>, TImmutableDBKeys>>;

backend/src/db/schemas/identity-ldap-auths.ts

@@ -25,8 +25,7 @@ export const IdentityLdapAuthsSchema = z.object({
   allowedFields: z.unknown().nullable().optional(),
   createdAt: z.date(),
   updatedAt: z.date(),
-  accessTokenPeriod: z.coerce.number().default(0),
-  templateId: z.string().uuid().nullable().optional()
+  accessTokenPeriod: z.coerce.number().default(0)
 });
 
 export type TIdentityLdapAuths = z.infer<typeof IdentityLdapAuthsSchema>;

backend/src/db/schemas/identity-org-memberships.ts

@@ -14,9 +14,7 @@ export const IdentityOrgMembershipsSchema = z.object({
   orgId: z.string().uuid(),
   createdAt: z.date(),
   updatedAt: z.date(),
-  identityId: z.string().uuid(),
-  lastLoginAuthMethod: z.string().nullable().optional(),
-  lastLoginTime: z.date().nullable().optional()
+  identityId: z.string().uuid()
 });
 
 export type TIdentityOrgMemberships = z.infer<typeof IdentityOrgMembershipsSchema>;

backend/src/db/schemas/models.ts

@@ -91,7 +91,6 @@ export enum TableName {
   IdentityProjectMembership = "identity_project_memberships",
   IdentityProjectMembershipRole = "identity_project_membership_role",
   IdentityProjectAdditionalPrivilege = "identity_project_additional_privilege",
-  IdentityAuthTemplate = "identity_auth_templates",
   // used by both identity and users
   IdentityMetadata = "identity_metadata",
   ResourceMetadata = "resource_metadata",

backend/src/db/schemas/org-memberships.ts

@@ -19,9 +19,7 @@ export const OrgMembershipsSchema = z.object({
   roleId: z.string().uuid().nullable().optional(),
   projectFavorites: z.string().array().nullable().optional(),
   isActive: z.boolean().default(true),
-  lastInvitedAt: z.date().nullable().optional(),
-  lastLoginAuthMethod: z.string().nullable().optional(),
-  lastLoginTime: z.date().nullable().optional()
+  lastInvitedAt: z.date().nullable().optional()
 });
 
 export type TOrgMemberships = z.infer<typeof OrgMembershipsSchema>;

backend/src/db/schemas/projects.ts

@@ -30,8 +30,7 @@ export const ProjectsSchema = z.object({
   hasDeleteProtection: z.boolean().default(false).nullable().optional(),
   secretSharing: z.boolean().default(true),
   showSnapshotsLegacy: z.boolean().default(false),
-  defaultProduct: z.string().nullable().optional(),
-  secretDetectionIgnoreValues: z.string().array().nullable().optional()
+  defaultProduct: z.string().nullable().optional()
 });
 
 export type TProjects = z.infer<typeof ProjectsSchema>;

backend/src/db/schemas/reminders.ts

@@ -14,8 +14,7 @@ export const RemindersSchema = z.object({
   repeatDays: z.number().nullable().optional(),
   nextReminderDate: z.date(),
   createdAt: z.date(),
-  updatedAt: z.date(),
-  fromDate: z.date().nullable().optional()
+  updatedAt: z.date()
 });
 
 export type TReminders = z.infer<typeof RemindersSchema>;

backend/src/db/schemas/user-encryption-keys.ts

@@ -15,12 +15,12 @@ export const UserEncryptionKeysSchema = z.object({
   protectedKey: z.string().nullable().optional(),
   protectedKeyIV: z.string().nullable().optional(),
   protectedKeyTag: z.string().nullable().optional(),
-  publicKey: z.string().nullable().optional(),
-  encryptedPrivateKey: z.string().nullable().optional(),
-  iv: z.string().nullable().optional(),
-  tag: z.string().nullable().optional(),
-  salt: z.string().nullable().optional(),
-  verifier: z.string().nullable().optional(),
+  publicKey: z.string(),
+  encryptedPrivateKey: z.string(),
+  iv: z.string(),
+  tag: z.string(),
+  salt: z.string(),
+  verifier: z.string(),
   userId: z.string().uuid(),
   hashedPassword: z.string().nullable().optional(),
   serverEncryptedPrivateKey: z.string().nullable().optional(),

backend/src/db/seed-data.ts

@@ -115,10 +115,6 @@ export const generateUserSrpKeys = async (password: string) => {
 };
 
 export const getUserPrivateKey = async (password: string, user: TUserEncryptionKeys) => {
-  if (!user.encryptedPrivateKey || !user.iv || !user.tag || !user.salt) {
-    throw new Error("User encrypted private key not found");
-  }
-
   const derivedKey = await argon2.hash(password, {
     salt: Buffer.from(user.salt),
     memoryCost: 65536,

backend/src/db/seeds/1-user.ts

@@ -1,7 +1,7 @@
 import { Knex } from "knex";
 
-import { initEnvConfig } from "@app/lib/config/env";
-import { initLogger, logger } from "@app/lib/logger";
+import { crypto } from "@app/lib/crypto";
+import { initLogger } from "@app/lib/logger";
 import { superAdminDALFactory } from "@app/services/super-admin/super-admin-dal";
 
 import { AuthMethod } from "../../services/auth/auth-type";
@@ -17,7 +17,7 @@ export async function seed(knex: Knex): Promise<void> {
   initLogger();
 
   const superAdminDAL = superAdminDALFactory(knex);
-  await initEnvConfig(superAdminDAL, logger);
+  await crypto.initialize(superAdminDAL);
 
   await knex(TableName.SuperAdmin).insert([
     // eslint-disable-next-line
@@ -25,7 +25,6 @@ export async function seed(knex: Knex): Promise<void> {
     { id: "00000000-0000-0000-0000-000000000000", initialized: true, allowSignUp: true }
   ]);
   // Inserts seed entries
-
   const [user] = await knex(TableName.Users)
     .insert([
       {

backend/src/db/seeds/3-project.ts

@@ -1,28 +1,9 @@
 import { Knex } from "knex";
 
-import { initEnvConfig } from "@app/lib/config/env";
 import { crypto, SymmetricKeySize } from "@app/lib/crypto/cryptography";
-import { generateUserSrpKeys } from "@app/lib/crypto/srp";
-import { initLogger, logger } from "@app/lib/logger";
-import { alphaNumericNanoId } from "@app/lib/nanoid";
-import { AuthMethod } from "@app/services/auth/auth-type";
-import { assignWorkspaceKeysToMembers, createProjectKey } from "@app/services/project/project-fns";
-import { projectKeyDALFactory } from "@app/services/project-key/project-key-dal";
-import { projectMembershipDALFactory } from "@app/services/project-membership/project-membership-dal";
-import { projectUserMembershipRoleDALFactory } from "@app/services/project-membership/project-user-membership-role-dal";
-import { superAdminDALFactory } from "@app/services/super-admin/super-admin-dal";
-import { userDALFactory } from "@app/services/user/user-dal";
 
-import {
-  OrgMembershipRole,
-  OrgMembershipStatus,
-  ProjectMembershipRole,
-  ProjectType,
-  SecretEncryptionAlgo,
-  SecretKeyEncoding,
-  TableName
-} from "../schemas";
-import { seedData1 } from "../seed-data";
+import { ProjectMembershipRole, ProjectType, SecretEncryptionAlgo, SecretKeyEncoding, TableName } from "../schemas";
+import { buildUserProjectKey, getUserPrivateKey, seedData1 } from "../seed-data";
 
 export const DEFAULT_PROJECT_ENVS = [
   { name: "Development", slug: "dev" },
@@ -30,159 +11,12 @@ export const DEFAULT_PROJECT_ENVS = [
   { name: "Production", slug: "prod" }
 ];
 
-const createUserWithGhostUser = async (
-  orgId: string,
-  projectId: string,
-  userId: string,
-  userOrgMembershipId: string,
-  knex: Knex
-) => {
-  const projectKeyDAL = projectKeyDALFactory(knex);
-  const userDAL = userDALFactory(knex);
-  const projectMembershipDAL = projectMembershipDALFactory(knex);
-  const projectUserMembershipRoleDAL = projectUserMembershipRoleDALFactory(knex);
-
-  const email = `sudo-${alphaNumericNanoId(16)}-${orgId}@infisical.com`; // We add a nanoid because the email is unique. And we have to create a new ghost user each time, so we can have access to the private key.
-
-  const password = crypto.randomBytes(128).toString("hex");
-
-  const [ghostUser] = await knex(TableName.Users)
-    .insert({
-      isGhost: true,
-      authMethods: [AuthMethod.EMAIL],
-      username: email,
-      email,
-      isAccepted: true
-    })
-    .returning("*");
-
-  const encKeys = await generateUserSrpKeys(email, password);
-
-  await knex(TableName.UserEncryptionKey)
-    .insert({ userId: ghostUser.id, encryptionVersion: 2, publicKey: encKeys.publicKey })
-    .onConflict("userId")
-    .merge();
-
-  await knex(TableName.OrgMembership)
-    .insert({
-      orgId,
-      userId: ghostUser.id,
-      role: OrgMembershipRole.Admin,
-      status: OrgMembershipStatus.Accepted,
-      isActive: true
-    })
-    .returning("*");
-
-  const [projectMembership] = await knex(TableName.ProjectMembership)
-    .insert({
-      userId: ghostUser.id,
-      projectId
-    })
-    .returning("*");
-
-  await knex(TableName.ProjectUserMembershipRole).insert({
-    projectMembershipId: projectMembership.id,
-    role: ProjectMembershipRole.Admin
-  });
-
-  const { key: encryptedProjectKey, iv: encryptedProjectKeyIv } = createProjectKey({
-    publicKey: encKeys.publicKey,
-    privateKey: encKeys.plainPrivateKey
-  });
-
-  await knex(TableName.ProjectKeys).insert({
-    projectId,
-    receiverId: ghostUser.id,
-    encryptedKey: encryptedProjectKey,
-    nonce: encryptedProjectKeyIv,
-    senderId: ghostUser.id
-  });
-
-  const { iv, tag, ciphertext, encoding, algorithm } = crypto
-    .encryption()
-    .symmetric()
-    .encryptWithRootEncryptionKey(encKeys.plainPrivateKey);
-
-  await knex(TableName.ProjectBot).insert({
-    name: "Infisical Bot (Ghost)",
-    projectId,
-    tag,
-    iv,
-    encryptedProjectKey,
-    encryptedProjectKeyNonce: encryptedProjectKeyIv,
-    encryptedPrivateKey: ciphertext,
-    isActive: true,
-    publicKey: encKeys.publicKey,
-    senderId: ghostUser.id,
-    algorithm,
-    keyEncoding: encoding
-  });
-
-  const latestKey = await projectKeyDAL.findLatestProjectKey(ghostUser.id, projectId, knex);
-
-  if (!latestKey) {
-    throw new Error("Latest key not found for user");
-  }
-
-  const user = await userDAL.findUserEncKeyByUserId(userId, knex);
-
-  if (!user || !user.publicKey) {
-    throw new Error("User not found");
-  }
-
-  const [projectAdmin] = assignWorkspaceKeysToMembers({
-    decryptKey: latestKey,
-    userPrivateKey: encKeys.plainPrivateKey,
-    members: [
-      {
-        userPublicKey: user.publicKey,
-        orgMembershipId: userOrgMembershipId
-      }
-    ]
-  });
-
-  // Create a membership for the user
-  const userProjectMembership = await projectMembershipDAL.create(
-    {
-      projectId,
-      userId: user.id
-    },
-    knex
-  );
-  await projectUserMembershipRoleDAL.create(
-    { projectMembershipId: userProjectMembership.id, role: ProjectMembershipRole.Admin },
-    knex
-  );
-
-  // Create a project key for the user
-  await projectKeyDAL.create(
-    {
-      encryptedKey: projectAdmin.workspaceEncryptedKey,
-      nonce: projectAdmin.workspaceEncryptedNonce,
-      senderId: ghostUser.id,
-      receiverId: user.id,
-      projectId
-    },
-    knex
-  );
-
-  return {
-    user: ghostUser,
-    keys: encKeys
-  };
-};
-
 export async function seed(knex: Knex): Promise<void> {
   // Deletes ALL existing entries
   await knex(TableName.Project).del();
   await knex(TableName.Environment).del();
   await knex(TableName.SecretFolder).del();
 
-  initLogger();
-
-  const superAdminDAL = superAdminDALFactory(knex);
-  await initEnvConfig(superAdminDAL, logger);
-
   const [project] = await knex(TableName.Project)
     .insert({
       name: seedData1.project.name,
@@ -195,24 +29,29 @@ export async function seed(knex: Knex): Promise<void> {
     })
     .returning("*");
 
-  const userOrgMembership = await knex(TableName.OrgMembership)
-    .where({
-      orgId: seedData1.organization.id,
+  const projectMembership = await knex(TableName.ProjectMembership)
+    .insert({
+      projectId: project.id,
       userId: seedData1.id
     })
-    .first();
+    .returning("*");
+  await knex(TableName.ProjectUserMembershipRole).insert({
+    role: ProjectMembershipRole.Admin,
+    projectMembershipId: projectMembership[0].id
+  });
 
-  if (!userOrgMembership) {
-    throw new Error("User org membership not found");
-  }
   const user = await knex(TableName.UserEncryptionKey).where({ userId: seedData1.id }).first();
   if (!user) throw new Error("User not found");
 
-  if (!user.publicKey) {
-    throw new Error("User public key not found");
-  }
-
-  await createUserWithGhostUser(seedData1.organization.id, project.id, seedData1.id, userOrgMembership.id, knex);
+  const userPrivateKey = await getUserPrivateKey(seedData1.password, user);
+  const projectKey = buildUserProjectKey(userPrivateKey, user.publicKey);
+  await knex(TableName.ProjectKeys).insert({
+    projectId: project.id,
+    nonce: projectKey.nonce,
+    encryptedKey: projectKey.ciphertext,
+    receiverId: seedData1.id,
+    senderId: seedData1.id
+  });
 
   // create default environments and default folders
   const envs = await knex(TableName.Environment)

backend/src/db/seeds/5-machine-identity.ts

@@ -1,9 +1,6 @@
 import { Knex } from "knex";
 
-import { initEnvConfig } from "@app/lib/config/env";
 import { crypto } from "@app/lib/crypto/cryptography";
-import { initLogger, logger } from "@app/lib/logger";
-import { superAdminDALFactory } from "@app/services/super-admin/super-admin-dal";
 
 import { IdentityAuthMethod, OrgMembershipRole, ProjectMembershipRole, TableName } from "../schemas";
 import { seedData1 } from "../seed-data";
@@ -13,11 +10,6 @@ export async function seed(knex: Knex): Promise<void> {
   await knex(TableName.Identity).del();
   await knex(TableName.IdentityOrgMembership).del();
 
-  initLogger();
-
-  const superAdminDAL = superAdminDALFactory(knex);
-  await initEnvConfig(superAdminDAL, logger);
-
   // Inserts seed entries
   await knex(TableName.Identity).insert([
     {

backend/src/ee/routes/v1/access-approval-policy-router.ts

@@ -3,32 +3,12 @@ import { z } from "zod";
 
 import { ApproverType, BypasserType } from "@app/ee/services/access-approval-policy/access-approval-policy-types";
 import { removeTrailingSlash } from "@app/lib/fn";
-import { ms } from "@app/lib/ms";
 import { EnforcementLevel } from "@app/lib/types";
 import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
 import { sapPubSchema } from "@app/server/routes/sanitizedSchemas";
 import { AuthMode } from "@app/services/auth/auth-type";
 
-const maxTimePeriodSchema = z
-  .string()
-  .trim()
-  .nullish()
-  .transform((val, ctx) => {
-    if (val === undefined) return undefined;
-    if (!val || val === "permanent") return null;
-    const parsedMs = ms(val);
-
-    if (typeof parsedMs !== "number" || parsedMs <= 0) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: "Invalid time period format or value. Must be a positive duration (e.g., '1h', '30m', '2d')."
-      });
-      return z.NEVER;
-    }
-    return val;
-  });
-
 export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvider) => {
   server.route({
     url: "/",
@@ -91,8 +71,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
             .optional(),
           approvals: z.number().min(1).default(1),
           enforcementLevel: z.nativeEnum(EnforcementLevel).default(EnforcementLevel.Hard),
-          allowedSelfApprovals: z.boolean().default(true),
-          maxTimePeriod: maxTimePeriodSchema
+          allowedSelfApprovals: z.boolean().default(true)
         })
         .refine(
           (val) => Boolean(val.environment) || Boolean(val.environments),
@@ -145,8 +124,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
                 .array()
                 .nullable()
                 .optional(),
-              bypassers: z.object({ type: z.nativeEnum(BypasserType), id: z.string().nullable().optional() }).array(),
-              maxTimePeriod: z.string().nullable().optional()
+              bypassers: z.object({ type: z.nativeEnum(BypasserType), id: z.string().nullable().optional() }).array()
             })
             .array()
             .nullable()
@@ -255,8 +233,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
             stepNumber: z.number().int()
           })
           .array()
-          .optional(),
-        maxTimePeriod: maxTimePeriodSchema
+          .optional()
       }),
       response: {
         200: z.object({
@@ -337,8 +314,7 @@ export const registerAccessApprovalPolicyRouter = async (server: FastifyZodProvi
               })
               .array()
               .nullable()
-              .optional(),
-            maxTimePeriod: z.string().nullable().optional()
+              .optional()
           })
         })
       }

backend/src/ee/routes/v1/access-approval-request-router.ts

@@ -128,8 +128,7 @@ export const registerAccessApprovalRequestRouter = async (server: FastifyZodProv
               envId: z.string(),
               enforcementLevel: z.string(),
               deletedAt: z.date().nullish(),
-              allowedSelfApprovals: z.boolean(),
-              maxTimePeriod: z.string().nullable().optional()
+              allowedSelfApprovals: z.boolean()
             }),
             reviewers: z
               .object({

backend/src/ee/routes/v1/identity-template-router.ts

@@ -1,391 +0,0 @@
-import { z } from "zod";
-
-import { IdentityAuthTemplatesSchema } from "@app/db/schemas/identity-auth-templates";
-import { EventType } from "@app/ee/services/audit-log/audit-log-types";
-import {
-  IdentityAuthTemplateMethod,
-  TEMPLATE_SUCCESS_MESSAGES,
-  TEMPLATE_VALIDATION_MESSAGES
-} from "@app/ee/services/identity-auth-template/identity-auth-template-enums";
-import { readLimit, writeLimit } from "@app/server/config/rateLimiter";
-import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
-import { AuthMode } from "@app/services/auth/auth-type";
-
-const ldapTemplateFieldsSchema = z.object({
-  url: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.LDAP.URL_REQUIRED),
-  bindDN: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.LDAP.BIND_DN_REQUIRED),
-  bindPass: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.LDAP.BIND_PASSWORD_REQUIRED),
-  searchBase: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.LDAP.SEARCH_BASE_REQUIRED),
-  ldapCaCertificate: z.string().trim().optional()
-});
-
-export const registerIdentityTemplateRouter = async (server: FastifyZodProvider) => {
-  server.route({
-    method: "POST",
-    url: "/",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Create identity auth template",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      body: z.object({
-        name: z
-          .string()
-          .trim()
-          .min(1, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_NAME_REQUIRED)
-          .max(64, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_NAME_MAX_LENGTH),
-        authMethod: z.nativeEnum(IdentityAuthTemplateMethod),
-        templateFields: ldapTemplateFieldsSchema
-      }),
-      response: {
-        200: IdentityAuthTemplatesSchema.extend({
-          templateFields: z.record(z.string(), z.unknown())
-        })
-      }
-    },
-    handler: async (req) => {
-      const template = await server.services.identityAuthTemplate.createTemplate({
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId,
-        name: req.body.name,
-        authMethod: req.body.authMethod,
-        templateFields: req.body.templateFields
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.MACHINE_IDENTITY_AUTH_TEMPLATE_CREATE,
-          metadata: {
-            templateId: template.id,
-            name: template.name
-          }
-        }
-      });
-
-      return template;
-    }
-  });
-
-  server.route({
-    method: "PATCH",
-    url: "/:templateId",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Update identity auth template",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        templateId: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_ID_REQUIRED)
-      }),
-      body: z.object({
-        name: z
-          .string()
-          .trim()
-          .min(1, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_NAME_REQUIRED)
-          .max(64, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_NAME_MAX_LENGTH)
-          .optional(),
-        templateFields: ldapTemplateFieldsSchema.partial().optional()
-      }),
-      response: {
-        200: IdentityAuthTemplatesSchema.extend({
-          templateFields: z.record(z.string(), z.unknown())
-        })
-      }
-    },
-    handler: async (req) => {
-      const template = await server.services.identityAuthTemplate.updateTemplate({
-        templateId: req.params.templateId,
-        name: req.body.name,
-        templateFields: req.body.templateFields,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.MACHINE_IDENTITY_AUTH_TEMPLATE_UPDATE,
-          metadata: {
-            templateId: template.id,
-            name: template.name
-          }
-        }
-      });
-
-      return template;
-    }
-  });
-
-  server.route({
-    method: "DELETE",
-    url: "/:templateId",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Delete identity auth template",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        templateId: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_ID_REQUIRED)
-      }),
-      response: {
-        200: z.object({
-          message: z.string()
-        })
-      }
-    },
-    handler: async (req) => {
-      const template = await server.services.identityAuthTemplate.deleteTemplate({
-        templateId: req.params.templateId,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      await server.services.auditLog.createAuditLog({
-        ...req.auditLogInfo,
-        orgId: req.permission.orgId,
-        event: {
-          type: EventType.MACHINE_IDENTITY_AUTH_TEMPLATE_DELETE,
-          metadata: {
-            templateId: template.id,
-            name: template.name
-          }
-        }
-      });
-
-      return { message: TEMPLATE_SUCCESS_MESSAGES.DELETED };
-    }
-  });
-
-  server.route({
-    method: "GET",
-    url: "/:templateId",
-    config: {
-      rateLimit: readLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Get identity auth template by ID",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        templateId: z.string().min(1, TEMPLATE_VALIDATION_MESSAGES.TEMPLATE_ID_REQUIRED)
-      }),
-      response: {
-        200: IdentityAuthTemplatesSchema.extend({
-          templateFields: ldapTemplateFieldsSchema
-        })
-      }
-    },
-    handler: async (req) => {
-      const template = await server.services.identityAuthTemplate.getTemplate({
-        templateId: req.params.templateId,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      return template;
-    }
-  });
-
-  server.route({
-    method: "GET",
-    url: "/search",
-    config: {
-      rateLimit: readLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "List identity auth templates",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      querystring: z.object({
-        limit: z.coerce.number().positive().max(100).default(5).optional(),
-        offset: z.coerce.number().min(0).default(0).optional(),
-        search: z.string().optional()
-      }),
-      response: {
-        200: z.object({
-          templates: IdentityAuthTemplatesSchema.extend({
-            templateFields: ldapTemplateFieldsSchema
-          }).array(),
-          totalCount: z.number()
-        })
-      }
-    },
-    handler: async (req) => {
-      const { templates, totalCount } = await server.services.identityAuthTemplate.listTemplates({
-        limit: req.query.limit,
-        offset: req.query.offset,
-        search: req.query.search,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      return { templates, totalCount };
-    }
-  });
-
-  server.route({
-    method: "GET",
-    url: "/",
-    config: {
-      rateLimit: readLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Get identity auth templates by authentication method",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      querystring: z.object({
-        authMethod: z.nativeEnum(IdentityAuthTemplateMethod)
-      }),
-      response: {
-        200: IdentityAuthTemplatesSchema.extend({
-          templateFields: ldapTemplateFieldsSchema
-        }).array()
-      }
-    },
-    handler: async (req) => {
-      const templates = await server.services.identityAuthTemplate.getTemplatesByAuthMethod({
-        authMethod: req.query.authMethod,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      return templates;
-    }
-  });
-
-  server.route({
-    method: "GET",
-    url: "/:templateId/usage",
-    config: {
-      rateLimit: readLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Get template usage by template ID",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        templateId: z.string()
-      }),
-      response: {
-        200: z
-          .object({
-            identityId: z.string(),
-            identityName: z.string()
-          })
-          .array()
-      }
-    },
-    handler: async (req) => {
-      const templates = await server.services.identityAuthTemplate.findTemplateUsages({
-        templateId: req.params.templateId,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      return templates;
-    }
-  });
-
-  server.route({
-    method: "POST",
-    url: "/:templateId/delete-usage",
-    config: {
-      rateLimit: writeLimit
-    },
-    onRequest: verifyAuth([AuthMode.JWT, AuthMode.IDENTITY_ACCESS_TOKEN]),
-    schema: {
-      hide: false,
-      description: "Unlink identity auth template usage",
-      security: [
-        {
-          bearerAuth: []
-        }
-      ],
-      params: z.object({
-        templateId: z.string()
-      }),
-      body: z.object({
-        identityIds: z.string().array()
-      }),
-      response: {
-        200: z
-          .object({
-            authId: z.string(),
-            identityId: z.string(),
-            identityName: z.string()
-          })
-          .array()
-      }
-    },
-    handler: async (req) => {
-      const templates = await server.services.identityAuthTemplate.unlinkTemplateUsage({
-        templateId: req.params.templateId,
-        identityIds: req.body.identityIds,
-        actor: req.permission.type,
-        actorId: req.permission.id,
-        actorAuthMethod: req.permission.authMethod,
-        actorOrgId: req.permission.orgId
-      });
-
-      return templates;
-    }
-  });
-};

backend/src/ee/routes/v1/index.ts

@@ -13,7 +13,6 @@ import { registerGatewayRouter } from "./gateway-router";
 import { registerGithubOrgSyncRouter } from "./github-org-sync-router";
 import { registerGroupRouter } from "./group-router";
 import { registerIdentityProjectAdditionalPrivilegeRouter } from "./identity-project-additional-privilege-router";
-import { registerIdentityTemplateRouter } from "./identity-template-router";
 import { registerKmipRouter } from "./kmip-router";
 import { registerKmipSpecRouter } from "./kmip-spec-router";
 import { registerLdapRouter } from "./ldap-router";
@@ -126,7 +125,6 @@ export const registerV1EERoutes = async (server: FastifyZodProvider) => {
   await server.register(registerExternalKmsRouter, {
     prefix: "/external-kms"
   });
-  await server.register(registerIdentityTemplateRouter, { prefix: "/identity-templates" });
 
   await server.register(registerProjectTemplateRouter, { prefix: "/project-templates" });
 

backend/src/ee/routes/v1/ldap-router.ts

@@ -379,17 +379,14 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
 
   server.route({
     method: "POST",
-    url: "/config/test-connection",
+    url: "/config/:configId/test-connection",
     config: {
       rateLimit: readLimit
     },
     onRequest: verifyAuth([AuthMode.JWT]),
     schema: {
-      body: z.object({
-        url: z.string().trim(),
-        bindDN: z.string().trim(),
-        bindPass: z.string().trim(),
-        caCert: z.string().trim()
+      params: z.object({
+        configId: z.string().trim()
       }),
       response: {
         200: z.boolean()
@@ -402,9 +399,8 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
         orgId: req.permission.orgId,
         actorAuthMethod: req.permission.authMethod,
         actorOrgId: req.permission.orgId,
-        ...req.body
+        ldapConfigId: req.params.configId
       });
-
       return result;
     }
   });

backend/src/ee/routes/v2/secret-scanning-v2-routers/gitlab-secret-scanning-router.ts

@@ -1,16 +0,0 @@
-import { registerSecretScanningEndpoints } from "@app/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-endpoints";
-import {
-  CreateGitLabDataSourceSchema,
-  GitLabDataSourceSchema,
-  UpdateGitLabDataSourceSchema
-} from "@app/ee/services/secret-scanning-v2/gitlab";
-import { SecretScanningDataSource } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";
-
-export const registerGitLabSecretScanningRouter = async (server: FastifyZodProvider) =>
-  registerSecretScanningEndpoints({
-    type: SecretScanningDataSource.GitLab,
-    server,
-    responseSchema: GitLabDataSourceSchema,
-    createSchema: CreateGitLabDataSourceSchema,
-    updateSchema: UpdateGitLabDataSourceSchema
-  });

backend/src/ee/routes/v2/secret-scanning-v2-routers/index.ts

@@ -1,4 +1,3 @@
-import { registerGitLabSecretScanningRouter } from "@app/ee/routes/v2/secret-scanning-v2-routers/gitlab-secret-scanning-router";
 import { SecretScanningDataSource } from "@app/ee/services/secret-scanning-v2/secret-scanning-v2-enums";
 
 import { registerBitbucketSecretScanningRouter } from "./bitbucket-secret-scanning-router";
@@ -11,6 +10,5 @@ export const SECRET_SCANNING_REGISTER_ROUTER_MAP: Record<
   (server: FastifyZodProvider) => Promise<void>
 > = {
   [SecretScanningDataSource.GitHub]: registerGitHubSecretScanningRouter,
-  [SecretScanningDataSource.Bitbucket]: registerBitbucketSecretScanningRouter,
-  [SecretScanningDataSource.GitLab]: registerGitLabSecretScanningRouter
+  [SecretScanningDataSource.Bitbucket]: registerBitbucketSecretScanningRouter
 };

backend/src/ee/routes/v2/secret-scanning-v2-routers/secret-scanning-v2-router.ts

@@ -4,7 +4,6 @@ import { SecretScanningConfigsSchema } from "@app/db/schemas";
 import { EventType } from "@app/ee/services/audit-log/audit-log-types";
 import { BitbucketDataSourceListItemSchema } from "@app/ee/services/secret-scanning-v2/bitbucket";
 import { GitHubDataSourceListItemSchema } from "@app/ee/services/secret-scanning-v2/github";
-import { GitLabDataSourceListItemSchema } from "@app/ee/services/secret-scanning-v2/gitlab";
 import {
   SecretScanningFindingStatus,
   SecretScanningScanStatus
@@ -25,8 +24,7 @@ import { AuthMode } from "@app/services/auth/auth-type";
 
 const SecretScanningDataSourceOptionsSchema = z.discriminatedUnion("type", [
   GitHubDataSourceListItemSchema,
-  BitbucketDataSourceListItemSchema,
-  GitLabDataSourceListItemSchema
+  BitbucketDataSourceListItemSchema
 ]);
 
 export const registerSecretScanningV2Router = async (server: FastifyZodProvider) => {

backend/src/ee/services/access-approval-policy/access-approval-policy-dal.ts

@@ -56,7 +56,6 @@ export interface TAccessApprovalPolicyDALFactory
       allowedSelfApprovals: boolean;
       secretPath: string;
       deletedAt?: Date | null | undefined;
-      maxTimePeriod?: string | null;
       projectId: string;
       bypassers: (
         | {
@@ -97,7 +96,6 @@ export interface TAccessApprovalPolicyDALFactory
         allowedSelfApprovals: boolean;
         secretPath: string;
         deletedAt?: Date | null | undefined;
-        maxTimePeriod?: string | null;
         environments: {
           id: string;
           name: string;
@@ -143,7 +141,6 @@ export interface TAccessApprovalPolicyDALFactory
         allowedSelfApprovals: boolean;
         secretPath: string;
         deletedAt?: Date | null | undefined;
-        maxTimePeriod?: string | null;
       }
     | undefined
   >;

backend/src/ee/services/access-approval-policy/access-approval-policy-service.ts

@@ -100,8 +100,7 @@ export const accessApprovalPolicyServiceFactory = ({
     environments,
     enforcementLevel,
     allowedSelfApprovals,
-    approvalsRequired,
-    maxTimePeriod
+    approvalsRequired
   }) => {
     const project = await projectDAL.findProjectBySlug(projectSlug, actorOrgId);
     if (!project) throw new NotFoundError({ message: `Project with slug '${projectSlug}' not found` });
@@ -220,8 +219,7 @@ export const accessApprovalPolicyServiceFactory = ({
           secretPath,
           name,
           enforcementLevel,
-          allowedSelfApprovals,
-          maxTimePeriod
+          allowedSelfApprovals
         },
         tx
       );
@@ -320,8 +318,7 @@ export const accessApprovalPolicyServiceFactory = ({
     enforcementLevel,
     allowedSelfApprovals,
     approvalsRequired,
-    environments,
-    maxTimePeriod
+    environments
   }: TUpdateAccessApprovalPolicy) => {
     const groupApprovers = approvers.filter((approver) => approver.type === ApproverType.Group);
 
@@ -464,8 +461,7 @@ export const accessApprovalPolicyServiceFactory = ({
           secretPath,
           name,
           enforcementLevel,
-          allowedSelfApprovals,
-          maxTimePeriod
+          allowedSelfApprovals
         },
         tx
       );

backend/src/ee/services/access-approval-policy/access-approval-policy-types.ts

@@ -41,7 +41,6 @@ export type TCreateAccessApprovalPolicy = {
   enforcementLevel: EnforcementLevel;
   allowedSelfApprovals: boolean;
   approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
-  maxTimePeriod?: string | null;
 } & Omit<TProjectPermission, "projectId">;
 
 export type TUpdateAccessApprovalPolicy = {
@@ -61,7 +60,6 @@ export type TUpdateAccessApprovalPolicy = {
   allowedSelfApprovals: boolean;
   approvalsRequired?: { numberOfApprovals: number; stepNumber: number }[];
   environments?: string[];
-  maxTimePeriod?: string | null;
 } & Omit<TProjectPermission, "projectId">;
 
 export type TDeleteAccessApprovalPolicy = {
@@ -106,8 +104,7 @@ export interface TAccessApprovalPolicyServiceFactory {
     environment,
     enforcementLevel,
     allowedSelfApprovals,
-    approvalsRequired,
-    maxTimePeriod
+    approvalsRequired
   }: TCreateAccessApprovalPolicy) => Promise<{
     environment: {
       name: string;
@@ -138,7 +135,6 @@ export interface TAccessApprovalPolicyServiceFactory {
     allowedSelfApprovals: boolean;
     secretPath: string;
     deletedAt?: Date | null | undefined;
-    maxTimePeriod?: string | null;
   }>;
   deleteAccessApprovalPolicy: ({
     policyId,
@@ -163,7 +159,6 @@ export interface TAccessApprovalPolicyServiceFactory {
     allowedSelfApprovals: boolean;
     secretPath: string;
     deletedAt?: Date | null | undefined;
-    maxTimePeriod?: string | null;
     environment: {
       id: string;
       name: string;
@@ -190,8 +185,7 @@ export interface TAccessApprovalPolicyServiceFactory {
     enforcementLevel,
     allowedSelfApprovals,
     approvalsRequired,
-    environments,
-    maxTimePeriod
+    environments
   }: TUpdateAccessApprovalPolicy) => Promise<{
     environment: {
       id: string;
@@ -214,7 +208,6 @@ export interface TAccessApprovalPolicyServiceFactory {
     allowedSelfApprovals: boolean;
     secretPath?: string | null | undefined;
     deletedAt?: Date | null | undefined;
-    maxTimePeriod?: string | null;
   }>;
   getAccessApprovalPolicyByProjectSlug: ({
     actorId,
@@ -249,7 +242,6 @@ export interface TAccessApprovalPolicyServiceFactory {
       allowedSelfApprovals: boolean;
       secretPath: string;
       deletedAt?: Date | null | undefined;
-      maxTimePeriod?: string | null;
       environment: {
         id: string;
         name: string;
@@ -306,7 +298,6 @@ export interface TAccessApprovalPolicyServiceFactory {
     allowedSelfApprovals: boolean;
     secretPath: string;
     deletedAt?: Date | null | undefined;
-    maxTimePeriod?: string | null;
     environment: {
       id: string;
       name: string;

backend/src/ee/services/access-approval-request/access-approval-request-dal.ts

@@ -63,7 +63,6 @@ export interface TAccessApprovalRequestDALFactory extends Omit<TOrmify<TableName
           enforcementLevel: string;
           allowedSelfApprovals: boolean;
           deletedAt: Date | null | undefined;
-          maxTimePeriod?: string | null;
         };
         projectId: string;
         environments: string[];
@@ -162,7 +161,6 @@ export interface TAccessApprovalRequestDALFactory extends Omit<TOrmify<TableName
         allowedSelfApprovals: boolean;
         envId: string;
         deletedAt: Date | null | undefined;
-        maxTimePeriod?: string | null;
       };
       projectId: string;
       environment: string;
@@ -299,8 +297,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalR
             db.ref("enforcementLevel").withSchema(TableName.AccessApprovalPolicy).as("policyEnforcementLevel"),
             db.ref("allowedSelfApprovals").withSchema(TableName.AccessApprovalPolicy).as("policyAllowedSelfApprovals"),
             db.ref("envId").withSchema(TableName.AccessApprovalPolicy).as("policyEnvId"),
-            db.ref("deletedAt").withSchema(TableName.AccessApprovalPolicy).as("policyDeletedAt"),
-            db.ref("maxTimePeriod").withSchema(TableName.AccessApprovalPolicy).as("policyMaxTimePeriod")
+            db.ref("deletedAt").withSchema(TableName.AccessApprovalPolicy).as("policyDeletedAt")
           )
           .select(db.ref("approverUserId").withSchema(TableName.AccessApprovalPolicyApprover))
           .select(db.ref("sequence").withSchema(TableName.AccessApprovalPolicyApprover).as("approverSequence"))
@@ -367,8 +364,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalR
               enforcementLevel: doc.policyEnforcementLevel,
               allowedSelfApprovals: doc.policyAllowedSelfApprovals,
               envId: doc.policyEnvId,
-              deletedAt: doc.policyDeletedAt,
-              maxTimePeriod: doc.policyMaxTimePeriod
+              deletedAt: doc.policyDeletedAt
             },
             requestedByUser: {
               userId: doc.requestedByUserId,
@@ -578,8 +574,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalR
         tx.ref("enforcementLevel").withSchema(TableName.AccessApprovalPolicy).as("policyEnforcementLevel"),
         tx.ref("allowedSelfApprovals").withSchema(TableName.AccessApprovalPolicy).as("policyAllowedSelfApprovals"),
         tx.ref("approvals").withSchema(TableName.AccessApprovalPolicy).as("policyApprovals"),
-        tx.ref("deletedAt").withSchema(TableName.AccessApprovalPolicy).as("policyDeletedAt"),
-        tx.ref("maxTimePeriod").withSchema(TableName.AccessApprovalPolicy).as("policyMaxTimePeriod")
+        tx.ref("deletedAt").withSchema(TableName.AccessApprovalPolicy).as("policyDeletedAt")
       );
 
   const findById: TAccessApprovalRequestDALFactory["findById"] = async (id, tx) => {
@@ -600,8 +595,7 @@ export const accessApprovalRequestDALFactory = (db: TDbClient): TAccessApprovalR
             secretPath: el.policySecretPath,
             enforcementLevel: el.policyEnforcementLevel,
             allowedSelfApprovals: el.policyAllowedSelfApprovals,
-            deletedAt: el.policyDeletedAt,
-            maxTimePeriod: el.policyMaxTimePeriod
+            deletedAt: el.policyDeletedAt
           },
           requestedByUser: {
             userId: el.requestedByUserId,

backend/src/ee/services/access-approval-request/access-approval-request-service.ts

@@ -156,15 +156,6 @@ export const accessApprovalRequestServiceFactory = ({
       throw new BadRequestError({ message: "The policy linked to this request has been deleted" });
     }
 
-    // Check if the requested time falls under policy.maxTimePeriod
-    if (policy.maxTimePeriod) {
-      if (!temporaryRange || ms(temporaryRange) > ms(policy.maxTimePeriod)) {
-        throw new BadRequestError({
-          message: `Requested access time range is limited to ${policy.maxTimePeriod} by policy`
-        });
-      }
-    }
-
     const approverIds: string[] = [];
     const approverGroupIds: string[] = [];
 

backend/src/ee/services/access-approval-request/access-approval-request-types.ts

@@ -82,7 +82,6 @@ export interface TAccessApprovalRequestServiceFactory {
         allowedSelfApprovals: boolean;
         envId: string;
         deletedAt: Date | null | undefined;
-        maxTimePeriod?: string | null;
       };
       projectId: string;
       environment: string;

backend/src/ee/services/audit-log/audit-log-dal.ts

@@ -1,10 +1,8 @@
 // weird commonjs-related error in the CI requires us to do the import like this
 import knex from "knex";
-import { v4 as uuidv4 } from "uuid";
 
 import { TDbClient } from "@app/db";
 import { TableName, TAuditLogs } from "@app/db/schemas";
-import { getConfig } from "@app/lib/config/env";
 import { DatabaseError, GatewayTimeoutError } from "@app/lib/errors";
 import { ormify, selectAllTableCols, TOrmify } from "@app/lib/knex";
 import { logger } from "@app/lib/logger";
@@ -152,70 +150,43 @@ export const auditLogDALFactory = (db: TDbClient) => {
 
   // delete all audit log that have expired
   const pruneAuditLog: TAuditLogDALFactory["pruneAuditLog"] = async (tx) => {
-    const runPrune = async (dbClient: knex.Knex) => {
-      const AUDIT_LOG_PRUNE_BATCH_SIZE = 10000;
-      const MAX_RETRY_ON_FAILURE = 3;
+    const AUDIT_LOG_PRUNE_BATCH_SIZE = 10000;
+    const MAX_RETRY_ON_FAILURE = 3;
 
-      const today = new Date();
-      let deletedAuditLogIds: { id: string }[] = [];
-      let numberOfRetryOnFailure = 0;
-      let isRetrying = false;
+    const today = new Date();
+    let deletedAuditLogIds: { id: string }[] = [];
+    let numberOfRetryOnFailure = 0;
+    let isRetrying = false;
 
-      logger.info(`${QueueName.DailyResourceCleanUp}: audit log started`);
-      do {
-        try {
-          const findExpiredLogSubQuery = dbClient(TableName.AuditLog)
-            .where("expiresAt", "<", today)
-            .where("createdAt", "<", today) // to use audit log partition
-            .orderBy(`${TableName.AuditLog}.createdAt`, "desc")
-            .select("id")
-            .limit(AUDIT_LOG_PRUNE_BATCH_SIZE);
+    logger.info(`${QueueName.DailyResourceCleanUp}: audit log started`);
+    do {
+      try {
+        const findExpiredLogSubQuery = (tx || db)(TableName.AuditLog)
+          .where("expiresAt", "<", today)
+          .where("createdAt", "<", today) // to use audit log partition
+          .orderBy(`${TableName.AuditLog}.createdAt`, "desc")
+          .select("id")
+          .limit(AUDIT_LOG_PRUNE_BATCH_SIZE);
 
-          // eslint-disable-next-line no-await-in-loop
-          deletedAuditLogIds = await dbClient(TableName.AuditLog)
-            .whereIn("id", findExpiredLogSubQuery)
-            .del()
-            .returning("id");
-          numberOfRetryOnFailure = 0; // reset
-        } catch (error) {
-          numberOfRetryOnFailure += 1;
-          logger.error(error, "Failed to delete audit log on pruning");
-        } finally {
-          // eslint-disable-next-line no-await-in-loop
-          await new Promise((resolve) => {
-            setTimeout(resolve, 10); // time to breathe for db
-          });
-        }
-        isRetrying = numberOfRetryOnFailure > 0;
-      } while (deletedAuditLogIds.length > 0 || (isRetrying && numberOfRetryOnFailure < MAX_RETRY_ON_FAILURE));
-      logger.info(`${QueueName.DailyResourceCleanUp}: audit log completed`);
-    };
-
-    if (tx) {
-      await runPrune(tx);
-    } else {
-      const QUERY_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
-      await db.transaction(async (trx) => {
-        await trx.raw(`SET statement_timeout = ${QUERY_TIMEOUT_MS}`);
-        await runPrune(trx);
-      });
-    }
+        // eslint-disable-next-line no-await-in-loop
+        deletedAuditLogIds = await (tx || db)(TableName.AuditLog)
+          .whereIn("id", findExpiredLogSubQuery)
+          .del()
+          .returning("id");
+        numberOfRetryOnFailure = 0; // reset
+      } catch (error) {
+        numberOfRetryOnFailure += 1;
+        logger.error(error, "Failed to delete audit log on pruning");
+      } finally {
+        // eslint-disable-next-line no-await-in-loop
+        await new Promise((resolve) => {
+          setTimeout(resolve, 10); // time to breathe for db
+        });
+      }
+      isRetrying = numberOfRetryOnFailure > 0;
+    } while (deletedAuditLogIds.length > 0 || (isRetrying && numberOfRetryOnFailure < MAX_RETRY_ON_FAILURE));
+    logger.info(`${QueueName.DailyResourceCleanUp}: audit log completed`);
   };
 
-  const create: TAuditLogDALFactory["create"] = async (tx) => {
-    const config = getConfig();
-
-    if (config.DISABLE_AUDIT_LOG_STORAGE) {
-      return {
-        ...tx,
-        id: uuidv4(),
-        createdAt: new Date(),
-        updatedAt: new Date()
-      };
-    }
-
-    return auditLogOrm.create(tx);
-  };
-
-  return { ...auditLogOrm, create, pruneAuditLog, find };
+  return { ...auditLogOrm, pruneAuditLog, find };
 };

backend/src/ee/services/audit-log/audit-log-queue.ts

@@ -1,8 +1,7 @@
 import { AxiosError, RawAxiosRequestHeaders } from "axios";
 
-import { ProjectType, SecretKeyEncoding } from "@app/db/schemas";
-import { TEventBusService } from "@app/ee/services/event/event-bus-service";
-import { TopicName, toPublishableEvent } from "@app/ee/services/event/types";
+import { SecretKeyEncoding } from "@app/db/schemas";
+import { getConfig } from "@app/lib/config/env";
 import { request } from "@app/lib/config/request";
 import { crypto } from "@app/lib/crypto/cryptography";
 import { logger } from "@app/lib/logger";
@@ -22,7 +21,6 @@ type TAuditLogQueueServiceFactoryDep = {
   queueService: TQueueServiceFactory;
   projectDAL: Pick<TProjectDALFactory, "findById">;
   licenseService: Pick<TLicenseServiceFactory, "getPlan">;
-  eventBusService: TEventBusService;
 };
 
 export type TAuditLogQueueServiceFactory = {
@@ -38,18 +36,134 @@ export const auditLogQueueServiceFactory = async ({
   queueService,
   projectDAL,
   licenseService,
-  auditLogStreamDAL,
-  eventBusService
+  auditLogStreamDAL
 }: TAuditLogQueueServiceFactoryDep): Promise<TAuditLogQueueServiceFactory> => {
+  const appCfg = getConfig();
+
   const pushToLog = async (data: TCreateAuditLogDTO) => {
-    await queueService.queue<QueueName.AuditLog>(QueueName.AuditLog, QueueJobs.AuditLog, data, {
-      removeOnFail: {
-        count: 3
-      },
-      removeOnComplete: true
-    });
+    if (appCfg.USE_PG_QUEUE && appCfg.SHOULD_INIT_PG_QUEUE) {
+      await queueService.queuePg<QueueName.AuditLog>(QueueJobs.AuditLog, data, {
+        retryLimit: 10,
+        retryBackoff: true
+      });
+    } else {
+      await queueService.queue<QueueName.AuditLog>(QueueName.AuditLog, QueueJobs.AuditLog, data, {
+        removeOnFail: {
+          count: 3
+        },
+        removeOnComplete: true
+      });
+    }
   };
 
+  if (appCfg.SHOULD_INIT_PG_QUEUE) {
+    await queueService.startPg<QueueName.AuditLog>(
+      QueueJobs.AuditLog,
+      async ([job]) => {
+        const { actor, event, ipAddress, projectId, userAgent, userAgentType } = job.data;
+        let { orgId } = job.data;
+        const MS_IN_DAY = 24 * 60 * 60 * 1000;
+        let project;
+
+        if (!orgId) {
+          // it will never be undefined for both org and project id
+          // TODO(akhilmhdh): use caching here in dal to avoid db calls
+          project = await projectDAL.findById(projectId as string);
+          orgId = project.orgId;
+        }
+
+        const plan = await licenseService.getPlan(orgId);
+        if (plan.auditLogsRetentionDays === 0) {
+          // skip inserting if audit log retention is 0 meaning its not supported
+          return;
+        }
+
+        // For project actions, set TTL to project-level audit log retention config
+        // This condition ensures that the plan's audit log retention days cannot be bypassed
+        const ttlInDays =
+          project?.auditLogsRetentionDays && project.auditLogsRetentionDays < plan.auditLogsRetentionDays
+            ? project.auditLogsRetentionDays
+            : plan.auditLogsRetentionDays;
+
+        const ttl = ttlInDays * MS_IN_DAY;
+
+        const auditLog = await auditLogDAL.create({
+          actor: actor.type,
+          actorMetadata: actor.metadata,
+          userAgent,
+          projectId,
+          projectName: project?.name,
+          ipAddress,
+          orgId,
+          eventType: event.type,
+          expiresAt: new Date(Date.now() + ttl),
+          eventMetadata: event.metadata,
+          userAgentType
+        });
+
+        const logStreams = orgId ? await auditLogStreamDAL.find({ orgId }) : [];
+        await Promise.allSettled(
+          logStreams.map(
+            async ({
+              url,
+              encryptedHeadersTag,
+              encryptedHeadersIV,
+              encryptedHeadersKeyEncoding,
+              encryptedHeadersCiphertext
+            }) => {
+              const streamHeaders =
+                encryptedHeadersIV && encryptedHeadersCiphertext && encryptedHeadersTag
+                  ? (JSON.parse(
+                      crypto
+                        .encryption()
+                        .symmetric()
+                        .decryptWithRootEncryptionKey({
+                          keyEncoding: encryptedHeadersKeyEncoding as SecretKeyEncoding,
+                          iv: encryptedHeadersIV,
+                          tag: encryptedHeadersTag,
+                          ciphertext: encryptedHeadersCiphertext
+                        })
+                    ) as LogStreamHeaders[])
+                  : [];
+
+              const headers: RawAxiosRequestHeaders = { "Content-Type": "application/json" };
+
+              if (streamHeaders.length)
+                streamHeaders.forEach(({ key, value }) => {
+                  headers[key] = value;
+                });
+
+              try {
+                const response = await request.post(
+                  url,
+                  { ...providerSpecificPayload(url), ...auditLog },
+                  {
+                    headers,
+                    // request timeout
+                    timeout: AUDIT_LOG_STREAM_TIMEOUT,
+                    // connection timeout
+                    signal: AbortSignal.timeout(AUDIT_LOG_STREAM_TIMEOUT)
+                  }
+                );
+                return response;
+              } catch (error) {
+                logger.error(
+                  `Failed to stream audit log [url=${url}] for org [orgId=${orgId}] [error=${(error as AxiosError).message}]`
+                );
+                return error;
+              }
+            }
+          )
+        );
+      },
+      {
+        batchSize: 1,
+        workerCount: 30,
+        pollingIntervalSeconds: 0.5
+      }
+    );
+  }
+
   queueService.start(QueueName.AuditLog, async (job) => {
     const { actor, event, ipAddress, projectId, userAgent, userAgentType } = job.data;
     let { orgId } = job.data;
@@ -64,97 +178,88 @@ export const auditLogQueueServiceFactory = async ({
     }
 
     const plan = await licenseService.getPlan(orgId);
+    if (plan.auditLogsRetentionDays === 0) {
+      // skip inserting if audit log retention is 0 meaning its not supported
+      return;
+    }
 
-    // skip inserting if audit log retention is 0 meaning its not supported
-    if (plan.auditLogsRetentionDays !== 0) {
-      // For project actions, set TTL to project-level audit log retention config
-      // This condition ensures that the plan's audit log retention days cannot be bypassed
-      const ttlInDays =
-        project?.auditLogsRetentionDays && project.auditLogsRetentionDays < plan.auditLogsRetentionDays
-          ? project.auditLogsRetentionDays
-          : plan.auditLogsRetentionDays;
+    // For project actions, set TTL to project-level audit log retention config
+    // This condition ensures that the plan's audit log retention days cannot be bypassed
+    const ttlInDays =
+      project?.auditLogsRetentionDays && project.auditLogsRetentionDays < plan.auditLogsRetentionDays
+        ? project.auditLogsRetentionDays
+        : plan.auditLogsRetentionDays;
 
-      const ttl = ttlInDays * MS_IN_DAY;
+    const ttl = ttlInDays * MS_IN_DAY;
 
-      const auditLog = await auditLogDAL.create({
-        actor: actor.type,
-        actorMetadata: actor.metadata,
-        userAgent,
-        projectId,
-        projectName: project?.name,
-        ipAddress,
-        orgId,
-        eventType: event.type,
-        expiresAt: new Date(Date.now() + ttl),
-        eventMetadata: event.metadata,
-        userAgentType
-      });
+    const auditLog = await auditLogDAL.create({
+      actor: actor.type,
+      actorMetadata: actor.metadata,
+      userAgent,
+      projectId,
+      projectName: project?.name,
+      ipAddress,
+      orgId,
+      eventType: event.type,
+      expiresAt: new Date(Date.now() + ttl),
+      eventMetadata: event.metadata,
+      userAgentType
+    });
 
-      const logStreams = orgId ? await auditLogStreamDAL.find({ orgId }) : [];
-      await Promise.allSettled(
-        logStreams.map(
-          async ({
-            url,
-            encryptedHeadersTag,
-            encryptedHeadersIV,
-            encryptedHeadersKeyEncoding,
-            encryptedHeadersCiphertext
-          }) => {
-            const streamHeaders =
-              encryptedHeadersIV && encryptedHeadersCiphertext && encryptedHeadersTag
-                ? (JSON.parse(
-                    crypto
-                      .encryption()
-                      .symmetric()
-                      .decryptWithRootEncryptionKey({
-                        keyEncoding: encryptedHeadersKeyEncoding as SecretKeyEncoding,
-                        iv: encryptedHeadersIV,
-                        tag: encryptedHeadersTag,
-                        ciphertext: encryptedHeadersCiphertext
-                      })
-                  ) as LogStreamHeaders[])
-                : [];
+    const logStreams = orgId ? await auditLogStreamDAL.find({ orgId }) : [];
+    await Promise.allSettled(
+      logStreams.map(
+        async ({
+          url,
+          encryptedHeadersTag,
+          encryptedHeadersIV,
+          encryptedHeadersKeyEncoding,
+          encryptedHeadersCiphertext
+        }) => {
+          const streamHeaders =
+            encryptedHeadersIV && encryptedHeadersCiphertext && encryptedHeadersTag
+              ? (JSON.parse(
+                  crypto
+                    .encryption()
+                    .symmetric()
+                    .decryptWithRootEncryptionKey({
+                      keyEncoding: encryptedHeadersKeyEncoding as SecretKeyEncoding,
+                      iv: encryptedHeadersIV,
+                      tag: encryptedHeadersTag,
+                      ciphertext: encryptedHeadersCiphertext
+                    })
+                ) as LogStreamHeaders[])
+              : [];
 
-            const headers: RawAxiosRequestHeaders = { "Content-Type": "application/json" };
+          const headers: RawAxiosRequestHeaders = { "Content-Type": "application/json" };
 
-            if (streamHeaders.length)
-              streamHeaders.forEach(({ key, value }) => {
-                headers[key] = value;
-              });
+          if (streamHeaders.length)
+            streamHeaders.forEach(({ key, value }) => {
+              headers[key] = value;
+            });
 
-            try {
-              const response = await request.post(
-                url,
-                { ...providerSpecificPayload(url), ...auditLog },
-                {
-                  headers,
-                  // request timeout
-                  timeout: AUDIT_LOG_STREAM_TIMEOUT,
-                  // connection timeout
-                  signal: AbortSignal.timeout(AUDIT_LOG_STREAM_TIMEOUT)
-                }
-              );
-              return response;
-            } catch (error) {
-              logger.error(
-                `Failed to stream audit log [url=${url}] for org [orgId=${orgId}] [error=${(error as AxiosError).message}]`
-              );
-              return error;
-            }
+          try {
+            const response = await request.post(
+              url,
+              { ...providerSpecificPayload(url), ...auditLog },
+              {
+                headers,
+                // request timeout
+                timeout: AUDIT_LOG_STREAM_TIMEOUT,
+                // connection timeout
+                signal: AbortSignal.timeout(AUDIT_LOG_STREAM_TIMEOUT)
+              }
+            );
+            return response;
+          } catch (error) {
+            logger.error(
+              `Failed to stream audit log [url=${url}] for org [orgId=${orgId}] [error=${(error as AxiosError).message}]`
+            );
+            return error;
           }
-        )
-      );
-    }
-
-    const publishable = toPublishableEvent(event);
-
-    if (publishable) {
-      await eventBusService.publish(TopicName.CoreServers, {
-        type: ProjectType.SecretManager,
-        source: "infiscal",
-        data: publishable.data
-      });
-    }
+        }
+      )
+    );
   });
 
   return {

backend/src/ee/services/audit-log/audit-log-types.ts

@@ -161,9 +161,6 @@ export enum EventType {
   CREATE_IDENTITY = "create-identity",
   UPDATE_IDENTITY = "update-identity",
   DELETE_IDENTITY = "delete-identity",
-  MACHINE_IDENTITY_AUTH_TEMPLATE_CREATE = "machine-identity-auth-template-create",
-  MACHINE_IDENTITY_AUTH_TEMPLATE_UPDATE = "machine-identity-auth-template-update",
-  MACHINE_IDENTITY_AUTH_TEMPLATE_DELETE = "machine-identity-auth-template-delete",
   LOGIN_IDENTITY_UNIVERSAL_AUTH = "login-identity-universal-auth",
   ADD_IDENTITY_UNIVERSAL_AUTH = "add-identity-universal-auth",
   UPDATE_IDENTITY_UNIVERSAL_AUTH = "update-identity-universal-auth",
@@ -833,30 +830,6 @@ interface LoginIdentityUniversalAuthEvent {
   };
 }
 
-interface MachineIdentityAuthTemplateCreateEvent {
-  type: EventType.MACHINE_IDENTITY_AUTH_TEMPLATE_CREATE;
-  metadata: {
-    templateId: string;
-    name: string;
-  };
-}
-
-interface MachineIdentityAuthTemplateUpdateEvent {
-  type: EventType.MACHINE_IDENTITY_AUTH_TEMPLATE_UPDATE;
-  metadata: {
-    templateId: string;
-    name: string;
-  };
-}
-
-interface MachineIdentityAuthTemplateDeleteEvent {
-  type: EventType.MACHINE_IDENTITY_AUTH_TEMPLATE_DELETE;
-  metadata: {
-    templateId: string;
-    name: string;
-  };
-}
-
 interface AddIdentityUniversalAuthEvent {
   type: EventType.ADD_IDENTITY_UNIVERSAL_AUTH;
   metadata: {
@@ -1352,7 +1325,6 @@ interface AddIdentityLdapAuthEvent {
     accessTokenTrustedIps?: Array<TIdentityTrustedIp>;
     allowedFields?: TAllowedFields[];
     url: string;
-    templateId?: string | null;
   };
 }
 
@@ -1366,7 +1338,6 @@ interface UpdateIdentityLdapAuthEvent {
     accessTokenTrustedIps?: Array<TIdentityTrustedIp>;
     allowedFields?: TAllowedFields[];
     url?: string;
-    templateId?: string | null;
   };
 }
 
@@ -3468,9 +3439,6 @@ export type Event =
   | UpdateIdentityEvent
   | DeleteIdentityEvent
   | LoginIdentityUniversalAuthEvent
-  | MachineIdentityAuthTemplateCreateEvent
-  | MachineIdentityAuthTemplateUpdateEvent
-  | MachineIdentityAuthTemplateDeleteEvent
   | AddIdentityUniversalAuthEvent
   | UpdateIdentityUniversalAuthEvent
   | DeleteIdentityUniversalAuthEvent

backend/src/ee/services/dynamic-secret/dynamic-secret-fns.ts

@@ -9,7 +9,7 @@ import { getDbConnectionHost } from "@app/lib/knex";
 export const verifyHostInputValidity = async (host: string, isGateway = false) => {
   const appCfg = getConfig();
 
-  if (appCfg.isDevelopmentMode || appCfg.isTestMode) return [host];
+  if (appCfg.isDevelopmentMode) return [host];
 
   if (isGateway) return [host];
 

backend/src/ee/services/dynamic-secret/providers/aws-elasticache.ts

@@ -15,7 +15,6 @@ import { z } from "zod";
 import { CustomAWSHasher } from "@app/lib/aws/hashing";
 import { crypto } from "@app/lib/crypto";
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
 
 import { DynamicSecretAwsElastiCacheSchema, TDynamicProviderFns } from "./models";
@@ -171,29 +170,14 @@ export const AwsElastiCacheDatabaseProvider = (): TDynamicProviderFns => {
   };
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      await ElastiCacheUserManager(
-        {
-          accessKeyId: providerInputs.accessKeyId,
-          secretAccessKey: providerInputs.secretAccessKey
-        },
-        providerInputs.region
-      ).verifyCredentials(providerInputs.clusterName);
-      return true;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [
-          providerInputs.accessKeyId,
-          providerInputs.secretAccessKey,
-          providerInputs.clusterName,
-          providerInputs.region
-        ]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await ElastiCacheUserManager(
+      {
+        accessKeyId: providerInputs.accessKeyId,
+        secretAccessKey: providerInputs.secretAccessKey
+      },
+      providerInputs.region
+    ).verifyCredentials(providerInputs.clusterName);
+    return true;
   };
 
   const create = async (data: {
@@ -222,37 +206,21 @@ export const AwsElastiCacheDatabaseProvider = (): TDynamicProviderFns => {
 
     const parsedStatement = CreateElastiCacheUserSchema.parse(JSON.parse(creationStatement));
 
-    try {
-      await ElastiCacheUserManager(
-        {
-          accessKeyId: providerInputs.accessKeyId,
-          secretAccessKey: providerInputs.secretAccessKey
-        },
-        providerInputs.region
-      ).createUser(parsedStatement, providerInputs.clusterName);
+    await ElastiCacheUserManager(
+      {
+        accessKeyId: providerInputs.accessKeyId,
+        secretAccessKey: providerInputs.secretAccessKey
+      },
+      providerInputs.region
+    ).createUser(parsedStatement, providerInputs.clusterName);
 
-      return {
-        entityId: leaseUsername,
-        data: {
-          DB_USERNAME: leaseUsername,
-          DB_PASSWORD: leasePassword
-        }
-      };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [
-          leaseUsername,
-          leasePassword,
-          providerInputs.accessKeyId,
-          providerInputs.secretAccessKey,
-          providerInputs.clusterName
-        ]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return {
+      entityId: leaseUsername,
+      data: {
+        DB_USERNAME: leaseUsername,
+        DB_PASSWORD: leasePassword
+      }
+    };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
@@ -261,25 +229,15 @@ export const AwsElastiCacheDatabaseProvider = (): TDynamicProviderFns => {
     const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username: entityId });
     const parsedStatement = DeleteElasticCacheUserSchema.parse(JSON.parse(revokeStatement));
 
-    try {
-      await ElastiCacheUserManager(
-        {
-          accessKeyId: providerInputs.accessKeyId,
-          secretAccessKey: providerInputs.secretAccessKey
-        },
-        providerInputs.region
-      ).deleteUser(parsedStatement);
+    await ElastiCacheUserManager(
+      {
+        accessKeyId: providerInputs.accessKeyId,
+        secretAccessKey: providerInputs.secretAccessKey
+      },
+      providerInputs.region
+    ).deleteUser(parsedStatement);
 
-      return { entityId };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [entityId, providerInputs.accessKeyId, providerInputs.secretAccessKey, providerInputs.clusterName]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return { entityId };
   };
 
   const renew = async (_inputs: unknown, entityId: string) => {

backend/src/ee/services/dynamic-secret/providers/aws-iam.ts

@@ -23,7 +23,6 @@ import { CustomAWSHasher } from "@app/lib/aws/hashing";
 import { getConfig } from "@app/lib/config/env";
 import { crypto } from "@app/lib/crypto/cryptography";
 import { BadRequestError, UnauthorizedError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { AwsIamAuthType, DynamicSecretAwsIamSchema, TDynamicProviderFns } from "./models";
@@ -119,39 +118,22 @@ export const AwsIamProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown, { projectId }: { projectId: string }) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      const client = await $getClient(providerInputs, projectId);
-      const isConnected = await client
-        .send(new GetUserCommand({}))
-        .then(() => true)
-        .catch((err) => {
-          const message = (err as Error)?.message;
-          if (
-            (providerInputs.method === AwsIamAuthType.AssumeRole || providerInputs.method === AwsIamAuthType.IRSA) &&
-            // assume role will throw an error asking to provider username, but if so this has access in aws correctly
-            message.includes("Must specify userName when calling with non-User credentials")
-          ) {
-            return true;
-          }
-          throw err;
-        });
-      return isConnected;
-    } catch (err) {
-      const sensitiveTokens = [];
-      if (providerInputs.method === AwsIamAuthType.AccessKey) {
-        sensitiveTokens.push(providerInputs.accessKey, providerInputs.secretAccessKey);
-      }
-      if (providerInputs.method === AwsIamAuthType.AssumeRole) {
-        sensitiveTokens.push(providerInputs.roleArn);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: sensitiveTokens
+    const client = await $getClient(providerInputs, projectId);
+    const isConnected = await client
+      .send(new GetUserCommand({}))
+      .then(() => true)
+      .catch((err) => {
+        const message = (err as Error)?.message;
+        if (
+          (providerInputs.method === AwsIamAuthType.AssumeRole || providerInputs.method === AwsIamAuthType.IRSA) &&
+          // assume role will throw an error asking to provider username, but if so this has access in aws correctly
+          message.includes("Must specify userName when calling with non-User credentials")
+        ) {
+          return true;
+        }
+        throw err;
       });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return isConnected;
   };
 
   const create = async (data: {
@@ -180,81 +162,62 @@ export const AwsIamProvider = (): TDynamicProviderFns => {
       awsTags.push(...additionalTags);
     }
 
-    try {
-      const createUserRes = await client.send(
-        new CreateUserCommand({
-          Path: awsPath,
-          PermissionsBoundary: permissionBoundaryPolicyArn || undefined,
-          Tags: awsTags,
-          UserName: username
-        })
+    const createUserRes = await client.send(
+      new CreateUserCommand({
+        Path: awsPath,
+        PermissionsBoundary: permissionBoundaryPolicyArn || undefined,
+        Tags: awsTags,
+        UserName: username
+      })
+    );
+
+    if (!createUserRes.User) throw new BadRequestError({ message: "Failed to create AWS IAM User" });
+    if (userGroups) {
+      await Promise.all(
+        userGroups
+          .split(",")
+          .filter(Boolean)
+          .map((group) =>
+            client.send(new AddUserToGroupCommand({ UserName: createUserRes?.User?.UserName, GroupName: group }))
+          )
       );
-
-      if (!createUserRes.User) throw new BadRequestError({ message: "Failed to create AWS IAM User" });
-      if (userGroups) {
-        await Promise.all(
-          userGroups
-            .split(",")
-            .filter(Boolean)
-            .map((group) =>
-              client.send(new AddUserToGroupCommand({ UserName: createUserRes?.User?.UserName, GroupName: group }))
-            )
-        );
-      }
-      if (policyArns) {
-        await Promise.all(
-          policyArns
-            .split(",")
-            .filter(Boolean)
-            .map((policyArn) =>
-              client.send(
-                new AttachUserPolicyCommand({ UserName: createUserRes?.User?.UserName, PolicyArn: policyArn })
-              )
-            )
-        );
-      }
-      if (policyDocument) {
-        await client.send(
-          new PutUserPolicyCommand({
-            UserName: createUserRes.User.UserName,
-            PolicyName: `infisical-dynamic-policy-${alphaNumericNanoId(4)}`,
-            PolicyDocument: policyDocument
-          })
-        );
-      }
-
-      const createAccessKeyRes = await client.send(
-        new CreateAccessKeyCommand({
-          UserName: createUserRes.User.UserName
-        })
-      );
-      if (!createAccessKeyRes.AccessKey)
-        throw new BadRequestError({ message: "Failed to create AWS IAM User access key" });
-
-      return {
-        entityId: username,
-        data: {
-          ACCESS_KEY: createAccessKeyRes.AccessKey.AccessKeyId,
-          SECRET_ACCESS_KEY: createAccessKeyRes.AccessKey.SecretAccessKey,
-          USERNAME: username
-        }
-      };
-    } catch (err) {
-      const sensitiveTokens = [username];
-      if (providerInputs.method === AwsIamAuthType.AccessKey) {
-        sensitiveTokens.push(providerInputs.accessKey, providerInputs.secretAccessKey);
-      }
-      if (providerInputs.method === AwsIamAuthType.AssumeRole) {
-        sensitiveTokens.push(providerInputs.roleArn);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: sensitiveTokens
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
     }
+    if (policyArns) {
+      await Promise.all(
+        policyArns
+          .split(",")
+          .filter(Boolean)
+          .map((policyArn) =>
+            client.send(new AttachUserPolicyCommand({ UserName: createUserRes?.User?.UserName, PolicyArn: policyArn }))
+          )
+      );
+    }
+    if (policyDocument) {
+      await client.send(
+        new PutUserPolicyCommand({
+          UserName: createUserRes.User.UserName,
+          PolicyName: `infisical-dynamic-policy-${alphaNumericNanoId(4)}`,
+          PolicyDocument: policyDocument
+        })
+      );
+    }
+
+    const createAccessKeyRes = await client.send(
+      new CreateAccessKeyCommand({
+        UserName: createUserRes.User.UserName
+      })
+    );
+    if (!createAccessKeyRes.AccessKey)
+      throw new BadRequestError({ message: "Failed to create AWS IAM User access key" });
+
+    return {
+      entityId: username,
+      data: {
+        ACCESS_KEY: createAccessKeyRes.AccessKey.AccessKeyId,
+        SECRET_ACCESS_KEY: createAccessKeyRes.AccessKey.SecretAccessKey,
+        USERNAME: username
+      }
+    };
   };
 
   const revoke = async (inputs: unknown, entityId: string, metadata: { projectId: string }) => {
@@ -315,25 +278,8 @@ export const AwsIamProvider = (): TDynamicProviderFns => {
       )
     );
 
-    try {
-      await client.send(new DeleteUserCommand({ UserName: username }));
-      return { entityId: username };
-    } catch (err) {
-      const sensitiveTokens = [username];
-      if (providerInputs.method === AwsIamAuthType.AccessKey) {
-        sensitiveTokens.push(providerInputs.accessKey, providerInputs.secretAccessKey);
-      }
-      if (providerInputs.method === AwsIamAuthType.AssumeRole) {
-        sensitiveTokens.push(providerInputs.roleArn);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: sensitiveTokens
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await client.send(new DeleteUserCommand({ UserName: username }));
+    return { entityId: username };
   };
 
   const renew = async (_inputs: unknown, entityId: string) => {

backend/src/ee/services/dynamic-secret/providers/azure-entra-id.ts

@@ -2,7 +2,6 @@ import axios from "axios";
 import { customAlphabet } from "nanoid";
 
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 
 import { AzureEntraIDSchema, TDynamicProviderFns } from "./models";
 
@@ -52,82 +51,45 @@ export const AzureEntraIDProvider = (): TDynamicProviderFns & {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      const data = await $getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret);
-      return data.success;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.clientSecret, providerInputs.applicationId, providerInputs.tenantId]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    const data = await $getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret);
+    return data.success;
   };
 
   const create = async ({ inputs }: { inputs: unknown }) => {
     const providerInputs = await validateProviderInputs(inputs);
+    const data = await $getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret);
+    if (!data.success) {
+      throw new BadRequestError({ message: "Failed to authorize to Microsoft Entra ID" });
+    }
 
     const password = generatePassword();
-    try {
-      const data = await $getToken(providerInputs.tenantId, providerInputs.applicationId, providerInputs.clientSecret);
-      if (!data.success) {
-        throw new BadRequestError({ message: "Failed to authorize to Microsoft Entra ID" });
-      }
 
-      const response = await axios.patch(
-        `${MSFT_GRAPH_API_URL}/users/${providerInputs.userId}`,
-        {
-          passwordProfile: {
-            forceChangePasswordNextSignIn: false,
-            password
-          }
-        },
-        {
-          headers: {
-            "Content-Type": "application/json",
-            Authorization: `Bearer ${data.token}`
-          }
-        }
-      );
-      if (response.status !== 204) {
-        throw new BadRequestError({ message: "Failed to update password" });
-      }
-
-      return { entityId: providerInputs.userId, data: { email: providerInputs.email, password } };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [
-          providerInputs.clientSecret,
-          providerInputs.applicationId,
-          providerInputs.userId,
-          providerInputs.email,
+    const response = await axios.patch(
+      `${MSFT_GRAPH_API_URL}/users/${providerInputs.userId}`,
+      {
+        passwordProfile: {
+          forceChangePasswordNextSignIn: false,
           password
-        ]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
+        }
+      },
+      {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${data.token}`
+        }
+      }
+    );
+    if (response.status !== 204) {
+      throw new BadRequestError({ message: "Failed to update password" });
     }
+
+    return { entityId: providerInputs.userId, data: { email: providerInputs.email, password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
-    const providerInputs = await validateProviderInputs(inputs);
-    try {
-      // Creates a new password
-      await create({ inputs });
-      return { entityId };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.clientSecret, providerInputs.applicationId, entityId]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    // Creates a new password
+    await create({ inputs });
+    return { entityId };
   };
 
   const fetchAzureEntraIdUsers = async (tenantId: string, applicationId: string, clientSecret: string) => {

backend/src/ee/services/dynamic-secret/providers/cassandra.ts

@@ -3,8 +3,6 @@ import handlebars from "handlebars";
 import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
 
@@ -73,24 +71,9 @@ export const CassandraProvider = (): TDynamicProviderFns => {
     const providerInputs = await validateProviderInputs(inputs);
     const client = await $getClient(providerInputs);
 
-    try {
-      const isConnected = await client.execute("SELECT * FROM system_schema.keyspaces").then(() => true);
-      await client.shutdown();
-      return isConnected;
-    } catch (err) {
-      const tokens = [providerInputs.password, providerInputs.username];
-      if (providerInputs.keyspace) {
-        tokens.push(providerInputs.keyspace);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens
-      });
-      await client.shutdown();
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    const isConnected = await client.execute("SELECT * FROM system_schema.keyspaces").then(() => true);
+    await client.shutdown();
+    return isConnected;
   };
 
   const create = async (data: {
@@ -106,39 +89,23 @@ export const CassandraProvider = (): TDynamicProviderFns => {
     const username = generateUsername(usernameTemplate, identity);
     const password = generatePassword();
     const { keyspace } = providerInputs;
+    const expiration = new Date(expireAt).toISOString();
 
-    try {
-      const expiration = new Date(expireAt).toISOString();
+    const creationStatement = handlebars.compile(providerInputs.creationStatement, { noEscape: true })({
+      username,
+      password,
+      expiration,
+      keyspace
+    });
 
-      const creationStatement = handlebars.compile(providerInputs.creationStatement, { noEscape: true })({
-        username,
-        password,
-        expiration,
-        keyspace
-      });
-
-      const queries = creationStatement.toString().split(";").filter(Boolean);
-      for (const query of queries) {
-        // eslint-disable-next-line
-        await client.execute(query);
-      }
-      await client.shutdown();
-
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (err) {
-      const tokens = [username, password];
-      if (keyspace) {
-        tokens.push(keyspace);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens
-      });
-      await client.shutdown();
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
+    const queries = creationStatement.toString().split(";").filter(Boolean);
+    for (const query of queries) {
+      // eslint-disable-next-line
+      await client.execute(query);
     }
+    await client.shutdown();
+
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
@@ -148,29 +115,14 @@ export const CassandraProvider = (): TDynamicProviderFns => {
     const username = entityId;
     const { keyspace } = providerInputs;
 
-    try {
-      const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username, keyspace });
-      const queries = revokeStatement.toString().split(";").filter(Boolean);
-      for (const query of queries) {
-        // eslint-disable-next-line
-        await client.execute(query);
-      }
-      await client.shutdown();
-      return { entityId: username };
-    } catch (err) {
-      const tokens = [username];
-      if (keyspace) {
-        tokens.push(keyspace);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens
-      });
-      await client.shutdown();
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
+    const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username, keyspace });
+    const queries = revokeStatement.toString().split(";").filter(Boolean);
+    for (const query of queries) {
+      // eslint-disable-next-line
+      await client.execute(query);
     }
+    await client.shutdown();
+    return { entityId: username };
   };
 
   const renew = async (inputs: unknown, entityId: string, expireAt: number) => {
@@ -178,36 +130,21 @@ export const CassandraProvider = (): TDynamicProviderFns => {
     if (!providerInputs.renewStatement) return { entityId };
 
     const client = await $getClient(providerInputs);
+
+    const expiration = new Date(expireAt).toISOString();
     const { keyspace } = providerInputs;
 
-    try {
-      const expiration = new Date(expireAt).toISOString();
-
-      const renewStatement = handlebars.compile(providerInputs.renewStatement)({
-        username: entityId,
-        keyspace,
-        expiration
-      });
-      const queries = renewStatement.toString().split(";").filter(Boolean);
-      for await (const query of queries) {
-        await client.execute(query);
-      }
-      await client.shutdown();
-      return { entityId };
-    } catch (err) {
-      const tokens = [entityId];
-      if (keyspace) {
-        tokens.push(keyspace);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens
-      });
-      await client.shutdown();
-      throw new BadRequestError({
-        message: `Failed to renew lease from provider: ${sanitizedErrorMessage}`
-      });
+    const renewStatement = handlebars.compile(providerInputs.renewStatement)({
+      username: entityId,
+      keyspace,
+      expiration
+    });
+    const queries = renewStatement.toString().split(";").filter(Boolean);
+    for await (const query of queries) {
+      await client.execute(query);
     }
+    await client.shutdown();
+    return { entityId };
   };
 
   return {

backend/src/ee/services/dynamic-secret/providers/elastic-search.ts

@@ -2,8 +2,6 @@ import { Client as ElasticSearchClient } from "@elastic/elasticsearch";
 import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { verifyHostInputValidity } from "../dynamic-secret-fns";
@@ -65,24 +63,12 @@ export const ElasticSearchProvider = (): TDynamicProviderFns => {
     const providerInputs = await validateProviderInputs(inputs);
     const connection = await $getClient(providerInputs);
 
-    try {
-      const infoResponse = await connection.info().then(() => true);
-      return infoResponse;
-    } catch (err) {
-      const tokens = [];
-      if (providerInputs.auth.type === ElasticSearchAuthTypes.ApiKey) {
-        tokens.push(providerInputs.auth.apiKey, providerInputs.auth.apiKeyId);
-      } else {
-        tokens.push(providerInputs.auth.username, providerInputs.auth.password);
-      }
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    const infoResponse = await connection
+      .info()
+      .then(() => true)
+      .catch(() => false);
+
+    return infoResponse;
   };
 
   const create = async (data: { inputs: unknown; usernameTemplate?: string | null; identity?: { name: string } }) => {
@@ -93,49 +79,27 @@ export const ElasticSearchProvider = (): TDynamicProviderFns => {
     const username = generateUsername(usernameTemplate, identity);
     const password = generatePassword();
 
-    try {
-      await connection.security.putUser({
-        username,
-        password,
-        full_name: "Managed by Infisical.com",
-        roles: providerInputs.roles
-      });
+    await connection.security.putUser({
+      username,
+      password,
+      full_name: "Managed by Infisical.com",
+      roles: providerInputs.roles
+    });
 
-      await connection.close();
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, password]
-      });
-      await connection.close();
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await connection.close();
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
     const providerInputs = await validateProviderInputs(inputs);
     const connection = await $getClient(providerInputs);
 
-    try {
-      await connection.security.deleteUser({
-        username: entityId
-      });
+    await connection.security.deleteUser({
+      username: entityId
+    });
 
-      await connection.close();
-      return { entityId };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [entityId]
-      });
-      await connection.close();
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await connection.close();
+    return { entityId };
   };
 
   const renew = async (_inputs: unknown, entityId: string) => {

backend/src/ee/services/dynamic-secret/providers/gcp-iam.ts

@@ -3,7 +3,6 @@ import { GetAccessTokenResponse } from "google-auth-library/build/src/auth/oauth
 
 import { getConfig } from "@app/lib/config/env";
 import { BadRequestError, InternalServerError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { DynamicSecretGcpIamSchema, TDynamicProviderFns } from "./models";
@@ -66,18 +65,8 @@ export const GcpIamProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      await $getToken(providerInputs.serviceAccountEmail, 10);
-      return true;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.serviceAccountEmail]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await $getToken(providerInputs.serviceAccountEmail, 10);
+    return true;
   };
 
   const create = async (data: { inputs: unknown; expireAt: number }) => {
@@ -85,23 +74,13 @@ export const GcpIamProvider = (): TDynamicProviderFns => {
 
     const providerInputs = await validateProviderInputs(inputs);
 
-    try {
-      const now = Math.floor(Date.now() / 1000);
-      const ttl = Math.max(Math.floor(expireAt / 1000) - now, 0);
+    const now = Math.floor(Date.now() / 1000);
+    const ttl = Math.max(Math.floor(expireAt / 1000) - now, 0);
 
-      const token = await $getToken(providerInputs.serviceAccountEmail, ttl);
-      const entityId = alphaNumericNanoId(32);
+    const token = await $getToken(providerInputs.serviceAccountEmail, ttl);
+    const entityId = alphaNumericNanoId(32);
 
-      return { entityId, data: { SERVICE_ACCOUNT_EMAIL: providerInputs.serviceAccountEmail, TOKEN: token } };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.serviceAccountEmail]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return { entityId, data: { SERVICE_ACCOUNT_EMAIL: providerInputs.serviceAccountEmail, TOKEN: token } };
   };
 
   const revoke = async (_inputs: unknown, entityId: string) => {
@@ -110,21 +89,10 @@ export const GcpIamProvider = (): TDynamicProviderFns => {
   };
 
   const renew = async (inputs: unknown, entityId: string, expireAt: number) => {
-    try {
-      // To renew a token it must be re-created
-      const data = await create({ inputs, expireAt });
+    // To renew a token it must be re-created
+    const data = await create({ inputs, expireAt });
 
-      return { ...data, entityId };
-    } catch (err) {
-      const providerInputs = await validateProviderInputs(inputs);
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.serviceAccountEmail]
-      });
-      throw new BadRequestError({
-        message: `Failed to renew lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return { ...data, entityId };
   };
 
   return {

backend/src/ee/services/dynamic-secret/providers/github.ts

@@ -3,7 +3,6 @@ import jwt from "jsonwebtoken";
 
 import { crypto } from "@app/lib/crypto";
 import { BadRequestError, InternalServerError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { IntegrationUrls } from "@app/services/integration-auth/integration-list";
 
@@ -90,46 +89,26 @@ export const GithubProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      await $generateGitHubInstallationAccessToken(providerInputs);
-      return true;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.privateKey, String(providerInputs.appId), String(providerInputs.installationId)]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await $generateGitHubInstallationAccessToken(providerInputs);
+    return true;
   };
 
   const create = async (data: { inputs: unknown }) => {
     const { inputs } = data;
     const providerInputs = await validateProviderInputs(inputs);
 
-    try {
-      const ghTokenData = await $generateGitHubInstallationAccessToken(providerInputs);
-      const entityId = alphaNumericNanoId(32);
+    const ghTokenData = await $generateGitHubInstallationAccessToken(providerInputs);
+    const entityId = alphaNumericNanoId(32);
 
-      return {
-        entityId,
-        data: {
-          TOKEN: ghTokenData.token,
-          EXPIRES_AT: ghTokenData.expires_at,
-          PERMISSIONS: ghTokenData.permissions,
-          REPOSITORY_SELECTION: ghTokenData.repository_selection
-        }
-      };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.privateKey, String(providerInputs.appId), String(providerInputs.installationId)]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return {
+      entityId,
+      data: {
+        TOKEN: ghTokenData.token,
+        EXPIRES_AT: ghTokenData.expires_at,
+        PERMISSIONS: ghTokenData.permissions,
+        REPOSITORY_SELECTION: ghTokenData.repository_selection
+      }
+    };
   };
 
   const revoke = async () => {

backend/src/ee/services/dynamic-secret/providers/kubernetes.ts

@@ -2,8 +2,7 @@ import axios, { AxiosError } from "axios";
 import handlebars from "handlebars";
 import https from "https";
 
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
+import { BadRequestError, InternalServerError } from "@app/lib/errors";
 import { GatewayHttpProxyActions, GatewayProxyProtocol, withGatewayProxy } from "@app/lib/gateway";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { blockLocalAndPrivateIpAddresses } from "@app/lib/validator";
@@ -357,12 +356,8 @@ export const KubernetesProvider = ({ gatewayService }: TKubernetesProviderDTO):
         errorMessage = (error.response?.data as { message: string }).message;
       }
 
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: errorMessage,
-        tokens: [providerInputs.clusterToken || ""]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
+      throw new InternalServerError({
+        message: `Failed to validate connection: ${errorMessage}`
       });
     }
   };
@@ -607,12 +602,8 @@ export const KubernetesProvider = ({ gatewayService }: TKubernetesProviderDTO):
         errorMessage = (error.response?.data as { message: string }).message;
       }
 
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: errorMessage,
-        tokens: [providerInputs.clusterToken || ""]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
+      throw new InternalServerError({
+        message: `Failed to create dynamic secret: ${errorMessage}`
       });
     }
   };
@@ -692,65 +683,50 @@ export const KubernetesProvider = ({ gatewayService }: TKubernetesProviderDTO):
     };
 
     if (providerInputs.credentialType === KubernetesCredentialType.Dynamic) {
-      try {
-        const rawUrl =
-          providerInputs.authMethod === KubernetesAuthMethod.Gateway
-            ? GATEWAY_AUTH_DEFAULT_URL
-            : providerInputs.url || "";
+      const rawUrl =
+        providerInputs.authMethod === KubernetesAuthMethod.Gateway
+          ? GATEWAY_AUTH_DEFAULT_URL
+          : providerInputs.url || "";
 
-        const url = new URL(rawUrl);
-        const k8sGatewayHost = url.hostname;
-        const k8sPort = url.port ? Number(url.port) : 443;
-        const k8sHost = `${url.protocol}//${url.hostname}`;
+      const url = new URL(rawUrl);
+      const k8sGatewayHost = url.hostname;
+      const k8sPort = url.port ? Number(url.port) : 443;
+      const k8sHost = `${url.protocol}//${url.hostname}`;
 
-        const httpsAgent =
-          providerInputs.ca && providerInputs.sslEnabled
-            ? new https.Agent({
-                ca: providerInputs.ca,
-                rejectUnauthorized: true
-              })
-            : undefined;
+      const httpsAgent =
+        providerInputs.ca && providerInputs.sslEnabled
+          ? new https.Agent({
+              ca: providerInputs.ca,
+              rejectUnauthorized: true
+            })
+          : undefined;
 
-        if (providerInputs.gatewayId) {
-          if (providerInputs.authMethod === KubernetesAuthMethod.Gateway) {
-            await $gatewayProxyWrapper(
-              {
-                gatewayId: providerInputs.gatewayId,
-                targetHost: k8sHost,
-                targetPort: k8sPort,
-                httpsAgent,
-                reviewTokenThroughGateway: true
-              },
-              serviceAccountDynamicCallback
-            );
-          } else {
-            await $gatewayProxyWrapper(
-              {
-                gatewayId: providerInputs.gatewayId,
-                targetHost: k8sGatewayHost,
-                targetPort: k8sPort,
-                httpsAgent,
-                reviewTokenThroughGateway: false
-              },
-              serviceAccountDynamicCallback
-            );
-          }
+      if (providerInputs.gatewayId) {
+        if (providerInputs.authMethod === KubernetesAuthMethod.Gateway) {
+          await $gatewayProxyWrapper(
+            {
+              gatewayId: providerInputs.gatewayId,
+              targetHost: k8sHost,
+              targetPort: k8sPort,
+              httpsAgent,
+              reviewTokenThroughGateway: true
+            },
+            serviceAccountDynamicCallback
+          );
         } else {
-          await serviceAccountDynamicCallback(k8sHost, k8sPort, httpsAgent);
+          await $gatewayProxyWrapper(
+            {
+              gatewayId: providerInputs.gatewayId,
+              targetHost: k8sGatewayHost,
+              targetPort: k8sPort,
+              httpsAgent,
+              reviewTokenThroughGateway: false
+            },
+            serviceAccountDynamicCallback
+          );
         }
-      } catch (error) {
-        let errorMessage = error instanceof Error ? error.message : "Unknown error";
-        if (axios.isAxiosError(error) && (error.response?.data as { message: string })?.message) {
-          errorMessage = (error.response?.data as { message: string }).message;
-        }
-
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: errorMessage,
-          tokens: [entityId, providerInputs.clusterToken || ""]
-        });
-        throw new BadRequestError({
-          message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-        });
+      } else {
+        await serviceAccountDynamicCallback(k8sHost, k8sPort, httpsAgent);
       }
     }
 

backend/src/ee/services/dynamic-secret/providers/ldap.ts

@@ -6,7 +6,6 @@ import RE2 from "re2";
 import { z } from "zod";
 
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { LdapCredentialType, LdapSchema, TDynamicProviderFns } from "./models";
@@ -92,18 +91,8 @@ export const LdapProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      const client = await $getClient(providerInputs);
-      return client.connected;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.bindpass, providerInputs.binddn]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    const client = await $getClient(providerInputs);
+    return client.connected;
   };
 
   const executeLdif = async (client: ldapjs.Client, ldif_file: string) => {
@@ -216,11 +205,11 @@ export const LdapProvider = (): TDynamicProviderFns => {
     if (providerInputs.credentialType === LdapCredentialType.Static) {
       const dnRegex = new RE2("^dn:\\s*(.+)", "m");
       const dnMatch = dnRegex.exec(providerInputs.rotationLdif);
-      const username = dnMatch?.[1];
-      if (!username) throw new BadRequestError({ message: "Username not found from Ldif" });
-      const password = generatePassword();
 
       if (dnMatch) {
+        const username = dnMatch[1];
+        const password = generatePassword();
+
         const generatedLdif = generateLDIF({ username, password, ldifTemplate: providerInputs.rotationLdif });
 
         try {
@@ -228,11 +217,7 @@ export const LdapProvider = (): TDynamicProviderFns => {
 
           return { entityId: username, data: { DN_ARRAY: dnArray, USERNAME: username, PASSWORD: password } };
         } catch (err) {
-          const sanitizedErrorMessage = sanitizeString({
-            unsanitizedString: (err as Error)?.message,
-            tokens: [username, password, providerInputs.binddn, providerInputs.bindpass]
-          });
-          throw new BadRequestError({ message: sanitizedErrorMessage });
+          throw new BadRequestError({ message: (err as Error).message });
         }
       } else {
         throw new BadRequestError({
@@ -253,11 +238,7 @@ export const LdapProvider = (): TDynamicProviderFns => {
           const rollbackLdif = generateLDIF({ username, password, ldifTemplate: providerInputs.rollbackLdif });
           await executeLdif(client, rollbackLdif);
         }
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [username, password, providerInputs.binddn, providerInputs.bindpass]
-        });
-        throw new BadRequestError({ message: sanitizedErrorMessage });
+        throw new BadRequestError({ message: (err as Error).message });
       }
     }
   };
@@ -281,11 +262,7 @@ export const LdapProvider = (): TDynamicProviderFns => {
 
           return { entityId: username, data: { DN_ARRAY: dnArray, USERNAME: username, PASSWORD: password } };
         } catch (err) {
-          const sanitizedErrorMessage = sanitizeString({
-            unsanitizedString: (err as Error)?.message,
-            tokens: [username, password, providerInputs.binddn, providerInputs.bindpass]
-          });
-          throw new BadRequestError({ message: sanitizedErrorMessage });
+          throw new BadRequestError({ message: (err as Error).message });
         }
       } else {
         throw new BadRequestError({
@@ -301,7 +278,7 @@ export const LdapProvider = (): TDynamicProviderFns => {
     return { entityId };
   };
 
-  const renew = async (_inputs: unknown, entityId: string) => {
+  const renew = async (inputs: unknown, entityId: string) => {
     // No renewal necessary
     return { entityId };
   };

backend/src/ee/services/dynamic-secret/providers/mongo-atlas.ts

@@ -3,8 +3,6 @@ import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
 import { createDigestAuthRequestInterceptor } from "@app/lib/axios/digest-auth";
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { DynamicSecretMongoAtlasSchema, TDynamicProviderFns } from "./models";
@@ -51,25 +49,19 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => {
     const providerInputs = await validateProviderInputs(inputs);
     const client = await $getClient(providerInputs);
 
-    try {
-      const isConnected = await client({
-        method: "GET",
-        url: `v2/groups/${providerInputs.groupId}/databaseUsers`,
-        params: { itemsPerPage: 1 }
-      }).then(() => true);
-      return isConnected;
-    } catch (error) {
-      const errorMessage = (error as AxiosError).response
-        ? JSON.stringify((error as AxiosError).response?.data)
-        : (error as Error)?.message;
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: errorMessage,
-        tokens: [providerInputs.adminPublicKey, providerInputs.adminPrivateKey, providerInputs.groupId]
+    const isConnected = await client({
+      method: "GET",
+      url: `v2/groups/${providerInputs.groupId}/databaseUsers`,
+      params: { itemsPerPage: 1 }
+    })
+      .then(() => true)
+      .catch((error) => {
+        if ((error as AxiosError).response) {
+          throw new Error(JSON.stringify((error as AxiosError).response?.data));
+        }
+        throw error;
       });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return isConnected;
   };
 
   const create = async (data: {
@@ -85,39 +77,25 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => {
     const username = generateUsername(usernameTemplate, identity);
     const password = generatePassword();
     const expiration = new Date(expireAt).toISOString();
-    try {
-      await client({
-        method: "POST",
-        url: `/v2/groups/${providerInputs.groupId}/databaseUsers`,
-        data: {
-          roles: providerInputs.roles,
-          scopes: providerInputs.scopes,
-          deleteAfterDate: expiration,
-          username,
-          password,
-          databaseName: "admin",
-          groupId: providerInputs.groupId
-        }
-      });
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (error) {
-      const errorMessage = (error as AxiosError).response
-        ? JSON.stringify((error as AxiosError).response?.data)
-        : (error as Error)?.message;
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: errorMessage,
-        tokens: [
-          username,
-          password,
-          providerInputs.adminPublicKey,
-          providerInputs.adminPrivateKey,
-          providerInputs.groupId
-        ]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await client({
+      method: "POST",
+      url: `/v2/groups/${providerInputs.groupId}/databaseUsers`,
+      data: {
+        roles: providerInputs.roles,
+        scopes: providerInputs.scopes,
+        deleteAfterDate: expiration,
+        username,
+        password,
+        databaseName: "admin",
+        groupId: providerInputs.groupId
+      }
+    }).catch((error) => {
+      if ((error as AxiosError).response) {
+        throw new Error(JSON.stringify((error as AxiosError).response?.data));
+      }
+      throw error;
+    });
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
@@ -133,23 +111,15 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => {
       throw err;
     });
     if (isExisting) {
-      try {
-        await client({
-          method: "DELETE",
-          url: `/v2/groups/${providerInputs.groupId}/databaseUsers/admin/${username}`
-        });
-      } catch (error) {
-        const errorMessage = (error as AxiosError).response
-          ? JSON.stringify((error as AxiosError).response?.data)
-          : (error as Error)?.message;
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: errorMessage,
-          tokens: [username, providerInputs.adminPublicKey, providerInputs.adminPrivateKey, providerInputs.groupId]
-        });
-        throw new BadRequestError({
-          message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-        });
-      }
+      await client({
+        method: "DELETE",
+        url: `/v2/groups/${providerInputs.groupId}/databaseUsers/admin/${username}`
+      }).catch((error) => {
+        if ((error as AxiosError).response) {
+          throw new Error(JSON.stringify((error as AxiosError).response?.data));
+        }
+        throw error;
+      });
     }
 
     return { entityId: username };
@@ -162,29 +132,21 @@ export const MongoAtlasProvider = (): TDynamicProviderFns => {
     const username = entityId;
     const expiration = new Date(expireAt).toISOString();
 
-    try {
-      await client({
-        method: "PATCH",
-        url: `/v2/groups/${providerInputs.groupId}/databaseUsers/admin/${username}`,
-        data: {
-          deleteAfterDate: expiration,
-          databaseName: "admin",
-          groupId: providerInputs.groupId
-        }
-      });
-      return { entityId: username };
-    } catch (error) {
-      const errorMessage = (error as AxiosError).response
-        ? JSON.stringify((error as AxiosError).response?.data)
-        : (error as Error)?.message;
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: errorMessage,
-        tokens: [username, providerInputs.adminPublicKey, providerInputs.adminPrivateKey, providerInputs.groupId]
-      });
-      throw new BadRequestError({
-        message: `Failed to renew lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await client({
+      method: "PATCH",
+      url: `/v2/groups/${providerInputs.groupId}/databaseUsers/admin/${username}`,
+      data: {
+        deleteAfterDate: expiration,
+        databaseName: "admin",
+        groupId: providerInputs.groupId
+      }
+    }).catch((error) => {
+      if ((error as AxiosError).response) {
+        throw new Error(JSON.stringify((error as AxiosError).response?.data));
+      }
+      throw error;
+    });
+    return { entityId: username };
   };
 
   return {

backend/src/ee/services/dynamic-secret/providers/mongo-db.ts

@@ -2,8 +2,6 @@ import { MongoClient } from "mongodb";
 import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { verifyHostInputValidity } from "../dynamic-secret-fns";
@@ -53,24 +51,13 @@ export const MongoDBProvider = (): TDynamicProviderFns => {
     const providerInputs = await validateProviderInputs(inputs);
     const client = await $getClient(providerInputs);
 
-    try {
-      const isConnected = await client
-        .db(providerInputs.database)
-        .command({ ping: 1 })
-        .then(() => true);
+    const isConnected = await client
+      .db(providerInputs.database)
+      .command({ ping: 1 })
+      .then(() => true);
 
-      await client.close();
-      return isConnected;
-    } catch (err) {
-      await client.close();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.password, providerInputs.username, providerInputs.database, providerInputs.host]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await client.close();
+    return isConnected;
   };
 
   const create = async (data: { inputs: unknown; usernameTemplate?: string | null; identity?: { name: string } }) => {
@@ -81,27 +68,16 @@ export const MongoDBProvider = (): TDynamicProviderFns => {
     const username = generateUsername(usernameTemplate, identity);
     const password = generatePassword();
 
-    try {
-      const db = client.db(providerInputs.database);
+    const db = client.db(providerInputs.database);
 
-      await db.command({
-        createUser: username,
-        pwd: password,
-        roles: providerInputs.roles
-      });
-      await client.close();
+    await db.command({
+      createUser: username,
+      pwd: password,
+      roles: providerInputs.roles
+    });
+    await client.close();
 
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (err) {
-      await client.close();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, password, providerInputs.password, providerInputs.username, providerInputs.database]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
@@ -110,24 +86,13 @@ export const MongoDBProvider = (): TDynamicProviderFns => {
 
     const username = entityId;
 
-    try {
-      const db = client.db(providerInputs.database);
-      await db.command({
-        dropUser: username
-      });
-      await client.close();
+    const db = client.db(providerInputs.database);
+    await db.command({
+      dropUser: username
+    });
+    await client.close();
 
-      return { entityId: username };
-    } catch (err) {
-      await client.close();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, providerInputs.password, providerInputs.username, providerInputs.database]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    return { entityId: username };
   };
 
   const renew = async (_inputs: unknown, entityId: string) => {

backend/src/ee/services/dynamic-secret/providers/rabbit-mq.ts

@@ -3,8 +3,6 @@ import https from "https";
 import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { logger } from "@app/lib/logger";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
@@ -112,19 +110,11 @@ export const RabbitMqProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      const connection = await $getClient(providerInputs);
-      const infoResponse = await connection.get("/whoami").then(() => true);
-      return infoResponse;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.password, providerInputs.username, providerInputs.host]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    const connection = await $getClient(providerInputs);
+
+    const infoResponse = await connection.get("/whoami").then(() => true);
+
+    return infoResponse;
   };
 
   const create = async (data: { inputs: unknown; usernameTemplate?: string | null; identity?: { name: string } }) => {
@@ -135,44 +125,26 @@ export const RabbitMqProvider = (): TDynamicProviderFns => {
     const username = generateUsername(usernameTemplate, identity);
     const password = generatePassword();
 
-    try {
-      await createRabbitMqUser({
-        axiosInstance: connection,
-        virtualHost: providerInputs.virtualHost,
-        createUser: {
-          password,
-          username,
-          tags: [...(providerInputs.tags ?? []), "infisical-user"]
-        }
-      });
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, password, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await createRabbitMqUser({
+      axiosInstance: connection,
+      virtualHost: providerInputs.virtualHost,
+      createUser: {
+        password,
+        username,
+        tags: [...(providerInputs.tags ?? []), "infisical-user"]
+      }
+    });
+
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
     const providerInputs = await validateProviderInputs(inputs);
     const connection = await $getClient(providerInputs);
 
-    try {
-      await deleteRabbitMqUser({ axiosInstance: connection, usernameToDelete: entityId });
-      return { entityId };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [entityId, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await deleteRabbitMqUser({ axiosInstance: connection, usernameToDelete: entityId });
+
+    return { entityId };
   };
 
   const renew = async (_inputs: unknown, entityId: string) => {

backend/src/ee/services/dynamic-secret/providers/redis.ts

@@ -4,7 +4,6 @@ import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
 
@@ -113,27 +112,14 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    let connection;
-    try {
-      connection = await $getClient(providerInputs);
-      const pingResponse = await connection.ping().then(() => true);
-      await connection.quit();
-      return pingResponse;
-    } catch (err) {
-      if (connection) await connection.quit();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [
-          providerInputs.password || "",
-          providerInputs.username,
-          providerInputs.host,
-          String(providerInputs.port)
-        ]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    const connection = await $getClient(providerInputs);
+
+    const pingResponse = await connection
+      .ping()
+      .then(() => true)
+      .catch(() => false);
+
+    return pingResponse;
   };
 
   const create = async (data: {
@@ -158,20 +144,10 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => {
 
     const queries = creationStatement.toString().split(";").filter(Boolean);
 
-    try {
-      await executeTransactions(connection, queries);
-      await connection.quit();
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (err) {
-      await connection.quit();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, password, providerInputs.password || "", providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await executeTransactions(connection, queries);
+
+    await connection.quit();
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, entityId: string) => {
@@ -183,20 +159,10 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => {
     const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username });
     const queries = revokeStatement.toString().split(";").filter(Boolean);
 
-    try {
-      await executeTransactions(connection, queries);
-      await connection.quit();
-      return { entityId: username };
-    } catch (err) {
-      await connection.quit();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, providerInputs.password || "", providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
-    }
+    await executeTransactions(connection, queries);
+
+    await connection.quit();
+    return { entityId: username };
   };
 
   const renew = async (inputs: unknown, entityId: string, expireAt: number) => {
@@ -210,23 +176,13 @@ export const RedisDatabaseProvider = (): TDynamicProviderFns => {
 
     const renewStatement = handlebars.compile(providerInputs.renewStatement)({ username, expiration });
 
-    try {
-      if (renewStatement) {
-        const queries = renewStatement.toString().split(";").filter(Boolean);
-        await executeTransactions(connection, queries);
-      }
-      await connection.quit();
-      return { entityId: username };
-    } catch (err) {
-      await connection.quit();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, providerInputs.password || "", providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to renew lease from provider: ${sanitizedErrorMessage}`
-      });
+    if (renewStatement) {
+      const queries = renewStatement.toString().split(";").filter(Boolean);
+      await executeTransactions(connection, queries);
     }
+
+    await connection.quit();
+    return { entityId: username };
   };
 
   return {

backend/src/ee/services/dynamic-secret/providers/sap-ase.ts

@@ -4,7 +4,6 @@ import odbc from "odbc";
 import { z } from "zod";
 
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
 
@@ -68,41 +67,25 @@ export const SapAseProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    let masterClient;
-    let client;
-    try {
-      masterClient = await $getClient(providerInputs, true);
-      client = await $getClient(providerInputs);
+    const masterClient = await $getClient(providerInputs, true);
+    const client = await $getClient(providerInputs);
 
-      const [resultFromMasterDatabase] = await masterClient.query<{ version: string }>("SELECT @@VERSION AS version");
-      const [resultFromSelectedDatabase] = await client.query<{ version: string }>("SELECT @@VERSION AS version");
+    const [resultFromMasterDatabase] = await masterClient.query<{ version: string }>("SELECT @@VERSION AS version");
+    const [resultFromSelectedDatabase] = await client.query<{ version: string }>("SELECT @@VERSION AS version");
 
-      if (!resultFromSelectedDatabase.version) {
-        throw new BadRequestError({
-          message: "Failed to validate SAP ASE connection, version query failed"
-        });
-      }
-
-      if (resultFromMasterDatabase.version !== resultFromSelectedDatabase.version) {
-        throw new BadRequestError({
-          message: "Failed to validate SAP ASE connection (master), version mismatch"
-        });
-      }
-
-      await masterClient.close();
-      await client.close();
-      return true;
-    } catch (err) {
-      if (masterClient) await masterClient.close();
-      if (client) await client.close();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.password, providerInputs.username, providerInputs.host, providerInputs.database]
-      });
+    if (!resultFromSelectedDatabase.version) {
       throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
+        message: "Failed to validate SAP ASE connection, version query failed"
       });
     }
+
+    if (resultFromMasterDatabase.version !== resultFromSelectedDatabase.version) {
+      throw new BadRequestError({
+        message: "Failed to validate SAP ASE connection (master), version mismatch"
+      });
+    }
+
+    return true;
   };
 
   const create = async (data: { inputs: unknown; usernameTemplate?: string | null; identity?: { name: string } }) => {
@@ -122,26 +105,16 @@ export const SapAseProvider = (): TDynamicProviderFns => {
 
     const queries = creationStatement.trim().replaceAll("\n", "").split(";").filter(Boolean);
 
-    try {
-      for await (const query of queries) {
-        // If it's an adduser query, we need to first call sp_addlogin on the MASTER database.
-        // If not done, then the newly created user won't be able to authenticate.
-        await (query.startsWith(SapCommands.CreateLogin) ? masterClient : client).query(query);
-      }
-      await masterClient.close();
-      await client.close();
-      return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
-    } catch (err) {
-      await masterClient.close();
-      await client.close();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, password, providerInputs.password, providerInputs.username, providerInputs.database]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
+    for await (const query of queries) {
+      // If it's an adduser query, we need to first call sp_addlogin on the MASTER database.
+      // If not done, then the newly created user won't be able to authenticate.
+      await (query.startsWith(SapCommands.CreateLogin) ? masterClient : client).query(query);
     }
+
+    await masterClient.close();
+    await client.close();
+
+    return { entityId: username, data: { DB_USERNAME: username, DB_PASSWORD: password } };
   };
 
   const revoke = async (inputs: unknown, username: string) => {
@@ -167,24 +140,14 @@ export const SapAseProvider = (): TDynamicProviderFns => {
       }
     }
 
-    try {
-      for await (const query of queries) {
-        await (query.startsWith(SapCommands.DropLogin) ? masterClient : client).query(query);
-      }
-      await masterClient.close();
-      await client.close();
-      return { entityId: username };
-    } catch (err) {
-      await masterClient.close();
-      await client.close();
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, providerInputs.password, providerInputs.username, providerInputs.database]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-      });
+    for await (const query of queries) {
+      await (query.startsWith(SapCommands.DropLogin) ? masterClient : client).query(query);
     }
+
+    await masterClient.close();
+    await client.close();
+
+    return { entityId: username };
   };
 
   const renew = async (_: unknown, username: string) => {

backend/src/ee/services/dynamic-secret/providers/sap-hana.ts

@@ -10,7 +10,6 @@ import { customAlphabet } from "nanoid";
 import { z } from "zod";
 
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
 
@@ -84,26 +83,19 @@ export const SapHanaProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    try {
-      const client = await $getClient(providerInputs);
-      const testResult = await new Promise<boolean>((resolve, reject) => {
-        client.exec("SELECT 1 FROM DUMMY;", (err: any) => {
-          if (err) {
-            return reject(err);
-          }
-          resolve(true);
-        });
+    const client = await $getClient(providerInputs);
+
+    const testResult = await new Promise<boolean>((resolve, reject) => {
+      client.exec("SELECT 1 FROM DUMMY;", (err: any) => {
+        if (err) {
+          reject();
+        }
+
+        resolve(true);
       });
-      return testResult;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.password, providerInputs.username, providerInputs.host]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+    });
+
+    return testResult;
   };
 
   const create = async (data: {
@@ -127,22 +119,18 @@ export const SapHanaProvider = (): TDynamicProviderFns => {
     });
 
     const queries = creationStatement.toString().split(";").filter(Boolean);
-    try {
-      for await (const query of queries) {
-        await new Promise((resolve, reject) => {
-          client.exec(query, (err: any) => {
-            if (err) return reject(err);
-            resolve(true);
-          });
+    for await (const query of queries) {
+      await new Promise((resolve, reject) => {
+        client.exec(query, (err: any) => {
+          if (err) {
+            reject(
+              new BadRequestError({
+                message: err.message
+              })
+            );
+          }
+          resolve(true);
         });
-      }
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, password, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
       });
     }
 
@@ -154,24 +142,18 @@ export const SapHanaProvider = (): TDynamicProviderFns => {
     const client = await $getClient(providerInputs);
     const revokeStatement = handlebars.compile(providerInputs.revocationStatement)({ username });
     const queries = revokeStatement.toString().split(";").filter(Boolean);
-    try {
-      for await (const query of queries) {
-        await new Promise((resolve, reject) => {
-          client.exec(query, (err: any) => {
-            if (err) {
-              reject(err);
-            }
-            resolve(true);
-          });
+    for await (const query of queries) {
+      await new Promise((resolve, reject) => {
+        client.exec(query, (err: any) => {
+          if (err) {
+            reject(
+              new BadRequestError({
+                message: err.message
+              })
+            );
+          }
+          resolve(true);
         });
-      }
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [username, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
       });
     }
 
@@ -192,20 +174,16 @@ export const SapHanaProvider = (): TDynamicProviderFns => {
         await new Promise((resolve, reject) => {
           client.exec(query, (err: any) => {
             if (err) {
-              reject(err);
+              reject(
+                new BadRequestError({
+                  message: err.message
+                })
+              );
             }
             resolve(true);
           });
         });
       }
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [entityId, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({
-        message: `Failed to renew lease from provider: ${sanitizedErrorMessage}`
-      });
     } finally {
       client.disconnect();
     }

backend/src/ee/services/dynamic-secret/providers/snowflake.ts

@@ -4,7 +4,6 @@ import snowflake from "snowflake-sdk";
 import { z } from "zod";
 
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
 
@@ -70,10 +69,12 @@ export const SnowflakeProvider = (): TDynamicProviderFns => {
 
   const validateConnection = async (inputs: unknown) => {
     const providerInputs = await validateProviderInputs(inputs);
-    let client;
+    const client = await $getClient(providerInputs);
+
+    let isValidConnection: boolean;
+
     try {
-      client = await $getClient(providerInputs);
-      const isValidConnection = await Promise.race([
+      isValidConnection = await Promise.race([
         client.isValidAsync(),
         new Promise((resolve) => {
           setTimeout(resolve, 10000);
@@ -81,18 +82,11 @@ export const SnowflakeProvider = (): TDynamicProviderFns => {
           throw new BadRequestError({ message: "Unable to establish connection - verify credentials" });
         })
       ]);
-      return isValidConnection;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: [providerInputs.password, providerInputs.username, providerInputs.accountId, providerInputs.orgId]
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
     } finally {
-      if (client) client.destroy(noop);
+      client.destroy(noop);
     }
+
+    return isValidConnection;
   };
 
   const create = async (data: {
@@ -122,19 +116,13 @@ export const SnowflakeProvider = (): TDynamicProviderFns => {
           sqlText: creationStatement,
           complete(err) {
             if (err) {
-              return reject(err);
+              return reject(new BadRequestError({ name: "CreateLease", message: err.message }));
             }
 
             return resolve(true);
           }
         });
       });
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error).message,
-        tokens: [username, password, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({ message: `Failed to create lease from provider: ${sanitizedErrorMessage}` });
     } finally {
       client.destroy(noop);
     }
@@ -155,19 +143,13 @@ export const SnowflakeProvider = (): TDynamicProviderFns => {
           sqlText: revokeStatement,
           complete(err) {
             if (err) {
-              return reject(err);
+              return reject(new BadRequestError({ name: "RevokeLease", message: err.message }));
             }
 
             return resolve(true);
           }
         });
       });
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error).message,
-        tokens: [username, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({ message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}` });
     } finally {
       client.destroy(noop);
     }
@@ -193,19 +175,13 @@ export const SnowflakeProvider = (): TDynamicProviderFns => {
           sqlText: renewStatement,
           complete(err) {
             if (err) {
-              return reject(err);
+              return reject(new BadRequestError({ name: "RenewLease", message: err.message }));
             }
 
             return resolve(true);
           }
         });
       });
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error).message,
-        tokens: [entityId, providerInputs.password, providerInputs.username]
-      });
-      throw new BadRequestError({ message: `Failed to renew lease from provider: ${sanitizedErrorMessage}` });
     } finally {
       client.destroy(noop);
     }

backend/src/ee/services/dynamic-secret/providers/sql-database.ts

@@ -3,8 +3,6 @@ import knex from "knex";
 import { z } from "zod";
 
 import { crypto } from "@app/lib/crypto/cryptography";
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { GatewayProxyProtocol, withGatewayProxy } from "@app/lib/gateway";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 import { validateHandlebarTemplate } from "@app/lib/template/validate-handlebars";
@@ -214,19 +212,8 @@ export const SqlDatabaseProvider = ({ gatewayService }: TSqlDatabaseProviderDTO)
       // oracle needs from keyword
       const testStatement = providerInputs.client === SqlProviders.Oracle ? "SELECT 1 FROM DUAL" : "SELECT 1";
 
-      try {
-        isConnected = await db.raw(testStatement).then(() => true);
-      } catch (err) {
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [providerInputs.username]
-        });
-        throw new BadRequestError({
-          message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-        });
-      } finally {
-        await db.destroy();
-      }
+      isConnected = await db.raw(testStatement).then(() => true);
+      await db.destroy();
     };
 
     if (providerInputs.gatewayId) {
@@ -246,13 +233,13 @@ export const SqlDatabaseProvider = ({ gatewayService }: TSqlDatabaseProviderDTO)
     const { inputs, expireAt, usernameTemplate, identity } = data;
 
     const providerInputs = await validateProviderInputs(inputs);
-    const { database } = providerInputs;
     const username = generateUsername(providerInputs.client, usernameTemplate, identity);
 
     const password = generatePassword(providerInputs.client, providerInputs.passwordRequirements);
     const gatewayCallback = async (host = providerInputs.host, port = providerInputs.port) => {
       const db = await $getClient({ ...providerInputs, port, host });
       try {
+        const { database } = providerInputs;
         const expiration = new Date(expireAt).toISOString();
 
         const creationStatement = handlebars.compile(providerInputs.creationStatement, { noEscape: true })({
@@ -269,14 +256,6 @@ export const SqlDatabaseProvider = ({ gatewayService }: TSqlDatabaseProviderDTO)
             await tx.raw(query);
           }
         });
-      } catch (err) {
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [username, password, database]
-        });
-        throw new BadRequestError({
-          message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-        });
       } finally {
         await db.destroy();
       }
@@ -304,14 +283,6 @@ export const SqlDatabaseProvider = ({ gatewayService }: TSqlDatabaseProviderDTO)
             await tx.raw(query);
           }
         });
-      } catch (err) {
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [username, database]
-        });
-        throw new BadRequestError({
-          message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-        });
       } finally {
         await db.destroy();
       }
@@ -348,14 +319,6 @@ export const SqlDatabaseProvider = ({ gatewayService }: TSqlDatabaseProviderDTO)
             }
           });
         }
-      } catch (err) {
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [database]
-        });
-        throw new BadRequestError({
-          message: `Failed to renew lease from provider: ${sanitizedErrorMessage}`
-        });
       } finally {
         await db.destroy();
       }

backend/src/ee/services/dynamic-secret/providers/totp.ts

@@ -1,8 +1,6 @@
 import { authenticator } from "otplib";
 import { HashAlgorithms } from "otplib/core";
 
-import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
 
 import { DynamicSecretTotpSchema, TDynamicProviderFns, TotpConfigType } from "./models";
@@ -14,84 +12,62 @@ export const TotpProvider = (): TDynamicProviderFns => {
     return providerInputs;
   };
 
-  const validateConnection = async (inputs: unknown) => {
-    try {
-      await validateProviderInputs(inputs);
-      return true;
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: []
-      });
-      throw new BadRequestError({
-        message: `Failed to connect with provider: ${sanitizedErrorMessage}`
-      });
-    }
+  const validateConnection = async () => {
+    return true;
   };
 
-  const create = async (data: { inputs: unknown }) => {
-    const { inputs } = data;
-    try {
-      const providerInputs = await validateProviderInputs(inputs);
+  const create = async (inputs: unknown) => {
+    const providerInputs = await validateProviderInputs(inputs);
 
-      const entityId = alphaNumericNanoId(32);
-      const authenticatorInstance = authenticator.clone();
+    const entityId = alphaNumericNanoId(32);
+    const authenticatorInstance = authenticator.clone();
 
-      let secret: string;
-      let period: number | null | undefined;
-      let digits: number | null | undefined;
-      let algorithm: HashAlgorithms | null | undefined;
+    let secret: string;
+    let period: number | null | undefined;
+    let digits: number | null | undefined;
+    let algorithm: HashAlgorithms | null | undefined;
 
-      if (providerInputs.configType === TotpConfigType.URL) {
-        const urlObj = new URL(providerInputs.url);
-        secret = urlObj.searchParams.get("secret") as string;
-        const periodFromUrl = urlObj.searchParams.get("period");
-        const digitsFromUrl = urlObj.searchParams.get("digits");
-        const algorithmFromUrl = urlObj.searchParams.get("algorithm");
+    if (providerInputs.configType === TotpConfigType.URL) {
+      const urlObj = new URL(providerInputs.url);
+      secret = urlObj.searchParams.get("secret") as string;
+      const periodFromUrl = urlObj.searchParams.get("period");
+      const digitsFromUrl = urlObj.searchParams.get("digits");
+      const algorithmFromUrl = urlObj.searchParams.get("algorithm");
 
-        if (periodFromUrl) {
-          period = +periodFromUrl;
-        }
-
-        if (digitsFromUrl) {
-          digits = +digitsFromUrl;
-        }
-
-        if (algorithmFromUrl) {
-          algorithm = algorithmFromUrl.toLowerCase() as HashAlgorithms;
-        }
-      } else {
-        secret = providerInputs.secret;
-        period = providerInputs.period;
-        digits = providerInputs.digits;
-        algorithm = providerInputs.algorithm as unknown as HashAlgorithms;
+      if (periodFromUrl) {
+        period = +periodFromUrl;
       }
 
-      if (digits) {
-        authenticatorInstance.options = { digits };
+      if (digitsFromUrl) {
+        digits = +digitsFromUrl;
       }
 
-      if (algorithm) {
-        authenticatorInstance.options = { algorithm };
+      if (algorithmFromUrl) {
+        algorithm = algorithmFromUrl.toLowerCase() as HashAlgorithms;
       }
-
-      if (period) {
-        authenticatorInstance.options = { step: period };
-      }
-
-      return {
-        entityId,
-        data: { TOTP: authenticatorInstance.generate(secret), TIME_REMAINING: authenticatorInstance.timeRemaining() }
-      };
-    } catch (err) {
-      const sanitizedErrorMessage = sanitizeString({
-        unsanitizedString: (err as Error)?.message,
-        tokens: []
-      });
-      throw new BadRequestError({
-        message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-      });
+    } else {
+      secret = providerInputs.secret;
+      period = providerInputs.period;
+      digits = providerInputs.digits;
+      algorithm = providerInputs.algorithm as unknown as HashAlgorithms;
     }
+
+    if (digits) {
+      authenticatorInstance.options = { digits };
+    }
+
+    if (algorithm) {
+      authenticatorInstance.options = { algorithm };
+    }
+
+    if (period) {
+      authenticatorInstance.options = { step: period };
+    }
+
+    return {
+      entityId,
+      data: { TOTP: authenticatorInstance.generate(secret), TIME_REMAINING: authenticatorInstance.timeRemaining() }
+    };
   };
 
   const revoke = async (_inputs: unknown, entityId: string) => {

backend/src/ee/services/dynamic-secret/providers/vertica.ts

@@ -4,7 +4,6 @@ import { z } from "zod";
 
 import { crypto } from "@app/lib/crypto/cryptography";
 import { BadRequestError } from "@app/lib/errors";
-import { sanitizeString } from "@app/lib/fn";
 import { GatewayProxyProtocol, withGatewayProxy } from "@app/lib/gateway";
 import { logger } from "@app/lib/logger";
 import { alphaNumericNanoId } from "@app/lib/nanoid";
@@ -276,14 +275,6 @@ export const VerticaProvider = ({ gatewayService }: TVerticaProviderDTO): TDynam
             await client.raw(trimmedQuery);
           }
         }
-      } catch (err) {
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [username, password, providerInputs.username, providerInputs.password]
-        });
-        throw new BadRequestError({
-          message: `Failed to create lease from provider: ${sanitizedErrorMessage}`
-        });
       } finally {
         if (client) await client.destroy();
       }
@@ -348,14 +339,6 @@ export const VerticaProvider = ({ gatewayService }: TVerticaProviderDTO): TDynam
             await client.raw(trimmedQuery);
           }
         }
-      } catch (err) {
-        const sanitizedErrorMessage = sanitizeString({
-          unsanitizedString: (err as Error)?.message,
-          tokens: [username, providerInputs.username, providerInputs.password]
-        });
-        throw new BadRequestError({
-          message: `Failed to revoke lease from provider: ${sanitizedErrorMessage}`
-        });
       } finally {
         if (client) await client.destroy();
       }

backend/src/ee/services/event/event-bus-service.ts

@@ -1,83 +0,0 @@
-import Redis from "ioredis";
-import { z } from "zod";
-
-import { logger } from "@app/lib/logger";
-
-import { EventSchema, TopicName } from "./types";
-
-export const eventBusFactory = (redis: Redis) => {
-  const publisher = redis.duplicate();
-  // Duplicate the publisher to create a subscriber.
-  // This is necessary because Redis does not allow a single connection to both publish and subscribe.
-  const subscriber = publisher.duplicate();
-
-  const init = async (topics: TopicName[] = Object.values(TopicName)) => {
-    subscriber.on("error", (e) => {
-      logger.error(e, "Event Bus subscriber error");
-    });
-
-    publisher.on("error", (e) => {
-      logger.error(e, "Event Bus publisher error");
-    });
-
-    await subscriber.subscribe(...topics);
-  };
-
-  /**
-   * Publishes an event to the specified topic.
-   * @param topic - The topic to publish the event to.
-   * @param event - The event data to publish.
-   */
-  const publish = async <T extends z.input<typeof EventSchema>>(topic: TopicName, event: T) => {
-    const json = JSON.stringify(event);
-
-    return publisher.publish(topic, json, (err) => {
-      if (err) {
-        return logger.error(err, `Error publishing to channel ${topic}`);
-      }
-    });
-  };
-
-  /**
-   * @param fn - The function to call when a message is received.
-   * It should accept the parsed event data as an argument.
-   * @template T - The type of the event data, which should match the schema defined in EventSchema.
-   * @returns A function that can be called to unsubscribe from the event bus.
-   */
-  const subscribe = <T extends z.infer<typeof EventSchema>>(fn: (data: T) => Promise<void> | void) => {
-    // Not using async await cause redis client's `on` method does not expect async listeners.
-    const listener = (channel: string, message: string) => {
-      try {
-        const parsed = JSON.parse(message) as T;
-        const thenable = fn(parsed);
-
-        // If the function returns a Promise, catch any errors that occur during processing.
-        if (thenable instanceof Promise) {
-          thenable.catch((error) => {
-            logger.error(error, `Error processing message from channel ${channel}`);
-          });
-        }
-      } catch (error) {
-        logger.error(error, `Error parsing message data from channel ${channel}`);
-      }
-    };
-    subscriber.on("message", listener);
-
-    return () => {
-      subscriber.off("message", listener);
-    };
-  };
-
-  const close = async () => {
-    try {
-      await publisher.quit();
-      await subscriber.quit();
-    } catch (error) {
-      logger.error(error, "Error closing event bus connections");
-    }
-  };
-
-  return { init, publish, subscribe, close };
-};
-
-export type TEventBusService = ReturnType<typeof eventBusFactory>;

backend/src/ee/services/event/event-sse-service.ts

@@ -1,162 +0,0 @@
-/* eslint-disable no-continue */
-import { subject } from "@casl/ability";
-import Redis from "ioredis";
-
-import { KeyStorePrefixes } from "@app/keystore/keystore";
-import { logger } from "@app/lib/logger";
-
-import { TEventBusService } from "./event-bus-service";
-import { createEventStreamClient, EventStreamClient, IEventStreamClientOpts } from "./event-sse-stream";
-import { EventData, RegisteredEvent, toBusEventName } from "./types";
-
-const AUTH_REFRESH_INTERVAL = 60 * 1000;
-const HEART_BEAT_INTERVAL = 15 * 1000;
-
-export const sseServiceFactory = (bus: TEventBusService, redis: Redis) => {
-  const clients = new Set<EventStreamClient>();
-
-  const heartbeatInterval = setInterval(() => {
-    for (const client of clients) {
-      if (client.stream.closed) continue;
-      void client.ping();
-    }
-  }, HEART_BEAT_INTERVAL);
-
-  const refreshInterval = setInterval(() => {
-    for (const client of clients) {
-      if (client.stream.closed) continue;
-      void client.refresh();
-    }
-  }, AUTH_REFRESH_INTERVAL);
-
-  const removeActiveConnection = async (projectId: string, identityId: string, connectionId: string) => {
-    const set = KeyStorePrefixes.ActiveSSEConnectionsSet(projectId, identityId);
-    const key = KeyStorePrefixes.ActiveSSEConnections(projectId, identityId, connectionId);
-
-    await Promise.all([redis.lrem(set, 0, connectionId), redis.del(key)]);
-  };
-
-  const getActiveConnectionsCount = async (projectId: string, identityId: string) => {
-    const set = KeyStorePrefixes.ActiveSSEConnectionsSet(projectId, identityId);
-    const connections = await redis.lrange(set, 0, -1);
-
-    if (connections.length === 0) {
-      return 0; // No active connections
-    }
-
-    const keys = connections.map((c) => KeyStorePrefixes.ActiveSSEConnections(projectId, identityId, c));
-
-    const values = await redis.mget(...keys);
-
-    // eslint-disable-next-line no-plusplus
-    for (let i = 0; i < values.length; i++) {
-      if (values[i] === null) {
-        // eslint-disable-next-line no-await-in-loop
-        await removeActiveConnection(projectId, identityId, connections[i]);
-      }
-    }
-
-    return redis.llen(set);
-  };
-
-  const onDisconnect = async (client: EventStreamClient) => {
-    try {
-      client.close();
-      clients.delete(client);
-      await removeActiveConnection(client.auth.projectId, client.auth.actorId, client.id);
-    } catch (error) {
-      logger.error(error, "Error during SSE stream disconnection");
-    }
-  };
-
-  function filterEventsForClient(client: EventStreamClient, event: EventData, registered: RegisteredEvent[]) {
-    const eventType = toBusEventName(event.data.eventType);
-    const match = registered.find((r) => r.event === eventType);
-    if (!match) return;
-
-    const item = event.data.payload;
-
-    if (Array.isArray(item)) {
-      if (item.length === 0) return;
-
-      const baseSubject = {
-        eventType,
-        environment: undefined as string | undefined,
-        secretPath: undefined as string | undefined
-      };
-
-      const filtered = item.filter((ev) => {
-        baseSubject.secretPath = ev.secretPath ?? "/";
-        baseSubject.environment = ev.environment;
-
-        return client.matcher.can("subscribe", subject(event.type, baseSubject));
-      });
-
-      if (filtered.length === 0) return;
-
-      return client.send({
-        ...event,
-        data: {
-          ...event.data,
-          payload: filtered
-        }
-      });
-    }
-
-    // For single item
-    const baseSubject = {
-      eventType,
-      secretPath: item.secretPath ?? "/",
-      environment: item.environment
-    };
-
-    if (client.matcher.can("subscribe", subject(event.type, baseSubject))) {
-      client.send(event);
-    }
-  }
-
-  const subscribe = async (
-    opts: IEventStreamClientOpts & {
-      onClose?: () => void;
-    }
-  ) => {
-    const client = createEventStreamClient(redis, opts);
-
-    // Set up event listener on event bus
-    const unsubscribe = bus.subscribe((event) => {
-      if (event.type !== opts.type) return;
-      filterEventsForClient(client, event, opts.registered);
-    });
-
-    client.stream.on("close", () => {
-      unsubscribe();
-      void onDisconnect(client); // This will never throw
-    });
-
-    await client.open();
-
-    clients.add(client);
-
-    return client;
-  };
-
-  const close = () => {
-    if (heartbeatInterval) {
-      clearInterval(heartbeatInterval);
-    }
-
-    if (refreshInterval) {
-      clearInterval(refreshInterval);
-    }
-
-    for (const client of clients) {
-      client.close();
-    }
-
-    clients.clear();
-  };
-
-  return { subscribe, close, getActiveConnectionsCount };
-};
-
-export type TServerSentEventsService = ReturnType<typeof sseServiceFactory>;

backend/src/ee/services/event/event-sse-stream.ts

@@ -1,187 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-import { Readable } from "node:stream";
-
-import { MongoAbility, PureAbility } from "@casl/ability";
-import { MongoQuery } from "@ucast/mongo2js";
-import Redis from "ioredis";
-import { nanoid } from "nanoid";
-
-import { ProjectType } from "@app/db/schemas";
-import { ProjectPermissionSet } from "@app/ee/services/permission/project-permission";
-import { KeyStorePrefixes } from "@app/keystore/keystore";
-import { conditionsMatcher } from "@app/lib/casl";
-import { logger } from "@app/lib/logger";
-
-import { EventData, RegisteredEvent } from "./types";
-
-export const getServerSentEventsHeaders = () =>
-  ({
-    "Cache-Control": "no-cache",
-    "Content-Type": "text/event-stream",
-    Connection: "keep-alive",
-    "X-Accel-Buffering": "no"
-  }) as const;
-
-type TAuthInfo = {
-  actorId: string;
-  projectId: string;
-  permission: MongoAbility<ProjectPermissionSet, MongoQuery>;
-};
-
-export interface IEventStreamClientOpts {
-  type: ProjectType;
-  registered: RegisteredEvent[];
-  onAuthRefresh: (info: TAuthInfo) => Promise<void> | void;
-  getAuthInfo: () => Promise<TAuthInfo> | TAuthInfo;
-}
-
-interface EventMessage {
-  time?: string | number;
-  type: string;
-  data?: unknown;
-}
-
-function serializeSseEvent(chunk: EventMessage): string {
-  let payload = "";
-
-  if (chunk.time) payload += `id: ${chunk.time}\n`;
-  if (chunk.type) payload += `event: ${chunk.type}\n`;
-  if (chunk.data) payload += `data: ${JSON.stringify(chunk)}\n`;
-
-  return `${payload}\n`;
-}
-
-export type EventStreamClient = {
-  id: string;
-  stream: Readable;
-  open: () => Promise<void>;
-  send: (data: EventMessage | EventData) => void;
-  ping: () => Promise<void>;
-  refresh: () => Promise<void>;
-  close: () => void;
-  get auth(): TAuthInfo;
-  signal: AbortSignal;
-  abort: () => void;
-  matcher: PureAbility;
-};
-
-export function createEventStreamClient(redis: Redis, options: IEventStreamClientOpts): EventStreamClient {
-  const rules = options.registered.map((r) => {
-    const secretPath = r.conditions?.secretPath;
-    const hasConditions = r.conditions?.environmentSlug || r.conditions?.secretPath;
-
-    return {
-      subject: options.type,
-      action: "subscribe",
-      conditions: {
-        eventType: r.event,
-        ...(hasConditions
-          ? {
-              environment: r.conditions?.environmentSlug ?? "",
-              secretPath: { $glob: secretPath }
-            }
-          : {})
-      }
-    };
-  });
-
-  const id = `sse-${nanoid()}`;
-  const control = new AbortController();
-  const matcher = new PureAbility(rules, { conditionsMatcher });
-
-  let auth: TAuthInfo | undefined;
-
-  const stream = new Readable({
-    objectMode: true
-  });
-
-  // We will manually push data to the stream
-  stream._read = () => {};
-
-  const send = (data: EventMessage | EventData) => {
-    const chunk = serializeSseEvent(data);
-    if (!stream.push(chunk)) {
-      logger.debug("Backpressure detected: dropped manual event");
-    }
-  };
-
-  stream.on("error", (error: Error) => stream.destroy(error));
-
-  const open = async () => {
-    auth = await options.getAuthInfo();
-    await options.onAuthRefresh(auth);
-
-    const { actorId, projectId } = auth;
-    const set = KeyStorePrefixes.ActiveSSEConnectionsSet(projectId, actorId);
-    const key = KeyStorePrefixes.ActiveSSEConnections(projectId, actorId, id);
-
-    await Promise.all([redis.rpush(set, id), redis.set(key, "1", "EX", 60)]);
-  };
-
-  const ping = async () => {
-    if (!auth) return; // Avoid race condition if ping is called before open
-
-    const { actorId, projectId } = auth;
-    const key = KeyStorePrefixes.ActiveSSEConnections(projectId, actorId, id);
-
-    await redis.set(key, "1", "EX", 60);
-
-    stream.push("1");
-  };
-
-  const close = () => {
-    if (stream.closed) return;
-    stream.push(null);
-    stream.destroy();
-  };
-
-  /**
-   * Refreshes the connection's auth permissions
-   * Must be called atleast once when connection is opened
-   */
-  const refresh = async () => {
-    try {
-      auth = await options.getAuthInfo();
-      await options.onAuthRefresh(auth);
-    } catch (error) {
-      if (error instanceof Error) {
-        send({
-          type: "error",
-          data: {
-            ...error
-          }
-        });
-        return close();
-      }
-      stream.emit("error", error);
-    }
-  };
-
-  const abort = () => {
-    try {
-      control.abort();
-    } catch (error) {
-      logger.debug(error, "Error aborting SSE stream");
-    }
-  };
-
-  return {
-    id,
-    stream,
-    open,
-    send,
-    ping,
-    refresh,
-    close,
-    signal: control.signal,
-    abort,
-    matcher,
-    get auth() {
-      if (!auth) {
-        throw new Error("Auth info not set");
-      }
-
-      return auth;
-    }
-  };
-}

backend/src/ee/services/event/types.ts

@@ -1,125 +0,0 @@
-import { z } from "zod";
-
-import { ProjectType } from "@app/db/schemas";
-import { Event, EventType } from "@app/ee/services/audit-log/audit-log-types";
-
-export enum TopicName {
-  CoreServers = "infisical::core-servers"
-}
-
-export enum BusEventName {
-  CreateSecret = "secret:create",
-  UpdateSecret = "secret:update",
-  DeleteSecret = "secret:delete"
-}
-
-type PublisableEventTypes =
-  | EventType.CREATE_SECRET
-  | EventType.CREATE_SECRETS
-  | EventType.DELETE_SECRET
-  | EventType.DELETE_SECRETS
-  | EventType.UPDATE_SECRETS
-  | EventType.UPDATE_SECRET;
-
-export function toBusEventName(input: EventType) {
-  switch (input) {
-    case EventType.CREATE_SECRET:
-    case EventType.CREATE_SECRETS:
-      return BusEventName.CreateSecret;
-    case EventType.UPDATE_SECRET:
-    case EventType.UPDATE_SECRETS:
-      return BusEventName.UpdateSecret;
-    case EventType.DELETE_SECRET:
-    case EventType.DELETE_SECRETS:
-      return BusEventName.DeleteSecret;
-    default:
-      return null;
-  }
-}
-
-const isBulkEvent = (event: Event): event is Extract<Event, { metadata: { secrets: Array<unknown> } }> => {
-  return event.type.endsWith("-secrets"); // Feels so wrong
-};
-
-export const toPublishableEvent = (event: Event) => {
-  const name = toBusEventName(event.type);
-
-  if (!name) return null;
-
-  const e = event as Extract<Event, { type: PublisableEventTypes }>;
-
-  if (isBulkEvent(e)) {
-    return {
-      name,
-      isBulk: true,
-      data: {
-        eventType: e.type,
-        payload: e.metadata.secrets.map((s) => ({
-          environment: e.metadata.environment,
-          secretPath: e.metadata.secretPath,
-          ...s
-        }))
-      }
-    } as const;
-  }
-
-  return {
-    name,
-    isBulk: false,
-    data: {
-      eventType: e.type,
-      payload: {
-        ...e.metadata,
-        environment: e.metadata.environment
-      }
-    }
-  } as const;
-};
-
-export const EventName = z.nativeEnum(BusEventName);
-
-const EventSecretPayload = z.object({
-  secretPath: z.string().optional(),
-  secretId: z.string(),
-  secretKey: z.string(),
-  environment: z.string()
-});
-
-export type EventSecret = z.infer<typeof EventSecretPayload>;
-
-export const EventSchema = z.object({
-  datacontenttype: z.literal("application/json").optional().default("application/json"),
-  type: z.nativeEnum(ProjectType),
-  source: z.string(),
-  time: z
-    .string()
-    .optional()
-    .default(() => new Date().toISOString()),
-  data: z.discriminatedUnion("eventType", [
-    z.object({
-      specversion: z.number().optional().default(1),
-      eventType: z.enum([EventType.CREATE_SECRET, EventType.UPDATE_SECRET, EventType.DELETE_SECRET]),
-      payload: EventSecretPayload
-    }),
-    z.object({
-      specversion: z.number().optional().default(1),
-      eventType: z.enum([EventType.CREATE_SECRETS, EventType.UPDATE_SECRETS, EventType.DELETE_SECRETS]),
-      payload: EventSecretPayload.array()
-    })
-    // Add more event types as needed
-  ])
-});
-
-export type EventData = z.infer<typeof EventSchema>;
-
-export const EventRegisterSchema = z.object({
-  event: EventName,
-  conditions: z
-    .object({
-      secretPath: z.string().optional().default("/"),
-      environmentSlug: z.string()
-    })
-    .optional()
-});
-
-export type RegisteredEvent = z.infer<typeof EventRegisterSchema>;

backend/src/ee/services/group/group-fns.ts

@@ -1,6 +1,6 @@
 import { Knex } from "knex";
 
-import { ProjectVersion, SecretKeyEncoding, TableName, TUsers } from "@app/db/schemas";
+import { SecretKeyEncoding, TableName, TUsers } from "@app/db/schemas";
 import { crypto } from "@app/lib/crypto/cryptography";
 import { BadRequestError, ForbiddenRequestError, NotFoundError, ScimRequestError } from "@app/lib/errors";
 
@@ -65,18 +65,6 @@ const addAcceptedUsersToGroup = async ({
   const userKeysSet = new Set(keys.map((k) => `${k.projectId}-${k.receiverId}`));
 
   for await (const projectId of projectIds) {
-    const project = await projectDAL.findById(projectId, tx);
-    if (!project) {
-      throw new NotFoundError({
-        message: `Failed to find project with ID '${projectId}'`
-      });
-    }
-
-    if (project.version !== ProjectVersion.V1 && project.version !== ProjectVersion.V2) {
-      // eslint-disable-next-line no-continue
-      continue;
-    }
-
     const usersToAddProjectKeyFor = users.filter((u) => !userKeysSet.has(`${projectId}-${u.userId}`));
 
     if (usersToAddProjectKeyFor.length) {
@@ -98,12 +86,6 @@ const addAcceptedUsersToGroup = async ({
         });
       }
 
-      if (!ghostUserLatestKey.sender.publicKey) {
-        throw new NotFoundError({
-          message: `Failed to find project owner's public key in project with ID '${projectId}'`
-        });
-      }
-
       const bot = await projectBotDAL.findOne({ projectId }, tx);
 
       if (!bot) {
@@ -130,12 +112,6 @@ const addAcceptedUsersToGroup = async ({
       });
 
       const projectKeysToAdd = usersToAddProjectKeyFor.map((user) => {
-        if (!user.publicKey) {
-          throw new NotFoundError({
-            message: `Failed to find user's public key in project with ID '${projectId}'`
-          });
-        }
-
         const { ciphertext: encryptedKey, nonce } = crypto
           .encryption()
           .asymmetric()

backend/src/ee/services/group/group-service.ts

@@ -41,7 +41,7 @@ type TGroupServiceFactoryDep = {
     TUserGroupMembershipDALFactory,
     "findOne" | "delete" | "filterProjectsByUserMembership" | "transaction" | "insertMany" | "find"
   >;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "delete" | "findLatestProjectKey" | "insertMany">;
   permissionService: Pick<TPermissionServiceFactory, "getOrgPermission" | "getOrgPermissionByRole">;

backend/src/ee/services/group/group-types.ts

@@ -65,7 +65,7 @@ export type TAddUsersToGroup = {
   userGroupMembershipDAL: Pick<TUserGroupMembershipDALFactory, "find" | "transaction" | "insertMany">;
   groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
   tx: Knex;
 };
@@ -78,7 +78,7 @@ export type TAddUsersToGroupByUserIds = {
   orgDAL: Pick<TOrgDALFactory, "findMembership">;
   groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
   tx?: Knex;
 };
@@ -102,7 +102,7 @@ export type TConvertPendingGroupAdditionsToGroupMemberships = {
   >;
   groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
   tx?: Knex;
 };

backend/src/ee/services/identity-auth-template/identity-auth-template-dal.ts

@@ -1,83 +0,0 @@
-/* eslint-disable no-case-declarations */
-import { Knex } from "knex";
-
-import { TDbClient } from "@app/db";
-import { TableName } from "@app/db/schemas";
-import { buildFindFilter, ormify } from "@app/lib/knex";
-
-import { IdentityAuthTemplateMethod } from "./identity-auth-template-enums";
-
-export type TIdentityAuthTemplateDALFactory = ReturnType<typeof identityAuthTemplateDALFactory>;
-
-export const identityAuthTemplateDALFactory = (db: TDbClient) => {
-  const identityAuthTemplateOrm = ormify(db, TableName.IdentityAuthTemplate);
-
-  const findByOrgId = async (
-    orgId: string,
-    { limit, offset, search, tx }: { limit?: number; offset?: number; search?: string; tx?: Knex } = {}
-  ) => {
-    let query = (tx || db.replicaNode())(TableName.IdentityAuthTemplate).where({ orgId });
-    let countQuery = (tx || db.replicaNode())(TableName.IdentityAuthTemplate).where({ orgId });
-
-    if (search) {
-      const searchFilter = `%${search.toLowerCase()}%`;
-      query = query.whereRaw("LOWER(name) LIKE ?", [searchFilter]);
-      countQuery = countQuery.whereRaw("LOWER(name) LIKE ?", [searchFilter]);
-    }
-
-    query = query.orderBy("createdAt", "desc");
-
-    if (limit !== undefined) {
-      query = query.limit(limit);
-    }
-    if (offset !== undefined) {
-      query = query.offset(offset);
-    }
-
-    const docs = await query;
-
-    const [{ count }] = (await countQuery.count("* as count")) as [{ count: string | number }];
-
-    return { docs, totalCount: Number(count) };
-  };
-
-  const findByAuthMethod = async (authMethod: string, orgId: string, tx?: Knex) => {
-    const query = (tx || db.replicaNode())(TableName.IdentityAuthTemplate)
-      .where({ authMethod, orgId })
-      .orderBy("createdAt", "desc");
-    const docs = await query;
-    return docs;
-  };
-
-  const findTemplateUsages = async (templateId: string, authMethod: string, tx?: Knex) => {
-    switch (authMethod) {
-      case IdentityAuthTemplateMethod.LDAP:
-        const query = (tx || db.replicaNode())(TableName.IdentityLdapAuth)
-          .join(TableName.Identity, `${TableName.IdentityLdapAuth}.identityId`, `${TableName.Identity}.id`)
-          // eslint-disable-next-line @typescript-eslint/no-misused-promises
-          .where(buildFindFilter({ templateId }, TableName.IdentityLdapAuth))
-          .select(
-            db.ref("identityId").withSchema(TableName.IdentityLdapAuth),
-            db.ref("name").withSchema(TableName.Identity).as("identityName")
-          );
-        const docs = await query;
-        return docs;
-      default:
-        return [];
-    }
-  };
-
-  const findByIdAndOrgId = async (id: string, orgId: string, tx?: Knex) => {
-    const query = (tx || db.replicaNode())(TableName.IdentityAuthTemplate).where({ id, orgId });
-    const doc = await query;
-    return doc?.[0];
-  };
-
-  return {
-    ...identityAuthTemplateOrm,
-    findByOrgId,
-    findByAuthMethod,
-    findTemplateUsages,
-    findByIdAndOrgId
-  };
-};

backend/src/ee/services/identity-auth-template/identity-auth-template-enums.ts

@@ -1,22 +0,0 @@
-export enum IdentityAuthTemplateMethod {
-  LDAP = "ldap"
-}
-
-export const TEMPLATE_VALIDATION_MESSAGES = {
-  TEMPLATE_NAME_REQUIRED: "Template name is required",
-  TEMPLATE_NAME_MAX_LENGTH: "Template name must be at most 64 characters long",
-  AUTH_METHOD_REQUIRED: "Auth method is required",
-  TEMPLATE_ID_REQUIRED: "Template ID is required",
-  LDAP: {
-    URL_REQUIRED: "LDAP URL is required",
-    BIND_DN_REQUIRED: "Bind DN is required",
-    BIND_PASSWORD_REQUIRED: "Bind password is required",
-    SEARCH_BASE_REQUIRED: "Search base is required"
-  }
-} as const;
-
-export const TEMPLATE_SUCCESS_MESSAGES = {
-  CREATED: "Template created successfully",
-  UPDATED: "Template updated successfully",
-  DELETED: "Template deleted successfully"
-} as const;

backend/src/ee/services/identity-auth-template/identity-auth-template-service.ts

@@ -1,454 +0,0 @@
-import { ForbiddenError } from "@casl/ability";
-
-import { EventType, TAuditLogServiceFactory } from "@app/ee/services/audit-log/audit-log-types";
-import { TLicenseServiceFactory } from "@app/ee/services/license/license-service";
-import {
-  OrgPermissionMachineIdentityAuthTemplateActions,
-  OrgPermissionSubjects
-} from "@app/ee/services/permission/org-permission";
-import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
-import { BadRequestError, NotFoundError } from "@app/lib/errors";
-import { TOrgPermission } from "@app/lib/types";
-import { ActorType } from "@app/services/auth/auth-type";
-import { TIdentityLdapAuthDALFactory } from "@app/services/identity-ldap-auth/identity-ldap-auth-dal";
-import { TKmsServiceFactory } from "@app/services/kms/kms-service";
-import { KmsDataKey } from "@app/services/kms/kms-types";
-
-import { TIdentityAuthTemplateDALFactory } from "./identity-auth-template-dal";
-import { IdentityAuthTemplateMethod } from "./identity-auth-template-enums";
-import {
-  TDeleteIdentityAuthTemplateDTO,
-  TFindTemplateUsagesDTO,
-  TGetIdentityAuthTemplateDTO,
-  TGetTemplatesByAuthMethodDTO,
-  TLdapTemplateFields,
-  TListIdentityAuthTemplatesDTO,
-  TUnlinkTemplateUsageDTO
-} from "./identity-auth-template-types";
-
-type TIdentityAuthTemplateServiceFactoryDep = {
-  identityAuthTemplateDAL: TIdentityAuthTemplateDALFactory;
-  identityLdapAuthDAL: TIdentityLdapAuthDALFactory;
-  permissionService: Pick<TPermissionServiceFactory, "getOrgPermission">;
-  kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey" | "encryptWithInputKey" | "decryptWithInputKey">;
-  licenseService: Pick<TLicenseServiceFactory, "getPlan">;
-  auditLogService: Pick<TAuditLogServiceFactory, "createAuditLog">;
-};
-
-export type TIdentityAuthTemplateServiceFactory = ReturnType<typeof identityAuthTemplateServiceFactory>;
-
-export const identityAuthTemplateServiceFactory = ({
-  identityAuthTemplateDAL,
-  identityLdapAuthDAL,
-  permissionService,
-  kmsService,
-  licenseService,
-  auditLogService
-}: TIdentityAuthTemplateServiceFactoryDep) => {
-  // Plan check
-  const $checkPlan = async (orgId: string) => {
-    const plan = await licenseService.getPlan(orgId);
-    if (!plan.machineIdentityAuthTemplates)
-      throw new BadRequestError({
-        message:
-          "Failed to use identity auth template due to plan restriction. Upgrade plan to access machine identity auth templates."
-      });
-  };
-  const createTemplate = async ({
-    name,
-    authMethod,
-    templateFields,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: {
-    name: string;
-    authMethod: string;
-    templateFields: Record<string, unknown>;
-  } & Omit<TOrgPermission, "orgId">) => {
-    await $checkPlan(actorOrgId);
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.CreateTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const { encryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: actorOrgId
-    });
-    const template = await identityAuthTemplateDAL.create({
-      name,
-      authMethod,
-      templateFields: encryptor({ plainText: Buffer.from(JSON.stringify(templateFields)) }).cipherTextBlob,
-      orgId: actorOrgId
-    });
-
-    return { ...template, templateFields };
-  };
-
-  const updateTemplate = async ({
-    templateId,
-    name,
-    templateFields,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: {
-    templateId: string;
-    name?: string;
-    templateFields?: Record<string, unknown>;
-  } & Omit<TOrgPermission, "orgId">) => {
-    await $checkPlan(actorOrgId);
-    const template = await identityAuthTemplateDAL.findByIdAndOrgId(templateId, actorOrgId);
-    if (!template) {
-      throw new NotFoundError({ message: "Template not found" });
-    }
-
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      template.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.EditTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const { encryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: template.orgId
-    });
-
-    let finalTemplateFields: Record<string, unknown> = {};
-
-    const updatedTemplate = await identityAuthTemplateDAL.transaction(async (tx) => {
-      const authTemplate = await identityAuthTemplateDAL.updateById(
-        templateId,
-        {
-          name,
-          ...(templateFields && {
-            templateFields: encryptor({ plainText: Buffer.from(JSON.stringify(templateFields)) }).cipherTextBlob
-          })
-        },
-        tx
-      );
-
-      if (templateFields && template.authMethod === IdentityAuthTemplateMethod.LDAP) {
-        const { decryptor } = await kmsService.createCipherPairWithDataKey({
-          type: KmsDataKey.Organization,
-          orgId: template.orgId
-        });
-
-        const currentTemplateFields = JSON.parse(
-          decryptor({ cipherTextBlob: template.templateFields }).toString()
-        ) as TLdapTemplateFields;
-
-        const mergedTemplateFields: TLdapTemplateFields = { ...currentTemplateFields, ...templateFields };
-        finalTemplateFields = mergedTemplateFields;
-        const ldapUpdateData: {
-          url?: string;
-          searchBase?: string;
-          encryptedBindDN?: Buffer;
-          encryptedBindPass?: Buffer;
-          encryptedLdapCaCertificate?: Buffer;
-        } = {};
-
-        if ("url" in templateFields) {
-          ldapUpdateData.url = mergedTemplateFields.url;
-        }
-        if ("searchBase" in templateFields) {
-          ldapUpdateData.searchBase = mergedTemplateFields.searchBase;
-        }
-        if ("bindDN" in templateFields) {
-          ldapUpdateData.encryptedBindDN = encryptor({
-            plainText: Buffer.from(mergedTemplateFields.bindDN)
-          }).cipherTextBlob;
-        }
-        if ("bindPass" in templateFields) {
-          ldapUpdateData.encryptedBindPass = encryptor({
-            plainText: Buffer.from(mergedTemplateFields.bindPass)
-          }).cipherTextBlob;
-        }
-        if ("ldapCaCertificate" in templateFields) {
-          ldapUpdateData.encryptedLdapCaCertificate = encryptor({
-            plainText: Buffer.from(mergedTemplateFields.ldapCaCertificate || "")
-          }).cipherTextBlob;
-        }
-
-        if (Object.keys(ldapUpdateData).length > 0) {
-          const updatedLdapAuths = await identityLdapAuthDAL.update({ templateId }, ldapUpdateData, tx);
-          await Promise.all(
-            updatedLdapAuths.map(async (updatedLdapAuth) => {
-              await auditLogService.createAuditLog({
-                actor: {
-                  type: ActorType.PLATFORM,
-                  metadata: {}
-                },
-                orgId: actorOrgId,
-                event: {
-                  type: EventType.UPDATE_IDENTITY_LDAP_AUTH,
-                  metadata: {
-                    identityId: updatedLdapAuth.identityId,
-                    templateId: template.id
-                  }
-                }
-              });
-            })
-          );
-        }
-      }
-      return authTemplate;
-    });
-
-    return { ...updatedTemplate, templateFields: finalTemplateFields };
-  };
-
-  const deleteTemplate = async ({
-    templateId,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: TDeleteIdentityAuthTemplateDTO) => {
-    await $checkPlan(actorOrgId);
-    const template = await identityAuthTemplateDAL.findByIdAndOrgId(templateId, actorOrgId);
-    if (!template) {
-      throw new NotFoundError({ message: "Template not found" });
-    }
-
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      template.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.DeleteTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const deletedTemplate = await identityAuthTemplateDAL.transaction(async (tx) => {
-      // Remove template reference from identityLdapAuth records
-      const updatedLdapAuths = await identityLdapAuthDAL.update({ templateId }, { templateId: null }, tx);
-      await Promise.all(
-        updatedLdapAuths.map(async (updatedLdapAuth) => {
-          await auditLogService.createAuditLog({
-            actor: {
-              type: ActorType.PLATFORM,
-              metadata: {}
-            },
-            orgId: actorOrgId,
-            event: {
-              type: EventType.UPDATE_IDENTITY_LDAP_AUTH,
-              metadata: {
-                identityId: updatedLdapAuth.identityId,
-                templateId: template.id
-              }
-            }
-          });
-        })
-      );
-
-      // Delete the template
-      const [deletedTpl] = await identityAuthTemplateDAL.delete({ id: templateId }, tx);
-      return deletedTpl;
-    });
-
-    return deletedTemplate;
-  };
-
-  const getTemplate = async ({
-    templateId,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: TGetIdentityAuthTemplateDTO) => {
-    await $checkPlan(actorOrgId);
-    const template = await identityAuthTemplateDAL.findByIdAndOrgId(templateId, actorOrgId);
-    if (!template) {
-      throw new NotFoundError({ message: "Template not found" });
-    }
-
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      template.orgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.ListTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const { decryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: template.orgId
-    });
-    const decryptedTemplateFields = decryptor({ cipherTextBlob: template.templateFields }).toString();
-    return {
-      ...template,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      templateFields: JSON.parse(decryptedTemplateFields)
-    };
-  };
-
-  const listTemplates = async ({
-    limit,
-    offset,
-    search,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: TListIdentityAuthTemplatesDTO) => {
-    await $checkPlan(actorOrgId);
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.ListTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const { docs, totalCount } = await identityAuthTemplateDAL.findByOrgId(actorOrgId, { limit, offset, search });
-
-    const { decryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: actorOrgId
-    });
-    return {
-      totalCount,
-      templates: docs.map((doc) => ({
-        ...doc,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        templateFields: JSON.parse(decryptor({ cipherTextBlob: doc.templateFields }).toString())
-      }))
-    };
-  };
-
-  const getTemplatesByAuthMethod = async ({
-    authMethod,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: TGetTemplatesByAuthMethodDTO) => {
-    await $checkPlan(actorOrgId);
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.AttachTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const docs = await identityAuthTemplateDAL.findByAuthMethod(authMethod, actorOrgId);
-
-    const { decryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: actorOrgId
-    });
-    return docs.map((doc) => ({
-      ...doc,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      templateFields: JSON.parse(decryptor({ cipherTextBlob: doc.templateFields }).toString())
-    }));
-  };
-
-  const findTemplateUsages = async ({
-    templateId,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: TFindTemplateUsagesDTO) => {
-    await $checkPlan(actorOrgId);
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.ListTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const template = await identityAuthTemplateDAL.findByIdAndOrgId(templateId, actorOrgId);
-    if (!template) {
-      throw new NotFoundError({ message: "Template not found" });
-    }
-
-    const docs = await identityAuthTemplateDAL.findTemplateUsages(templateId, template.authMethod);
-    return docs;
-  };
-
-  const unlinkTemplateUsage = async ({
-    templateId,
-    identityIds,
-    actorId,
-    actorAuthMethod,
-    actor,
-    actorOrgId
-  }: TUnlinkTemplateUsageDTO) => {
-    await $checkPlan(actorOrgId);
-    const { permission } = await permissionService.getOrgPermission(
-      actor,
-      actorId,
-      actorOrgId,
-      actorAuthMethod,
-      actorOrgId
-    );
-    ForbiddenError.from(permission).throwUnlessCan(
-      OrgPermissionMachineIdentityAuthTemplateActions.UnlinkTemplates,
-      OrgPermissionSubjects.MachineIdentityAuthTemplate
-    );
-
-    const template = await identityAuthTemplateDAL.findByIdAndOrgId(templateId, actorOrgId);
-    if (!template) {
-      throw new NotFoundError({ message: "Template not found" });
-    }
-
-    switch (template.authMethod) {
-      case IdentityAuthTemplateMethod.LDAP:
-        await identityLdapAuthDAL.update({ $in: { identityId: identityIds }, templateId }, { templateId: null });
-        break;
-      default:
-        break;
-    }
-  };
-
-  return {
-    createTemplate,
-    updateTemplate,
-    deleteTemplate,
-    getTemplate,
-    listTemplates,
-    getTemplatesByAuthMethod,
-    findTemplateUsages,
-    unlinkTemplateUsage
-  };
-};

backend/src/ee/services/identity-auth-template/identity-auth-template-types.ts

@@ -1,61 +0,0 @@
-import { TProjectPermission } from "@app/lib/types";
-
-import { IdentityAuthTemplateMethod } from "./identity-auth-template-enums";
-
-// Method-specific template field types
-export type TLdapTemplateFields = {
-  url: string;
-  bindDN: string;
-  bindPass: string;
-  searchBase: string;
-  ldapCaCertificate?: string;
-};
-
-// Union type for all template field types
-export type TTemplateFieldsByMethod = {
-  [IdentityAuthTemplateMethod.LDAP]: TLdapTemplateFields;
-};
-
-// Generic base types that use conditional types for type safety
-export type TCreateIdentityAuthTemplateDTO = {
-  name: string;
-  authMethod: IdentityAuthTemplateMethod;
-  templateFields: TTemplateFieldsByMethod[IdentityAuthTemplateMethod];
-} & Omit<TProjectPermission, "projectId">;
-
-export type TUpdateIdentityAuthTemplateDTO = {
-  templateId: string;
-  name?: string;
-  templateFields?: Partial<TTemplateFieldsByMethod[IdentityAuthTemplateMethod]>;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TDeleteIdentityAuthTemplateDTO = {
-  templateId: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TGetIdentityAuthTemplateDTO = {
-  templateId: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TListIdentityAuthTemplatesDTO = {
-  limit?: number;
-  offset?: number;
-  search?: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TGetTemplatesByAuthMethodDTO = {
-  authMethod: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TFindTemplateUsagesDTO = {
-  templateId: string;
-} & Omit<TProjectPermission, "projectId">;
-
-export type TUnlinkTemplateUsageDTO = {
-  templateId: string;
-  identityIds: string[];
-} & Omit<TProjectPermission, "projectId">;
-
-// Specific LDAP types for convenience
-export type TCreateLdapTemplateDTO = TCreateIdentityAuthTemplateDTO;
-export type TUpdateLdapTemplateDTO = TUpdateIdentityAuthTemplateDTO;

backend/src/ee/services/identity-auth-template/index.ts

@@ -1,6 +0,0 @@
-export type { TIdentityAuthTemplateDALFactory } from "./identity-auth-template-dal";
-export { identityAuthTemplateDALFactory } from "./identity-auth-template-dal";
-export * from "./identity-auth-template-enums";
-export type { TIdentityAuthTemplateServiceFactory } from "./identity-auth-template-service";
-export { identityAuthTemplateServiceFactory } from "./identity-auth-template-service";
-export type * from "./identity-auth-template-types";

backend/src/ee/services/ldap-config/ldap-config-service.ts

@@ -1,5 +1,4 @@
 import { ForbiddenError } from "@casl/ability";
-import { Knex } from "knex";
 
 import { OrgMembershipStatus, TableName, TLdapConfigsUpdate, TUsers } from "@app/db/schemas";
 import { TGroupDALFactory } from "@app/ee/services/group/group-dal";
@@ -46,7 +45,7 @@ import { searchGroups, testLDAPConfig } from "./ldap-fns";
 import { TLdapGroupMapDALFactory } from "./ldap-group-map-dal";
 
 type TLdapConfigServiceFactoryDep = {
-  ldapConfigDAL: Pick<TLdapConfigDALFactory, "create" | "update" | "findOne" | "transaction">;
+  ldapConfigDAL: Pick<TLdapConfigDALFactory, "create" | "update" | "findOne">;
   ldapGroupMapDAL: Pick<TLdapGroupMapDALFactory, "find" | "create" | "delete" | "findLdapGroupMapsByLdapConfigId">;
   orgMembershipDAL: Pick<TOrgMembershipDALFactory, "create">;
   orgDAL: Pick<
@@ -56,7 +55,7 @@ type TLdapConfigServiceFactoryDep = {
   groupDAL: Pick<TGroupDALFactory, "find" | "findOne">;
   groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany" | "delete">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
   userGroupMembershipDAL: Pick<
     TUserGroupMembershipDALFactory,
@@ -132,19 +131,6 @@ export const ldapConfigServiceFactory = ({
       orgId
     });
 
-    const isConnected = await testLDAPConfig({
-      bindDN,
-      bindPass,
-      caCert,
-      url
-    });
-
-    if (!isConnected) {
-      throw new BadRequestError({
-        message: "Failed to establish connection to LDAP directory. Please verify that your credentials are correct."
-      });
-    }
-
     const ldapConfig = await ldapConfigDAL.create({
       orgId,
       isActive,
@@ -162,50 +148,6 @@ export const ldapConfigServiceFactory = ({
     return ldapConfig;
   };
 
-  const getLdapCfg = async (filter: { orgId: string; isActive?: boolean; id?: string }, tx?: Knex) => {
-    const ldapConfig = await ldapConfigDAL.findOne(filter, tx);
-    if (!ldapConfig) {
-      throw new NotFoundError({
-        message: `Failed to find organization LDAP data in organization with ID '${filter.orgId}'`
-      });
-    }
-
-    const { decryptor } = await kmsService.createCipherPairWithDataKey({
-      type: KmsDataKey.Organization,
-      orgId: ldapConfig.orgId
-    });
-
-    let bindDN = "";
-    if (ldapConfig.encryptedLdapBindDN) {
-      bindDN = decryptor({ cipherTextBlob: ldapConfig.encryptedLdapBindDN }).toString();
-    }
-
-    let bindPass = "";
-    if (ldapConfig.encryptedLdapBindPass) {
-      bindPass = decryptor({ cipherTextBlob: ldapConfig.encryptedLdapBindPass }).toString();
-    }
-
-    let caCert = "";
-    if (ldapConfig.encryptedLdapCaCertificate) {
-      caCert = decryptor({ cipherTextBlob: ldapConfig.encryptedLdapCaCertificate }).toString();
-    }
-
-    return {
-      id: ldapConfig.id,
-      organization: ldapConfig.orgId,
-      isActive: ldapConfig.isActive,
-      url: ldapConfig.url,
-      bindDN,
-      bindPass,
-      uniqueUserAttribute: ldapConfig.uniqueUserAttribute,
-      searchBase: ldapConfig.searchBase,
-      searchFilter: ldapConfig.searchFilter,
-      groupSearchBase: ldapConfig.groupSearchBase,
-      groupSearchFilter: ldapConfig.groupSearchFilter,
-      caCert
-    };
-  };
-
   const updateLdapCfg = async ({
     actor,
     actorId,
@@ -260,25 +202,53 @@ export const ldapConfigServiceFactory = ({
       updateQuery.encryptedLdapCaCertificate = encryptor({ plainText: Buffer.from(caCert) }).cipherTextBlob;
     }
 
-    const config = await ldapConfigDAL.transaction(async (tx) => {
-      const [updatedLdapCfg] = await ldapConfigDAL.update({ orgId }, updateQuery, tx);
-      const decryptedLdapCfg = await getLdapCfg({ orgId }, tx);
+    const [ldapConfig] = await ldapConfigDAL.update({ orgId }, updateQuery);
 
-      const isSoftDeletion = !decryptedLdapCfg.url && !decryptedLdapCfg.bindDN && !decryptedLdapCfg.bindPass;
-      if (!isSoftDeletion) {
-        const isConnected = await testLDAPConfig(decryptedLdapCfg);
-        if (!isConnected) {
-          throw new BadRequestError({
-            message:
-              "Failed to establish connection to LDAP directory. Please verify that your credentials are correct."
-          });
-        }
-      }
+    return ldapConfig;
+  };
 
-      return updatedLdapCfg;
+  const getLdapCfg = async (filter: { orgId: string; isActive?: boolean; id?: string }) => {
+    const ldapConfig = await ldapConfigDAL.findOne(filter);
+    if (!ldapConfig) {
+      throw new NotFoundError({
+        message: `Failed to find organization LDAP data in organization with ID '${filter.orgId}'`
+      });
+    }
+
+    const { decryptor } = await kmsService.createCipherPairWithDataKey({
+      type: KmsDataKey.Organization,
+      orgId: ldapConfig.orgId
     });
 
-    return config;
+    let bindDN = "";
+    if (ldapConfig.encryptedLdapBindDN) {
+      bindDN = decryptor({ cipherTextBlob: ldapConfig.encryptedLdapBindDN }).toString();
+    }
+
+    let bindPass = "";
+    if (ldapConfig.encryptedLdapBindPass) {
+      bindPass = decryptor({ cipherTextBlob: ldapConfig.encryptedLdapBindPass }).toString();
+    }
+
+    let caCert = "";
+    if (ldapConfig.encryptedLdapCaCertificate) {
+      caCert = decryptor({ cipherTextBlob: ldapConfig.encryptedLdapCaCertificate }).toString();
+    }
+
+    return {
+      id: ldapConfig.id,
+      organization: ldapConfig.orgId,
+      isActive: ldapConfig.isActive,
+      url: ldapConfig.url,
+      bindDN,
+      bindPass,
+      uniqueUserAttribute: ldapConfig.uniqueUserAttribute,
+      searchBase: ldapConfig.searchBase,
+      searchFilter: ldapConfig.searchFilter,
+      groupSearchBase: ldapConfig.groupSearchBase,
+      groupSearchFilter: ldapConfig.groupSearchFilter,
+      caCert
+    };
   };
 
   const getLdapCfgWithPermissionCheck = async ({
@@ -557,13 +527,14 @@ export const ldapConfigServiceFactory = ({
     });
 
     const isUserCompleted = Boolean(user.isAccepted);
+    const userEnc = await userDAL.findUserEncKeyByUserId(user.id);
 
     const providerAuthToken = crypto.jwt().sign(
       {
         authTokenType: AuthTokenType.PROVIDER_TOKEN,
         userId: user.id,
         username: user.username,
-        hasExchangedPrivateKey: true,
+        hasExchangedPrivateKey: Boolean(userEnc?.serverEncryptedPrivateKey),
         ...(user.email && { email: user.email, isEmailVerified: user.isEmailVerified }),
         firstName,
         lastName,
@@ -723,17 +694,7 @@ export const ldapConfigServiceFactory = ({
     return deletedGroupMap;
   };
 
-  const testLDAPConnection = async ({
-    actor,
-    actorId,
-    orgId,
-    actorAuthMethod,
-    actorOrgId,
-    bindDN,
-    bindPass,
-    caCert,
-    url
-  }: TTestLdapConnectionDTO) => {
+  const testLDAPConnection = async ({ actor, actorId, orgId, actorAuthMethod, actorOrgId }: TTestLdapConnectionDTO) => {
     const { permission } = await permissionService.getOrgPermission(actor, actorId, orgId, actorAuthMethod, actorOrgId);
     ForbiddenError.from(permission).throwUnlessCan(OrgPermissionActions.Create, OrgPermissionSubjects.Ldap);
 
@@ -743,12 +704,11 @@ export const ldapConfigServiceFactory = ({
         message: "Failed to test LDAP connection due to plan restriction. Upgrade plan to test the LDAP connection."
       });
 
-    return testLDAPConfig({
-      bindDN,
-      bindPass,
-      caCert,
-      url
+    const ldapConfig = await getLdapCfg({
+      orgId
     });
+
+    return testLDAPConfig(ldapConfig);
   };
 
   return {

backend/src/ee/services/ldap-config/ldap-config-types.ts

@@ -83,4 +83,6 @@ export type TDeleteLdapGroupMapDTO = {
   ldapGroupMapId: string;
 } & TOrgPermission;
 
-export type TTestLdapConnectionDTO = TOrgPermission & TTestLDAPConfigDTO;
+export type TTestLdapConnectionDTO = {
+  ldapConfigId: string;
+} & TOrgPermission;

backend/src/ee/services/license/__mocks__/license-fns.ts

@@ -31,8 +31,7 @@ export const getDefaultOnPremFeatures = () => {
     caCrl: false,
     sshHostGroups: false,
     enterpriseSecretSyncs: false,
-    enterpriseAppConnections: true,
-    machineIdentityAuthTemplates: false
+    enterpriseAppConnections: false
   };
 };
 

backend/src/ee/services/license/license-fns.ts

@@ -59,9 +59,7 @@ export const getDefaultOnPremFeatures = (): TFeatureSet => ({
   secretScanning: false,
   enterpriseSecretSyncs: false,
   enterpriseAppConnections: false,
-  fips: false,
-  eventSubscriptions: false,
-  machineIdentityAuthTemplates: false
+  fips: false
 });
 
 export const setupLicenseRequestWithStore = (

backend/src/ee/services/license/license-service.ts

@@ -5,14 +5,13 @@
 // TODO(akhilmhdh): With tony find out the api structure and fill it here
 
 import { ForbiddenError } from "@casl/ability";
-import { AxiosError } from "axios";
 import { CronJob } from "cron";
 import { Knex } from "knex";
 
 import { TKeyStoreFactory } from "@app/keystore/keystore";
 import { getConfig } from "@app/lib/config/env";
 import { verifyOfflineLicense } from "@app/lib/crypto";
-import { BadRequestError, NotFoundError } from "@app/lib/errors";
+import { NotFoundError } from "@app/lib/errors";
 import { logger } from "@app/lib/logger";
 import { TIdentityOrgDALFactory } from "@app/services/identity/identity-org-dal";
 import { TOrgDALFactory } from "@app/services/org/org-dal";
@@ -604,22 +603,10 @@ export const licenseServiceFactory = ({
       });
     }
 
-    try {
-      const { data } = await licenseServerCloudApi.request.delete(
-        `/api/license-server/v1/customers/${organization.customerId}/billing-details/payment-methods/${pmtMethodId}`
-      );
-      return data;
-    } catch (error) {
-      if (error instanceof AxiosError) {
-        throw new BadRequestError({
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-          message: `Failed to remove payment method: ${error.response?.data?.message}`
-        });
-      }
-      throw new BadRequestError({
-        message: "Unable to remove payment method"
-      });
-    }
+    const { data } = await licenseServerCloudApi.request.delete(
+      `/api/license-server/v1/customers/${organization.customerId}/billing-details/payment-methods/${pmtMethodId}`
+    );
+    return data;
   };
 
   const getOrgTaxIds = async ({ orgId, actor, actorId, actorAuthMethod, actorOrgId }: TGetOrgTaxIdDTO) => {

backend/src/ee/services/license/license-types.ts

@@ -75,9 +75,7 @@ export type TFeatureSet = {
   secretScanning: false;
   enterpriseSecretSyncs: false;
   enterpriseAppConnections: false;
-  machineIdentityAuthTemplates: false;
   fips: false;
-  eventSubscriptions: false;
 };
 
 export type TOrgPlansTableDTO = {

backend/src/ee/services/oidc/oidc-config-service.ts

@@ -79,7 +79,7 @@ type TOidcConfigServiceFactoryDep = {
   >;
   groupProjectDAL: Pick<TGroupProjectDALFactory, "find">;
   projectKeyDAL: Pick<TProjectKeyDALFactory, "find" | "findLatestProjectKey" | "insertMany" | "delete">;
-  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "findProjectGhostUser">;
   projectBotDAL: Pick<TProjectBotDALFactory, "findOne">;
   auditLogService: Pick<TAuditLogServiceFactory, "createAuditLog">;
   kmsService: Pick<TKmsServiceFactory, "createCipherPairWithDataKey">;
@@ -404,6 +404,7 @@ export const oidcConfigServiceFactory = ({
 
     await licenseService.updateSubscriptionOrgMemberCount(organization.id);
 
+    const userEnc = await userDAL.findUserEncKeyByUserId(user.id);
     const isUserCompleted = Boolean(user.isAccepted);
     const providerAuthToken = crypto.jwt().sign(
       {
@@ -416,7 +417,7 @@ export const oidcConfigServiceFactory = ({
         organizationName: organization.name,
         organizationId: organization.id,
         organizationSlug: organization.slug,
-        hasExchangedPrivateKey: true,
+        hasExchangedPrivateKey: Boolean(userEnc?.serverEncryptedPrivateKey),
         authMethod: AuthMethod.OIDC,
         authType: UserAliasType.OIDC,
         isUserCompleted,

backend/src/ee/services/permission/default-roles.ts

@@ -161,8 +161,7 @@ const buildAdminPermissionRules = () => {
       ProjectPermissionSecretActions.ReadValue,
       ProjectPermissionSecretActions.Create,
       ProjectPermissionSecretActions.Edit,
-      ProjectPermissionSecretActions.Delete,
-      ProjectPermissionSecretActions.Subscribe
+      ProjectPermissionSecretActions.Delete
     ],
     ProjectPermissionSub.Secrets
   );
@@ -266,8 +265,7 @@ const buildMemberPermissionRules = () => {
       ProjectPermissionSecretActions.ReadValue,
       ProjectPermissionSecretActions.Edit,
       ProjectPermissionSecretActions.Create,
-      ProjectPermissionSecretActions.Delete,
-      ProjectPermissionSecretActions.Subscribe
+      ProjectPermissionSecretActions.Delete
     ],
     ProjectPermissionSub.Secrets
   );

backend/src/ee/services/permission/org-permission.ts

@@ -28,15 +28,6 @@ export enum OrgPermissionKmipActions {
   Setup = "setup"
 }
 
-export enum OrgPermissionMachineIdentityAuthTemplateActions {
-  ListTemplates = "list-templates",
-  EditTemplates = "edit-templates",
-  CreateTemplates = "create-templates",
-  DeleteTemplates = "delete-templates",
-  UnlinkTemplates = "unlink-templates",
-  AttachTemplates = "attach-templates"
-}
-
 export enum OrgPermissionAdminConsoleAction {
   AccessAllProjects = "access-all-projects"
 }
@@ -97,7 +88,6 @@ export enum OrgPermissionSubjects {
   Identity = "identity",
   Kms = "kms",
   AdminConsole = "organization-admin-console",
-  MachineIdentityAuthTemplate = "machine-identity-auth-template",
   AuditLogs = "audit-logs",
   ProjectTemplates = "project-templates",
   AppConnections = "app-connections",
@@ -136,7 +126,6 @@ export type OrgPermissionSet =
       )
     ]
   | [OrgPermissionAdminConsoleAction, OrgPermissionSubjects.AdminConsole]
-  | [OrgPermissionMachineIdentityAuthTemplateActions, OrgPermissionSubjects.MachineIdentityAuthTemplate]
   | [OrgPermissionKmipActions, OrgPermissionSubjects.Kmip]
   | [OrgPermissionSecretShareAction, OrgPermissionSubjects.SecretShare];
 
@@ -248,14 +237,6 @@ export const OrgPermissionSchema = z.discriminatedUnion("subject", [
       "Describe what action an entity can take."
     )
   }),
-  z.object({
-    subject: z
-      .literal(OrgPermissionSubjects.MachineIdentityAuthTemplate)
-      .describe("The entity this permission pertains to."),
-    action: CASL_ACTION_SCHEMA_NATIVE_ENUM(OrgPermissionMachineIdentityAuthTemplateActions).describe(
-      "Describe what action an entity can take."
-    )
-  }),
   z.object({
     subject: z.literal(OrgPermissionSubjects.Gateway).describe("The entity this permission pertains to."),
     action: CASL_ACTION_SCHEMA_NATIVE_ENUM(OrgPermissionGatewayActions).describe(
@@ -369,25 +350,6 @@ const buildAdminPermission = () => {
   // the proxy assignment is temporary in order to prevent "more privilege" error during role assignment to MI
   can(OrgPermissionKmipActions.Proxy, OrgPermissionSubjects.Kmip);
 
-  can(OrgPermissionMachineIdentityAuthTemplateActions.ListTemplates, OrgPermissionSubjects.MachineIdentityAuthTemplate);
-  can(OrgPermissionMachineIdentityAuthTemplateActions.EditTemplates, OrgPermissionSubjects.MachineIdentityAuthTemplate);
-  can(
-    OrgPermissionMachineIdentityAuthTemplateActions.CreateTemplates,
-    OrgPermissionSubjects.MachineIdentityAuthTemplate
-  );
-  can(
-    OrgPermissionMachineIdentityAuthTemplateActions.DeleteTemplates,
-    OrgPermissionSubjects.MachineIdentityAuthTemplate
-  );
-  can(
-    OrgPermissionMachineIdentityAuthTemplateActions.UnlinkTemplates,
-    OrgPermissionSubjects.MachineIdentityAuthTemplate
-  );
-  can(
-    OrgPermissionMachineIdentityAuthTemplateActions.AttachTemplates,
-    OrgPermissionSubjects.MachineIdentityAuthTemplate
-  );
-
   can(OrgPermissionSecretShareAction.ManageSettings, OrgPermissionSubjects.SecretShare);
 
   return rules;
@@ -423,16 +385,6 @@ const buildMemberPermission = () => {
   can(OrgPermissionGatewayActions.CreateGateways, OrgPermissionSubjects.Gateway);
   can(OrgPermissionGatewayActions.AttachGateways, OrgPermissionSubjects.Gateway);
 
-  can(OrgPermissionMachineIdentityAuthTemplateActions.ListTemplates, OrgPermissionSubjects.MachineIdentityAuthTemplate);
-  can(
-    OrgPermissionMachineIdentityAuthTemplateActions.UnlinkTemplates,
-    OrgPermissionSubjects.MachineIdentityAuthTemplate
-  );
-  can(
-    OrgPermissionMachineIdentityAuthTemplateActions.AttachTemplates,
-    OrgPermissionSubjects.MachineIdentityAuthTemplate
-  );
-
   return rules;
 };
 

backend/src/ee/services/permission/project-permission.ts

@@ -36,8 +36,7 @@ export enum ProjectPermissionSecretActions {
   ReadValue = "readValue",
   Create = "create",
   Edit = "edit",
-  Delete = "delete",
-  Subscribe = "subscribe"
+  Delete = "delete"
 }
 
 export enum ProjectPermissionCmekActions {
@@ -205,7 +204,6 @@ export type SecretSubjectFields = {
   secretPath: string;
   secretName?: string;
   secretTags?: string[];
-  eventType?: string;
 };
 
 export type SecretFolderSubjectFields = {
@@ -485,17 +483,7 @@ const SecretConditionV2Schema = z
       .object({
         [PermissionConditionOperators.$IN]: PermissionConditionSchema[PermissionConditionOperators.$IN]
       })
-      .partial(),
-    eventType: z.union([
-      z.string(),
-      z
-        .object({
-          [PermissionConditionOperators.$EQ]: PermissionConditionSchema[PermissionConditionOperators.$EQ],
-          [PermissionConditionOperators.$NEQ]: PermissionConditionSchema[PermissionConditionOperators.$NEQ],
-          [PermissionConditionOperators.$IN]: PermissionConditionSchema[PermissionConditionOperators.$IN]
-        })
-        .partial()
-    ])
+      .partial()
   })
   .partial();
 

backend/src/ee/services/saml-config/saml-config-service.ts

@@ -411,6 +411,7 @@ export const samlConfigServiceFactory = ({
     await licenseService.updateSubscriptionOrgMemberCount(organization.id);
 
     const isUserCompleted = Boolean(user.isAccepted && user.isEmailVerified);
+    const userEnc = await userDAL.findUserEncKeyByUserId(user.id);
     const providerAuthToken = crypto.jwt().sign(
       {
         authTokenType: AuthTokenType.PROVIDER_TOKEN,
@@ -423,7 +424,7 @@ export const samlConfigServiceFactory = ({
         organizationId: organization.id,
         organizationSlug: organization.slug,
         authMethod: authProvider,
-        hasExchangedPrivateKey: true,
+        hasExchangedPrivateKey: Boolean(userEnc?.serverEncryptedPrivateKey),
         authType: UserAliasType.SAML,
         isUserCompleted,
         ...(relayState

backend/src/ee/services/scim/scim-service.ts

@@ -59,7 +59,7 @@ type TScimServiceFactoryDep = {
     TOrgMembershipDALFactory,
     "find" | "findOne" | "create" | "updateById" | "findById" | "update"
   >;
-  projectDAL: Pick<TProjectDALFactory, "find" | "findProjectGhostUser" | "findById">;
+  projectDAL: Pick<TProjectDALFactory, "find" | "findProjectGhostUser">;
   projectMembershipDAL: Pick<TProjectMembershipDALFactory, "find" | "delete" | "findProjectMembershipsByUserId">;
   groupDAL: Pick<
     TGroupDALFactory,
@@ -579,9 +579,6 @@ export const scimServiceFactory = ({
       });
 
     const serverCfg = await getServerCfg();
-    const hasEmailChanged = email?.toLowerCase() !== membership.email;
-    const defaultEmailVerified =
-      org.orgAuthMethod === OrgAuthMethod.OIDC ? serverCfg.trustOidcEmails : serverCfg.trustSamlEmails;
     await userDAL.transaction(async (tx) => {
       await userAliasDAL.update(
         {
@@ -608,7 +605,8 @@ export const scimServiceFactory = ({
           firstName,
           email: email?.toLowerCase(),
           lastName,
-          isEmailVerified: hasEmailChanged ? defaultEmailVerified : undefined
+          isEmailVerified:
+            org.orgAuthMethod === OrgAuthMethod.OIDC ? serverCfg.trustOidcEmails : serverCfg.trustSamlEmails
         },
         tx
       );