diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 8032f1d50..6bae4f3d4 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -10,8 +10,9 @@ "Bash(npm test)", "Bash(npm test:*)", "Bash(ls:*)", - "Bash(npx tsc:*)" + "Bash(npx tsc:*)", + "Bash(sed:*)" ], "deny": [] } -} \ No newline at end of file +} diff --git a/.github/labeler-config-srvaroa.yml b/.github/labeler-config-srvaroa.yml index 3719c0ad8..6c9e029bd 100644 --- a/.github/labeler-config-srvaroa.yml +++ b/.github/labeler-config-srvaroa.yml @@ -46,6 +46,9 @@ labels: - label: 'API' title: '.*openapi.*|.*swagger.*|.*api.*' + - label: 'v2' + base-branch: 'V2' + - label: 'Translation' files: - 'app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}.properties' @@ -62,6 +65,7 @@ labels: - 'app/core/src/main/java/stirling/software/SPDF/controller/web/.*' - 'app/core/src/main/java/stirling/software/SPDF/UI/.*' - 'app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/.*' + - 'frontend/**' - label: 'Java' files: @@ -120,6 +124,7 @@ labels: - 'scripts/installFonts.sh' - 'test.sh' - 'test2.sh' + - 'docker/**' - label: 'Devtools' files: @@ -131,7 +136,6 @@ labels: - '.github/workflows/pre_commit.yml' - 'devGuide/.*' - 'devTools/.*' - - 'devTools/.*' - label: 'Test' files: diff --git a/.github/labels.yml b/.github/labels.yml index a79fb8be5..842e3fb5c 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -83,6 +83,7 @@ color: "DEDEDE" - name: "v2" color: "FFFF00" + description: "Issues or pull requests related to the v2 branch" - name: "wontfix" description: "This will not be worked on" color: "FFFFFF" diff --git a/.github/workflows/PR-Auto-Deploy-V2.yml b/.github/workflows/PR-Auto-Deploy-V2.yml index bd546078d..2dbcd3260 100644 --- a/.github/workflows/PR-Auto-Deploy-V2.yml +++ b/.github/workflows/PR-Auto-Deploy-V2.yml @@ -318,7 +318,8 @@ jobs: SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "false" - SWAGGER_SERVER_URL: "http://${{ secrets.VPS_HOST }}:${V2_PORT}" + SWAGGER_SERVER_URL: "https://${V2_PORT}.ssl.stirlingpdf.cloud" + baseUrl: "https://${V2_PORT}.ssl.stirlingpdf.cloud" restart: on-failure:5 stirling-pdf-v2-frontend: diff --git a/.github/workflows/PR-Demo-Comment-with-react.yml b/.github/workflows/PR-Demo-Comment-with-react.yml index a5530fced..4acd0cbe6 100644 --- a/.github/workflows/PR-Demo-Comment-with-react.yml +++ b/.github/workflows/PR-Demo-Comment-with-react.yml @@ -47,7 +47,7 @@ jobs: egress-policy: audit - name: Checkout PR - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Setup GitHub App Bot if: github.actor != 'dependabot[bot]' @@ -158,7 +158,7 @@ jobs: egress-policy: audit - name: Checkout PR - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Setup GitHub App Bot if: github.actor != 'dependabot[bot]' @@ -170,7 +170,7 @@ jobs: private-key: ${{ secrets.GH_APP_PRIVATE_KEY }} - name: Checkout PR - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 with: repository: ${{ needs.check-comment.outputs.pr_repository }} ref: ${{ needs.check-comment.outputs.pr_ref }} diff --git a/.github/workflows/PR-Demo-cleanup.yml b/.github/workflows/PR-Demo-cleanup.yml index 29aea4389..67625c0a5 100644 --- a/.github/workflows/PR-Demo-cleanup.yml +++ b/.github/workflows/PR-Demo-cleanup.yml @@ -26,7 +26,7 @@ jobs: egress-policy: audit - name: Checkout PR - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Setup GitHub App Bot if: github.actor != 'dependabot[bot]' diff --git a/.github/workflows/ai_pr_title_review.yml b/.github/workflows/ai_pr_title_review.yml index 8a2e8b8ef..59a69ae5f 100644 --- a/.github/workflows/ai_pr_title_review.yml +++ b/.github/workflows/ai_pr_title_review.yml @@ -23,7 +23,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 with: fetch-depth: 0 @@ -87,7 +87,7 @@ jobs: - name: AI PR Title Analysis if: steps.actor.outputs.is_repo_dev == 'true' id: ai-title-analysis - uses: actions/ai-inference@0cbed4a10641c75090de5968e66d70eb4660f751 # v1.2.7 + uses: actions/ai-inference@b81b2afb8390ee6839b494a404766bef6493c7d9 # v1.2.8 with: model: openai/gpt-4o system-prompt-file: ".github/config/system-prompt.txt" diff --git a/.github/workflows/auto-labelerV2.yml b/.github/workflows/auto-labelerV2.yml index bd998d197..fae92940f 100644 --- a/.github/workflows/auto-labelerV2.yml +++ b/.github/workflows/auto-labelerV2.yml @@ -17,7 +17,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Setup GitHub App Bot id: setup-bot diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 453c4f445..0e38b82fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,8 +31,7 @@ jobs: project: ${{ steps.changes.outputs.project }} openapi: ${{ steps.changes.outputs.openapi }} steps: - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@v4.3.0 - name: Check for file changes uses: dorny/paths-filter@v3.0.2 @@ -56,14 +55,15 @@ jobs: with: egress-policy: audit - name: Checkout repository - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v4.3.0 + - name: Set up JDK ${{ matrix.jdk-version }} uses: actions/setup-java@v4.7.1 with: java-version: ${{ matrix.jdk-version }} distribution: "temurin" - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4.4.1 + uses: gradle/actions/setup-gradle@v4.4.2 with: gradle-version: 8.14 - name: Build with Gradle and spring security ${{ matrix.spring-security }} @@ -106,19 +106,24 @@ jobs: runs-on: ubuntu-latest steps: - name: Harden Runner - uses: step-security/harden-runner@v2.12.2 + uses: step-security/harden-runner@v2.13.0 with: egress-policy: audit - - uses: actions/checkout@v4.2.2 + + - name: Checkout repository + uses: actions/checkout@v4.3.0 + - name: Set up JDK 17 uses: actions/setup-java@v4.7.1 with: java-version: "17" distribution: "temurin" - - uses: gradle/actions/setup-gradle@v4.4.1 + - uses: gradle/actions/setup-gradle@v4.4.2 - name: Generate OpenAPI documentation run: ./gradlew :stirling-pdf:generateOpenApiDocs - + env: + DISABLE_ADDITIONAL_FEATURES: true + - name: Upload OpenAPI Documentation uses: actions/upload-artifact@v4.6.2 with: @@ -163,7 +168,7 @@ jobs: with: egress-policy: audit - name: Checkout repository - uses: actions/checkout@v4.2.2 + uses: actions/checkout@v4.3.0 - name: Set up JDK 17 uses: actions/setup-java@v4.7.1 with: @@ -205,7 +210,7 @@ jobs: egress-policy: audit - name: Checkout Repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up Java 17 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -254,7 +259,7 @@ jobs: egress-policy: audit - name: Checkout Repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK 17 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -263,7 +268,7 @@ jobs: distribution: "temurin" - name: Set up Gradle - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 with: gradle-version: 8.14 diff --git a/.github/workflows/check_properties.yml b/.github/workflows/check_properties.yml index 32a970ef1..8633d2d62 100644 --- a/.github/workflows/check_properties.yml +++ b/.github/workflows/check_properties.yml @@ -35,7 +35,7 @@ jobs: egress-policy: audit - name: Checkout main branch first - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Setup GitHub App Bot id: setup-bot diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 30c96a1b0..8d938011d 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: "Checkout Repository" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: "Dependency Review" uses: actions/dependency-review-action@da24556b548a50705dd671f47852072ea4c105d9 # v4.7.1 diff --git a/.github/workflows/deploy-on-v2-commit.yml b/.github/workflows/deploy-on-v2-commit.yml index 941db40cf..f2f90ccfa 100644 --- a/.github/workflows/deploy-on-v2-commit.yml +++ b/.github/workflows/deploy-on-v2-commit.yml @@ -151,7 +151,8 @@ jobs: SYSTEM_MAXFILESIZE: "100" METRICS_ENABLED: "true" SYSTEM_GOOGLEVISIBILITY: "false" - SWAGGER_SERVER_URL: "http://${{ secrets.VPS_HOST }}:3000" + SWAGGER_SERVER_URL: "https://demo.stirlingpdf.cloud" + baseUrl: "https://demo.stirlingpdf.cloud" restart: on-failure:5 frontend: diff --git a/.github/workflows/licenses-update.yml b/.github/workflows/licenses-update.yml index 49486c4d5..1f920e2da 100644 --- a/.github/workflows/licenses-update.yml +++ b/.github/workflows/licenses-update.yml @@ -36,7 +36,7 @@ jobs: egress-policy: audit - name: Check out code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 with: fetch-depth: 0 @@ -54,7 +54,7 @@ jobs: distribution: "temurin" - name: Setup Gradle - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 - name: Check licenses for compatibility run: ./gradlew clean checkLicense diff --git a/.github/workflows/manage-label.yml b/.github/workflows/manage-label.yml index 1388ef0fb..3f25fbaf1 100644 --- a/.github/workflows/manage-label.yml +++ b/.github/workflows/manage-label.yml @@ -20,7 +20,7 @@ jobs: egress-policy: audit - name: Check out the repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Run Labeler uses: crazy-max/ghaction-github-labeler@24d110aa46a59976b8a7f35518cb7f14f434c916 # v5.3.0 diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml index b55c7d402..e043fd094 100644 --- a/.github/workflows/multiOSReleases.yml +++ b/.github/workflows/multiOSReleases.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -64,7 +64,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK 21 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -72,7 +72,7 @@ jobs: java-version: "21" distribution: "temurin" - - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 with: gradle-version: 8.14 @@ -115,7 +115,7 @@ jobs: egress-policy: audit - name: Download build artifacts - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: stirling-${{ matrix.file_suffix }}binaries @@ -152,7 +152,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK 21 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -160,7 +160,7 @@ jobs: java-version: "21" distribution: "temurin" - - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 with: gradle-version: 8.14 @@ -243,7 +243,7 @@ jobs: egress-policy: audit - name: Download build artifacts - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: ${{ matrix.platform }}binaries @@ -306,7 +306,7 @@ jobs: egress-policy: audit - name: Download signed artifacts - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 - name: Display structure of downloaded files run: ls -R - name: Upload binaries, attestations and signatures to Release and create GitHub Release diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml index 6560e9226..eccf235d1 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre_commit.yml @@ -22,7 +22,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 with: fetch-depth: 0 diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index 2a04ba33e..9a583c7b9 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK 17 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -42,7 +42,7 @@ jobs: java-version: "17" distribution: "temurin" - - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 with: gradle-version: 8.14 diff --git a/.github/workflows/releaseArtifacts.yml b/.github/workflows/releaseArtifacts.yml index ba970e885..7839ffd64 100644 --- a/.github/workflows/releaseArtifacts.yml +++ b/.github/workflows/releaseArtifacts.yml @@ -27,7 +27,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK 17 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -35,7 +35,7 @@ jobs: java-version: "17" distribution: "temurin" - - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 with: gradle-version: 8.14 @@ -88,7 +88,7 @@ jobs: egress-policy: audit - name: Download build artifacts - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: binaries${{ matrix.file_suffix }} - name: Display structure of downloaded files @@ -166,7 +166,7 @@ jobs: egress-policy: audit - name: Download signed artifacts - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: signed${{ matrix.file_suffix }} diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 47fae4f83..a3a355845 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -39,7 +39,7 @@ jobs: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 with: persist-credentials: false @@ -74,6 +74,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5 + uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5 with: sarif_file: results.sarif diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml index 71f01438c..1e0e3ec32 100644 --- a/.github/workflows/sonarqube.yml +++ b/.github/workflows/sonarqube.yml @@ -34,12 +34,12 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 with: fetch-depth: 0 - name: Setup Gradle - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 - name: Build and analyze with Gradle env: diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml index 85a7f10f1..ebb51704c 100644 --- a/.github/workflows/swagger.yml +++ b/.github/workflows/swagger.yml @@ -30,7 +30,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK 17 uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -38,7 +38,7 @@ jobs: java-version: "17" distribution: "temurin" - - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 - name: Generate Swagger documentation run: ./gradlew :stirling-pdf:generateOpenApiDocs diff --git a/.github/workflows/sync_files.yml b/.github/workflows/sync_files.yml index a76cd4acf..d2ff7e827 100644 --- a/.github/workflows/sync_files.yml +++ b/.github/workflows/sync_files.yml @@ -36,7 +36,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Setup GitHub App Bot id: setup-bot diff --git a/.github/workflows/testdriver.yml b/.github/workflows/testdriver.yml index b5759ed54..209ce7435 100644 --- a/.github/workflows/testdriver.yml +++ b/.github/workflows/testdriver.yml @@ -29,7 +29,7 @@ jobs: egress-policy: audit - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up JDK uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 @@ -38,7 +38,7 @@ jobs: distribution: 'temurin' - name: Setup Gradle - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1 + uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3 # v4.4.2 with: gradle-version: 8.14 @@ -126,7 +126,7 @@ jobs: with: egress-policy: audit - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0 - name: Set up Node uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0 diff --git a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java index 170261ff8..b8fa08739 100644 --- a/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java +++ b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Locale; import java.util.Properties; import java.util.function.Predicate; +import java.util.stream.Stream; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -48,6 +49,14 @@ public class AppConfig { @Value("${server.port:8080}") private String serverPort; + @Value("${v2}") + public boolean v2Enabled; + + @Bean + public boolean v2Enabled() { + return v2Enabled; + } + /* Commented out Thymeleaf template engine bean - to be removed when frontend migration is complete @Bean @ConditionalOnProperty(name = "system.customHTMLFiles", havingValue = "true") @@ -119,7 +128,7 @@ public class AppConfig { public boolean rateLimit() { String rateLimit = System.getProperty("rateLimit"); if (rateLimit == null) rateLimit = System.getenv("rateLimit"); - return (rateLimit != null) ? Boolean.valueOf(rateLimit) : false; + return Boolean.parseBoolean(rateLimit); } @Bean(name = "RunningInDocker") @@ -139,8 +148,8 @@ public class AppConfig { if (!Files.exists(mountInfo)) { return true; } - try { - return Files.lines(mountInfo).anyMatch(line -> line.contains(" /configs ")); + try (Stream lines = Files.lines(mountInfo)) { + return lines.anyMatch(line -> line.contains(" /configs ")); } catch (IOException e) { return false; } diff --git a/app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java b/app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java index 247a012ad..64fbc41b7 100644 --- a/app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java +++ b/app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java @@ -25,6 +25,7 @@ public class InstallationPathConfig { private static final String STATIC_PATH; private static final String TEMPLATES_PATH; private static final String SIGNATURES_PATH; + private static final String PRIVATE_KEY_PATH; static { BASE_PATH = initializeBasePath(); @@ -45,6 +46,7 @@ public class InstallationPathConfig { STATIC_PATH = CUSTOM_FILES_PATH + "static" + File.separator; TEMPLATES_PATH = CUSTOM_FILES_PATH + "templates" + File.separator; SIGNATURES_PATH = CUSTOM_FILES_PATH + "signatures" + File.separator; + PRIVATE_KEY_PATH = CONFIG_PATH + "db" + File.separator + "keys" + File.separator; } private static String initializeBasePath() { @@ -120,4 +122,8 @@ public class InstallationPathConfig { public static String getSignaturesPath() { return SIGNATURES_PATH; } + + public static String getPrivateKeyPath() { + return PRIVATE_KEY_PATH; + } } diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java index ee893c575..7eeace787 100644 --- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java +++ b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java @@ -119,6 +119,7 @@ public class ApplicationProperties { private long loginResetTimeMinutes; private String loginMethod = "all"; private String customGlobalAPIKey; + private Jwt jwt = new Jwt(); public Boolean isAltLogin() { return saml2.getEnabled() || oauth2.getEnabled(); @@ -298,6 +299,15 @@ public class ApplicationProperties { } } } + + @Data + public static class Jwt { + private boolean enableKeystore = true; + private boolean enableKeyRotation = false; + private boolean enableKeyCleanup = true; + private int keyRetentionDays = 7; + private boolean secureCookie; + } } @Data @@ -362,7 +372,8 @@ public class ApplicationProperties { public String getBaseTmpDir() { return baseTmpDir != null && !baseTmpDir.isEmpty() ? baseTmpDir - : java.lang.System.getProperty("java.io.tmpdir") + "/stirling-pdf"; + : java.lang.System.getProperty("java.io.tmpdir").replaceAll("/+$", "") + + "/stirling-pdf"; } @JsonIgnore diff --git a/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java index 654c78fe9..239976b66 100644 --- a/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java +++ b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java @@ -14,8 +14,10 @@ public class RequestUriUtils { || requestURI.startsWith(contextPath + "/images/") || requestURI.startsWith(contextPath + "/public/") || requestURI.startsWith(contextPath + "/pdfjs/") + || requestURI.startsWith(contextPath + "/pdfjs-legacy/") || requestURI.startsWith(contextPath + "/login") || requestURI.startsWith(contextPath + "/error") + || requestURI.startsWith(contextPath + "/favicon") || requestURI.endsWith(".svg") || requestURI.endsWith(".png") || requestURI.endsWith(".ico") diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java index 32d1347d6..97cf2e620 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java @@ -37,7 +37,6 @@ public class ConvertHtmlToPDF { private final CustomHtmlSanitizer customHtmlSanitizer; @AutoJobPostMapping(consumes = "multipart/form-data", value = "/html/pdf") - @Operation( summary = "Convert an HTML or ZIP (containing HTML and CSS) to PDF", description = diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java index 2e0f53a0f..3c82c2844 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java @@ -46,7 +46,6 @@ public class ConvertMarkdownToPdf { private final CustomHtmlSanitizer customHtmlSanitizer; @AutoJobPostMapping(consumes = "multipart/form-data", value = "/markdown/pdf") - @Operation( summary = "Convert a Markdown file to PDF", description = diff --git a/app/core/src/main/resources/application.properties b/app/core/src/main/resources/application.properties index da1999dd0..a631b8b14 100644 --- a/app/core/src/main/resources/application.properties +++ b/app/core/src/main/resources/application.properties @@ -5,7 +5,7 @@ logging.level.org.eclipse.jetty=WARN #logging.level.org.springframework.security.saml2=TRACE #logging.level.org.springframework.security=DEBUG #logging.level.org.opensaml=DEBUG -#logging.level.stirling.software.SPDF.config.security: DEBUG +#logging.level.stirling.software.proprietary.security=DEBUG logging.level.com.zaxxer.hikari=WARN spring.jpa.open-in-view=false server.forward-headers-strategy=NATIVE @@ -55,4 +55,7 @@ posthog.host=https://eu.i.posthog.com spring.main.allow-bean-definition-overriding=true # Set up a consistent temporary directory location -java.io.tmpdir=${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf} \ No newline at end of file +java.io.tmpdir=${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf} + +# V2 features +v2=false diff --git a/app/core/src/main/resources/messages_ar_AR.properties b/app/core/src/main/resources/messages_ar_AR.properties index 1cd554cd1..ed0bc1228 100644 --- a/app/core/src/main/resources/messages_ar_AR.properties +++ b/app/core/src/main/resources/messages_ar_AR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=لقد تسجل دخولًا إلى login.alreadyLoggedIn2=أجهزة أخرى. يرجى تسجيل الخروج من الأجهزة وحاول مرة أخرى. login.toManySessions=لديك عدة جلسات نشطة login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=حجب تلقائي diff --git a/app/core/src/main/resources/messages_az_AZ.properties b/app/core/src/main/resources/messages_az_AZ.properties index 2304a13d1..f0e3f5ea9 100644 --- a/app/core/src/main/resources/messages_az_AZ.properties +++ b/app/core/src/main/resources/messages_az_AZ.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Siz artıq daxil olmusunuz login.alreadyLoggedIn2=cihazlar. Zəhmət olmasa, cihazlardan çıxış edin və yenidən cəhd edin. login.toManySessions=Həddindən artıq aktiv sessiyanız var login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Avtomatik Gizlətmə diff --git a/app/core/src/main/resources/messages_bg_BG.properties b/app/core/src/main/resources/messages_bg_BG.properties index a99e9447e..d7964e792 100644 --- a/app/core/src/main/resources/messages_bg_BG.properties +++ b/app/core/src/main/resources/messages_bg_BG.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Вече сте влезли в login.alreadyLoggedIn2=устройства. Моля, излезте от устройствата и опитайте отново. login.toManySessions=Имате твърде много активни сесии login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Автоматично редактиране diff --git a/app/core/src/main/resources/messages_bo_CN.properties b/app/core/src/main/resources/messages_bo_CN.properties index aef66f128..32df39257 100644 --- a/app/core/src/main/resources/messages_bo_CN.properties +++ b/app/core/src/main/resources/messages_bo_CN.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=ཁྱེད་རང་ login.alreadyLoggedIn2=སྒྲིག་ཆས་ནང་ནང་འཛུལ་བྱས་ཟིན། སྒྲིག་ཆས་ནས་ཕྱིར་འཐེན་བྱས་ནས་ཡང་བསྐྱར་ཚོད་ལྟ་བྱེད་རོགས། login.toManySessions=ཁྱེད་ལ་འཛུལ་ཞུགས་བྱས་པའི་གནས་སྐབས་མང་དྲགས་འདུག login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=རང་འགུལ་སྒྲིབ་སྲུང་། diff --git a/app/core/src/main/resources/messages_ca_CA.properties b/app/core/src/main/resources/messages_ca_CA.properties index ff7f2b64b..dda522bdd 100644 --- a/app/core/src/main/resources/messages_ca_CA.properties +++ b/app/core/src/main/resources/messages_ca_CA.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Ja has iniciat sessió a login.alreadyLoggedIn2=dispositius. Si us plau, tanca la sessió en els dispositius i torna-ho a intentar. login.toManySessions=Tens massa sessions actives login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Redacció Automàtica diff --git a/app/core/src/main/resources/messages_cs_CZ.properties b/app/core/src/main/resources/messages_cs_CZ.properties index a68fbcb78..7ce4b77a2 100644 --- a/app/core/src/main/resources/messages_cs_CZ.properties +++ b/app/core/src/main/resources/messages_cs_CZ.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Již jste přihlášeni na login.alreadyLoggedIn2=zařízeních. Odhlaste se prosím z těchto zařízení a zkuste to znovu. login.toManySessions=Máte příliš mnoho aktivních relací login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatické začernění diff --git a/app/core/src/main/resources/messages_da_DK.properties b/app/core/src/main/resources/messages_da_DK.properties index 8d55cc8d1..b82f1d761 100644 --- a/app/core/src/main/resources/messages_da_DK.properties +++ b/app/core/src/main/resources/messages_da_DK.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Du er allerede logget ind på login.alreadyLoggedIn2=enheder. Log ud af disse enheder og prøv igen. login.toManySessions=Du har for mange aktive sessoner login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto Rediger diff --git a/app/core/src/main/resources/messages_de_DE.properties b/app/core/src/main/resources/messages_de_DE.properties index 63b54fa74..db91b8dc7 100644 --- a/app/core/src/main/resources/messages_de_DE.properties +++ b/app/core/src/main/resources/messages_de_DE.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Sie sind bereits an login.alreadyLoggedIn2=Geräten angemeldet. Bitte melden Sie sich dort ab und versuchen es dann erneut. login.toManySessions=Sie haben zu viele aktive Sitzungen login.logoutMessage=Sie wurden erfolgreich abgemeldet. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatisch zensieren/schwärzen diff --git a/app/core/src/main/resources/messages_el_GR.properties b/app/core/src/main/resources/messages_el_GR.properties index a9fbee538..7f59f217e 100644 --- a/app/core/src/main/resources/messages_el_GR.properties +++ b/app/core/src/main/resources/messages_el_GR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Είστε ήδη συνδεδεμένοι σε login.alreadyLoggedIn2=συσκευές. Παρακαλώ αποσυνδεθείτε από τις συσκευές και προσπαθήστε ξανά. login.toManySessions=Έχετε πάρα πολλές ενεργές συνεδρίες login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Αυτόματη απόκρυψη diff --git a/app/core/src/main/resources/messages_en_GB.properties b/app/core/src/main/resources/messages_en_GB.properties index 865acff9a..d63b1c6c4 100644 --- a/app/core/src/main/resources/messages_en_GB.properties +++ b/app/core/src/main/resources/messages_en_GB.properties @@ -893,7 +893,7 @@ login.rememberme=Remember me login.invalid=Invalid username or password. login.locked=Your account has been locked. login.signinTitle=Please sign in -login.ssoSignIn=Login via Single Sign-on +login.ssoSignIn=Login via Single Sign-On login.oAuth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled login.oAuth2AdminBlockedUser=Registration or logging in of non-registered users is currently blocked. Please contact the administrator. login.oauth2RequestNotFound=Authorization request not found @@ -908,6 +908,7 @@ login.alreadyLoggedIn=You are already logged in to login.alreadyLoggedIn2=devices. Please log out of the devices and try again. login.toManySessions=You have too many active sessions login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto Redact diff --git a/app/core/src/main/resources/messages_en_US.properties b/app/core/src/main/resources/messages_en_US.properties index 250dd51c5..8ccbd7c99 100644 --- a/app/core/src/main/resources/messages_en_US.properties +++ b/app/core/src/main/resources/messages_en_US.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=You are already logged in to login.alreadyLoggedIn2=devices. Please log out of the devices and try again. login.toManySessions=You have too many active sessions login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto Redact diff --git a/app/core/src/main/resources/messages_es_ES.properties b/app/core/src/main/resources/messages_es_ES.properties index 4ccb6d758..ae63d5107 100644 --- a/app/core/src/main/resources/messages_es_ES.properties +++ b/app/core/src/main/resources/messages_es_ES.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Ya ha iniciado sesión en login.alreadyLoggedIn2=dispositivos. Cierre sesión en los dispositivos y vuelva a intentarlo. login.toManySessions=Tiene demasiadas sesiones activas login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto Censurar Texto diff --git a/app/core/src/main/resources/messages_eu_ES.properties b/app/core/src/main/resources/messages_eu_ES.properties index 27dbfdb08..17bd70a93 100644 --- a/app/core/src/main/resources/messages_eu_ES.properties +++ b/app/core/src/main/resources/messages_eu_ES.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=You are already logged in to login.alreadyLoggedIn2=devices. Please log out of the devices and try again. login.toManySessions=You have too many active sessions login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto Idatzi diff --git a/app/core/src/main/resources/messages_fa_IR.properties b/app/core/src/main/resources/messages_fa_IR.properties index dccb7fc0b..a3b7cfec3 100644 --- a/app/core/src/main/resources/messages_fa_IR.properties +++ b/app/core/src/main/resources/messages_fa_IR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=شما قبلاً وارد شده‌اید در login.alreadyLoggedIn2=دستگاه‌ها. لطفاً از دستگاه‌ها خارج شده و دوباره تلاش کنید. login.toManySessions=شما تعداد زیادی نشست فعال دارید. login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=سانسور خودکار diff --git a/app/core/src/main/resources/messages_fr_FR.properties b/app/core/src/main/resources/messages_fr_FR.properties index 86e6c0d95..b9db7ff5c 100644 --- a/app/core/src/main/resources/messages_fr_FR.properties +++ b/app/core/src/main/resources/messages_fr_FR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Vous êtes déjà connecté sur login.alreadyLoggedIn2=appareils. Veuillez vous déconnecter des appareils et réessayer. login.toManySessions=Vous avez trop de sessions actives. login.logoutMessage=Vous avez été déconnecté. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Caviarder automatiquement diff --git a/app/core/src/main/resources/messages_ga_IE.properties b/app/core/src/main/resources/messages_ga_IE.properties index 816932ff1..b0363acb4 100644 --- a/app/core/src/main/resources/messages_ga_IE.properties +++ b/app/core/src/main/resources/messages_ga_IE.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Tá tú logáilte isteach cheana login.alreadyLoggedIn2=gléasanna. Logáil amach as na gléasanna agus bain triail eile as. login.toManySessions=Tá an iomarca seisiún gníomhach agat login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto Redact diff --git a/app/core/src/main/resources/messages_hi_IN.properties b/app/core/src/main/resources/messages_hi_IN.properties index e2f9b2c19..32885740c 100644 --- a/app/core/src/main/resources/messages_hi_IN.properties +++ b/app/core/src/main/resources/messages_hi_IN.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=आप पहले से ही login.alreadyLoggedIn2=उपकरणों में लॉग इन हैं। कृपया उपकरणों से लॉग आउट करें और पुनः प्रयास करें। login.toManySessions=आपके बहुत सारे सक्रिय सत्र हैं login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=स्वतः गोपनीयकरण diff --git a/app/core/src/main/resources/messages_hr_HR.properties b/app/core/src/main/resources/messages_hr_HR.properties index 7ea02b909..cb06aba43 100644 --- a/app/core/src/main/resources/messages_hr_HR.properties +++ b/app/core/src/main/resources/messages_hr_HR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Već ste se prijavili na login.alreadyLoggedIn2=ure. Odjavite se s ure i pokušajte ponovo. login.toManySessions=Imate preko mrežne sesije aktivnih login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatsko uređivanje diff --git a/app/core/src/main/resources/messages_hu_HU.properties b/app/core/src/main/resources/messages_hu_HU.properties index c5488bc2b..7845c3fce 100644 --- a/app/core/src/main/resources/messages_hu_HU.properties +++ b/app/core/src/main/resources/messages_hu_HU.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Már be van jelentkezve login.alreadyLoggedIn2=eszközön. Kérjük, jelentkezzen ki az eszközökről és próbálja újra. login.toManySessions=Túl sok aktív munkamenet login.logoutMessage=Sikeresen kijelentkezett. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatikus kitakarás diff --git a/app/core/src/main/resources/messages_id_ID.properties b/app/core/src/main/resources/messages_id_ID.properties index 541226f69..d06da87ab 100644 --- a/app/core/src/main/resources/messages_id_ID.properties +++ b/app/core/src/main/resources/messages_id_ID.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Anda sudah login ke login.alreadyLoggedIn2=perangkat. Silakan keluar dari perangkat dan coba lagi. login.toManySessions=Anda memiliki terlalu banyak sesi aktif login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Redaksional Otomatis diff --git a/app/core/src/main/resources/messages_it_IT.properties b/app/core/src/main/resources/messages_it_IT.properties index 74952b670..7491624f0 100644 --- a/app/core/src/main/resources/messages_it_IT.properties +++ b/app/core/src/main/resources/messages_it_IT.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Hai già effettuato l'accesso a login.alreadyLoggedIn2=dispositivi. Esci dai dispositivi e riprova. login.toManySessions=Hai troppe sessioni attive login.logoutMessage=Sei stato disconnesso. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Redazione automatica @@ -1773,7 +1774,7 @@ audit.dashboard.filter.userPlaceholder=Filtra per utente audit.dashboard.filter.startDate=Data di inizio audit.dashboard.filter.endDate=Data di fine audit.dashboard.filter.apply=Applica filtri -audit.dashboard.filter.reset=Resetta Filtri +audit.dashboard.filter.reset=Resetta filtri # Table Headers audit.dashboard.table.id=ID @@ -1863,7 +1864,7 @@ scannerEffect.submit=Crea una falsa scansione #home.scannerEffect home.scannerEffect.title=Falsa scansione home.scannerEffect.desc=Crea un PDF che sembra scansionato -scannerEffect.tags=scansiona, simula, realistico, converti +scannerEffect.tags=scansiona,simula,realistico,converti # ScannerEffect advanced settings (frontend) scannerEffect.advancedSettings=Abilita impostazioni di scansione avanzate @@ -1885,7 +1886,7 @@ scannerEffect.resolution=Risoluzione (DPI) home.editTableOfContents.title=Modifica indice home.editTableOfContents.desc=Aggiungi o modifica segnalibri e sommario nei documenti PDF -editTableOfContents.tags=segnalibri, indice, navigazione, indice analitico, sommario, capitoli, sezioni, struttura +editTableOfContents.tags=segnalibri,indice,navigazione,indice analitico,sommario,capitoli,sezioni,struttura editTableOfContents.title=Modifica indice editTableOfContents.header=Aggiungi o modifica sommario PDF editTableOfContents.replaceExisting=Sostituisci i segnalibri esistenti (deseleziona per aggiungerli a quelli esistenti) diff --git a/app/core/src/main/resources/messages_ja_JP.properties b/app/core/src/main/resources/messages_ja_JP.properties index a5af895fd..f0c987c9d 100644 --- a/app/core/src/main/resources/messages_ja_JP.properties +++ b/app/core/src/main/resources/messages_ja_JP.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=すでにログインしています login.alreadyLoggedIn2=デバイスからログアウトしてもう一度お試しください。 login.toManySessions=アクティブなセッションが多すぎます login.logoutMessage=ログアウトしました +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=自動墨消し diff --git a/app/core/src/main/resources/messages_ko_KR.properties b/app/core/src/main/resources/messages_ko_KR.properties index 7de79d52c..77517a000 100644 --- a/app/core/src/main/resources/messages_ko_KR.properties +++ b/app/core/src/main/resources/messages_ko_KR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=이미 다음에 로그인되어 있습니다 login.alreadyLoggedIn2=개의 기기. 해당 기기에서 로그아웃한 후 다시 시도하세요. login.toManySessions=활성 세션이 너무 많습니다 login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=자동 검열 diff --git a/app/core/src/main/resources/messages_ml_IN.properties b/app/core/src/main/resources/messages_ml_IN.properties index 123f5a53f..356e5f99b 100644 --- a/app/core/src/main/resources/messages_ml_IN.properties +++ b/app/core/src/main/resources/messages_ml_IN.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=നിങ്ങൾ ഇതിനകം ലോഗിൻ ച login.alreadyLoggedIn2=ഉപകരണങ്ങളിൽ. ദയവായി ഉപകരണങ്ങളിൽ നിന്ന് ലോഗ് ഔട്ട് ചെയ്ത് വീണ്ടും ശ്രമിക്കുക. login.toManySessions=നിങ്ങൾക്ക് വളരെയധികം സജീവ സെഷനുകൾ ഉണ്ട് login.logoutMessage=നിങ്ങൾ ലോഗ് ഔട്ട് ചെയ്തു. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=സ്വയം റെഡാക്റ്റ് ചെയ്യുക diff --git a/app/core/src/main/resources/messages_nl_NL.properties b/app/core/src/main/resources/messages_nl_NL.properties index 44418eb0f..f7aa1e805 100644 --- a/app/core/src/main/resources/messages_nl_NL.properties +++ b/app/core/src/main/resources/messages_nl_NL.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=U zit reeds ingelogd bij login.alreadyLoggedIn2=apparaten. U moet u a.u.b. uitloggen van de apparaten en opnieuw proberen. login.toManySessions=U heeft te veel actieve sessies login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatisch censureren diff --git a/app/core/src/main/resources/messages_no_NB.properties b/app/core/src/main/resources/messages_no_NB.properties index ed830ec3f..ae9091cf5 100644 --- a/app/core/src/main/resources/messages_no_NB.properties +++ b/app/core/src/main/resources/messages_no_NB.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Du er allerede innlogget på login.alreadyLoggedIn2=enheter. Logg ut og forsøk igjen login.toManySessions=Du har for mange aktive økter login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatisk Sensurering diff --git a/app/core/src/main/resources/messages_pl_PL.properties b/app/core/src/main/resources/messages_pl_PL.properties index 0eefb4ccc..9c5dc670e 100644 --- a/app/core/src/main/resources/messages_pl_PL.properties +++ b/app/core/src/main/resources/messages_pl_PL.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Jesteś już zalogowany na login.alreadyLoggedIn2=urządzeniach. Wyloguj się z tych urządzeń i spróbuj ponownie. login.toManySessions=Masz zbyt wiele aktywnych sesji login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatyczne zaciemnienie diff --git a/app/core/src/main/resources/messages_pt_BR.properties b/app/core/src/main/resources/messages_pt_BR.properties index 57e8dd93e..bf2cb6a17 100644 --- a/app/core/src/main/resources/messages_pt_BR.properties +++ b/app/core/src/main/resources/messages_pt_BR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Você já está conectado em login.alreadyLoggedIn2=aparelhos. Por favor saia dos aparelhos e tente novamente. login.toManySessions=Você tem muitas sessões ativas login.logoutMessage=Você foi desconectado. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Ocultação de Texto Automática diff --git a/app/core/src/main/resources/messages_pt_PT.properties b/app/core/src/main/resources/messages_pt_PT.properties index 2c78fa93b..7b73092f1 100644 --- a/app/core/src/main/resources/messages_pt_PT.properties +++ b/app/core/src/main/resources/messages_pt_PT.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Já tem sessão iniciada em login.alreadyLoggedIn2=dispositivos. Por favor termine sessão nesses dispositivos e tente novamente. login.toManySessions=Tem demasiadas sessões ativas login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Redação Automática diff --git a/app/core/src/main/resources/messages_ro_RO.properties b/app/core/src/main/resources/messages_ro_RO.properties index 5a904a9c8..07fee9b86 100644 --- a/app/core/src/main/resources/messages_ro_RO.properties +++ b/app/core/src/main/resources/messages_ro_RO.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=You are already logged in to login.alreadyLoggedIn2=devices. Please log out of the devices and try again. login.toManySessions=You have too many active sessions login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Redactare Automată diff --git a/app/core/src/main/resources/messages_ru_RU.properties b/app/core/src/main/resources/messages_ru_RU.properties index 4580f3933..14dd4121a 100644 --- a/app/core/src/main/resources/messages_ru_RU.properties +++ b/app/core/src/main/resources/messages_ru_RU.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Вы уже вошли в login.alreadyLoggedIn2=устройств(а). Пожалуйста, выйдите из этих устройств и попробуйте снова. login.toManySessions=У вас слишком много активных сессий login.logoutMessage=Вы вышли из системы. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Автоматическое редактирование diff --git a/app/core/src/main/resources/messages_sk_SK.properties b/app/core/src/main/resources/messages_sk_SK.properties index 68faeab85..4b84511f5 100644 --- a/app/core/src/main/resources/messages_sk_SK.properties +++ b/app/core/src/main/resources/messages_sk_SK.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=You are already logged in to login.alreadyLoggedIn2=devices. Please log out of the devices and try again. login.toManySessions=You have too many active sessions login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatické redigovanie diff --git a/app/core/src/main/resources/messages_sl_SI.properties b/app/core/src/main/resources/messages_sl_SI.properties index fe95a4165..72987dfcd 100644 --- a/app/core/src/main/resources/messages_sl_SI.properties +++ b/app/core/src/main/resources/messages_sl_SI.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Prijavljeni ste že v login.alreadyLoggedIn2=naprave. Odjavite se iz naprav in poskusite znova. login.toManySessions=Imate preveč aktivnih sej login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Samodejno redigiraj diff --git a/app/core/src/main/resources/messages_sr_LATN_RS.properties b/app/core/src/main/resources/messages_sr_LATN_RS.properties index f15d8397a..4a6e987ca 100644 --- a/app/core/src/main/resources/messages_sr_LATN_RS.properties +++ b/app/core/src/main/resources/messages_sr_LATN_RS.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Već si prijavljen na login.alreadyLoggedIn2=uređaja. Odjavi se sa uređaja i pokušaj ponovo. login.toManySessions=Imaš previše aktivnih sesija login.logoutMessage=Odjavljen si. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Automatsko cenzurisanje diff --git a/app/core/src/main/resources/messages_sv_SE.properties b/app/core/src/main/resources/messages_sv_SE.properties index 7a786add6..0182c8f98 100644 --- a/app/core/src/main/resources/messages_sv_SE.properties +++ b/app/core/src/main/resources/messages_sv_SE.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Du är redan inloggad på login.alreadyLoggedIn2=enheter. Logga ut från enheterna och försök igen. login.toManySessions=Du har för många aktiva sessioner login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Auto-redigera diff --git a/app/core/src/main/resources/messages_th_TH.properties b/app/core/src/main/resources/messages_th_TH.properties index 9b332982c..a0473bdef 100644 --- a/app/core/src/main/resources/messages_th_TH.properties +++ b/app/core/src/main/resources/messages_th_TH.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=คุณได้เข้าสู่ระบบใน login.alreadyLoggedIn2=อุปกรณ์แล้ว กรุณาออกจากระบบจากอุปกรณ์ที่ใช้งานอยู่แล้ว จากนั้นลองใหม่อีกครั้ง login.toManySessions=คุณมีการเข้าสู่ระบบพร้อมกันเกินกว่ากำหนด login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=ซ่อนข้อมูลอัตโนมัติ diff --git a/app/core/src/main/resources/messages_tr_TR.properties b/app/core/src/main/resources/messages_tr_TR.properties index 72e78f1b3..155b4365d 100644 --- a/app/core/src/main/resources/messages_tr_TR.properties +++ b/app/core/src/main/resources/messages_tr_TR.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Zaten şu cihazlarda oturum açılmış: login.alreadyLoggedIn2=Lütfen bu cihazlardan çıkış yaparak tekrar deneyin. login.toManySessions=Çok fazla aktif oturumunuz var login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Otomatik Karartma diff --git a/app/core/src/main/resources/messages_uk_UA.properties b/app/core/src/main/resources/messages_uk_UA.properties index db5739fe3..cf0cc7115 100644 --- a/app/core/src/main/resources/messages_uk_UA.properties +++ b/app/core/src/main/resources/messages_uk_UA.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=Ви вже увійшли до login.alreadyLoggedIn2=пристроїв (а). Будь ласка, вийдіть із цих пристроїв і спробуйте знову. login.toManySessions=У вас дуже багато активних сесій login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Автоматичне редагування diff --git a/app/core/src/main/resources/messages_vi_VN.properties b/app/core/src/main/resources/messages_vi_VN.properties index 0a1e9b392..ba7ba416b 100644 --- a/app/core/src/main/resources/messages_vi_VN.properties +++ b/app/core/src/main/resources/messages_vi_VN.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=You are already logged in to login.alreadyLoggedIn2=devices. Please log out of the devices and try again. login.toManySessions=You have too many active sessions login.logoutMessage=You have been logged out. +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=Tự động biên tập diff --git a/app/core/src/main/resources/messages_zh_CN.properties b/app/core/src/main/resources/messages_zh_CN.properties index 4eeac6483..80abcef7a 100644 --- a/app/core/src/main/resources/messages_zh_CN.properties +++ b/app/core/src/main/resources/messages_zh_CN.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=您已经登录到了 login.alreadyLoggedIn2=设备，请注销设备后重试。 login.toManySessions=你已经有太多的会话了。请注销一些设备后重试。 login.logoutMessage=您已退出登录。 +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=自动删除 diff --git a/app/core/src/main/resources/messages_zh_TW.properties b/app/core/src/main/resources/messages_zh_TW.properties index cee6b9c7d..c2cf4518c 100644 --- a/app/core/src/main/resources/messages_zh_TW.properties +++ b/app/core/src/main/resources/messages_zh_TW.properties @@ -908,6 +908,7 @@ login.alreadyLoggedIn=您已經登入了 login.alreadyLoggedIn2=部裝置。請先從這些裝置登出後再試一次。 login.toManySessions=您有太多使用中的工作階段 login.logoutMessage=您已登出。 +login.invalidInResponseTo=The requested SAML response is invalid or has expired. Please contact the administrator. #auto-redact autoRedact.title=自動塗黑 diff --git a/app/core/src/main/resources/settings.yml.template b/app/core/src/main/resources/settings.yml.template index 1af95f852..bbbac5fcd 100644 --- a/app/core/src/main/resources/settings.yml.template +++ b/app/core/src/main/resources/settings.yml.template @@ -59,12 +59,17 @@ security: idpCert: classpath:okta.cert # The certificate your Provider will use to authenticate your app's SAML authentication requests. Provided by your Provider privateKey: classpath:saml-private-key.key # Your private key. Generated from your keypair spCert: classpath:saml-public-cert.crt # Your signing certificate. Generated from your keypair + jwt: # This feature is currently under development and not yet fully supported. Do not use in production. + persistence: true # Set to 'true' to enable JWT key store + enableKeyRotation: true # Set to 'true' to enable key pair rotation + enableKeyCleanup: true # Set to 'true' to enable key pair cleanup + keyRetentionDays: 7 # Number of days to retain old keys. The default is 7 days. + secureCookie: false # Set to 'true' to use secure cookies for JWTs premium: key: 00000000-0000-0000-0000-000000000000 enabled: false # Enable license key checks for pro/enterprise features proFeatures: - database: true # Enable database features SSOAutoLogin: false CustomMetadata: autoUpdateMetadata: false diff --git a/app/core/src/main/resources/static/3rdPartyLicenses.json b/app/core/src/main/resources/static/3rdPartyLicenses.json index 23278a23f..062818603 100644 --- a/app/core/src/main/resources/static/3rdPartyLicenses.json +++ b/app/core/src/main/resources/static/3rdPartyLicenses.json @@ -132,6 +132,13 @@ "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" }, + { + "moduleName": "com.github.ben-manes.caffeine:caffeine", + "moduleUrl": "https://github.com/ben-manes/caffeine", + "moduleVersion": "3.2.2", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt" + }, { "moduleName": "com.github.jai-imageio:jai-imageio-core", "moduleUrl": "https://github.com/jai-imageio/jai-imageio-core", @@ -168,7 +175,7 @@ { "moduleName": "com.google.errorprone:error_prone_annotations", "moduleUrl": "https://errorprone.info/error_prone_annotations", - "moduleVersion": "2.38.0", + "moduleVersion": "2.40.0", "moduleLicense": "Apache 2.0", "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" }, @@ -549,6 +556,27 @@ "moduleLicense": "MIT License", "moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php" }, + { + "moduleName": "io.jsonwebtoken:jjwt-api", + "moduleUrl": "https://github.com/jwtk/jjwt", + "moduleVersion": "0.12.6", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, + { + "moduleName": "io.jsonwebtoken:jjwt-impl", + "moduleUrl": "https://github.com/jwtk/jjwt", + "moduleVersion": "0.12.6", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, + { + "moduleName": "io.jsonwebtoken:jjwt-jackson", + "moduleUrl": "https://github.com/jwtk/jjwt", + "moduleVersion": "0.12.6", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, { "moduleName": "io.micrometer:micrometer-commons", "moduleUrl": "https://github.com/micrometer-metrics/micrometer", @@ -1507,6 +1535,13 @@ "moduleLicense": "Apache License, Version 2.0", "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" }, + { + "moduleName": "org.springframework.boot:spring-boot-starter-cache", + "moduleUrl": "https://spring.io/projects/spring-boot", + "moduleVersion": "3.5.4", + "moduleLicense": "Apache License, Version 2.0", + "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0" + }, { "moduleName": "org.springframework.boot:spring-boot-starter-data-jpa", "moduleUrl": "https://spring.io/projects/spring-boot", diff --git a/app/core/src/main/resources/static/js/DecryptFiles.js b/app/core/src/main/resources/static/js/DecryptFiles.js index 67349a012..0e5b58a92 100644 --- a/app/core/src/main/resources/static/js/DecryptFiles.js +++ b/app/core/src/main/resources/static/js/DecryptFiles.js @@ -46,10 +46,9 @@ export class DecryptFile { formData.append('password', password); } // Send decryption request - const response = await fetch('/api/v1/security/remove-password', { + const response = await fetchWithCsrf('/api/v1/security/remove-password', { method: 'POST', body: formData, - headers: csrfToken ? {'X-XSRF-TOKEN': csrfToken} : undefined, }); if (response.ok) { diff --git a/app/core/src/main/resources/static/js/downloader.js b/app/core/src/main/resources/static/js/downloader.js index 42ba0c357..b5324dd82 100644 --- a/app/core/src/main/resources/static/js/downloader.js +++ b/app/core/src/main/resources/static/js/downloader.js @@ -218,7 +218,7 @@ formData.append('password', password); // Use handleSingleDownload to send the request - const decryptionResult = await fetch(removePasswordUrl, {method: 'POST', body: formData}); + const decryptionResult = await fetchWithCsrf(removePasswordUrl, {method: 'POST', body: formData}); if (decryptionResult && decryptionResult.blob) { const decryptedBlob = await decryptionResult.blob(); diff --git a/app/core/src/main/resources/static/js/fetch-utils.js b/app/core/src/main/resources/static/js/fetch-utils.js index dfe2604a8..2cccbd19d 100644 --- a/app/core/src/main/resources/static/js/fetch-utils.js +++ b/app/core/src/main/resources/static/js/fetch-utils.js @@ -1,3 +1,29 @@ +// Authentication utility for cookie-based JWT +window.JWTManager = { + + // Logout - clear cookies and redirect to login + logout: function() { + + // Clear JWT cookie manually (fallback) + document.cookie = 'stirling_jwt=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT; SameSite=None; Secure'; + + // Perform logout request to clear server-side session + fetch('/logout', { + method: 'POST', + credentials: 'include' + }).then(response => { + if (response.redirected) { + window.location.href = response.url; + } else { + window.location.href = '/login?logout=true'; + } + }).catch(() => { + // If logout fails, let server handle it + window.location.href = '/logout'; + }); + } +}; + window.fetchWithCsrf = async function(url, options = {}) { function getCsrfToken() { const cookieValue = document.cookie @@ -24,5 +50,18 @@ window.fetchWithCsrf = async function(url, options = {}) { fetchOptions.headers['X-XSRF-TOKEN'] = csrfToken; } - return fetch(url, fetchOptions); + // Always include credentials to send JWT cookies + fetchOptions.credentials = 'include'; + + // Make the request + const response = await fetch(url, fetchOptions); + + // Handle 401 responses (unauthorized) + if (response.status === 401) { + console.warn('Authentication failed, redirecting to login'); + window.JWTManager.logout(); + return response; + } + + return response; } diff --git a/app/core/src/main/resources/static/js/jwt-init.js b/app/core/src/main/resources/static/js/jwt-init.js new file mode 100644 index 000000000..35b736fd6 --- /dev/null +++ b/app/core/src/main/resources/static/js/jwt-init.js @@ -0,0 +1,44 @@ +// JWT Authentication Management Script +// This script handles cookie-based JWT authentication and page access control + +(function() { + // Clean up JWT token from URL parameters after OAuth/Login flows + function cleanupTokenFromUrl() { + const urlParams = new URLSearchParams(window.location.search); + const hasToken = urlParams.get('jwt') || urlParams.get('token'); + if (hasToken) { + // Clean up URL by removing token parameter + // Token should now be set as cookie by server + urlParams.delete('jwt'); + urlParams.delete('token'); + const newUrl = window.location.pathname + (urlParams.toString() ? '?' + urlParams.toString() : ''); + window.history.replaceState({}, '', newUrl); + } + } + + // Initialize JWT handling when page loads + function initializeJWT() { + // Clean up any JWT tokens from URL (OAuth flow) + cleanupTokenFromUrl(); + + // Authentication is handled server-side + // If user is not authenticated, server will redirect to login + console.log('JWT initialization complete - authentication handled server-side'); + } + + // No form enhancement needed for cookie-based JWT + // Cookies are automatically sent with form submissions + function enhanceFormSubmissions() { + // Cookie-based JWT is automatically included in form submissions + // No additional processing needed + } + + // Initialize when DOM is ready + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', function() { + initializeJWT(); + }); + } else { + initializeJWT(); + } +})(); diff --git a/app/core/src/main/resources/static/js/navbar.js b/app/core/src/main/resources/static/js/navbar.js index a95ff1639..1fd46ed70 100644 --- a/app/core/src/main/resources/static/js/navbar.js +++ b/app/core/src/main/resources/static/js/navbar.js @@ -138,5 +138,19 @@ document.addEventListener('DOMContentLoaded', () => { tooltipSetup(); setupDropdowns(); fixNavbarDropdownStyles(); + // Setup logout button functionality + const logoutButton = document.querySelector('a[href="/logout"]'); + if (logoutButton) { + logoutButton.addEventListener('click', function(event) { + event.preventDefault(); + if (window.JWTManager) { + window.JWTManager.logout(); + } else { + // Fallback if JWTManager is not available + window.location.href = '/logout'; + } + }); + } + }); window.addEventListener('resize', fixNavbarDropdownStyles); diff --git a/app/core/src/main/resources/static/js/usage.js b/app/core/src/main/resources/static/js/usage.js index 624e4ec78..443a27ce1 100644 --- a/app/core/src/main/resources/static/js/usage.js +++ b/app/core/src/main/resources/static/js/usage.js @@ -102,7 +102,7 @@ async function fetchEndpointData() { refreshBtn.classList.add('refreshing'); refreshBtn.disabled = true; - const response = await fetch('/api/v1/info/load/all'); + const response = await fetchWithCsrf('/api/v1/info/load/all'); if (!response.ok) { throw new Error('Network response was not ok'); } diff --git a/app/core/src/main/resources/templates/account.html b/app/core/src/main/resources/templates/account.html index 33a0d9f47..db48bb3a5 100644 --- a/app/core/src/main/resources/templates/account.html +++ b/app/core/src/main/resources/templates/account.html @@ -390,8 +390,13 @@ key.includes('clientSubmissionOrder') || key.includes('lastSubmitTime') || key.includes('lastClientId') || - - + key.includes('stirling_jwt') || + key.includes('JSESSIONID') || + key.includes('XSRF-TOKEN') || + key.includes('remember-me') || + key.includes('auth') || + key.includes('token') || + key.includes('session') || key.includes('posthog') || key.includes('ssoRedirectAttempts') || key.includes('lastRedirectAttempt') || key.includes('surveyVersion') || key.includes('pageViews'); } diff --git a/app/proprietary/build.gradle b/app/proprietary/build.gradle index 4a855ec6b..8f09c7568 100644 --- a/app/proprietary/build.gradle +++ b/app/proprietary/build.gradle @@ -1,9 +1,15 @@ repositories { maven { url = "https://build.shibboleth.net/maven/releases" } } + +ext { + jwtVersion = '0.12.6' +} + bootRun { enabled = false } + spotless { java { target 'src/**/java/**/*.java' @@ -43,6 +49,8 @@ dependencies { api 'org.springframework.boot:spring-boot-starter-data-jpa' api 'org.springframework.boot:spring-boot-starter-oauth2-client' api 'org.springframework.boot:spring-boot-starter-mail' + api 'org.springframework.boot:spring-boot-starter-cache' + api 'com.github.ben-manes.caffeine:caffeine' api 'io.swagger.core.v3:swagger-core-jakarta:2.2.35' implementation 'com.bucket4j:bucket4j_jdk17-core:8.14.0' @@ -52,6 +60,10 @@ dependencies { // implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5:3.1.3.RELEASE' // Removed - UI moved to React frontend api 'io.micrometer:micrometer-registry-prometheus' implementation 'com.unboundid.product.scim2:scim2-sdk-client:4.0.0' + + api "io.jsonwebtoken:jjwt-api:$jwtVersion" + runtimeOnly "io.jsonwebtoken:jjwt-impl:$jwtVersion" + runtimeOnly "io.jsonwebtoken:jjwt-jackson:$jwtVersion" runtimeOnly 'com.h2database:h2:2.3.232' // Don't upgrade h2database runtimeOnly 'org.postgresql:postgresql:42.7.7' constraints { diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java index d5180c321..51908ef03 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java @@ -1,6 +1,7 @@ package stirling.software.proprietary.security; import java.io.IOException; +import java.util.Map; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; @@ -17,6 +18,8 @@ import stirling.software.common.util.RequestUriUtils; import stirling.software.proprietary.audit.AuditEventType; import stirling.software.proprietary.audit.AuditLevel; import stirling.software.proprietary.audit.Audited; +import stirling.software.proprietary.security.model.AuthenticationType; +import stirling.software.proprietary.security.service.JwtServiceInterface; import stirling.software.proprietary.security.service.LoginAttemptService; import stirling.software.proprietary.security.service.UserService; @@ -24,13 +27,17 @@ import stirling.software.proprietary.security.service.UserService; public class CustomAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { - private LoginAttemptService loginAttemptService; - private UserService userService; + private final LoginAttemptService loginAttemptService; + private final UserService userService; + private final JwtServiceInterface jwtService; public CustomAuthenticationSuccessHandler( - LoginAttemptService loginAttemptService, UserService userService) { + LoginAttemptService loginAttemptService, + UserService userService, + JwtServiceInterface jwtService) { this.loginAttemptService = loginAttemptService; this.userService = userService; + this.jwtService = jwtService; } @Override @@ -46,23 +53,31 @@ public class CustomAuthenticationSuccessHandler } loginAttemptService.loginSucceeded(userName); - // Get the saved request - HttpSession session = request.getSession(false); - SavedRequest savedRequest = - (session != null) - ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST") - : null; + if (jwtService.isJwtEnabled()) { + String jwt = + jwtService.generateToken( + authentication, Map.of("authType", AuthenticationType.WEB)); + jwtService.addToken(response, jwt); + log.debug("JWT generated for user: {}", userName); - if (savedRequest != null - && !RequestUriUtils.isStaticResource( - request.getContextPath(), savedRequest.getRedirectUrl())) { - // Redirect to the original destination - super.onAuthenticationSuccess(request, response, authentication); - } else { - // Redirect to the root URL (considering context path) getRedirectStrategy().sendRedirect(request, response, "/"); - } + } else { + // Get the saved request + HttpSession session = request.getSession(false); + SavedRequest savedRequest = + (session != null) + ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST") + : null; - // super.onAuthenticationSuccess(request, response, authentication); + if (savedRequest != null + && !RequestUriUtils.isStaticResource( + request.getContextPath(), savedRequest.getRedirectUrl())) { + // Redirect to the original destination + super.onAuthenticationSuccess(request, response, authentication); + } else { + // No saved request or it's a static resource, redirect to home page + getRedirectStrategy().sendRedirect(request, response, "/"); + } + } } } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java index 033ea913c..136120528 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java @@ -33,6 +33,7 @@ import stirling.software.proprietary.audit.AuditLevel; import stirling.software.proprietary.audit.Audited; import stirling.software.proprietary.security.saml2.CertificateUtils; import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal; +import stirling.software.proprietary.security.service.JwtServiceInterface; @Slf4j @RequiredArgsConstructor @@ -40,15 +41,18 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { public static final String LOGOUT_PATH = "/login?logout=true"; - private final ApplicationProperties applicationProperties; + private final ApplicationProperties.Security securityProperties; private final AppConfig appConfig; + private final JwtServiceInterface jwtService; + @Override @Audited(type = AuditEventType.USER_LOGOUT, level = AuditLevel.BASIC) public void onLogoutSuccess( HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException { + if (!response.isCommitted()) { if (authentication != null) { if (authentication instanceof Saml2Authentication samlAuthentication) { @@ -67,6 +71,9 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { authentication.getClass().getSimpleName()); getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH); } + } else if (!jwtService.extractToken(request).isBlank()) { + jwtService.clearToken(response); + getRedirectStrategy().sendRedirect(request, response, LOGOUT_PATH); } else { // Redirect to login page after logout String path = checkForErrors(request); @@ -82,7 +89,7 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { Saml2Authentication samlAuthentication) throws IOException { - SAML2 samlConf = applicationProperties.getSecurity().getSaml2(); + SAML2 samlConf = securityProperties.getSaml2(); String registrationId = samlConf.getRegistrationId(); CustomSaml2AuthenticatedPrincipal principal = @@ -127,7 +134,7 @@ public class CustomLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { OAuth2AuthenticationToken oAuthToken) throws IOException { String registrationId; - OAUTH2 oauth = applicationProperties.getSecurity().getOauth2(); + OAUTH2 oauth = securityProperties.getOauth2(); String path = checkForErrors(request); String redirectUrl = UrlUtils.getOrigin(request) + "/login?" + path; diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java index 4b09fe0e9..e145e2754 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java @@ -43,7 +43,6 @@ public class InitialSecuritySetup { } } - userService.migrateOauth2ToSSO(); assignUsersToDefaultTeamIfMissing(); initializeInternalApiUser(); } catch (IllegalArgumentException | SQLException | UnsupportedProviderException e) { diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/JwtAuthenticationEntryPoint.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/JwtAuthenticationEntryPoint.java new file mode 100644 index 000000000..6805bcb54 --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/JwtAuthenticationEntryPoint.java @@ -0,0 +1,22 @@ +package stirling.software.proprietary.security; + +import java.io.IOException; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +@Component +public class JwtAuthenticationEntryPoint implements AuthenticationEntryPoint { + @Override + public void commence( + HttpServletRequest request, + HttpServletResponse response, + AuthenticationException authException) + throws IOException { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage()); + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java index 1009a6aba..132fadfbd 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java @@ -74,8 +74,11 @@ public class AccountWebController { // @GetMapping("/login") public String login(HttpServletRequest request, Model model, Authentication authentication) { - // If the user is already authenticated, redirect them to the home page. - if (authentication != null && authentication.isAuthenticated()) { + // If the user is already authenticated and it's not a logout scenario, redirect them to the + // home page. + if (authentication != null + && authentication.isAuthenticated() + && request.getParameter("logout") == null) { return "redirect:/"; } @@ -181,7 +184,7 @@ public class AccountWebController { errorOAuth = "login.relyingPartyRegistrationNotFound"; // Valid InResponseTo was not available from the validation context, unable to // evaluate - case "invalid_in_response_to" -> errorOAuth = "login.invalid_in_response_to"; + case "invalid_in_response_to" -> errorOAuth = "login.invalidInResponseTo"; case "not_authentication_provider_found" -> errorOAuth = "login.not_authentication_provider_found"; } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/CacheConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/CacheConfig.java new file mode 100644 index 000000000..ba074a5da --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/CacheConfig.java @@ -0,0 +1,31 @@ +package stirling.software.proprietary.security.configuration; + +import java.time.Duration; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.caffeine.CaffeineCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.github.benmanes.caffeine.cache.Caffeine; + +@Configuration +@EnableCaching +public class CacheConfig { + + @Value("${security.jwt.keyRetentionDays}") + private int keyRetentionDays; + + @Bean + public CacheManager cacheManager() { + CaffeineCacheManager cacheManager = new CaffeineCacheManager(); + cacheManager.setCaffeine( + Caffeine.newBuilder() + .maximumSize(1000) // Make configurable? + .expireAfterWrite(Duration.ofDays(keyRetentionDays)) + .recordStats()); + return cacheManager; + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java index ab809a037..aceb3b712 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java @@ -13,6 +13,7 @@ import org.springframework.security.authentication.dao.DaoAuthenticationProvider import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.authority.mapping.GrantedAuthoritiesMapper; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -35,10 +36,12 @@ import stirling.software.common.model.ApplicationProperties; import stirling.software.proprietary.security.CustomAuthenticationFailureHandler; import stirling.software.proprietary.security.CustomAuthenticationSuccessHandler; import stirling.software.proprietary.security.CustomLogoutSuccessHandler; +import stirling.software.proprietary.security.JwtAuthenticationEntryPoint; import stirling.software.proprietary.security.database.repository.JPATokenRepositoryImpl; import stirling.software.proprietary.security.database.repository.PersistentLoginRepository; import stirling.software.proprietary.security.filter.FirstLoginFilter; import stirling.software.proprietary.security.filter.IPRateLimitingFilter; +import stirling.software.proprietary.security.filter.JwtAuthenticationFilter; import stirling.software.proprietary.security.filter.UserAuthenticationFilter; import stirling.software.proprietary.security.model.User; import stirling.software.proprietary.security.oauth2.CustomOAuth2AuthenticationFailureHandler; @@ -48,6 +51,7 @@ import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticationSuc import stirling.software.proprietary.security.saml2.CustomSaml2ResponseAuthenticationConverter; import stirling.software.proprietary.security.service.CustomOAuth2UserService; import stirling.software.proprietary.security.service.CustomUserDetailsService; +import stirling.software.proprietary.security.service.JwtServiceInterface; import stirling.software.proprietary.security.service.LoginAttemptService; import stirling.software.proprietary.security.service.UserService; import stirling.software.proprietary.security.session.SessionPersistentRegistry; @@ -64,9 +68,11 @@ public class SecurityConfiguration { private final boolean loginEnabledValue; private final boolean runningProOrHigher; - private final ApplicationProperties applicationProperties; + private final ApplicationProperties.Security securityProperties; private final AppConfig appConfig; private final UserAuthenticationFilter userAuthenticationFilter; + private final JwtServiceInterface jwtService; + private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; private final LoginAttemptService loginAttemptService; private final FirstLoginFilter firstLoginFilter; private final SessionPersistentRegistry sessionRegistry; @@ -82,8 +88,10 @@ public class SecurityConfiguration { @Qualifier("loginEnabled") boolean loginEnabledValue, @Qualifier("runningProOrHigher") boolean runningProOrHigher, AppConfig appConfig, - ApplicationProperties applicationProperties, + ApplicationProperties.Security securityProperties, UserAuthenticationFilter userAuthenticationFilter, + JwtServiceInterface jwtService, + JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint, LoginAttemptService loginAttemptService, FirstLoginFilter firstLoginFilter, SessionPersistentRegistry sessionRegistry, @@ -97,8 +105,10 @@ public class SecurityConfiguration { this.loginEnabledValue = loginEnabledValue; this.runningProOrHigher = runningProOrHigher; this.appConfig = appConfig; - this.applicationProperties = applicationProperties; + this.securityProperties = securityProperties; this.userAuthenticationFilter = userAuthenticationFilter; + this.jwtService = jwtService; + this.jwtAuthenticationEntryPoint = jwtAuthenticationEntryPoint; this.loginAttemptService = loginAttemptService; this.firstLoginFilter = firstLoginFilter; this.sessionRegistry = sessionRegistry; @@ -115,14 +125,28 @@ public class SecurityConfiguration { @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - if (applicationProperties.getSecurity().getCsrfDisabled() || !loginEnabledValue) { - http.csrf(csrf -> csrf.disable()); + if (securityProperties.getCsrfDisabled() || !loginEnabledValue) { + http.csrf(CsrfConfigurer::disable); } if (loginEnabledValue) { + boolean v2Enabled = appConfig.v2Enabled(); + + if (v2Enabled) { + http.addFilterBefore( + jwtAuthenticationFilter(), + UsernamePasswordAuthenticationFilter.class) + .exceptionHandling( + exceptionHandling -> + exceptionHandling.authenticationEntryPoint( + jwtAuthenticationEntryPoint)); + } http.addFilterBefore( - userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); - if (!applicationProperties.getSecurity().getCsrfDisabled()) { + userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) + .addFilterAfter(rateLimitingFilter(), UserAuthenticationFilter.class) + .addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class); + + if (!securityProperties.getCsrfDisabled()) { CookieCsrfTokenRepository cookieRepo = CookieCsrfTokenRepository.withHttpOnlyFalse(); CsrfTokenRequestAttributeHandler requestHandler = @@ -156,16 +180,21 @@ public class SecurityConfiguration { .csrfTokenRepository(cookieRepo) .csrfTokenRequestHandler(requestHandler)); } - http.addFilterBefore(rateLimitingFilter(), UsernamePasswordAuthenticationFilter.class); - http.addFilterAfter(firstLoginFilter, UsernamePasswordAuthenticationFilter.class); + http.sessionManagement( - sessionManagement -> + sessionManagement -> { + if (v2Enabled) { + sessionManagement.sessionCreationPolicy( + SessionCreationPolicy.STATELESS); + } else { sessionManagement .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED) .maximumSessions(10) .maxSessionsPreventsLogin(false) .sessionRegistry(sessionRegistry) - .expiredUrl("/login?logout=true")); + .expiredUrl("/login?logout=true"); + } + }); http.authenticationProvider(daoAuthenticationProvider()); http.requestCache(requestCache -> requestCache.requestCache(new NullRequestCache())); http.logout( @@ -175,10 +204,10 @@ public class SecurityConfiguration { .matcher("/logout")) .logoutSuccessHandler( new CustomLogoutSuccessHandler( - applicationProperties, appConfig)) + securityProperties, appConfig, jwtService)) .clearAuthentication(true) .invalidateHttpSession(true) - .deleteCookies("JSESSIONID", "remember-me")); + .deleteCookies("JSESSIONID", "remember-me", "stirling_jwt")); http.rememberMe( rememberMeConfigurer -> // Use the configurator directly rememberMeConfigurer @@ -200,6 +229,7 @@ public class SecurityConfiguration { req -> { String uri = req.getRequestURI(); String contextPath = req.getContextPath(); + // Remove the context path from the URI String trimmedUri = uri.startsWith(contextPath) @@ -217,29 +247,35 @@ public class SecurityConfiguration { || trimmedUri.startsWith("/css/") || trimmedUri.startsWith("/fonts/") || trimmedUri.startsWith("/js/") + || trimmedUri.startsWith("/pdfjs/") + || trimmedUri.startsWith("/pdfjs-legacy/") + || trimmedUri.startsWith("/favicon") || trimmedUri.startsWith( - "/api/v1/info/status"); + "/api/v1/info/status") + || trimmedUri.startsWith("/v1/api-docs") + || uri.contains("/v1/api-docs"); }) .permitAll() .anyRequest() .authenticated()); // Handle User/Password Logins - if (applicationProperties.getSecurity().isUserPass()) { + if (securityProperties.isUserPass()) { http.formLogin( formLogin -> formLogin .loginPage("/login") .successHandler( new CustomAuthenticationSuccessHandler( - loginAttemptService, userService)) + loginAttemptService, + userService, + jwtService)) .failureHandler( new CustomAuthenticationFailureHandler( loginAttemptService, userService)) - .defaultSuccessUrl("/") .permitAll()); } // Handle OAUTH2 Logins - if (applicationProperties.getSecurity().isOauth2Active()) { + if (securityProperties.isOauth2Active()) { http.oauth2Login( oauth2 -> oauth2.loginPage("/oauth2") @@ -251,17 +287,18 @@ public class SecurityConfiguration { .successHandler( new CustomOAuth2AuthenticationSuccessHandler( loginAttemptService, - applicationProperties, - userService)) + securityProperties.getOauth2(), + userService, + jwtService)) .failureHandler( new CustomOAuth2AuthenticationFailureHandler()) - . // Add existing Authorities from the database - userInfoEndpoint( + // Add existing Authorities from the database + .userInfoEndpoint( userInfoEndpoint -> userInfoEndpoint .oidcUserService( new CustomOAuth2UserService( - applicationProperties, + securityProperties, userService, loginAttemptService)) .userAuthoritiesMapper( @@ -269,8 +306,7 @@ public class SecurityConfiguration { .permitAll()); } // Handle SAML - if (applicationProperties.getSecurity().isSaml2Active() && runningProOrHigher) { - // Configure the authentication provider + if (securityProperties.isSaml2Active() && runningProOrHigher) { OpenSaml4AuthenticationProvider authenticationProvider = new OpenSaml4AuthenticationProvider(); authenticationProvider.setResponseAuthenticationConverter( @@ -287,8 +323,9 @@ public class SecurityConfiguration { .successHandler( new CustomSaml2AuthenticationSuccessHandler( loginAttemptService, - applicationProperties, - userService)) + securityProperties.getSaml2(), + userService, + jwtService)) .failureHandler( new CustomSaml2AuthenticationFailureHandler()) .authenticationRequestResolver( @@ -323,4 +360,14 @@ public class SecurityConfiguration { public PersistentTokenRepository persistentTokenRepository() { return new JPATokenRepositoryImpl(persistentLoginRepository); } + + @Bean + public JwtAuthenticationFilter jwtAuthenticationFilter() { + return new JwtAuthenticationFilter( + jwtService, + userService, + userDetailsService, + jwtAuthenticationEntryPoint, + securityProperties); + } } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java new file mode 100644 index 000000000..faf50832f --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java @@ -0,0 +1,204 @@ +package stirling.software.proprietary.security.filter; + +import static stirling.software.common.util.RequestUriUtils.isStaticResource; +import static stirling.software.proprietary.security.model.AuthenticationType.*; +import static stirling.software.proprietary.security.model.AuthenticationType.SAML2; + +import java.io.IOException; +import java.sql.SQLException; +import java.util.Map; +import java.util.Optional; + +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.web.filter.OncePerRequestFilter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import lombok.extern.slf4j.Slf4j; + +import stirling.software.common.model.ApplicationProperties; +import stirling.software.common.model.exception.UnsupportedProviderException; +import stirling.software.proprietary.security.model.ApiKeyAuthenticationToken; +import stirling.software.proprietary.security.model.AuthenticationType; +import stirling.software.proprietary.security.model.User; +import stirling.software.proprietary.security.model.exception.AuthenticationFailureException; +import stirling.software.proprietary.security.service.CustomUserDetailsService; +import stirling.software.proprietary.security.service.JwtServiceInterface; +import stirling.software.proprietary.security.service.UserService; + +@Slf4j +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtServiceInterface jwtService; + private final UserService userService; + private final CustomUserDetailsService userDetailsService; + private final AuthenticationEntryPoint authenticationEntryPoint; + private final ApplicationProperties.Security securityProperties; + + public JwtAuthenticationFilter( + JwtServiceInterface jwtService, + UserService userService, + CustomUserDetailsService userDetailsService, + AuthenticationEntryPoint authenticationEntryPoint, + ApplicationProperties.Security securityProperties) { + this.jwtService = jwtService; + this.userService = userService; + this.userDetailsService = userDetailsService; + this.authenticationEntryPoint = authenticationEntryPoint; + this.securityProperties = securityProperties; + } + + @Override + protected void doFilterInternal( + HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + if (!jwtService.isJwtEnabled()) { + filterChain.doFilter(request, response); + return; + } + if (isStaticResource(request.getContextPath(), request.getRequestURI())) { + filterChain.doFilter(request, response); + return; + } + + if (!apiKeyExists(request, response)) { + String jwtToken = jwtService.extractToken(request); + + if (jwtToken == null) { + // Any unauthenticated requests should redirect to /login + String requestURI = request.getRequestURI(); + String contextPath = request.getContextPath(); + + if (!requestURI.startsWith(contextPath + "/login")) { + response.sendRedirect("/login"); + return; + } + } + + try { + jwtService.validateToken(jwtToken); + } catch (AuthenticationFailureException e) { + jwtService.clearToken(response); + handleAuthenticationFailure(request, response, e); + return; + } + + Map claims = jwtService.extractClaims(jwtToken); + String tokenUsername = claims.get("sub").toString(); + + try { + authenticate(request, claims); + } catch (SQLException | UnsupportedProviderException e) { + log.error("Error processing user authentication for user: {}", tokenUsername, e); + handleAuthenticationFailure( + request, + response, + new AuthenticationFailureException( + "Error processing user authentication", e)); + return; + } + } + + filterChain.doFilter(request, response); + } + + private boolean apiKeyExists(HttpServletRequest request, HttpServletResponse response) + throws IOException, ServletException { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication == null || !authentication.isAuthenticated()) { + String apiKey = request.getHeader("X-API-KEY"); + + if (apiKey != null && !apiKey.isBlank()) { + try { + Optional user = userService.getUserByApiKey(apiKey); + + if (user.isEmpty()) { + handleAuthenticationFailure( + request, + response, + new AuthenticationFailureException("Invalid API Key")); + return false; + } + + authentication = + new ApiKeyAuthenticationToken( + user.get(), apiKey, user.get().getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(authentication); + return true; + } catch (AuthenticationException e) { + handleAuthenticationFailure( + request, + response, + new AuthenticationFailureException("Invalid API Key", e)); + return false; + } + } + + return false; + } + + return true; + } + + private void authenticate(HttpServletRequest request, Map claims) + throws SQLException, UnsupportedProviderException { + String username = claims.get("sub").toString(); + + if (username != null && SecurityContextHolder.getContext().getAuthentication() == null) { + processUserAuthenticationType(claims, username); + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + + if (userDetails != null) { + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + + authToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authToken); + } else { + throw new UsernameNotFoundException("User not found: " + username); + } + } + } + + private void processUserAuthenticationType(Map claims, String username) + throws SQLException, UnsupportedProviderException { + AuthenticationType authenticationType = + AuthenticationType.valueOf(claims.getOrDefault("authType", WEB).toString()); + log.debug("Processing {} login for {} user", authenticationType, username); + + switch (authenticationType) { + case OAUTH2 -> { + ApplicationProperties.Security.OAUTH2 oauth2Properties = + securityProperties.getOauth2(); + userService.processSSOPostLogin( + username, oauth2Properties.getAutoCreateUser(), OAUTH2); + } + case SAML2 -> { + ApplicationProperties.Security.SAML2 saml2Properties = + securityProperties.getSaml2(); + userService.processSSOPostLogin( + username, saml2Properties.getAutoCreateUser(), SAML2); + } + } + } + + private void handleAuthenticationFailure( + HttpServletRequest request, + HttpServletResponse response, + AuthenticationException authException) + throws IOException, ServletException { + authenticationEntryPoint.commence(request, response, authException); + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java index e9addd239..f51a9d543 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpStatus; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.session.SessionInformation; import org.springframework.security.core.userdetails.UserDetails; @@ -64,6 +63,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter { return; } String requestURI = request.getRequestURI(); + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); // Check for session expiration (unsure if needed) @@ -92,14 +92,9 @@ public class UserAuthenticationFilter extends OncePerRequestFilter { response.getWriter().write("Invalid API Key."); return; } - List authorities = - user.get().getAuthorities().stream() - .map( - authority -> - new SimpleGrantedAuthority( - authority.getAuthority())) - .toList(); - authentication = new ApiKeyAuthenticationToken(user.get(), apiKey, authorities); + authentication = + new ApiKeyAuthenticationToken( + user.get(), apiKey, user.get().getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authentication); } catch (AuthenticationException e) { // If API key authentication fails, deny the request @@ -115,20 +110,19 @@ public class UserAuthenticationFilter extends OncePerRequestFilter { String method = request.getMethod(); String contextPath = request.getContextPath(); - if ("GET".equalsIgnoreCase(method) && !(contextPath + "/login").equals(requestURI)) { + if ("GET".equalsIgnoreCase(method) && !requestURI.startsWith(contextPath + "/login")) { response.sendRedirect(contextPath + "/login"); // redirect to the login page - return; } else { response.setStatus(HttpStatus.UNAUTHORIZED.value()); response.getWriter() .write( - "Authentication required. Please provide a X-API-KEY in request" - + " header.\n" - + "This is found in Settings -> Account Settings -> API Key\n" - + "Alternatively you can disable authentication if this is" - + " unexpected"); - return; + """ + Authentication required. Please provide a X-API-KEY in request header. + This is found in Settings -> Account Settings -> API Key + Alternatively you can disable authentication if this is unexpected. + """); } + return; } // Check if the authenticated user is disabled and invalidate their session if so @@ -226,11 +220,12 @@ public class UserAuthenticationFilter extends OncePerRequestFilter { } @Override - protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException { + protected boolean shouldNotFilter(HttpServletRequest request) { String uri = request.getRequestURI(); String contextPath = request.getContextPath(); String[] permitAllPatterns = { contextPath + "/login", + contextPath + "/signup", contextPath + "/register", contextPath + "/error", contextPath + "/images/", @@ -247,6 +242,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter { for (String pattern : permitAllPatterns) { if (uri.startsWith(pattern) || uri.endsWith(".svg") + || uri.endsWith(".mjs") || uri.endsWith(".png") || uri.endsWith(".ico")) { return true; diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java index ca8140bca..c92c1655e 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java @@ -2,5 +2,8 @@ package stirling.software.proprietary.security.model; public enum AuthenticationType { WEB, - SSO + @Deprecated(since = "1.0.2") + SSO, + OAUTH2, + SAML2 } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java index 382d3a71e..a32e7d7ca 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java @@ -2,6 +2,8 @@ package stirling.software.proprietary.security.model; import java.io.Serializable; +import org.springframework.security.core.GrantedAuthority; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -18,7 +20,7 @@ import lombok.Setter; @Table(name = "authorities") @Getter @Setter -public class Authority implements Serializable { +public class Authority implements GrantedAuthority, Serializable { private static final long serialVersionUID = 1L; diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/JwtVerificationKey.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/JwtVerificationKey.java new file mode 100644 index 000000000..632c5f13a --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/JwtVerificationKey.java @@ -0,0 +1,33 @@ +package stirling.software.proprietary.security.model; + +import java.io.Serial; +import java.io.Serializable; +import java.time.LocalDateTime; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@NoArgsConstructor +@ToString(onlyExplicitlyIncluded = true) +@EqualsAndHashCode(onlyExplicitlyIncluded = true) +public class JwtVerificationKey implements Serializable { + + @Serial private static final long serialVersionUID = 1L; + + @ToString.Include private String keyId; + + private String verifyingKey; + + @ToString.Include private LocalDateTime createdAt; + + public JwtVerificationKey(String keyId, String verifyingKey) { + this.keyId = keyId; + this.verifyingKey = verifyingKey; + this.createdAt = LocalDateTime.now(); + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java index d3e232f61..7d1b235cd 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java @@ -7,6 +7,8 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.springframework.security.core.userdetails.UserDetails; + import jakarta.persistence.*; import lombok.EqualsAndHashCode; @@ -25,7 +27,7 @@ import stirling.software.proprietary.model.Team; @Setter @EqualsAndHashCode(onlyExplicitlyIncluded = true) @ToString(onlyExplicitlyIncluded = true) -public class User implements Serializable { +public class User implements UserDetails, Serializable { private static final long serialVersionUID = 1L; diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/AuthenticationFailureException.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/AuthenticationFailureException.java new file mode 100644 index 000000000..f2cd5e242 --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/AuthenticationFailureException.java @@ -0,0 +1,13 @@ +package stirling.software.proprietary.security.model.exception; + +import org.springframework.security.core.AuthenticationException; + +public class AuthenticationFailureException extends AuthenticationException { + public AuthenticationFailureException(String message) { + super(message); + } + + public AuthenticationFailureException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java index 71bd42a85..4e7ed9d9e 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java @@ -1,7 +1,11 @@ package stirling.software.proprietary.security.oauth2; +import static stirling.software.proprietary.security.model.AuthenticationType.OAUTH2; +import static stirling.software.proprietary.security.model.AuthenticationType.SSO; + import java.io.IOException; import java.sql.SQLException; +import java.util.Map; import org.springframework.security.authentication.LockedException; import org.springframework.security.core.Authentication; @@ -18,10 +22,10 @@ import jakarta.servlet.http.HttpSession; import lombok.RequiredArgsConstructor; import stirling.software.common.model.ApplicationProperties; -import stirling.software.common.model.ApplicationProperties.Security.OAUTH2; import stirling.software.common.model.exception.UnsupportedProviderException; import stirling.software.common.util.RequestUriUtils; import stirling.software.proprietary.security.model.AuthenticationType; +import stirling.software.proprietary.security.service.JwtServiceInterface; import stirling.software.proprietary.security.service.LoginAttemptService; import stirling.software.proprietary.security.service.UserService; @@ -30,8 +34,9 @@ public class CustomOAuth2AuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { private final LoginAttemptService loginAttemptService; - private final ApplicationProperties applicationProperties; + private final ApplicationProperties.Security.OAUTH2 oauth2Properties; private final UserService userService; + private final JwtServiceInterface jwtService; @Override public void onAuthenticationSuccess( @@ -60,8 +65,6 @@ public class CustomOAuth2AuthenticationSuccessHandler // Redirect to the original destination super.onAuthenticationSuccess(request, response, authentication); } else { - OAUTH2 oAuth = applicationProperties.getSecurity().getOauth2(); - if (loginAttemptService.isBlocked(username)) { if (session != null) { session.removeAttribute("SPRING_SECURITY_SAVED_REQUEST"); @@ -69,7 +72,12 @@ public class CustomOAuth2AuthenticationSuccessHandler throw new LockedException( "Your account has been locked due to too many failed login attempts."); } - + if (jwtService.isJwtEnabled()) { + String jwt = + jwtService.generateToken( + authentication, Map.of("authType", AuthenticationType.OAUTH2)); + jwtService.addToken(response, jwt); + } if (userService.isUserDisabled(username)) { getRedirectStrategy() .sendRedirect(request, response, "/logout?userIsDisabled=true"); @@ -77,20 +85,22 @@ public class CustomOAuth2AuthenticationSuccessHandler } if (userService.usernameExistsIgnoreCase(username) && userService.hasPassword(username) - && !userService.isAuthenticationTypeByUsername(username, AuthenticationType.SSO) - && oAuth.getAutoCreateUser()) { + && (!userService.isAuthenticationTypeByUsername(username, SSO) + || !userService.isAuthenticationTypeByUsername(username, OAUTH2)) + && oauth2Properties.getAutoCreateUser()) { response.sendRedirect(contextPath + "/logout?oAuth2AuthenticationErrorWeb=true"); return; } try { - if (oAuth.getBlockRegistration() + if (oauth2Properties.getBlockRegistration() && !userService.usernameExistsIgnoreCase(username)) { response.sendRedirect(contextPath + "/logout?oAuth2AdminBlockedUser=true"); return; } if (principal instanceof OAuth2User) { - userService.processSSOPostLogin(username, oAuth.getAutoCreateUser()); + userService.processSSOPostLogin( + username, oauth2Properties.getAutoCreateUser(), OAUTH2); } response.sendRedirect(contextPath + "/"); } catch (IllegalArgumentException | SQLException | UnsupportedProviderException e) { diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java index 6516cc7d7..913dc458a 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java @@ -34,6 +34,7 @@ import stirling.software.common.model.oauth2.GitHubProvider; import stirling.software.common.model.oauth2.GoogleProvider; import stirling.software.common.model.oauth2.KeycloakProvider; import stirling.software.common.model.oauth2.Provider; +import stirling.software.proprietary.security.model.Authority; import stirling.software.proprietary.security.model.User; import stirling.software.proprietary.security.model.exception.NoProviderFoundException; import stirling.software.proprietary.security.service.UserService; @@ -239,12 +240,14 @@ public class OAuth2Configuration { Optional userOpt = userService.findByUsernameIgnoreCase( (String) oAuth2Auth.getAttributes().get(useAsUsername)); - if (userOpt.isPresent()) { - User user = userOpt.get(); - mappedAuthorities.add( - new SimpleGrantedAuthority( - userService.findRole(user).getAuthority())); - } + userOpt.ifPresent( + user -> + mappedAuthorities.add( + new Authority( + userService + .findRole(user) + .getAuthority(), + user))); } }); return mappedAuthorities; diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java index 2170a9632..3255cbc15 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java @@ -1,7 +1,11 @@ package stirling.software.proprietary.security.saml2; +import static stirling.software.proprietary.security.model.AuthenticationType.SAML2; +import static stirling.software.proprietary.security.model.AuthenticationType.SSO; + import java.io.IOException; import java.sql.SQLException; +import java.util.Map; import org.springframework.security.authentication.LockedException; import org.springframework.security.core.Authentication; @@ -17,10 +21,10 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import stirling.software.common.model.ApplicationProperties; -import stirling.software.common.model.ApplicationProperties.Security.SAML2; import stirling.software.common.model.exception.UnsupportedProviderException; import stirling.software.common.util.RequestUriUtils; import stirling.software.proprietary.security.model.AuthenticationType; +import stirling.software.proprietary.security.service.JwtServiceInterface; import stirling.software.proprietary.security.service.LoginAttemptService; import stirling.software.proprietary.security.service.UserService; @@ -30,8 +34,9 @@ public class CustomSaml2AuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { private LoginAttemptService loginAttemptService; - private ApplicationProperties applicationProperties; + private ApplicationProperties.Security.SAML2 saml2Properties; private UserService userService; + private final JwtServiceInterface jwtService; @Override public void onAuthenticationSuccess( @@ -65,10 +70,9 @@ public class CustomSaml2AuthenticationSuccessHandler savedRequest.getRedirectUrl()); super.onAuthenticationSuccess(request, response, authentication); } else { - SAML2 saml2 = applicationProperties.getSecurity().getSaml2(); log.debug( "Processing SAML2 authentication with autoCreateUser: {}", - saml2.getAutoCreateUser()); + saml2Properties.getAutoCreateUser()); if (loginAttemptService.isBlocked(username)) { log.debug("User {} is blocked due to too many login attempts", username); @@ -82,17 +86,21 @@ public class CustomSaml2AuthenticationSuccessHandler boolean userExists = userService.usernameExistsIgnoreCase(username); boolean hasPassword = userExists && userService.hasPassword(username); boolean isSSOUser = - userExists - && userService.isAuthenticationTypeByUsername( - username, AuthenticationType.SSO); + userExists && userService.isAuthenticationTypeByUsername(username, SSO); + boolean isSAML2User = + userExists && userService.isAuthenticationTypeByUsername(username, SAML2); log.debug( - "User status - Exists: {}, Has password: {}, Is SSO user: {}", + "User status - Exists: {}, Has password: {}, Is SSO user: {}, Is SAML2 user: {}", userExists, hasPassword, - isSSOUser); + isSSOUser, + isSAML2User); - if (userExists && hasPassword && !isSSOUser && saml2.getAutoCreateUser()) { + if (userExists + && hasPassword + && (!isSSOUser || !isSAML2User) + && saml2Properties.getAutoCreateUser()) { log.debug( "User {} exists with password but is not SSO user, redirecting to logout", username); @@ -102,15 +110,18 @@ public class CustomSaml2AuthenticationSuccessHandler } try { - if (saml2.getBlockRegistration() && !userExists) { + if (!userExists || saml2Properties.getBlockRegistration()) { log.debug("Registration blocked for new user: {}", username); response.sendRedirect( contextPath + "/login?errorOAuth=oAuth2AdminBlockedUser"); return; } log.debug("Processing SSO post-login for user: {}", username); - userService.processSSOPostLogin(username, saml2.getAutoCreateUser()); + userService.processSSOPostLogin( + username, saml2Properties.getAutoCreateUser(), SAML2); log.debug("Successfully processed authentication for user: {}", username); + + generateJwt(response, authentication); response.sendRedirect(contextPath + "/"); } catch (IllegalArgumentException | SQLException | UnsupportedProviderException e) { log.debug( @@ -124,4 +135,13 @@ public class CustomSaml2AuthenticationSuccessHandler super.onAuthenticationSuccess(request, response, authentication); } } + + private void generateJwt(HttpServletResponse response, Authentication authentication) { + if (jwtService.isJwtEnabled()) { + String jwt = + jwtService.generateToken( + authentication, Map.of("authType", AuthenticationType.SAML2)); + jwtService.addToken(response, jwt); + } + } } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/JwtSaml2AuthenticationRequestRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/JwtSaml2AuthenticationRequestRepository.java new file mode 100644 index 000000000..d0508151c --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/JwtSaml2AuthenticationRequestRepository.java @@ -0,0 +1,135 @@ +package stirling.software.proprietary.security.saml2; + +import java.util.HashMap; +import java.util.Map; + +import org.springframework.security.saml2.provider.service.authentication.Saml2PostAuthenticationRequest; +import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration; +import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; +import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import lombok.extern.slf4j.Slf4j; + +import stirling.software.proprietary.security.service.JwtServiceInterface; + +@Slf4j +public class JwtSaml2AuthenticationRequestRepository + implements Saml2AuthenticationRequestRepository { + private final Map tokenStore; + private final JwtServiceInterface jwtService; + private final RelyingPartyRegistrationRepository relyingPartyRegistrationRepository; + + private static final String SAML_REQUEST_TOKEN = "stirling_saml_request_token"; + + public JwtSaml2AuthenticationRequestRepository( + Map tokenStore, + JwtServiceInterface jwtService, + RelyingPartyRegistrationRepository relyingPartyRegistrationRepository) { + this.tokenStore = tokenStore; + this.jwtService = jwtService; + this.relyingPartyRegistrationRepository = relyingPartyRegistrationRepository; + } + + @Override + public void saveAuthenticationRequest( + Saml2PostAuthenticationRequest authRequest, + HttpServletRequest request, + HttpServletResponse response) { + if (!jwtService.isJwtEnabled()) { + log.debug("V2 is not enabled, skipping SAMLRequest token storage"); + return; + } + + if (authRequest == null) { + removeAuthenticationRequest(request, response); + return; + } + + Map claims = serializeSamlRequest(authRequest); + String token = jwtService.generateToken("", claims); + String relayState = authRequest.getRelayState(); + + tokenStore.put(relayState, token); + request.setAttribute(SAML_REQUEST_TOKEN, relayState); + response.addHeader(SAML_REQUEST_TOKEN, relayState); + + log.debug("Saved SAMLRequest token with RelayState: {}", relayState); + } + + @Override + public Saml2PostAuthenticationRequest loadAuthenticationRequest(HttpServletRequest request) { + String token = extractTokenFromStore(request); + + if (token == null) { + log.debug("No SAMLResponse token found in RelayState"); + return null; + } + + Map claims = jwtService.extractClaims(token); + return deserializeSamlRequest(claims); + } + + @Override + public Saml2PostAuthenticationRequest removeAuthenticationRequest( + HttpServletRequest request, HttpServletResponse response) { + Saml2PostAuthenticationRequest authRequest = loadAuthenticationRequest(request); + + String relayStateId = request.getParameter("RelayState"); + if (relayStateId != null) { + tokenStore.remove(relayStateId); + log.debug("Removed SAMLRequest token for RelayState ID: {}", relayStateId); + } + + return authRequest; + } + + private String extractTokenFromStore(HttpServletRequest request) { + String authnRequestId = request.getParameter("RelayState"); + + if (authnRequestId != null && !authnRequestId.isEmpty()) { + String token = tokenStore.get(authnRequestId); + + if (token != null) { + tokenStore.remove(authnRequestId); + log.debug("Retrieved SAMLRequest token for RelayState ID: {}", authnRequestId); + return token; + } else { + log.warn("No SAMLRequest token found for RelayState ID: {}", authnRequestId); + } + } + + return null; + } + + private Map serializeSamlRequest(Saml2PostAuthenticationRequest authRequest) { + Map claims = new HashMap<>(); + + claims.put("id", authRequest.getId()); + claims.put("relyingPartyRegistrationId", authRequest.getRelyingPartyRegistrationId()); + claims.put("authenticationRequestUri", authRequest.getAuthenticationRequestUri()); + claims.put("samlRequest", authRequest.getSamlRequest()); + claims.put("relayState", authRequest.getRelayState()); + + return claims; + } + + private Saml2PostAuthenticationRequest deserializeSamlRequest(Map claims) { + String relyingPartyRegistrationId = (String) claims.get("relyingPartyRegistrationId"); + RelyingPartyRegistration relyingPartyRegistration = + relyingPartyRegistrationRepository.findByRegistrationId(relyingPartyRegistrationId); + + if (relyingPartyRegistration == null) { + return null; + } + + return Saml2PostAuthenticationRequest.withRelyingPartyRegistration(relyingPartyRegistration) + .id((String) claims.get("id")) + .authenticationRequestUri((String) claims.get("authenticationRequestUri")) + .samlRequest((String) claims.get("samlRequest")) + .relayState((String) claims.get("relayState")) + .build(); + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java similarity index 85% rename from app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java index 7fd4768b3..9d21f88a3 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java @@ -3,6 +3,7 @@ package stirling.software.proprietary.security.saml2; import java.security.cert.X509Certificate; import java.util.Collections; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; import org.opensaml.saml.saml2.core.AuthnRequest; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -11,12 +12,12 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.Resource; import org.springframework.security.saml2.core.Saml2X509Credential; import org.springframework.security.saml2.core.Saml2X509Credential.Saml2X509CredentialType; -import org.springframework.security.saml2.provider.service.authentication.AbstractSaml2AuthenticationRequest; +import org.springframework.security.saml2.provider.service.authentication.Saml2PostAuthenticationRequest; import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository; import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration; import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding; -import org.springframework.security.saml2.provider.service.web.HttpSessionSaml2AuthenticationRequestRepository; +import org.springframework.security.saml2.provider.service.web.Saml2AuthenticationRequestRepository; import org.springframework.security.saml2.provider.service.web.authentication.OpenSaml4AuthenticationRequestResolver; import jakarta.servlet.http.HttpServletRequest; @@ -26,12 +27,13 @@ import lombok.extern.slf4j.Slf4j; import stirling.software.common.model.ApplicationProperties; import stirling.software.common.model.ApplicationProperties.Security.SAML2; +import stirling.software.proprietary.security.service.JwtServiceInterface; @Configuration @Slf4j @ConditionalOnProperty(value = "security.saml2.enabled", havingValue = "true") @RequiredArgsConstructor -public class SAML2Configuration { +public class Saml2Configuration { private final ApplicationProperties applicationProperties; @@ -58,6 +60,7 @@ public class SAML2Configuration { .assertionConsumerServiceBinding(Saml2MessageBinding.POST) .assertionConsumerServiceLocation( "{baseUrl}/login/saml2/sso/{registrationId}") + .authnRequestsSigned(true) .assertingPartyMetadata( metadata -> metadata.entityId(samlConf.getIdpIssuer()) @@ -71,15 +74,29 @@ public class SAML2Configuration { Saml2MessageBinding.POST) .singleLogoutServiceLocation( samlConf.getIdpSingleLogoutUrl()) + .singleLogoutServiceResponseLocation( + "http://localhost:8080/login") .wantAuthnRequestsSigned(true)) .build(); return new InMemoryRelyingPartyRegistrationRepository(rp); } + @Bean + @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true") + public Saml2AuthenticationRequestRepository + saml2AuthenticationRequestRepository( + JwtServiceInterface jwtService, + RelyingPartyRegistrationRepository relyingPartyRegistrationRepository) { + return new JwtSaml2AuthenticationRequestRepository( + new ConcurrentHashMap<>(), jwtService, relyingPartyRegistrationRepository); + } + @Bean @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true") public OpenSaml4AuthenticationRequestResolver authenticationRequestResolver( - RelyingPartyRegistrationRepository relyingPartyRegistrationRepository) { + RelyingPartyRegistrationRepository relyingPartyRegistrationRepository, + Saml2AuthenticationRequestRepository + saml2AuthenticationRequestRepository) { OpenSaml4AuthenticationRequestResolver resolver = new OpenSaml4AuthenticationRequestResolver(relyingPartyRegistrationRepository); @@ -87,10 +104,8 @@ public class SAML2Configuration { customizer -> { HttpServletRequest request = customizer.getRequest(); AuthnRequest authnRequest = customizer.getAuthnRequest(); - HttpSessionSaml2AuthenticationRequestRepository requestRepository = - new HttpSessionSaml2AuthenticationRequestRepository(); - AbstractSaml2AuthenticationRequest saml2AuthenticationRequest = - requestRepository.loadAuthenticationRequest(request); + Saml2PostAuthenticationRequest saml2AuthenticationRequest = + saml2AuthenticationRequestRepository.loadAuthenticationRequest(request); if (saml2AuthenticationRequest != null) { String sessionId = request.getSession(false).getId(); @@ -113,7 +128,6 @@ public class SAML2Configuration { log.debug("Generating new authentication request ID"); authnRequest.setID("ARQ" + UUID.randomUUID().toString().substring(1)); } - logAuthnRequestDetails(authnRequest); logHttpRequestDetails(request); }); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java index 0b286e894..8f9afbe3d 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java @@ -27,13 +27,13 @@ public class CustomOAuth2UserService implements OAuth2UserService new UsernameNotFoundException( "No user found with username: " + username)); + if (loginAttemptService.isBlocked(username)) { throw new LockedException( "Your account has been locked due to too many failed login attempts."); } - if (!user.hasPassword()) { + + AuthenticationType userAuthenticationType = + AuthenticationType.valueOf(user.getAuthenticationType().toUpperCase()); + if (!user.hasPassword() && userAuthenticationType == AuthenticationType.WEB) { throw new IllegalArgumentException("Password must not be null"); } - return new org.springframework.security.core.userdetails.User( - user.getUsername(), - user.getPassword(), - user.isEnabled(), - true, - true, - true, - getAuthorities(user.getAuthorities())); - } - private Collection getAuthorities(Set authorities) { - return authorities.stream() - .map(authority -> new SimpleGrantedAuthority(authority.getAuthority())) - .toList(); + return user; } } diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java new file mode 100644 index 000000000..8724da9a8 --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtService.java @@ -0,0 +1,330 @@ +package stirling.software.proprietary.security.service; + +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.spec.InvalidKeySpecException; +import java.time.LocalDateTime; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseCookie; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.oauth2.core.user.OAuth2User; +import org.springframework.stereotype.Service; + +import io.github.pixee.security.Newlines; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.UnsupportedJwtException; +import io.jsonwebtoken.security.SignatureException; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import lombok.extern.slf4j.Slf4j; + +import stirling.software.proprietary.security.model.JwtVerificationKey; +import stirling.software.proprietary.security.model.exception.AuthenticationFailureException; +import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticatedPrincipal; + +@Slf4j +@Service +public class JwtService implements JwtServiceInterface { + + private static final String JWT_COOKIE_NAME = "stirling_jwt"; + private static final String ISSUER = "Stirling PDF"; + private static final long EXPIRATION = 3600000; + + @Value("${stirling.security.jwt.secureCookie:true}") + private boolean secureCookie; + + private final KeyPersistenceServiceInterface keyPersistenceService; + private final boolean v2Enabled; + + @Autowired + public JwtService( + @Qualifier("v2Enabled") boolean v2Enabled, + KeyPersistenceServiceInterface keyPersistenceService) { + this.v2Enabled = v2Enabled; + this.keyPersistenceService = keyPersistenceService; + } + + @Override + public String generateToken(Authentication authentication, Map claims) { + Object principal = authentication.getPrincipal(); + String username = ""; + + if (principal instanceof UserDetails) { + username = ((UserDetails) principal).getUsername(); + } else if (principal instanceof OAuth2User) { + username = ((OAuth2User) principal).getName(); + } else if (principal instanceof CustomSaml2AuthenticatedPrincipal) { + username = ((CustomSaml2AuthenticatedPrincipal) principal).getName(); + } + + return generateToken(username, claims); + } + + @Override + public String generateToken(String username, Map claims) { + try { + JwtVerificationKey activeKey = keyPersistenceService.getActiveKey(); + Optional keyPairOpt = keyPersistenceService.getKeyPair(activeKey.getKeyId()); + + if (keyPairOpt.isEmpty()) { + throw new RuntimeException("Unable to retrieve key pair for active key"); + } + + KeyPair keyPair = keyPairOpt.get(); + + var builder = + Jwts.builder() + .claims(claims) + .subject(username) + .issuer(ISSUER) + .issuedAt(new Date()) + .expiration(new Date(System.currentTimeMillis() + EXPIRATION)) + .signWith(keyPair.getPrivate(), Jwts.SIG.RS256); + + String keyId = activeKey.getKeyId(); + if (keyId != null) { + builder.header().keyId(keyId); + } + + return builder.compact(); + } catch (Exception e) { + throw new RuntimeException("Failed to generate token", e); + } + } + + @Override + public void validateToken(String token) throws AuthenticationFailureException { + extractAllClaims(token); + + if (isTokenExpired(token)) { + throw new AuthenticationFailureException("The token has expired"); + } + } + + @Override + public String extractUsername(String token) { + return extractClaim(token, Claims::getSubject); + } + + @Override + public Map extractClaims(String token) { + Claims claims = extractAllClaims(token); + return new HashMap<>(claims); + } + + @Override + public boolean isTokenExpired(String token) { + return extractExpiration(token).before(new Date()); + } + + private Date extractExpiration(String token) { + return extractClaim(token, Claims::getExpiration); + } + + private T extractClaim(String token, Function claimsResolver) { + final Claims claims = extractAllClaims(token); + return claimsResolver.apply(claims); + } + + private Claims extractAllClaims(String token) { + try { + String keyId = extractKeyId(token); + KeyPair keyPair; + + if (keyId != null) { + Optional specificKeyPair = keyPersistenceService.getKeyPair(keyId); + + if (specificKeyPair.isPresent()) { + keyPair = specificKeyPair.get(); + } else { + log.warn( + "Key ID {} not found in keystore, token may have been signed with an expired key", + keyId); + + if (keyId.equals(keyPersistenceService.getActiveKey().getKeyId())) { + JwtVerificationKey verificationKey = + keyPersistenceService.refreshActiveKeyPair(); + Optional refreshedKeyPair = + keyPersistenceService.getKeyPair(verificationKey.getKeyId()); + if (refreshedKeyPair.isPresent()) { + keyPair = refreshedKeyPair.get(); + } else { + throw new AuthenticationFailureException( + "Failed to retrieve refreshed key pair"); + } + } else { + // Try to use active key as fallback + JwtVerificationKey activeKey = keyPersistenceService.getActiveKey(); + Optional activeKeyPair = + keyPersistenceService.getKeyPair(activeKey.getKeyId()); + if (activeKeyPair.isPresent()) { + keyPair = activeKeyPair.get(); + } else { + throw new AuthenticationFailureException( + "Failed to retrieve active key pair"); + } + } + } + } else { + log.debug("No key ID in token header, trying all available keys"); + // Try all available keys when no keyId is present + return tryAllKeys(token); + } + + return Jwts.parser() + .verifyWith(keyPair.getPublic()) + .build() + .parseSignedClaims(token) + .getPayload(); + } catch (SignatureException e) { + log.warn("Invalid signature: {}", e.getMessage()); + throw new AuthenticationFailureException("Invalid signature", e); + } catch (MalformedJwtException e) { + log.warn("Invalid token: {}", e.getMessage()); + throw new AuthenticationFailureException("Invalid token", e); + } catch (ExpiredJwtException e) { + log.warn("The token has expired: {}", e.getMessage()); + throw new AuthenticationFailureException("The token has expired", e); + } catch (UnsupportedJwtException e) { + log.warn("The token is unsupported: {}", e.getMessage()); + throw new AuthenticationFailureException("The token is unsupported", e); + } catch (IllegalArgumentException e) { + log.warn("Claims are empty: {}", e.getMessage()); + throw new AuthenticationFailureException("Claims are empty", e); + } + } + + private Claims tryAllKeys(String token) throws AuthenticationFailureException { + // First try the active key + try { + JwtVerificationKey activeKey = keyPersistenceService.getActiveKey(); + PublicKey publicKey = + keyPersistenceService.decodePublicKey(activeKey.getVerifyingKey()); + return Jwts.parser() + .verifyWith(publicKey) + .build() + .parseSignedClaims(token) + .getPayload(); + } catch (SignatureException + | NoSuchAlgorithmException + | InvalidKeySpecException activeKeyException) { + log.debug("Active key failed, trying all available keys from cache"); + + // If active key fails, try all available keys from cache + List allKeys = + keyPersistenceService.getKeysEligibleForCleanup( + LocalDateTime.now().plusDays(1)); + + for (JwtVerificationKey verificationKey : allKeys) { + try { + PublicKey publicKey = + keyPersistenceService.decodePublicKey( + verificationKey.getVerifyingKey()); + return Jwts.parser() + .verifyWith(publicKey) + .build() + .parseSignedClaims(token) + .getPayload(); + } catch (SignatureException + | NoSuchAlgorithmException + | InvalidKeySpecException e) { + log.debug( + "Key {} failed to verify token, trying next key", + verificationKey.getKeyId()); + // Continue to next key + } + } + + throw new AuthenticationFailureException( + "Token signature could not be verified with any available key", + activeKeyException); + } + } + + @Override + public String extractToken(HttpServletRequest request) { + Cookie[] cookies = request.getCookies(); + + if (cookies != null) { + for (Cookie cookie : cookies) { + if (JWT_COOKIE_NAME.equals(cookie.getName())) { + return cookie.getValue(); + } + } + } + + return null; + } + + @Override + public void addToken(HttpServletResponse response, String token) { + ResponseCookie cookie = + ResponseCookie.from(JWT_COOKIE_NAME, Newlines.stripAll(token)) + .httpOnly(true) + .secure(secureCookie) + .sameSite("Strict") + .maxAge(EXPIRATION / 1000) + .path("/") + .build(); + + response.addHeader("Set-Cookie", cookie.toString()); + } + + @Override + public void clearToken(HttpServletResponse response) { + ResponseCookie cookie = + ResponseCookie.from(JWT_COOKIE_NAME, "") + .httpOnly(true) + .secure(secureCookie) + .sameSite("None") + .maxAge(0) + .path("/") + .build(); + + response.addHeader("Set-Cookie", cookie.toString()); + } + + @Override + public boolean isJwtEnabled() { + return v2Enabled; + } + + private String extractKeyId(String token) { + try { + PublicKey signingKey = + keyPersistenceService.decodePublicKey( + keyPersistenceService.getActiveKey().getVerifyingKey()); + + String keyId = + (String) + Jwts.parser() + .verifyWith(signingKey) + .build() + .parse(token) + .getHeader() + .get("kid"); + log.debug("Extracted key ID from token: {}", keyId); + return keyId; + } catch (Exception e) { + log.warn("Failed to extract key ID from token header: {}", e.getMessage()); + return null; + } + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtServiceInterface.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtServiceInterface.java new file mode 100644 index 000000000..7cdca8209 --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/JwtServiceInterface.java @@ -0,0 +1,90 @@ +package stirling.software.proprietary.security.service; + +import java.util.Map; + +import org.springframework.security.core.Authentication; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +public interface JwtServiceInterface { + + /** + * Generate a JWT token for the authenticated user + * + * @param authentication Spring Security authentication object + * @return JWT token as a string + */ + String generateToken(Authentication authentication, Map claims); + + /** + * Generate a JWT token for a specific username + * + * @param username the username for which to generate the token + * @param claims additional claims to include in the token + * @return JWT token as a string + */ + String generateToken(String username, Map claims); + + /** + * Validate a JWT token + * + * @param token the JWT token to validate + * @return true if token is valid, false otherwise + */ + void validateToken(String token); + + /** + * Extract username from JWT token + * + * @param token the JWT token + * @return username extracted from token + */ + String extractUsername(String token); + + /** + * Extract all claims from JWT token + * + * @param token the JWT token + * @return map of claims + */ + Map extractClaims(String token); + + /** + * Check if token is expired + * + * @param token the JWT token + * @return true if token is expired, false otherwise + */ + boolean isTokenExpired(String token); + + /** + * Extract JWT token from HTTP request (header or cookie) + * + * @param request HTTP servlet request + * @return JWT token if found, null otherwise + */ + String extractToken(HttpServletRequest request); + + /** + * Add JWT token to HTTP response (header and cookie) + * + * @param response HTTP servlet response + * @param token JWT token to add + */ + void addToken(HttpServletResponse response, String token); + + /** + * Clear JWT token from HTTP response (remove cookie) + * + * @param response HTTP servlet response + */ + void clearToken(HttpServletResponse response); + + /** + * Check if JWT authentication is enabled + * + * @return true if JWT is enabled, false otherwise + */ + boolean isJwtEnabled(); +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPairCleanupService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPairCleanupService.java new file mode 100644 index 000000000..b419f78fe --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPairCleanupService.java @@ -0,0 +1,88 @@ +package stirling.software.proprietary.security.service; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.time.LocalDateTime; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import jakarta.annotation.PostConstruct; + +import lombok.extern.slf4j.Slf4j; + +import stirling.software.common.configuration.InstallationPathConfig; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.proprietary.security.model.JwtVerificationKey; + +@Slf4j +@Service +@ConditionalOnBooleanProperty("v2") +public class KeyPairCleanupService { + + private final KeyPersistenceService keyPersistenceService; + private final ApplicationProperties.Security.Jwt jwtProperties; + + @Autowired + public KeyPairCleanupService( + KeyPersistenceService keyPersistenceService, + ApplicationProperties applicationProperties) { + this.keyPersistenceService = keyPersistenceService; + this.jwtProperties = applicationProperties.getSecurity().getJwt(); + } + + @Transactional + @PostConstruct + @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.DAYS) + public void cleanup() { + if (!jwtProperties.isEnableKeyCleanup() || !keyPersistenceService.isKeystoreEnabled()) { + return; + } + + LocalDateTime cutoffDate = + LocalDateTime.now().minusDays(jwtProperties.getKeyRetentionDays()); + + List eligibleKeys = + keyPersistenceService.getKeysEligibleForCleanup(cutoffDate); + if (eligibleKeys.isEmpty()) { + return; + } + + log.info("Removing keys older than retention period"); + removeKeys(eligibleKeys); + keyPersistenceService.refreshActiveKeyPair(); + } + + private void removeKeys(List keys) { + keys.forEach( + key -> { + try { + keyPersistenceService.removeKey(key.getKeyId()); + removePrivateKey(key.getKeyId()); + } catch (IOException e) { + log.warn("Failed to remove key: {}", key.getKeyId(), e); + } + }); + } + + private void removePrivateKey(String keyId) throws IOException { + if (!keyPersistenceService.isKeystoreEnabled()) { + return; + } + + Path privateKeyDirectory = Paths.get(InstallationPathConfig.getPrivateKeyPath()); + Path keyFile = privateKeyDirectory.resolve(keyId + KeyPersistenceService.KEY_SUFFIX); + + if (Files.exists(keyFile)) { + Files.delete(keyFile); + log.debug("Deleted private key: {}", keyFile); + } + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceService.java new file mode 100644 index 000000000..48bcddac0 --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceService.java @@ -0,0 +1,243 @@ +package stirling.software.proprietary.security.service; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.Base64; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.caffeine.CaffeineCache; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import jakarta.annotation.PostConstruct; + +import lombok.extern.slf4j.Slf4j; + +import stirling.software.common.configuration.InstallationPathConfig; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.proprietary.security.model.JwtVerificationKey; + +@Slf4j +@Service +public class KeyPersistenceService implements KeyPersistenceServiceInterface { + + public static final String KEY_SUFFIX = ".key"; + + private final ApplicationProperties.Security.Jwt jwtProperties; + private final CacheManager cacheManager; + private final Cache verifyingKeyCache; + + private volatile JwtVerificationKey activeKey; + + @Autowired + public KeyPersistenceService( + ApplicationProperties applicationProperties, CacheManager cacheManager) { + this.jwtProperties = applicationProperties.getSecurity().getJwt(); + this.cacheManager = cacheManager; + this.verifyingKeyCache = cacheManager.getCache("verifyingKeys"); + } + + @PostConstruct + public void initializeKeystore() { + if (!isKeystoreEnabled()) { + return; + } + + try { + ensurePrivateKeyDirectoryExists(); + loadKeyPair(); + } catch (Exception e) { + log.error("Failed to initialize keystore, using in-memory generation", e); + } + } + + private void loadKeyPair() { + if (activeKey == null) { + generateAndStoreKeypair(); + } + } + + @Transactional + private JwtVerificationKey generateAndStoreKeypair() { + JwtVerificationKey verifyingKey = null; + + try { + KeyPair keyPair = generateRSAKeypair(); + String keyId = generateKeyId(); + + storePrivateKey(keyId, keyPair.getPrivate()); + verifyingKey = new JwtVerificationKey(keyId, encodePublicKey(keyPair.getPublic())); + verifyingKeyCache.put(keyId, verifyingKey); + activeKey = verifyingKey; + } catch (IOException e) { + log.error("Failed to generate and store keypair", e); + } + + return verifyingKey; + } + + @Override + public JwtVerificationKey getActiveKey() { + if (activeKey == null) { + return generateAndStoreKeypair(); + } + return activeKey; + } + + @Override + public Optional getKeyPair(String keyId) { + if (!isKeystoreEnabled()) { + return Optional.empty(); + } + + try { + JwtVerificationKey verifyingKey = + verifyingKeyCache.get(keyId, JwtVerificationKey.class); + + if (verifyingKey == null) { + log.warn("No signing key found in database for keyId: {}", keyId); + return Optional.empty(); + } + + PrivateKey privateKey = loadPrivateKey(keyId); + PublicKey publicKey = decodePublicKey(verifyingKey.getVerifyingKey()); + + return Optional.of(new KeyPair(publicKey, privateKey)); + } catch (Exception e) { + log.error("Failed to load keypair for keyId: {}", keyId, e); + return Optional.empty(); + } + } + + @Override + public boolean isKeystoreEnabled() { + return jwtProperties.isEnableKeystore(); + } + + @Override + public JwtVerificationKey refreshActiveKeyPair() { + return generateAndStoreKeypair(); + } + + @Override + @CacheEvict( + value = {"verifyingKeys"}, + key = "#keyId", + condition = "#root.target.isKeystoreEnabled()") + public void removeKey(String keyId) { + verifyingKeyCache.evict(keyId); + } + + @Override + public List getKeysEligibleForCleanup(LocalDateTime cutoffDate) { + CaffeineCache caffeineCache = (CaffeineCache) verifyingKeyCache; + com.github.benmanes.caffeine.cache.Cache nativeCache = + caffeineCache.getNativeCache(); + + log.debug( + "Cache size: {}, Checking {} keys for cleanup", + nativeCache.estimatedSize(), + nativeCache.asMap().size()); + + return nativeCache.asMap().values().stream() + .filter(value -> value instanceof JwtVerificationKey) + .map(value -> (JwtVerificationKey) value) + .filter( + key -> { + boolean eligible = key.getCreatedAt().isBefore(cutoffDate); + log.debug( + "Key {} created at {}, eligible for cleanup: {}", + key.getKeyId(), + key.getCreatedAt(), + eligible); + return eligible; + }) + .collect(Collectors.toList()); + } + + private String generateKeyId() { + return "jwt-key-" + + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HHmmss")); + } + + private KeyPair generateRSAKeypair() { + KeyPairGenerator keyPairGenerator = null; + + try { + keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); + } catch (NoSuchAlgorithmException e) { + log.error("Failed to initialize RSA key pair generator", e); + } + + return keyPairGenerator.generateKeyPair(); + } + + private void ensurePrivateKeyDirectoryExists() throws IOException { + Path keyPath = Paths.get(InstallationPathConfig.getPrivateKeyPath()); + + if (!Files.exists(keyPath)) { + Files.createDirectories(keyPath); + } + } + + private void storePrivateKey(String keyId, PrivateKey privateKey) throws IOException { + Path keyFile = + Paths.get(InstallationPathConfig.getPrivateKeyPath()).resolve(keyId + KEY_SUFFIX); + String encodedKey = Base64.getEncoder().encodeToString(privateKey.getEncoded()); + Files.writeString(keyFile, encodedKey); + + // Set read/write to only the owner + keyFile.toFile().setReadable(true, true); + keyFile.toFile().setWritable(true, true); + keyFile.toFile().setExecutable(false, false); + } + + private PrivateKey loadPrivateKey(String keyId) + throws IOException, NoSuchAlgorithmException, InvalidKeySpecException { + Path keyFile = + Paths.get(InstallationPathConfig.getPrivateKeyPath()).resolve(keyId + KEY_SUFFIX); + + if (!Files.exists(keyFile)) { + throw new IOException("Private key not found: " + keyFile); + } + + String encodedKey = Files.readString(keyFile); + byte[] keyBytes = Base64.getDecoder().decode(encodedKey); + PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + + return keyFactory.generatePrivate(keySpec); + } + + private String encodePublicKey(PublicKey publicKey) { + return Base64.getEncoder().encodeToString(publicKey.getEncoded()); + } + + public PublicKey decodePublicKey(String encodedKey) + throws NoSuchAlgorithmException, InvalidKeySpecException { + byte[] keyBytes = Base64.getDecoder().decode(encodedKey); + X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes); + KeyFactory keyFactory = KeyFactory.getInstance("RSA"); + return keyFactory.generatePublic(keySpec); + } +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceServiceInterface.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceServiceInterface.java new file mode 100644 index 000000000..f3050472e --- /dev/null +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/KeyPersistenceServiceInterface.java @@ -0,0 +1,29 @@ +package stirling.software.proprietary.security.service; + +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.spec.InvalidKeySpecException; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +import stirling.software.proprietary.security.model.JwtVerificationKey; + +public interface KeyPersistenceServiceInterface { + + JwtVerificationKey getActiveKey(); + + Optional getKeyPair(String keyId); + + boolean isKeystoreEnabled(); + + JwtVerificationKey refreshActiveKeyPair(); + + List getKeysEligibleForCleanup(LocalDateTime cutoffDate); + + void removeKey(String keyId); + + PublicKey decodePublicKey(String encodedKey) + throws NoSuchAlgorithmException, InvalidKeySpecException; +} diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java index 50c8027f6..6f213b25e 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java @@ -15,7 +15,6 @@ import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.session.SessionInformation; import org.springframework.security.core.userdetails.UserDetails; @@ -61,19 +60,9 @@ public class UserService implements UserServiceInterface { private final ApplicationProperties.Security.OAUTH2 oAuth2; - @Transactional - public void migrateOauth2ToSSO() { - userRepository - .findByAuthenticationTypeIgnoreCase("OAUTH2") - .forEach( - user -> { - user.setAuthenticationType(AuthenticationType.SSO); - userRepository.save(user); - }); - } - // Handle OAUTH2 login and user auto creation. - public void processSSOPostLogin(String username, boolean autoCreateUser) + public void processSSOPostLogin( + String username, boolean autoCreateUser, AuthenticationType type) throws IllegalArgumentException, SQLException, UnsupportedProviderException { if (!isUsernameValid(username)) { return; @@ -83,7 +72,7 @@ public class UserService implements UserServiceInterface { return; } if (autoCreateUser) { - saveUser(username, AuthenticationType.SSO); + saveUser(username, type); } } @@ -100,10 +89,7 @@ public class UserService implements UserServiceInterface { } private Collection getAuthorities(User user) { - // Convert each Authority object into a SimpleGrantedAuthority object. - return user.getAuthorities().stream() - .map((Authority authority) -> new SimpleGrantedAuthority(authority.getAuthority())) - .toList(); + return user.getAuthorities(); } private String generateApiKey() { diff --git a/app/proprietary/src/main/resources/static/js/audit/dashboard.js b/app/proprietary/src/main/resources/static/js/audit/dashboard.js index 5cc670908..c0b93bd8e 100644 --- a/app/proprietary/src/main/resources/static/js/audit/dashboard.js +++ b/app/proprietary/src/main/resources/static/js/audit/dashboard.js @@ -230,7 +230,7 @@ function loadAuditData(targetPage, realPageSize) { document.getElementById('page-indicator').textContent = `Page ${requestedPage + 1} of ?`; } - fetch(url) + fetchWithCsrf(url) .then(response => { return response.json(); }) @@ -302,7 +302,7 @@ function loadStats(days) { showLoading('user-chart-loading'); showLoading('time-chart-loading'); - fetch(`/audit/stats?days=${days}`) + fetchWithCsrf(`/audit/stats?days=${days}`) .then(response => response.json()) .then(data => { document.getElementById('total-events').textContent = data.totalEvents; @@ -835,7 +835,7 @@ function hideLoading(id) { // Load event types from the server for filter dropdowns function loadEventTypes() { - fetch('/audit/types') + fetchWithCsrf('/audit/types') .then(response => response.json()) .then(types => { if (!types || types.length === 0) { diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java index 04ca4c35f..7a4076260 100644 --- a/app/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java @@ -14,12 +14,18 @@ import org.springframework.security.oauth2.client.authentication.OAuth2Authentic import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import stirling.software.common.configuration.AppConfig; import stirling.software.common.model.ApplicationProperties; +import stirling.software.proprietary.security.service.JwtServiceInterface; @ExtendWith(MockitoExtension.class) class CustomLogoutSuccessHandlerTest { - @Mock private ApplicationProperties applicationProperties; + @Mock private ApplicationProperties.Security securityProperties; + + @Mock private AppConfig appConfig; + + @Mock private JwtServiceInterface jwtService; @InjectMocks private CustomLogoutSuccessHandler customLogoutSuccessHandler; @@ -27,9 +33,12 @@ class CustomLogoutSuccessHandlerTest { void testSuccessfulLogout() throws IOException { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); - String logoutPath = "logout=true"; + String token = "token"; + String logoutPath = "/login?logout=true"; when(response.isCommitted()).thenReturn(false); + when(jwtService.extractToken(request)).thenReturn(token); + doNothing().when(jwtService).clearToken(response); when(request.getContextPath()).thenReturn(""); when(response.encodeRedirectURL(logoutPath)).thenReturn(logoutPath); @@ -38,12 +47,30 @@ class CustomLogoutSuccessHandlerTest { verify(response).sendRedirect(logoutPath); } + @Test + void testSuccessfulLogoutViaJWT() throws IOException { + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); + String logoutPath = "/login?logout=true"; + String token = "token"; + + when(response.isCommitted()).thenReturn(false); + when(jwtService.extractToken(request)).thenReturn(token); + doNothing().when(jwtService).clearToken(response); + when(request.getContextPath()).thenReturn(""); + when(response.encodeRedirectURL(logoutPath)).thenReturn(logoutPath); + + customLogoutSuccessHandler.onLogoutSuccess(request, response, null); + + verify(response).sendRedirect(logoutPath); + verify(jwtService).clearToken(response); + } + @Test void testSuccessfulLogoutViaOAuth2() throws IOException { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken oAuth2AuthenticationToken = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -54,8 +81,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(oAuth2AuthenticationToken.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, oAuth2AuthenticationToken); @@ -70,7 +96,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -84,8 +109,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); @@ -101,7 +125,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -111,8 +134,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); @@ -127,7 +149,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -138,8 +159,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); @@ -154,7 +174,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -167,8 +186,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); @@ -183,7 +201,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -198,8 +215,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); @@ -214,7 +230,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -230,8 +245,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); @@ -246,7 +260,6 @@ class CustomLogoutSuccessHandlerTest { HttpServletRequest request = mock(HttpServletRequest.class); HttpServletResponse response = mock(HttpServletResponse.class); OAuth2AuthenticationToken authentication = mock(OAuth2AuthenticationToken.class); - ApplicationProperties.Security security = mock(ApplicationProperties.Security.class); ApplicationProperties.Security.OAUTH2 oauth = mock(ApplicationProperties.Security.OAUTH2.class); @@ -259,8 +272,7 @@ class CustomLogoutSuccessHandlerTest { when(request.getServerName()).thenReturn("localhost"); when(request.getServerPort()).thenReturn(8080); when(request.getContextPath()).thenReturn(""); - when(applicationProperties.getSecurity()).thenReturn(security); - when(security.getOauth2()).thenReturn(oauth); + when(securityProperties.getOauth2()).thenReturn(oauth); when(authentication.getAuthorizedClientRegistrationId()).thenReturn("test"); customLogoutSuccessHandler.onLogoutSuccess(request, response, authentication); diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/JwtAuthenticationEntryPointTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/JwtAuthenticationEntryPointTest.java new file mode 100644 index 000000000..a47f45318 --- /dev/null +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/JwtAuthenticationEntryPointTest.java @@ -0,0 +1,38 @@ +package stirling.software.proprietary.security; + +import static org.mockito.Mockito.*; + +import java.io.IOException; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import stirling.software.proprietary.security.model.exception.AuthenticationFailureException; + +@ExtendWith(MockitoExtension.class) +class JwtAuthenticationEntryPointTest { + + @Mock private HttpServletRequest request; + + @Mock private HttpServletResponse response; + + @Mock private AuthenticationFailureException authException; + + @InjectMocks private JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint; + + @Test + void testCommence() throws IOException { + String errorMessage = "Authentication failed"; + when(authException.getMessage()).thenReturn(errorMessage); + + jwtAuthenticationEntryPoint.commence(request, response, authException); + + verify(response).sendError(HttpServletResponse.SC_UNAUTHORIZED, errorMessage); + } +} diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilterTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilterTest.java new file mode 100644 index 000000000..d3f484486 --- /dev/null +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilterTest.java @@ -0,0 +1,242 @@ +package stirling.software.proprietary.security.filter; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.util.Collections; +import java.util.Map; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.web.AuthenticationEntryPoint; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import stirling.software.common.model.ApplicationProperties; +import stirling.software.proprietary.security.model.exception.AuthenticationFailureException; +import stirling.software.proprietary.security.service.CustomUserDetailsService; +import stirling.software.proprietary.security.service.JwtServiceInterface; +import stirling.software.proprietary.security.service.UserService; + +@Disabled +@ExtendWith(MockitoExtension.class) +class JwtAuthenticationFilterTest { + + @Mock private JwtServiceInterface jwtService; + + @Mock private CustomUserDetailsService userDetailsService; + + @Mock private UserService userService; + + @Mock private ApplicationProperties.Security securityProperties; + + @Mock private HttpServletRequest request; + + @Mock private HttpServletResponse response; + + @Mock private FilterChain filterChain; + + @Mock private UserDetails userDetails; + + @Mock private SecurityContext securityContext; + + @Mock private AuthenticationEntryPoint authenticationEntryPoint; + + @InjectMocks private JwtAuthenticationFilter jwtAuthenticationFilter; + + @Test + void shouldNotAuthenticateWhenJwtDisabled() throws ServletException, IOException { + when(jwtService.isJwtEnabled()).thenReturn(false); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(filterChain).doFilter(request, response); + verify(jwtService, never()).extractToken(any()); + } + + @Test + void shouldNotFilterWhenPageIsLogin() throws ServletException, IOException { + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getRequestURI()).thenReturn("/login"); + when(request.getContextPath()).thenReturn("/login"); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(filterChain, never()).doFilter(request, response); + } + + @Test + void testDoFilterInternal() throws ServletException, IOException { + String token = "valid-jwt-token"; + String newToken = "new-jwt-token"; + String username = "testuser"; + Map claims = Map.of("sub", username, "authType", "WEB"); + + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getContextPath()).thenReturn("/"); + when(request.getRequestURI()).thenReturn("/protected"); + when(jwtService.extractToken(request)).thenReturn(token); + doNothing().when(jwtService).validateToken(token); + when(jwtService.extractClaims(token)).thenReturn(claims); + when(userDetails.getAuthorities()).thenReturn(Collections.emptyList()); + when(userDetailsService.loadUserByUsername(username)).thenReturn(userDetails); + + try (MockedStatic mockedSecurityContextHolder = + mockStatic(SecurityContextHolder.class)) { + UsernamePasswordAuthenticationToken authToken = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + + when(securityContext.getAuthentication()).thenReturn(null).thenReturn(authToken); + mockedSecurityContextHolder + .when(SecurityContextHolder::getContext) + .thenReturn(securityContext); + when(jwtService.generateToken( + any(UsernamePasswordAuthenticationToken.class), eq(claims))) + .thenReturn(newToken); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(jwtService).validateToken(token); + verify(jwtService).extractClaims(token); + verify(userDetailsService).loadUserByUsername(username); + verify(securityContext) + .setAuthentication(any(UsernamePasswordAuthenticationToken.class)); + verify(jwtService) + .generateToken(any(UsernamePasswordAuthenticationToken.class), eq(claims)); + verify(jwtService).addToken(response, newToken); + verify(filterChain).doFilter(request, response); + } + } + + @Test + void testDoFilterInternalWithMissingTokenForRootPath() throws ServletException, IOException { + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getRequestURI()).thenReturn("/"); + when(request.getMethod()).thenReturn("GET"); + when(jwtService.extractToken(request)).thenReturn(null); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(response).sendRedirect("/login"); + verify(filterChain, never()).doFilter(request, response); + } + + @Test + void validationFailsWithInvalidToken() throws ServletException, IOException { + String token = "invalid-jwt-token"; + + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getRequestURI()).thenReturn("/protected"); + when(request.getContextPath()).thenReturn("/"); + when(jwtService.extractToken(request)).thenReturn(token); + doThrow(new AuthenticationFailureException("Invalid token")) + .when(jwtService) + .validateToken(token); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(jwtService).validateToken(token); + verify(authenticationEntryPoint) + .commence(eq(request), eq(response), any(AuthenticationFailureException.class)); + verify(filterChain, never()).doFilter(request, response); + } + + @Test + void validationFailsWithExpiredToken() throws ServletException, IOException { + String token = "expired-jwt-token"; + + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getRequestURI()).thenReturn("/protected"); + when(request.getContextPath()).thenReturn("/"); + when(jwtService.extractToken(request)).thenReturn(token); + doThrow(new AuthenticationFailureException("The token has expired")) + .when(jwtService) + .validateToken(token); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(jwtService).validateToken(token); + verify(authenticationEntryPoint).commence(eq(request), eq(response), any()); + verify(filterChain, never()).doFilter(request, response); + } + + @Test + void exceptionThrown_WhenUserNotFound() throws ServletException, IOException { + String token = "valid-jwt-token"; + String username = "nonexistentuser"; + Map claims = Map.of("sub", username, "authType", "WEB"); + + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getRequestURI()).thenReturn("/protected"); + when(request.getContextPath()).thenReturn("/"); + when(jwtService.extractToken(request)).thenReturn(token); + doNothing().when(jwtService).validateToken(token); + when(jwtService.extractClaims(token)).thenReturn(claims); + when(userDetailsService.loadUserByUsername(username)).thenReturn(null); + + try (MockedStatic mockedSecurityContextHolder = + mockStatic(SecurityContextHolder.class)) { + when(securityContext.getAuthentication()).thenReturn(null); + mockedSecurityContextHolder + .when(SecurityContextHolder::getContext) + .thenReturn(securityContext); + + UsernameNotFoundException result = + assertThrows( + UsernameNotFoundException.class, + () -> + jwtAuthenticationFilter.doFilterInternal( + request, response, filterChain)); + + assertEquals("User not found: " + username, result.getMessage()); + verify(userDetailsService).loadUserByUsername(username); + verify(filterChain, never()).doFilter(request, response); + } + } + + @Test + void testAuthenticationEntryPointCalledWithCorrectException() + throws ServletException, IOException { + when(jwtService.isJwtEnabled()).thenReturn(true); + when(request.getRequestURI()).thenReturn("/protected"); + when(request.getContextPath()).thenReturn("/"); + when(jwtService.extractToken(request)).thenReturn(null); + + jwtAuthenticationFilter.doFilterInternal(request, response, filterChain); + + verify(authenticationEntryPoint) + .commence( + eq(request), + eq(response), + argThat( + exception -> + exception + .getMessage() + .equals("JWT is missing from the request"))); + verify(filterChain, never()).doFilter(request, response); + } +} diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/saml2/JwtSaml2AuthenticationRequestRepositoryTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/saml2/JwtSaml2AuthenticationRequestRepositoryTest.java new file mode 100644 index 000000000..1aa083cc0 --- /dev/null +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/saml2/JwtSaml2AuthenticationRequestRepositoryTest.java @@ -0,0 +1,247 @@ +package stirling.software.proprietary.security.saml2; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.anyMap; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.NullAndEmptySource; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.mock.web.MockHttpServletRequest; +import org.springframework.mock.web.MockHttpServletResponse; +import org.springframework.security.saml2.provider.service.authentication.Saml2PostAuthenticationRequest; +import org.springframework.security.saml2.provider.service.registration.AssertingPartyMetadata; +import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration; +import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistrationRepository; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import stirling.software.proprietary.security.service.JwtServiceInterface; + +@ExtendWith(MockitoExtension.class) +class JwtSaml2AuthenticationRequestRepositoryTest { + + private static final String SAML_REQUEST_TOKEN = "stirling_saml_request_token"; + + private Map tokenStore; + + @Mock private JwtServiceInterface jwtService; + + @Mock private RelyingPartyRegistrationRepository relyingPartyRegistrationRepository; + + private JwtSaml2AuthenticationRequestRepository jwtSaml2AuthenticationRequestRepository; + + @BeforeEach + void setUp() { + tokenStore = new ConcurrentHashMap<>(); + jwtSaml2AuthenticationRequestRepository = + new JwtSaml2AuthenticationRequestRepository( + tokenStore, jwtService, relyingPartyRegistrationRepository); + } + + @Test + void saveAuthenticationRequest() { + var authRequest = mock(Saml2PostAuthenticationRequest.class); + var request = mock(MockHttpServletRequest.class); + var response = mock(MockHttpServletResponse.class); + String token = "testToken"; + String id = "testId"; + String relayState = "testRelayState"; + String authnRequestUri = "example.com/authnRequest"; + Map claims = Map.of(); + String samlRequest = "testSamlRequest"; + String relyingPartyRegistrationId = "stirling-pdf"; + + when(jwtService.isJwtEnabled()).thenReturn(true); + when(authRequest.getRelayState()).thenReturn(relayState); + when(authRequest.getId()).thenReturn(id); + when(authRequest.getAuthenticationRequestUri()).thenReturn(authnRequestUri); + when(authRequest.getSamlRequest()).thenReturn(samlRequest); + when(authRequest.getRelyingPartyRegistrationId()).thenReturn(relyingPartyRegistrationId); + when(jwtService.generateToken(eq(""), anyMap())).thenReturn(token); + + jwtSaml2AuthenticationRequestRepository.saveAuthenticationRequest( + authRequest, request, response); + + verify(request).setAttribute(SAML_REQUEST_TOKEN, relayState); + verify(response).addHeader(SAML_REQUEST_TOKEN, relayState); + } + + @Test + void saveAuthenticationRequestWithNullRequest() { + var request = mock(MockHttpServletRequest.class); + var response = mock(MockHttpServletResponse.class); + + jwtSaml2AuthenticationRequestRepository.saveAuthenticationRequest(null, request, response); + + assertTrue(tokenStore.isEmpty()); + } + + @Test + void loadAuthenticationRequest() { + var request = mock(MockHttpServletRequest.class); + var relyingPartyRegistration = mock(RelyingPartyRegistration.class); + var assertingPartyMetadata = mock(AssertingPartyMetadata.class); + String relayState = "testRelayState"; + String token = "testToken"; + Map claims = + Map.of( + "id", "testId", + "relyingPartyRegistrationId", "stirling-pdf", + "authenticationRequestUri", "example.com/authnRequest", + "samlRequest", "testSamlRequest", + "relayState", relayState); + + when(request.getParameter("RelayState")).thenReturn(relayState); + when(jwtService.extractClaims(token)).thenReturn(claims); + when(relyingPartyRegistrationRepository.findByRegistrationId("stirling-pdf")) + .thenReturn(relyingPartyRegistration); + when(relyingPartyRegistration.getRegistrationId()).thenReturn("stirling-pdf"); + when(relyingPartyRegistration.getAssertingPartyMetadata()) + .thenReturn(assertingPartyMetadata); + when(assertingPartyMetadata.getSingleSignOnServiceLocation()) + .thenReturn("https://example.com/sso"); + tokenStore.put(relayState, token); + + var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request); + + assertNotNull(result); + assertFalse(tokenStore.containsKey(relayState)); + } + + @ParameterizedTest + @NullAndEmptySource + void loadAuthenticationRequestWithInvalidRelayState(String relayState) { + var request = mock(MockHttpServletRequest.class); + when(request.getParameter("RelayState")).thenReturn(relayState); + + var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request); + + assertNull(result); + } + + @Test + void loadAuthenticationRequestWithNonExistentToken() { + var request = mock(MockHttpServletRequest.class); + when(request.getParameter("RelayState")).thenReturn("nonExistentRelayState"); + + var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request); + + assertNull(result); + } + + @Test + void loadAuthenticationRequestWithNullRelyingPartyRegistration() { + var request = mock(MockHttpServletRequest.class); + String relayState = "testRelayState"; + String token = "testToken"; + Map claims = + Map.of( + "id", "testId", + "relyingPartyRegistrationId", "stirling-pdf", + "authenticationRequestUri", "example.com/authnRequest", + "samlRequest", "testSamlRequest", + "relayState", relayState); + + when(request.getParameter("RelayState")).thenReturn(relayState); + when(jwtService.extractClaims(token)).thenReturn(claims); + when(relyingPartyRegistrationRepository.findByRegistrationId("stirling-pdf")) + .thenReturn(null); + tokenStore.put(relayState, token); + + var result = jwtSaml2AuthenticationRequestRepository.loadAuthenticationRequest(request); + + assertNull(result); + } + + @Test + void removeAuthenticationRequest() { + var request = mock(HttpServletRequest.class); + var response = mock(HttpServletResponse.class); + var relyingPartyRegistration = mock(RelyingPartyRegistration.class); + var assertingPartyMetadata = mock(AssertingPartyMetadata.class); + String relayState = "testRelayState"; + String token = "testToken"; + Map claims = + Map.of( + "id", "testId", + "relyingPartyRegistrationId", "stirling-pdf", + "authenticationRequestUri", "example.com/authnRequest", + "samlRequest", "testSamlRequest", + "relayState", relayState); + + when(request.getParameter("RelayState")).thenReturn(relayState); + when(jwtService.extractClaims(token)).thenReturn(claims); + when(relyingPartyRegistrationRepository.findByRegistrationId("stirling-pdf")) + .thenReturn(relyingPartyRegistration); + when(relyingPartyRegistration.getRegistrationId()).thenReturn("stirling-pdf"); + when(relyingPartyRegistration.getAssertingPartyMetadata()) + .thenReturn(assertingPartyMetadata); + when(assertingPartyMetadata.getSingleSignOnServiceLocation()) + .thenReturn("https://example.com/sso"); + tokenStore.put(relayState, token); + + var result = + jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest( + request, response); + + assertNotNull(result); + assertFalse(tokenStore.containsKey(relayState)); + } + + @Test + void removeAuthenticationRequestWithNullRelayState() { + var request = mock(HttpServletRequest.class); + var response = mock(HttpServletResponse.class); + when(request.getParameter("RelayState")).thenReturn(null); + + var result = + jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest( + request, response); + + assertNull(result); + } + + @Test + void removeAuthenticationRequestWithNonExistentToken() { + var request = mock(HttpServletRequest.class); + var response = mock(HttpServletResponse.class); + when(request.getParameter("RelayState")).thenReturn("nonExistentRelayState"); + + var result = + jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest( + request, response); + + assertNull(result); + } + + @Test + void removeAuthenticationRequestWithOnlyRelayState() { + var request = mock(HttpServletRequest.class); + var response = mock(HttpServletResponse.class); + String relayState = "testRelayState"; + + when(request.getParameter("RelayState")).thenReturn(relayState); + + var result = + jwtSaml2AuthenticationRequestRepository.removeAuthenticationRequest( + request, response); + + assertNull(result); + assertFalse(tokenStore.containsKey(relayState)); + } +} diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java new file mode 100644 index 000000000..6f9af4c54 --- /dev/null +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/JwtServiceTest.java @@ -0,0 +1,389 @@ +package stirling.software.proprietary.security.service; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.atLeast; +import static org.mockito.Mockito.contains; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.security.core.Authentication; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +import stirling.software.proprietary.security.model.JwtVerificationKey; +import stirling.software.proprietary.security.model.User; +import stirling.software.proprietary.security.model.exception.AuthenticationFailureException; + +@ExtendWith(MockitoExtension.class) +class JwtServiceTest { + + @Mock private Authentication authentication; + + @Mock private User userDetails; + + @Mock private HttpServletRequest request; + + @Mock private HttpServletResponse response; + + @Mock private KeyPersistenceServiceInterface keystoreService; + + private JwtService jwtService; + private KeyPair testKeyPair; + private JwtVerificationKey testVerificationKey; + + @BeforeEach + void setUp() throws NoSuchAlgorithmException { + // Generate a test keypair + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); + testKeyPair = keyPairGenerator.generateKeyPair(); + + // Create test verification key + String encodedPublicKey = + Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded()); + testVerificationKey = new JwtVerificationKey("test-key-id", encodedPublicKey); + + jwtService = new JwtService(true, keystoreService); + } + + @Test + void testGenerateTokenWithAuthentication() throws Exception { + String username = "testuser"; + + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn(username); + + String token = jwtService.generateToken(authentication, Collections.emptyMap()); + + assertNotNull(token); + assertFalse(token.isEmpty()); + assertEquals(username, jwtService.extractUsername(token)); + } + + @Test + void testGenerateTokenWithUsernameAndClaims() throws Exception { + String username = "testuser"; + Map claims = new HashMap<>(); + claims.put("role", "admin"); + claims.put("department", "IT"); + + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn(username); + + String token = jwtService.generateToken(authentication, claims); + + assertNotNull(token); + assertFalse(token.isEmpty()); + assertEquals(username, jwtService.extractUsername(token)); + + Map extractedClaims = jwtService.extractClaims(token); + assertEquals("admin", extractedClaims.get("role")); + assertEquals("IT", extractedClaims.get("department")); + } + + @Test + void testValidateTokenSuccess() throws Exception { + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn("testuser"); + + String token = jwtService.generateToken(authentication, new HashMap<>()); + + assertDoesNotThrow(() -> jwtService.validateToken(token)); + } + + @Test + void testValidateTokenWithInvalidToken() throws Exception { + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + + assertThrows( + AuthenticationFailureException.class, + () -> { + jwtService.validateToken("invalid-token"); + }); + } + + @Test + void testValidateTokenWithMalformedToken() throws Exception { + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + + AuthenticationFailureException exception = + assertThrows( + AuthenticationFailureException.class, + () -> { + jwtService.validateToken("malformed.token"); + }); + + assertTrue(exception.getMessage().contains("Invalid")); + } + + @Test + void testValidateTokenWithEmptyToken() throws Exception { + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + + AuthenticationFailureException exception = + assertThrows( + AuthenticationFailureException.class, + () -> { + jwtService.validateToken(""); + }); + + assertTrue( + exception.getMessage().contains("Claims are empty") + || exception.getMessage().contains("Invalid")); + } + + @Test + void testExtractUsername() throws Exception { + String username = "testuser"; + User user = mock(User.class); + Map claims = Map.of("sub", "testuser", "authType", "WEB"); + + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(user); + when(user.getUsername()).thenReturn(username); + + String token = jwtService.generateToken(authentication, claims); + + assertEquals(username, jwtService.extractUsername(token)); + } + + @Test + void testExtractUsernameWithInvalidToken() throws Exception { + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + + assertThrows( + AuthenticationFailureException.class, + () -> jwtService.extractUsername("invalid-token")); + } + + @Test + void testExtractClaims() throws Exception { + String username = "testuser"; + Map claims = Map.of("role", "admin", "department", "IT"); + + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn(username); + + String token = jwtService.generateToken(authentication, claims); + Map extractedClaims = jwtService.extractClaims(token); + + assertEquals("admin", extractedClaims.get("role")); + assertEquals("IT", extractedClaims.get("department")); + assertEquals(username, extractedClaims.get("sub")); + assertEquals("Stirling PDF", extractedClaims.get("iss")); + } + + @Test + void testExtractClaimsWithInvalidToken() throws Exception { + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + + assertThrows( + AuthenticationFailureException.class, + () -> jwtService.extractClaims("invalid-token")); + } + + @Test + void testExtractTokenWithCookie() { + String token = "test-token"; + Cookie[] cookies = {new Cookie("stirling_jwt", token)}; + when(request.getCookies()).thenReturn(cookies); + + assertEquals(token, jwtService.extractToken(request)); + } + + @Test + void testExtractTokenWithNoCookies() { + when(request.getCookies()).thenReturn(null); + + assertNull(jwtService.extractToken(request)); + } + + @Test + void testExtractTokenWithWrongCookie() { + Cookie[] cookies = {new Cookie("OTHER_COOKIE", "value")}; + when(request.getCookies()).thenReturn(cookies); + + assertNull(jwtService.extractToken(request)); + } + + @Test + void testExtractTokenWithInvalidAuthorizationHeader() { + when(request.getCookies()).thenReturn(null); + + assertNull(jwtService.extractToken(request)); + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void testAddToken(boolean secureCookie) throws Exception { + String token = "test-token"; + + // Create new JwtService instance with the secureCookie parameter + JwtService testJwtService = createJwtServiceWithSecureCookie(secureCookie); + + testJwtService.addToken(response, token); + + verify(response).addHeader(eq("Set-Cookie"), contains("stirling_jwt=" + token)); + verify(response).addHeader(eq("Set-Cookie"), contains("HttpOnly")); + + if (secureCookie) { + verify(response).addHeader(eq("Set-Cookie"), contains("Secure")); + } + } + + @Test + void testClearToken() { + jwtService.clearToken(response); + + verify(response).addHeader(eq("Set-Cookie"), contains("stirling_jwt=")); + verify(response).addHeader(eq("Set-Cookie"), contains("Max-Age=0")); + } + + @Test + void testGenerateTokenWithKeyId() throws Exception { + String username = "testuser"; + Map claims = new HashMap<>(); + + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn(username); + + String token = jwtService.generateToken(authentication, claims); + + assertNotNull(token); + assertFalse(token.isEmpty()); + // Verify that the keystore service was called + verify(keystoreService).getActiveKey(); + verify(keystoreService).getKeyPair("test-key-id"); + } + + @Test + void testTokenVerificationWithSpecificKeyId() throws Exception { + String username = "testuser"; + Map claims = new HashMap<>(); + + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn(username); + + // Generate token with key ID + String token = jwtService.generateToken(authentication, claims); + + // Mock extraction of key ID and verification (lenient to avoid unused stubbing) + lenient() + .when(keystoreService.getKeyPair("test-key-id")) + .thenReturn(Optional.of(testKeyPair)); + + // Verify token can be validated + assertDoesNotThrow(() -> jwtService.validateToken(token)); + assertEquals(username, jwtService.extractUsername(token)); + } + + @Test + void testTokenVerificationFallsBackToActiveKeyWhenKeyIdNotFound() throws Exception { + String username = "testuser"; + Map claims = new HashMap<>(); + + // First, generate a token successfully + when(keystoreService.getActiveKey()).thenReturn(testVerificationKey); + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.of(testKeyPair)); + when(keystoreService.decodePublicKey(testVerificationKey.getVerifyingKey())) + .thenReturn(testKeyPair.getPublic()); + when(authentication.getPrincipal()).thenReturn(userDetails); + when(userDetails.getUsername()).thenReturn(username); + + String token = jwtService.generateToken(authentication, claims); + + // Now mock the scenario for validation - key not found, but fallback works + // Create a fallback key pair that can be used + JwtVerificationKey fallbackKey = + new JwtVerificationKey( + "fallback-key", + Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded())); + + // Mock the specific key lookup to fail, but the active key should work + when(keystoreService.getKeyPair("test-key-id")).thenReturn(Optional.empty()); + when(keystoreService.refreshActiveKeyPair()).thenReturn(fallbackKey); + when(keystoreService.getKeyPair("fallback-key")).thenReturn(Optional.of(testKeyPair)); + + // Should still work by falling back to the active keypair + assertDoesNotThrow(() -> jwtService.validateToken(token)); + assertEquals(username, jwtService.extractUsername(token)); + + // Verify fallback logic was used + verify(keystoreService, atLeast(1)).getActiveKey(); + } + + private JwtService createJwtServiceWithSecureCookie(boolean secureCookie) throws Exception { + // Use reflection to create JwtService with custom secureCookie value + JwtService testService = new JwtService(true, keystoreService); + + // Set the secureCookie field using reflection + java.lang.reflect.Field secureCookieField = + JwtService.class.getDeclaredField("secureCookie"); + secureCookieField.setAccessible(true); + secureCookieField.set(testService, secureCookie); + + return testService; + } +} diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/KeyPersistenceServiceInterfaceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/KeyPersistenceServiceInterfaceTest.java new file mode 100644 index 000000000..33b971e5a --- /dev/null +++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/KeyPersistenceServiceInterfaceTest.java @@ -0,0 +1,232 @@ +package stirling.software.proprietary.security.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; +import java.util.Optional; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; +import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.cache.CacheManager; +import org.springframework.cache.concurrent.ConcurrentMapCacheManager; + +import stirling.software.common.configuration.InstallationPathConfig; +import stirling.software.common.model.ApplicationProperties; +import stirling.software.proprietary.security.model.JwtVerificationKey; + +@ExtendWith(MockitoExtension.class) +class KeyPersistenceServiceInterfaceTest { + + @Mock private ApplicationProperties applicationProperties; + + @Mock private ApplicationProperties.Security security; + + @Mock private ApplicationProperties.Security.Jwt jwtConfig; + + @TempDir Path tempDir; + + private KeyPersistenceService keyPersistenceService; + private KeyPair testKeyPair; + private CacheManager cacheManager; + + @BeforeEach + void setUp() throws NoSuchAlgorithmException { + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); + testKeyPair = keyPairGenerator.generateKeyPair(); + + cacheManager = new ConcurrentMapCacheManager("verifyingKeys"); + + lenient().when(applicationProperties.getSecurity()).thenReturn(security); + lenient().when(security.getJwt()).thenReturn(jwtConfig); + lenient().when(jwtConfig.isEnableKeystore()).thenReturn(true); // Default value + } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void testKeystoreEnabled(boolean keystoreEnabled) { + when(jwtConfig.isEnableKeystore()).thenReturn(keystoreEnabled); + + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + + assertEquals(keystoreEnabled, keyPersistenceService.isKeystoreEnabled()); + } + } + + @Test + void testGetActiveKeypairWhenNoActiveKeyExists() { + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + keyPersistenceService.initializeKeystore(); + + JwtVerificationKey result = keyPersistenceService.getActiveKey(); + + assertNotNull(result); + assertNotNull(result.getKeyId()); + assertNotNull(result.getVerifyingKey()); + } + } + + @Test + void testGetActiveKeyPairWithExistingKey() throws Exception { + String keyId = "test-key-2024-01-01-120000"; + String publicKeyBase64 = + Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded()); + String privateKeyBase64 = + Base64.getEncoder().encodeToString(testKeyPair.getPrivate().getEncoded()); + + JwtVerificationKey existingKey = new JwtVerificationKey(keyId, publicKeyBase64); + + Path keyFile = tempDir.resolve(keyId + ".key"); + Files.writeString(keyFile, privateKeyBase64); + + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + keyPersistenceService.initializeKeystore(); + + JwtVerificationKey result = keyPersistenceService.getActiveKey(); + + assertNotNull(result); + assertNotNull(result.getKeyId()); + } + } + + @Test + void testGetKeyPair() throws Exception { + String keyId = "test-key-123"; + String publicKeyBase64 = + Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded()); + String privateKeyBase64 = + Base64.getEncoder().encodeToString(testKeyPair.getPrivate().getEncoded()); + + JwtVerificationKey signingKey = new JwtVerificationKey(keyId, publicKeyBase64); + + Path keyFile = tempDir.resolve(keyId + ".key"); + Files.writeString(keyFile, privateKeyBase64); + + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + + keyPersistenceService + .getClass() + .getDeclaredField("verifyingKeyCache") + .setAccessible(true); + var cache = cacheManager.getCache("verifyingKeys"); + cache.put(keyId, signingKey); + + Optional result = keyPersistenceService.getKeyPair(keyId); + + assertTrue(result.isPresent()); + assertNotNull(result.get().getPublic()); + assertNotNull(result.get().getPrivate()); + } + } + + @Test + void testGetKeyPairNotFound() { + String keyId = "non-existent-key"; + + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + + Optional result = keyPersistenceService.getKeyPair(keyId); + + assertFalse(result.isPresent()); + } + } + + @Test + void testGetKeyPairWhenKeystoreDisabled() { + when(jwtConfig.isEnableKeystore()).thenReturn(false); + + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + + Optional result = keyPersistenceService.getKeyPair("any-key"); + + assertFalse(result.isPresent()); + } + } + + @Test + void testInitializeKeystoreCreatesDirectory() throws IOException { + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + keyPersistenceService.initializeKeystore(); + + assertTrue(Files.exists(tempDir)); + assertTrue(Files.isDirectory(tempDir)); + } + } + + @Test + void testLoadExistingKeypairWithMissingPrivateKeyFile() throws Exception { + String keyId = "test-key-missing-file"; + String publicKeyBase64 = + Base64.getEncoder().encodeToString(testKeyPair.getPublic().getEncoded()); + + JwtVerificationKey existingKey = new JwtVerificationKey(keyId, publicKeyBase64); + + try (MockedStatic mockedStatic = + mockStatic(InstallationPathConfig.class)) { + mockedStatic + .when(InstallationPathConfig::getPrivateKeyPath) + .thenReturn(tempDir.toString()); + keyPersistenceService = new KeyPersistenceService(applicationProperties, cacheManager); + keyPersistenceService.initializeKeystore(); + + JwtVerificationKey result = keyPersistenceService.getActiveKey(); + assertNotNull(result); + assertNotNull(result.getKeyId()); + assertNotNull(result.getVerifyingKey()); + } + } +} diff --git a/build.gradle b/build.gradle index ba051f4fd..c2980cb5e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id "org.springframework.boot" version "3.5.4" id "org.springdoc.openapi-gradle-plugin" version "1.9.0" id "io.swagger.swaggerhub" version "1.3.2" - id "edu.sc.seis.launch4j" version "3.0.7" + id "edu.sc.seis.launch4j" version "4.0.0" id "com.diffplug.spotless" version "7.2.1" id "com.github.jk1.dependency-license-report" version "2.9" //id "nebula.lint" version "19.0.3" diff --git a/exampleYmlFiles/test_cicd.yml b/exampleYmlFiles/test_cicd.yml new file mode 100644 index 000000000..086f862d5 --- /dev/null +++ b/exampleYmlFiles/test_cicd.yml @@ -0,0 +1,35 @@ +services: + stirling-pdf: + container_name: Stirling-PDF-Security-Fat-with-login + image: docker.stirlingpdf.com/stirlingtools/stirling-pdf:latest-fat + deploy: + resources: + limits: + memory: 4G + healthcheck: + test: ["CMD-SHELL", "curl -f -H 'X-API-KEY: 123456789' http://localhost:8080/api/v1/info/status | grep -q 'UP'"] + interval: 5s + timeout: 10s + retries: 16 + ports: + - 8080:8080 + volumes: + - ./stirling/latest/data:/usr/share/tessdata:rw + - ./stirling/latest/config:/configs:rw + - ./stirling/latest/logs:/logs:rw + environment: + DISABLE_ADDITIONAL_FEATURES: "false" + SECURITY_ENABLELOGIN: "true" + V2: "false" + PUID: 1002 + PGID: 1002 + UMASK: "022" + SYSTEM_DEFAULTLOCALE: en-US + UI_APPNAME: Stirling-PDF + UI_HOMEDESCRIPTION: Demo site for Stirling-PDF Latest-fat with Security + UI_APPNAMENAVBAR: Stirling-PDF Latest-fat + SYSTEM_MAXFILESIZE: "100" + METRICS_ENABLED: "true" + SYSTEM_GOOGLEVISIBILITY: "true" + SECURITY_CUSTOMGLOBALAPIKEY: "123456789" + restart: on-failure:5 diff --git a/frontend/index.html b/frontend/index.html index c4a808349..31f1b3008 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,5 +1,5 @@ - + diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b2141beb7..877b5c48a 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@playwright/test": "^1.40.0", - "@types/node": "^24.2.0", + "@types/node": "^24.2.1", "@types/react": "^19.1.4", "@types/react-dom": "^19.1.5", "@vitejs/plugin-react": "^4.5.0", @@ -2386,10 +2386,11 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.2.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.0.tgz", - "integrity": "sha512-3xyG3pMCq3oYCNg7/ZP+E1ooTaGB4cG8JWRsqqOYQdbWNY4zbaV0Ennrd7stjiJEFZCaybcIgpTjJWHRfBSIDw==", + "version": "24.2.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.2.1.tgz", + "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==", "dev": true, + "license": "MIT", "dependencies": { "undici-types": "~7.10.0" } diff --git a/frontend/package.json b/frontend/package.json index b59be58e9..8154a9a1c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -65,7 +65,7 @@ }, "devDependencies": { "@playwright/test": "^1.40.0", - "@types/node": "^24.2.0", + "@types/node": "^24.2.1", "@types/react": "^19.1.4", "@types/react-dom": "^19.1.5", "@vitejs/plugin-react": "^4.5.0", diff --git a/frontend/public/locales/ar-AR/translation.json b/frontend/public/locales/ar-AR/translation.json index e6b5b13cb..e2c858a04 100644 --- a/frontend/public/locales/ar-AR/translation.json +++ b/frontend/public/locales/ar-AR/translation.json @@ -347,7 +347,7 @@ "title": "تدوير ملفات", "desc": "قم بتدوير ملفات PDF الخاصة بك بسهولة." }, - "imageToPdf": { + "imageToPDF": { "title": "صورة إلى PDF", "desc": "تحويل الصور (PNG ، JPEG ، GIF) إلى PDF." }, @@ -371,7 +371,7 @@ "title": "تغيير الأذونات", "desc": "قم بتغيير أذونات مستند PDF الخاص بك" }, - "removePages": { + "pageRemover": { "title": "إزالة الصفحات", "desc": "حذف الصفحات غير المرغوب فيها من مستند PDF الخاص بك." }, @@ -383,7 +383,7 @@ "title": "إزالة كلمة المرور", "desc": "إزالة الحماية بكلمة مرور من مستند PDF الخاص بك." }, - "compressPdfs": { + "compress": { "title": "ضغط ملفات", "desc": "ضغط ملفات PDF لتقليل حجم الملف." }, @@ -479,7 +479,7 @@ "title": "خط الأنابيب", "desc": "تشغيل إجراءات متعددة على ملفات PDF عن طريق تحديد نصوص خط الأنابيب" }, - "add-page-numbers": { + "addPageNumbers": { "title": "إضافة أرقام الصفحات", "desc": "إضافة أرقام الصفحات في جميع أنحاء المستند في موقع محدد" }, @@ -487,7 +487,7 @@ "title": "إعادة تسمية ملف PDF تلقائيًا", "desc": "إعادة تسمية ملف PDF تلقائيًا بناءً على الرأس المكتشف" }, - "adjust-contrast": { + "adjustContrast": { "title": "ضبط الألوان/التباين", "desc": "ضبط التباين والتشبع والسطوع لملف PDF" }, @@ -499,7 +499,7 @@ "title": "تقسيم الصفحات تلقائيًا", "desc": "تقسيم PDF الممسوح ضوئيًا تلقائيًا باستخدام رمز QR لتقسيم الصفحات الممسوحة ضوئيًا فعليًا" }, - "sanitizePdf": { + "sanitizePDF": { "title": "تنظيف", "desc": "إزالة البرامج النصية والعناصر الأخرى من ملفات PDF" }, @@ -523,11 +523,11 @@ "title": "الحصول على جميع المعلومات عن PDF", "desc": "يجمع أي وكل المعلومات الممكنة عن ملفات PDF" }, - "extractPage": { + "pageExtracter": { "title": "استخراج الصفحة (الصفحات)", "desc": "يستخرج صفحات محددة من PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF إلى صفحة واحدة كبيرة", "desc": "يدمج جميع صفحات PDF في صفحة واحدة كبيرة" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF إلى CSV", "desc": "يستخرج الجداول من PDF ويحولها إلى CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "تقسيم تلقائي حسب الحجم/العدد", "desc": "تقسيم ملف PDF واحد إلى مستندات متعددة بناءً على الحجم أو عدد الصفحات أو عدد المستندات" }, @@ -563,11 +563,11 @@ "title": "إضافة ختم إلى PDF", "desc": "إضافة نص أو إضافة أختام الصور في مواقع محددة" }, - "removeImagePdf": { + "removeImage": { "title": "إزالة الصورة", "desc": "إزالة الصورة من PDF لتقليل حجم الملف" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "تجزئة المستندات PDF حسب الفصول", "desc": "قسم مستند PDF إلى ملفات متعددة بناءً على هيكل فصوله." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "إستبدال و عكس الألوان", "desc": "استبدال الألوان للنصوص والخلفيات في المستندات PDF وإلغاء تعكير اللون الكامل للمستند لتقليل حجم الملف" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/az-AZ/translation.json b/frontend/public/locales/az-AZ/translation.json index 28daecd5c..7a13b1489 100644 --- a/frontend/public/locales/az-AZ/translation.json +++ b/frontend/public/locales/az-AZ/translation.json @@ -347,7 +347,7 @@ "title": "Çevir", "desc": "PDF-lərinizi asanlıqla çevirin." }, - "imageToPdf": { + "imageToPDF": { "title": "Şəkildən PDF-ə", "desc": "Şəkli (PNG, JPEG, GIF) PDF-ə Çevir." }, @@ -371,7 +371,7 @@ "title": "İcazəni Dəyiş", "desc": "PDF Sənədinin icazələrini dəyiş" }, - "removePages": { + "pageRemover": { "title": "Sil", "desc": "PDF Sənədindən istəmədiyin şəkilləri sil." }, @@ -383,7 +383,7 @@ "title": "Şifri Sil", "desc": "PDF Sənədindən şifr qorumasını götür." }, - "compressPdfs": { + "compress": { "title": "Sıx", "desc": "PDF fayllarını sıxaraq onların ölçüsünü azalt." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Pipeline Skriptləri təyin edərək PDF-lər üzərində bir neçə prosesi eyni vaxtda reallaşdırın." }, - "add-page-numbers": { + "addPageNumbers": { "title": "Səhifələri Nömrələ", "desc": "Sənədin səhifələrinə təyin edilmiş yerdə nömrələr əlavə edin" }, @@ -487,7 +487,7 @@ "title": "PDF Faylını Avtomatik Yenidən Adlandır", "desc": "Tapılmış başlığa əsasən PDF faylının adını dəyişir" }, - "adjust-contrast": { + "adjustContrast": { "title": "Rəngləri/Kontrastı Tənzimlə", "desc": "PDF-in kontrastını, parlaqlığını, rəng doyğunluğunu tənzimlə" }, @@ -499,7 +499,7 @@ "title": "Səhifələri Avtomatik Ayır", "desc": "Fiziki skan olunmuş səhifələri QR koda əsasən ayır" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Təmizlə", "desc": "Skriptləri və digər elementləri PDF faylından sil" }, @@ -523,11 +523,11 @@ "title": "PDF-in Bütün Məlumatları", "desc": "PDF barədə mümkün olan bütün məlumatları əldə edir" }, - "extractPage": { + "pageExtracter": { "title": "Səhifə(lər)i xaric et", "desc": "Seçilmiş səhifələri PDF-dən xaric edərək əldə et" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF-dən 1 Böyük Səhifəyə", "desc": "Bütün PDF səhifələrini bir böyük səhifəyə çevirir" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF-dən CSV-ə", "desc": "PDF-dən cədvəlləri CSV-ə çevirərək xaric edir" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Say/Ölçüyə Əsasən Avtomatik Ayır", "desc": "PDF-i ölçüyə, səhifə sayına və ya sənəd sayına əsasən bir neçə PDF-ə ayır." }, @@ -563,11 +563,11 @@ "title": "PDF-i Möhürlə", "desc": "Təyin edilmiş hissələrə mətn və ya şəkil möhürləri əlavə edin" }, - "removeImagePdf": { + "removeImage": { "title": "Şəkli Sil", "desc": "Fayl ölçüsünü azaltmaq üçün PDF-dən şəkil sil" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "PDF-i Fəsillərə Əsasən Böl", "desc": "Fəsil strukturuna əsasən PDF-i bir neçə fayla böl." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Qabaqcıl Rəng Seçimləri", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/bg-BG/translation.json b/frontend/public/locales/bg-BG/translation.json index 17f6a0639..70c2f909f 100644 --- a/frontend/public/locales/bg-BG/translation.json +++ b/frontend/public/locales/bg-BG/translation.json @@ -347,7 +347,7 @@ "title": "Завъртане", "desc": "Лесно завъртете вашите PDF файлове." }, - "imageToPdf": { + "imageToPDF": { "title": "Изображение към PDF", "desc": "Преобразуване на изображение (PNG, JPEG, GIF) към PDF." }, @@ -371,7 +371,7 @@ "title": "Промяна на правата", "desc": "Променете правата на вашия PDF документ" }, - "removePages": { + "pageRemover": { "title": "Премахване", "desc": "Изтрийте нежеланите страници от вашия PDF документ." }, @@ -383,7 +383,7 @@ "title": "Премахване на парола", "desc": "Премахнете защитата с парола от вашия PDF документ." }, - "compressPdfs": { + "compress": { "title": "Компресиране", "desc": "Компресирайте PDF файлове, за да намалите размера на файла." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Разширено)", "desc": "Изпълнявайте множество действия върху PDF файлове чрез дефиниране на конвейерни скриптове" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Добавяне на номера на страници", "desc": "Добавете номера на страници в документ на определено място" }, @@ -487,7 +487,7 @@ "title": "Автоматично преименуване на PDF файл", "desc": "Автоматично преименува PDF файл въз основа на откритата му заглавка" }, - "adjust-contrast": { + "adjustContrast": { "title": "Коригиране на цветове/контраст", "desc": "Коригиране на контраста, наситеността и яркостта на PDF" }, @@ -499,7 +499,7 @@ "title": "Автоматично разделяне на страници", "desc": "Автоматично разделяне на сканиран PDF файл с QR код за разделяне на физически сканирани страници" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Обеззаразяване", "desc": "Премахване на скриптове и други елементи от PDF файлове" }, @@ -523,11 +523,11 @@ "title": "Вземете ЦЯЛАТА информация от PDF", "desc": "Взима всяка възможна информация от PDF файлове" }, - "extractPage": { + "pageExtracter": { "title": "Извличане на страница(и)", "desc": "Извлича избрани страници от PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF към една голяма страница", "desc": "Обединява всички PDF страници в една голяма страница" }, @@ -543,11 +543,11 @@ "title": "Ръчно редактиране", "desc": "Редактиране на PDF файл въз основа на избран текст, нарисувани форми и/или избрана страница(и)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF към CSV", "desc": "Извлича таблици от PDF, като ги конвертира в CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Автоматично разделяне по размер/брой", "desc": "Разделете един PDF на множество документи въз основа на размер, брой страници или брой документи" }, @@ -563,11 +563,11 @@ "title": "Добавяне на печат към PDF", "desc": "Добавете текст или добавете печати с изображения на определени места" }, - "removeImagePdf": { + "removeImage": { "title": "Премахване на изображение", "desc": "Премахнете изображението от PDF, за да намалите размера на файла" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Разделете PDF по глави", "desc": "Разделете PDF на множество файлове въз основа на неговата структура на глави." }, @@ -575,7 +575,7 @@ "title": "Валидиране на PDF подпис", "desc": "Проверка на цифрови подписи и сертификати в PDF документи" }, - "replaceColorPdf": { + "replace-color": { "title": "Замяна и обръщане на цвят", "desc": "Заменете цвета на текста и фона в PDF и обърнете пълния цвят на PDF, за да намалите размера на файла" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ca-CA/translation.json b/frontend/public/locales/ca-CA/translation.json index da8236b95..aa539e795 100644 --- a/frontend/public/locales/ca-CA/translation.json +++ b/frontend/public/locales/ca-CA/translation.json @@ -347,7 +347,7 @@ "title": "Rota", "desc": "Rota els PDFs." }, - "imageToPdf": { + "imageToPDF": { "title": "Imatge a PDF", "desc": "Converteix imatge (PNG, JPEG, GIF) a PDF." }, @@ -371,7 +371,7 @@ "title": "Canvia permisos", "desc": "Canvia els permisos del document PDF" }, - "removePages": { + "pageRemover": { "title": "Elimina", "desc": "Elimina pàgines del document PDF." }, @@ -383,7 +383,7 @@ "title": "Elimina Contrasenya", "desc": "Elimina la contrasenya del document PDF." }, - "compressPdfs": { + "compress": { "title": "Comprimeix", "desc": "Comprimeix PDFs per reduir-ne la mida." }, @@ -479,7 +479,7 @@ "title": "Procés", "desc": "Executa múltiples accions en PDFs definint scripts de procés" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Afegir Números de Pàgina", "desc": "Afegir números de pàgina en una localització" }, @@ -487,7 +487,7 @@ "title": "Canvia Automàticament el Nom del Fitxer PDF", "desc": "Canvia automàticament el nom d'un fitxer PDF en funció de la capçalera detectada" }, - "adjust-contrast": { + "adjustContrast": { "title": "Ajusta Colors/Contrast", "desc": "Ajusta colors/contrast, saturació i brillantor" }, @@ -499,7 +499,7 @@ "title": "Divisió Automàtica de Pàgines", "desc": "Divideix automàticament un PDF escanejat amb un codi QR de separació de pàgines escanejades" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Neteja", "desc": "Elimina scripts i altres elements dels fitxers PDF" }, @@ -523,11 +523,11 @@ "title": "Obteniu Tota la Informació sobre el PDF", "desc": "Recupera tota la informació possible sobre els PDFs" }, - "extractPage": { + "pageExtracter": { "title": "Extreu pàgina(es)", "desc": "Extreu pàgines seleccionades d'un PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF a Una Sola Pàgina Gran", "desc": "Fusiona totes les pàgines d'un PDF en una sola pàgina gran" }, @@ -543,11 +543,11 @@ "title": "Redacció manual", "desc": "Redacta un PDF segons el text seleccionat, les formes dibuixades i/o les pàgines seleccionades" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF a CSV", "desc": "Extreu taules d'un PDF convertint-les a CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Divisió Automàtica per Mida/Quantitat", "desc": "Divideix un únic PDF en múltiples documents basant-se en la mida, el nombre de pàgines o el nombre de documents" }, @@ -563,11 +563,11 @@ "title": "Afegeix segell al PDF", "desc": "Afegeix segells de text o imatge en ubicacions establertes" }, - "removeImagePdf": { + "removeImage": { "title": "Elimina imatge", "desc": "Elimina imatges d'un PDF per reduir la mida del fitxer" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Divideix PDF per Capítols", "desc": "Divideix un PDF en múltiples fitxers segons la seva estructura de capítols." }, @@ -575,7 +575,7 @@ "title": "Validar Signatura PDF", "desc": "Verifica les signatures digitals i els certificats en documents PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Reemplaça i Inverteix Color", "desc": "Reemplaça el color del text i el fons en un PDF i inverteix tot el color del PDF per reduir la mida del fitxer" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/cs-CZ/translation.json b/frontend/public/locales/cs-CZ/translation.json index 799b422e6..6714eba64 100644 --- a/frontend/public/locales/cs-CZ/translation.json +++ b/frontend/public/locales/cs-CZ/translation.json @@ -347,7 +347,7 @@ "title": "Otočit", "desc": "Snadno otočit vaše PDF." }, - "imageToPdf": { + "imageToPDF": { "title": "Obrázek na PDF", "desc": "Převést obrázek (PNG, JPEG, GIF) na PDF." }, @@ -371,7 +371,7 @@ "title": "Změnit oprávnění", "desc": "Změnit oprávnění vašeho PDF dokumentu" }, - "removePages": { + "pageRemover": { "title": "Odstranit", "desc": "Smazat nežádoucí stránky z vašeho PDF dokumentu." }, @@ -383,7 +383,7 @@ "title": "Odstranit heslo", "desc": "Odstranit ochranu heslem z vašeho PDF dokumentu." }, - "compressPdfs": { + "compress": { "title": "Komprimovat", "desc": "Komprimovat PDF pro zmenšení jejich velikosti." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Spustit více akcí na PDF definováním pipeline skriptů" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Přidat čísla stránek", "desc": "Přidat čísla stránek v celém dokumentu na určeném místě" }, @@ -487,7 +487,7 @@ "title": "Automaticky přejmenovat PDF soubor", "desc": "Automaticky přejmenuje PDF soubor podle detekované hlavičky" }, - "adjust-contrast": { + "adjustContrast": { "title": "Upravit barvy/kontrast", "desc": "Upravit kontrast, sytost a jas PDF" }, @@ -499,7 +499,7 @@ "title": "Automaticky rozdělit stránky", "desc": "Automaticky rozdělit naskenované PDF s fyzickým QR kódem pro rozdělení stránek" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanitizovat", "desc": "Odstranit skripty a další prvky z PDF souborů" }, @@ -523,11 +523,11 @@ "title": "Získat VŠECHNY informace o PDF", "desc": "Získá všechny možné informace o PDF" }, - "extractPage": { + "pageExtracter": { "title": "Extrahovat stránky", "desc": "Extrahuje vybrané stránky z PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Jedna velká stránka", "desc": "Sloučí všechny stránky PDF do jedné velké stránky" }, @@ -543,11 +543,11 @@ "title": "Ruční začernění", "desc": "Začerní PDF na základě vybraného textu, nakreslených tvarů a/nebo vybraných stránek" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF na CSV", "desc": "Extrahuje tabulky z PDF a převádí je na CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Automaticky rozdělit podle velikosti/počtu", "desc": "Rozdělí jeden PDF na více dokumentů podle velikosti, počtu stránek nebo počtu dokumentů" }, @@ -563,11 +563,11 @@ "title": "Přidat razítko do PDF", "desc": "Přidá textová nebo obrázkové razítka na určená místa" }, - "removeImagePdf": { + "removeImage": { "title": "Odstranit obrázek", "desc": "Odstranit obrázek z PDF pro zmenšení velikosti souboru" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Rozdělit PDF podle kapitol", "desc": "Rozdělí PDF do více souborů podle jeho struktury kapitol." }, @@ -575,7 +575,7 @@ "title": "Ověřit podpis PDF", "desc": "Ověřit digitální podpisy a certifikáty v PDF dokumentech" }, - "replaceColorPdf": { + "replace-color": { "title": "Nahrazení a inverze barev", "desc": "Úprava barev textu a pozadí v PDF nebo jejich inverze ke snížení velikosti souboru" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/da-DK/translation.json b/frontend/public/locales/da-DK/translation.json index 668a3f56f..8ddfe3383 100644 --- a/frontend/public/locales/da-DK/translation.json +++ b/frontend/public/locales/da-DK/translation.json @@ -347,7 +347,7 @@ "title": "Rotér", "desc": "Rotér nemt dine PDF'er." }, - "imageToPdf": { + "imageToPDF": { "title": "Billede til PDF", "desc": "Konvertér et billede (PNG, JPEG, GIF) til PDF." }, @@ -371,7 +371,7 @@ "title": "Ændre Tilladelser", "desc": "Ændre tilladelserne for dit PDF-dokument" }, - "removePages": { + "pageRemover": { "title": "Fjern", "desc": "Slet uønskede sider fra dit PDF-dokument." }, @@ -383,7 +383,7 @@ "title": "Fjern Adgangskode", "desc": "Fjern adgangskodebeskyttelse fra dit PDF-dokument." }, - "compressPdfs": { + "compress": { "title": "Komprimer", "desc": "Komprimer PDF'er for at reducere deres filstørrelse." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Avanceret)", "desc": "Kør flere handlinger på PDF'er ved at definere pipeline-scripts" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Tilføj Sidenumre", "desc": "Tilføj Sidenumre gennem hele dokumentet på et bestemt sted" }, @@ -487,7 +487,7 @@ "title": "Auto Omdøb PDF-fil", "desc": "Auto omdøber en PDF-fil baseret på dens detekterede overskrift" }, - "adjust-contrast": { + "adjustContrast": { "title": "Justér Farver/Kontrast", "desc": "Justér Kontrast, Mætning og Lysstyrke af en PDF" }, @@ -499,7 +499,7 @@ "title": "Auto Opdel Sider", "desc": "Auto Opdel Scannede PDF'er med fysisk scannet side-splitter QR-kode" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Rens", "desc": "Fjern scripts og andre elementer fra PDF-filer" }, @@ -523,11 +523,11 @@ "title": "Få ALLE Oplysninger om PDF", "desc": "Henter alle mulige oplysninger om PDF'er" }, - "extractPage": { + "pageExtracter": { "title": "Udtræk side(r)", "desc": "Udtrækker udvalgte sider fra PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF til Enkelt Stor Side", "desc": "Fletter alle PDF-sider til én stor enkelt side" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF til CSV", "desc": "Udtrækker Tabeller fra en PDF og konverterer dem til CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto Opdel efter Størrelse/Antal", "desc": "Opdel en enkelt PDF i flere dokumenter baseret på størrelse, sideantal eller dokumentantal" }, @@ -563,11 +563,11 @@ "title": "Tilføj Stempel til PDF", "desc": "Tilføj tekst eller tilføj billedstempel på bestemte placeringer" }, - "removeImagePdf": { + "removeImage": { "title": "Fjern billede", "desc": "Fjern billede fra PDF for at reducere filstørrelse" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Partitioner PDF efter kapitler", "desc": "Partitioner en PDF i flere filer baseret på dens kapitelstruktur." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Erstatt farve for tekst og baggrund i en PDF og omgivende farve til fuld farve af PDF for at redusere filstørrelsen." } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/de-DE/translation.json b/frontend/public/locales/de-DE/translation.json index c5127bd14..76d349084 100644 --- a/frontend/public/locales/de-DE/translation.json +++ b/frontend/public/locales/de-DE/translation.json @@ -347,7 +347,7 @@ "title": "Drehen", "desc": "Drehen Sie Ihre PDFs ganz einfach" }, - "imageToPdf": { + "imageToPDF": { "title": "Bild zu PDF", "desc": "Konvertieren Sie ein Bild (PNG, JPEG, GIF) in ein PDF" }, @@ -371,7 +371,7 @@ "title": "Berechtigungen ändern", "desc": "Die Berechtigungen für Ihr PDF-Dokument verändern" }, - "removePages": { + "pageRemover": { "title": "Entfernen", "desc": "Ungewollte Seiten aus dem PDF entfernen" }, @@ -383,7 +383,7 @@ "title": "Passwort entfernen", "desc": "Den Passwortschutz eines PDFs entfernen" }, - "compressPdfs": { + "compress": { "title": "Komprimieren", "desc": "PDF komprimieren um die Dateigröße zu reduzieren" }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Mehrere Aktionen auf ein PDF anwenden, definiert durch ein Pipeline Skript" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Seitenzahlen hinzufügen", "desc": "Hinzufügen von Seitenzahlen an einer bestimmten Stelle" }, @@ -487,7 +487,7 @@ "title": "PDF automatisch umbenennen", "desc": "PDF-Datei anhand von erkannten Kopfzeilen umbenennen" }, - "adjust-contrast": { + "adjustContrast": { "title": "Farben/Kontrast anpassen", "desc": "Kontrast, Sättigung und Helligkeit einer PDF anpassen" }, @@ -499,7 +499,7 @@ "title": "PDF automatisch teilen", "desc": "Physisch gescannte PDF anhand von Splitter-Seiten und QR-Codes aufteilen" }, - "sanitizePdf": { + "sanitizePDF": { "title": "PDF Bereinigen", "desc": "Entfernen von Skripten und anderen Elementen aus PDF-Dateien" }, @@ -523,11 +523,11 @@ "title": "Alle Informationen anzeigen", "desc": "Erfasst alle möglichen Informationen in einer PDF" }, - "extractPage": { + "pageExtracter": { "title": "Seite(n) extrahieren", "desc": "Extrahiert ausgewählte Seiten aus einer PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF zu einer Seite zusammenfassen", "desc": "Fügt alle PDF-Seiten zu einer einzigen großen Seite zusammen" }, @@ -543,11 +543,11 @@ "title": "Manuell zensieren/schwärzen", "desc": "Zensiere (Schwärze) eine PDF-Datei durch Auswählen von Text, gezeichneten Formen und/oder ausgewählten Seite(n)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "Tabelle extrahieren", "desc": "Tabelle aus PDF in CSV extrahieren" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Teilen nach Größe/Anzahl", "desc": "Teilen Sie ein einzelnes PDF basierend auf Größe, Seitenanzahl oder Dokumentanzahl in mehrere Dokumente auf" }, @@ -563,11 +563,11 @@ "title": "Stempel zu PDF hinzufügen", "desc": "Fügen Sie an festgelegten Stellen Text oder Bildstempel hinzu" }, - "removeImagePdf": { + "removeImage": { "title": "Bild entfernen", "desc": "Bild aus PDF entfernen, um die Dateigröße zu verringern" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "PDF-Datei nach Kapiteln aufteilen", "desc": "Aufteilung einer PDF-Datei in mehrere Dateien auf Basis der Kapitelstruktur." }, @@ -575,7 +575,7 @@ "title": "PDF-Signatur überprüfen", "desc": "Digitale Signaturen und Zertifikate in PDF-Dokumenten überprüfen" }, - "replaceColorPdf": { + "replace-color": { "title": "Farbe ersetzen und invertieren", "desc": "Ersetzen Sie die Farbe des Texts und Hintergrund der PDF-Datei und invertieren Sie die komplette Farbe der PDF-Datei, um die Dateigröße zu reduzieren" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/el-GR/translation.json b/frontend/public/locales/el-GR/translation.json index e4a7d1954..74536559d 100644 --- a/frontend/public/locales/el-GR/translation.json +++ b/frontend/public/locales/el-GR/translation.json @@ -347,7 +347,7 @@ "title": "Περιστροφή", "desc": "Εύκολη περιστροφή των PDF σας." }, - "imageToPdf": { + "imageToPDF": { "title": "Εικόνα σε PDF", "desc": "Μετατροπή εικόνας (PNG, JPEG, GIF) σε PDF." }, @@ -371,7 +371,7 @@ "title": "Αλλαγή δικαιωμάτων", "desc": "Αλλαγή των δικαιωμάτων του εγγράφου PDF" }, - "removePages": { + "pageRemover": { "title": "Αφαίρεση", "desc": "Διαγραφή ανεπιθύμητων σελίδων από το έγγραφο PDF." }, @@ -383,7 +383,7 @@ "title": "Αφαίρεση κωδικού", "desc": "Αφαίρεση προστασίας κωδικού από το έγγραφο PDF." }, - "compressPdfs": { + "compress": { "title": "Συμπίεση", "desc": "Συμπίεση PDF για μείωση του μεγέθους αρχείου." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Εκτέλεση πολλαπλών ενεργειών σε PDF ορίζοντας scripts pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Προσθήκη αριθμών σελίδων", "desc": "Προσθήκη αριθμών σελίδων σε όλο το έγγραφο σε συγκεκριμένη θέση" }, @@ -487,7 +487,7 @@ "title": "Αυτόματη μετονομασία αρχείου PDF", "desc": "Αυτόματη μετονομασία ενός PDF με βάση την ανιχνευμένη κεφαλίδα" }, - "adjust-contrast": { + "adjustContrast": { "title": "Προσαρμογή χρωμάτων/αντίθεσης", "desc": "Προσαρμογή αντίθεσης, κορεσμού και φωτεινότητας ενός PDF" }, @@ -499,7 +499,7 @@ "title": "Αυτόματος διαχωρισμός σελίδων", "desc": "Αυτόματος διαχωρισμός σαρωμένου PDF με φυσικό σαρωμένο διαχωριστή σελίδων QR Code" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Εξυγίανση", "desc": "Αφαίρεση scripts και άλλων στοιχείων από αρχεία PDF" }, @@ -523,11 +523,11 @@ "title": "Λήψη ΟΛΩΝ των πληροφοριών του PDF", "desc": "Λήψη όλων των δυνατών πληροφοριών για τα PDF" }, - "extractPage": { + "pageExtracter": { "title": "Εξαγωγή σελίδας(ων)", "desc": "Εξαγωγή επιλεγμένων σελίδων από PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Ενιαία μεγάλη σελίδα", "desc": "Συγχώνευση όλων των σελίδων PDF σε μία μεγάλη σελίδα" }, @@ -543,11 +543,11 @@ "title": "Χειροκίνητη απόκρυψη", "desc": "Απόκρυψη σε PDF βάσει επιλεγμένου κειμένου, σχεδιασμένων σχημάτων και/ή επιλεγμένων σελίδων" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF σε CSV", "desc": "Εξαγωγή πινάκων από PDF και μετατροπή σε CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Αυτόματος διαχωρισμός ανά μέγεθος/πλήθος", "desc": "Διαχωρισμός ενός PDF σε πολλαπλά έγγραφα βάσει μεγέθους, αριθμού σελίδων ή αριθμού εγγράφων" }, @@ -563,11 +563,11 @@ "title": "Προσθήκη σφραγίδας σε PDF", "desc": "Προσθήκη κειμένου ή εικόνων σφραγίδας σε καθορισμένες θέσεις" }, - "removeImagePdf": { + "removeImage": { "title": "Αφαίρεση εικόνας", "desc": "Αφαίρεση εικόνας από PDF για μείωση μεγέθους αρχείου" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Διαχωρισμός PDF ανά κεφάλαια", "desc": "Διαχωρισμός ενός PDF σε πολλαπλά αρχεία βάσει της δομής κεφαλαίων." }, @@ -575,7 +575,7 @@ "title": "Επικύρωση υπογραφής PDF", "desc": "Επαλήθευση ψηφιακών υπογραφών και πιστοποιητικών σε έγγραφα PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Αντικατάσταση και αναστροφή χρώματος", "desc": "Αντικατάσταση χρώματος για κείμενο και φόντο σε PDF και αναστροφή πλήρους χρώματος για μείωση μεγέθους αρχείου" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/en-GB/translation.json b/frontend/public/locales/en-GB/translation.json index 81cdb73d6..eedfe350c 100644 --- a/frontend/public/locales/en-GB/translation.json +++ b/frontend/public/locales/en-GB/translation.json @@ -72,6 +72,9 @@ "githubSubmit": "GitHub - Submit a ticket", "discordSubmit": "Discord - Submit Support post" }, + "warning": { + "tooltipTitle": "Warning" + }, "delete": "Delete", "username": "Username", "password": "Password", @@ -352,7 +355,7 @@ "title": "Convert", "desc": "Convert files between different formats" }, - "imageToPdf": { + "imageToPDF": { "title": "Image to PDF", "desc": "Convert a image (PNG, JPEG, GIF) to PDF." }, @@ -380,26 +383,18 @@ "title": "Change Permissions", "desc": "Change the permissions of your PDF document" }, - "removePages": { + "pageRemover": { "title": "Remove", "desc": "Delete unwanted pages from your PDF document." }, - "addPassword": { - "title": "Add Password", - "desc": "Encrypt your PDF document with a password." - }, "removePassword": { "title": "Remove Password", "desc": "Remove password protection from your PDF document." }, - "compressPdfs": { + "compress": { "title": "Compress", "desc": "Compress PDFs to reduce their file size." }, - "sanitize": { - "title": "Sanitise", - "desc": "Remove potentially harmful elements from PDF files." - }, "unlockPDFForms": { "title": "Unlock PDF Forms", "desc": "Remove read-only property of form fields in a PDF document." @@ -492,7 +487,7 @@ "title": "Pipeline", "desc": "Run multiple actions on PDFs by defining pipeline scripts" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Add Page Numbers", "desc": "Add Page numbers throughout a document in a set location" }, @@ -500,7 +495,7 @@ "title": "Auto Rename PDF File", "desc": "Auto renames a PDF file based on its detected header" }, - "adjust-contrast": { + "adjustContrast": { "title": "Adjust Colours/Contrast", "desc": "Adjust Contrast, Saturation and Brightness of a PDF" }, @@ -536,11 +531,11 @@ "title": "Get ALL Info on PDF", "desc": "Grabs any and all information possible on PDFs" }, - "extractPage": { + "pageExtracter": { "title": "Extract page(s)", "desc": "Extracts select pages from PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF to Single Large Page", "desc": "Merges all PDF pages into one large single page" }, @@ -556,11 +551,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF to CSV", "desc": "Extracts Tables from a PDF converting it to CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto Split by Size/Count", "desc": "Split a single PDF into multiple documents based on size, page count, or document count" }, @@ -576,11 +571,11 @@ "title": "Add Stamp to PDF", "desc": "Add text or add image stamps at set locations" }, - "removeImagePdf": { + "removeImage": { "title": "Remove image", "desc": "Remove image from PDF to reduce file size" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -592,7 +587,7 @@ "title": "API Documentation", "desc": "View API documentation and test endpoints" }, - "replaceColorPdf": { + "replace-color": { "title": "Advanced Colour options", "desc": "Replace colour for text and background in PDF and invert full colour of pdf to reduce file size" }, @@ -857,30 +852,6 @@ "removePages": { "tags": "Remove pages,delete pages" }, - "addPassword": { - "tags": "secure,security", - "title": "Add Password", - "header": "Add password (Encrypt)", - "selectText": { - "1": "Select PDF to encrypt", - "2": "User Password", - "3": "Encryption Key Length", - "4": "Higher values are stronger, but lower values have better compatibility.", - "5": "Permissions to set (Recommended to be used along with Owner password)", - "6": "Prevent assembly of document", - "7": "Prevent content extraction", - "8": "Prevent extraction for accessibility", - "9": "Prevent filling in form", - "10": "Prevent modification", - "11": "Prevent annotation modification", - "12": "Prevent printing", - "13": "Prevent printing different formats", - "14": "Owner Password", - "15": "Restricts what can be done with the document once it is opened (Not supported by all readers)", - "16": "Restricts the opening of the document itself" - }, - "submit": "Encrypt" - }, "removePassword": { "tags": "secure,Decrypt,security,unpassword,delete password", "title": "Remove password", @@ -1833,6 +1804,8 @@ "approximateSize": "Approximate size" }, "sanitize": { + "title": "Sanitise", + "desc": "Remove potentially harmful elements from PDF files.", "submit": "Sanitise PDF", "completed": "Sanitisation completed successfully", "error.generic": "Sanitisation failed", @@ -1863,5 +1836,109 @@ "removeFonts": "Remove Fonts", "removeFonts.desc": "Remove embedded fonts from the PDF" } + }, + "addPassword": { + "title": "Add Password", + "desc": "Encrypt your PDF document with a password.", + "completed": "Password protection applied", + "submit": "Encrypt", + "filenamePrefix": "encrypted", + "error": { + "failed": "An error occurred while encrypting the PDF." + }, + "title": "Passwords & Encryption", + "passwords": { + "completed": "Passwords configured", + "user": { + "label": "User Password", + "placeholder": "Enter user password" + }, + "owner": { + "label": "Owner Password", + "placeholder": "Enter owner password" + } + }, + "encryption": { + "keyLength": { + "label": "Encryption Key Length", + "40bit": "40-bit (Low)", + "128bit": "128-bit (Standard)", + "256bit": "256-bit (High)" + } + }, + "results": { + "title": "Encrypted PDFs" + }, + "tooltip": { + "header": { + "title": "Password Protection Overview" + }, + "passwords": { + "title": "Password Types", + "text": "User passwords restrict opening the document, while owner passwords control what can be done with the document once opened. You can set both or just one.", + "bullet1": "User Password: Required to open the PDF", + "bullet2": "Owner Password: Controls document permissions (not supported by all PDF viewers)" + }, + "encryption": { + "title": "Encryption Levels", + "text": "Higher encryption levels provide better security but may not be supported by older PDF viewers.", + "bullet1": "40-bit: Basic security, compatible with older viewers", + "bullet2": "128-bit: Standard security, widely supported", + "bullet3": "256-bit: Maximum security, requires modern viewers" + }, + "permissions": { + "text": "These permissions control what users can do with the PDF. Most effective when combined with an owner password." + } + } + }, + "changePermissions": { + "title": "Change Permissions", + "desc": "Change document restrictions and permissions.", + "completed": "Permissions changed", + "submit": "Change Permissions", + "title": "Document Permissions", + "error": { + "failed": "An error occurred while changing PDF permissions." + }, + "permissions": { + "preventAssembly": { + "label": "Prevent assembly of document" + }, + "preventExtractContent": { + "label": "Prevent content extraction" + }, + "preventExtractForAccessibility": { + "label": "Prevent extraction for accessibility" + }, + "preventFillInForm": { + "label": "Prevent filling in form" + }, + "preventModify": { + "label": "Prevent modification" + }, + "preventModifyAnnotations": { + "label": "Prevent annotation modification" + }, + "preventPrinting": { + "label": "Prevent printing" + }, + "preventPrintingFaithful": { + "label": "Prevent printing different formats" + } + }, + "results": { + "title": "Modified PDFs" + }, + "tooltip": { + "header": { + "title": "Change Permissions" + }, + "description": { + "text": "Changes document permissions, allowing/disallowing access to different features in PDF readers." + }, + "warning": { + "text": "To make these permissions unchangeable, use the Add Password tool to set an owner password." + } + } } } diff --git a/frontend/public/locales/en-US/translation.json b/frontend/public/locales/en-US/translation.json index 6ca67480b..944a1df22 100644 --- a/frontend/public/locales/en-US/translation.json +++ b/frontend/public/locales/en-US/translation.json @@ -72,6 +72,9 @@ "githubSubmit": "GitHub - Submit a ticket", "discordSubmit": "Discord - Submit Support post" }, + "warning": { + "tooltipTitle": "Warning" + }, "delete": "Delete", "username": "Username", "password": "Password", @@ -348,7 +351,7 @@ "title": "Rotate", "desc": "Easily rotate your PDFs." }, - "imageToPdf": { + "imageToPDF": { "title": "Image to PDF", "desc": "Convert a image (PNG, JPEG, GIF) to PDF." }, @@ -372,7 +375,7 @@ "title": "Change Permissions", "desc": "Change the permissions of your PDF document" }, - "removePages": { + "pageRemover": { "title": "Remove", "desc": "Delete unwanted pages from your PDF document." }, @@ -380,11 +383,15 @@ "title": "Add Password", "desc": "Encrypt your PDF document with a password." }, + "changePermissions": { + "title": "Change Permissions", + "desc": "Change document restrictions and permissions." + }, "removePassword": { "title": "Remove Password", "desc": "Remove password protection from your PDF document." }, - "compressPdfs": { + "compress": { "title": "Compress", "desc": "Compress PDFs to reduce their file size." }, @@ -484,7 +491,7 @@ "title": "Pipeline", "desc": "Run multiple actions on PDFs by defining pipeline scripts" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Add Page Numbers", "desc": "Add Page numbers throughout a document in a set location" }, @@ -492,7 +499,7 @@ "title": "Auto Rename PDF File", "desc": "Auto renames a PDF file based on its detected header" }, - "adjust-contrast": { + "adjustContrast": { "title": "Adjust Colors/Contrast", "desc": "Adjust Contrast, Saturation and Brightness of a PDF" }, @@ -504,7 +511,7 @@ "title": "Auto Split Pages", "desc": "Auto Split Scanned PDF with physical scanned page splitter QR Code" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanitize", "desc": "Remove scripts and other elements from PDF files" }, @@ -528,11 +535,11 @@ "title": "Get ALL Info on PDF", "desc": "Grabs any and all information possible on PDFs" }, - "extractPage": { + "pageExtracter": { "title": "Extract page(s)", "desc": "Extracts select pages from PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Single Large Page", "desc": "Merges all PDF pages into one large single page" }, @@ -548,11 +555,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF to CSV", "desc": "Extracts Tables from a PDF converting it to CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto Split by Size/Count", "desc": "Split a single PDF into multiple documents based on size, page count, or document count" }, @@ -568,11 +575,11 @@ "title": "Add Stamp to PDF", "desc": "Add text or add image stamps at set locations" }, - "removeImagePdf": { + "removeImage": { "title": "Remove image", "desc": "Remove image from PDF to reduce file size" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -584,7 +591,7 @@ "title": "API Documentation", "desc": "View API documentation and test endpoints" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -745,30 +752,6 @@ "removePages": { "tags": "Remove pages,delete pages" }, - "addPassword": { - "tags": "secure,security", - "title": "Add Password", - "header": "Add password (Encrypt)", - "selectText": { - "1": "Select PDF to encrypt", - "2": "User Password", - "3": "Encryption Key Length", - "4": "Higher values are stronger, but lower values have better compatibility.", - "5": "Permissions to set (Recommended to be used along with Owner password)", - "6": "Prevent assembly of document", - "7": "Prevent content extraction", - "8": "Prevent extraction for accessibility", - "9": "Prevent filling in form", - "10": "Prevent modification", - "11": "Prevent annotation modification", - "12": "Prevent printing", - "13": "Prevent printing different formats", - "14": "Owner Password", - "15": "Restricts what can be done with the document once it is opened (Not supported by all readers)", - "16": "Restricts the opening of the document itself" - }, - "submit": "Encrypt" - }, "removePassword": { "tags": "secure,Decrypt,security,unpassword,delete password", "title": "Remove password", @@ -1650,5 +1633,109 @@ "removeFonts.desc": "Remove embedded fonts from the PDF" } } + }, + "addPassword": { + "completed": "Password protection applied", + "submit": "Encrypt", + "filenamePrefix": "encrypted", + "error": { + "failed": "An error occurred while encrypting the PDF." + }, + "passwords": { + "title": "Passwords", + "stepTitle": "Passwords & Encryption", + "completed": "Passwords configured", + "user": { + "label": "User Password", + "placeholder": "Enter user password" + }, + "owner": { + "label": "Owner Password", + "placeholder": "Enter owner password" + } + }, + "permissions": { + "stepTitle": "Document Permissions" + }, + "encryption": { + "keyLength": { + "label": "Encryption Key Length", + "40bit": "40-bit (Low)", + "128bit": "128-bit (Standard)", + "256bit": "256-bit (High)" + } + }, + "results": { + "title": "Password Protected PDFs" + }, + "tooltip": { + "header": { + "title": "Password Protection Overview" + }, + "passwords": { + "title": "Password Types", + "text": "User passwords restrict opening the document, while owner passwords control what can be done with the document once opened. You can set both or just one.", + "bullet1": "User Password: Required to open the PDF", + "bullet2": "Owner Password: Controls document permissions (not supported by all PDF viewers)" + }, + "encryption": { + "title": "Encryption Levels", + "text": "Higher encryption levels provide better security but may not be supported by older PDF viewers.", + "bullet1": "40-bit: Basic security, compatible with older viewers", + "bullet2": "128-bit: Standard security, widely supported", + "bullet3": "256-bit: Maximum security, requires modern viewers" + }, + "permissions": { + "text": "These permissions control what users can do with the PDF. Most effective when combined with an owner password." + } + } + }, + "changePermissions": { + "completed": "Permissions changed", + "submit": "Change Permissions", + "title": "Document Permissions", + "error": { + "failed": "An error occurred while changing PDF permissions." + }, + "permissions": { + "preventAssembly": { + "label": "Prevent assembly of document" + }, + "preventExtractContent": { + "label": "Prevent content extraction" + }, + "preventExtractForAccessibility": { + "label": "Prevent extraction for accessibility" + }, + "preventFillInForm": { + "label": "Prevent filling in form" + }, + "preventModify": { + "label": "Prevent modification" + }, + "preventModifyAnnotations": { + "label": "Prevent annotation modification" + }, + "preventPrinting": { + "label": "Prevent printing" + }, + "preventPrintingFaithful": { + "label": "Prevent printing different formats" + } + }, + "results": { + "title": "Modified PDFs" + }, + "tooltip": { + "header": { + "title": "Change Permissions" + }, + "description": { + "text": "Changes document permissions, allowing/disallowing access to different features in PDF readers." + }, + "warning": { + "text": "To make these permissions unchangeable, use the Add Password tool to set an owner password." + } + } } } diff --git a/frontend/public/locales/en/translation.json b/frontend/public/locales/en/translation.json deleted file mode 100644 index 8dc3e4f90..000000000 --- a/frontend/public/locales/en/translation.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "convert": { - "selectSourceFormat": "Select source file format", - "selectTargetFormat": "Select target file format", - "selectFirst": "Select a source format first", - "imageOptions": "Image Options:", - "emailOptions": "Email Options:", - "colorType": "Color Type", - "dpi": "DPI", - "singleOrMultiple": "Output", - "emailNote": "Email attachments and embedded images will be included" - }, - "common": { - "color": "Color", - "grayscale": "Grayscale", - "blackWhite": "Black & White", - "single": "Single Image", - "multiple": "Multiple Images" - }, - "groups": { - "document": "Document", - "spreadsheet": "Spreadsheet", - "presentation": "Presentation", - "image": "Image", - "web": "Web", - "text": "Text", - "email": "Email" - } -} \ No newline at end of file diff --git a/frontend/public/locales/es-ES/translation.json b/frontend/public/locales/es-ES/translation.json index ba16c683d..427123bdb 100644 --- a/frontend/public/locales/es-ES/translation.json +++ b/frontend/public/locales/es-ES/translation.json @@ -347,7 +347,7 @@ "title": "Rotar", "desc": "Rotar fácilmente sus PDFs" }, - "imageToPdf": { + "imageToPDF": { "title": "Imagen a PDF", "desc": "Convertir una imagen (PNG, JPEG, GIF) a PDF" }, @@ -371,7 +371,7 @@ "title": "Cambiar permisos", "desc": "Cambiar los permisos del documento PDF" }, - "removePages": { + "pageRemover": { "title": "Eliminar", "desc": "Eliminar páginas no deseadas del documento PDF" }, @@ -383,7 +383,7 @@ "title": "Eliminar contraseña", "desc": "Eliminar la contraseña del documento PDF" }, - "compressPdfs": { + "compress": { "title": "Comprimir", "desc": "Comprimir PDFs para reducir el tamaño del archivo" }, @@ -479,7 +479,7 @@ "title": "Automatización", "desc": "Ejecutar varias tareas a PDFs definiendo una secuencia de comandos" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Añadir números de página", "desc": "Añadir números de página en un documento en una ubicación concreta" }, @@ -487,7 +487,7 @@ "title": "Renombrar archivo PDF automáticamente", "desc": "Renombrar automáticamente un archivo PDF según el encabezamiento detectado" }, - "adjust-contrast": { + "adjustContrast": { "title": "Ajustar Color/Contraste", "desc": "Ajustar Contraste, Saturación y Brillo de un PDF" }, @@ -499,7 +499,7 @@ "title": "Auto Dividir Páginas", "desc": "Auto Dividir PDF escaneado con código QR divsor de página escaneada físicamente" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Desinfectar", "desc": "Eliminar scripts y otros elementos de los archivos PDF" }, @@ -523,11 +523,11 @@ "title": "Obtener toda la información en PDF", "desc": "Obtiene toda la información posible de archivos PDF" }, - "extractPage": { + "pageExtracter": { "title": "Extraer página(s)", "desc": "Extraer las páginas seleccionadas del PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF a una sola página", "desc": "Unir todas las páginas del PDF en una sola página" }, @@ -543,11 +543,11 @@ "title": "Redacción Manual", "desc": "Redacta un PDF basado en el texto seleccionado, dibuja formas y/o página(s) selecionada(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF a CSV", "desc": "Extraer Tablas de un PDF convirtiéndolas a CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto dividir por tamaño/conteo", "desc": "Divide un solo PDF en múltiples documentos según su tamaño, número de páginas, o número de documento" }, @@ -563,11 +563,11 @@ "title": "Añadir Sello a PDF", "desc": "Añadir texto o sello de imagen en ubicaciones específicas" }, - "removeImagePdf": { + "removeImage": { "title": "Eliminar imagen", "desc": "Eliminar imagen del PDF> para reducir el tamaño de archivo" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Dividir PDF por capítulos", "desc": "Divida un PDF en varios archivos según su estructura de capítulos." }, @@ -575,7 +575,7 @@ "title": "Validar firma del PDF", "desc": "Verifica firmas digitales y certificados en los documentos PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Reemplazar e Invertir Color", "desc": "Reemplaza el color del texto y el fondo en el PDF e invierte el color completo del PDF para reducir el tamaño del archivo" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/eu-ES/translation.json b/frontend/public/locales/eu-ES/translation.json index 19ffcd85b..f53214ced 100644 --- a/frontend/public/locales/eu-ES/translation.json +++ b/frontend/public/locales/eu-ES/translation.json @@ -347,7 +347,7 @@ "title": "Biratu", "desc": "Biratu PDFak modu errazean" }, - "imageToPdf": { + "imageToPDF": { "title": "Irudia PDF bihurtu", "desc": "Irudi bat(PNG, JPEG, GIF)PDF bihurtu" }, @@ -371,7 +371,7 @@ "title": "Aldatu baimenak", "desc": "Aldatu PDF dokumentuaren baimenak" }, - "removePages": { + "pageRemover": { "title": "Ezabatu", "desc": "Ezabatu nahi ez dituzun orrialdeak PDF dokumentutik" }, @@ -383,7 +383,7 @@ "title": "Ezabatu pasahitza", "desc": "Ezabatu pasahitza PDF dokumentutik" }, - "compressPdfs": { + "compress": { "title": "Konprimatu", "desc": "Konprimatu PDFak fitxategiaren tamaina murrizteko" }, @@ -479,7 +479,7 @@ "title": "Hodia (Aurreratua)", "desc": "Egin hainbat ekintza PDFn, hodi-script-ak definituz" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Gehitu orrialde-zenbakiak", "desc": "Gehitu orrialde-zenbakiak dokumentu batean, kokapen jakin batean" }, @@ -487,7 +487,7 @@ "title": "Auto Aldatu PDF fitxategiaren izena", "desc": "Automatikoki izena ematen dio detektatutako goiburuan oinarritutako PDF fitxategi bati" }, - "adjust-contrast": { + "adjustContrast": { "title": "Koloreak/kontrastea doitu", "desc": "PDF baten kontrastea, saturazioa eta distira doitzea" }, @@ -499,7 +499,7 @@ "title": "Orriak automatikoki banandu", "desc": "Auto Split Scanned PDF with physical scanned page splitter QR Code" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Desinfektatu", "desc": "Ezabatu script-ak eta PDF fitxategietako beste elementu batzuk" }, @@ -523,11 +523,11 @@ "title": "Lortu informazio guztia PDF-tik", "desc": "Eskuratu PDF fitxategiko Informazio guztia" }, - "extractPage": { + "pageExtracter": { "title": "Orria(k) atera", "desc": "Aukeratutako orriak PDF fitxategitik atera" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF fitxategia, orrialde handi bakar batera", "desc": "PDF orri guztiak orri handi bakar batean konbinatzen ditu" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF to CSV", "desc": "Extracts Tables from a PDF converting it to CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto Split by Size/Count", "desc": "Split a single PDF into multiple documents based on size, page count, or document count" }, @@ -563,11 +563,11 @@ "title": "Add Stamp to PDF", "desc": "Add text or add image stamps at set locations" }, - "removeImagePdf": { + "removeImage": { "title": "Remove image", "desc": "Remove image from PDF to reduce file size" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/fa-IR/translation.json b/frontend/public/locales/fa-IR/translation.json index d0af02fe2..a178d4fa5 100644 --- a/frontend/public/locales/fa-IR/translation.json +++ b/frontend/public/locales/fa-IR/translation.json @@ -347,7 +347,7 @@ "title": "چرخش", "desc": "چرخش آسان فایل‌های PDF." }, - "imageToPdf": { + "imageToPDF": { "title": "تصویر به PDF", "desc": "تبدیل یک تصویر (PNG، JPEG، GIF) به PDF." }, @@ -371,7 +371,7 @@ "title": "تغییر مجوزها", "desc": "تغییر مجوزهای سند PDF شما" }, - "removePages": { + "pageRemover": { "title": "حذف", "desc": "حذف صفحات ناخواسته از سند PDF شما." }, @@ -383,7 +383,7 @@ "title": "حذف رمز عبور", "desc": "حذف حفاظت رمز عبور از سند PDF شما." }, - "compressPdfs": { + "compress": { "title": "فشرده‌سازی", "desc": "فشرده‌سازی فایل‌های PDF برای کاهش اندازه آن‌ها." }, @@ -479,7 +479,7 @@ "title": "خط لوله", "desc": "اجرای چندین عملیات بر روی PDFها با تعریف اسکریپت‌های خط لوله" }, - "add-page-numbers": { + "addPageNumbers": { "title": "افزودن شماره صفحات", "desc": "افزودن شماره صفحات به تمام سند در یک مکان مشخص" }, @@ -487,7 +487,7 @@ "title": "تغییر نام خودکار فایل PDF", "desc": "تغییر نام خودکار یک فایل PDF بر اساس سربرگ تشخیص داده‌شده آن" }, - "adjust-contrast": { + "adjustContrast": { "title": "تنظیم رنگ‌ها/کنتراست", "desc": "تنظیم کنتراست، اشباع و روشنایی یک PDF" }, @@ -499,7 +499,7 @@ "title": "تقسیم خودکار صفحات", "desc": "تقسیم خودکار فایل اسکن‌شده PDF با استفاده از کد QR تقسیم‌کننده فیزیکی" }, - "sanitizePdf": { + "sanitizePDF": { "title": "پاکسازی", "desc": "حذف اسکریپت‌ها و سایر عناصر از فایل‌های PDF" }, @@ -523,11 +523,11 @@ "title": "دریافت تمام اطلاعات در مورد PDF", "desc": "گرفتن هر اطلاعات ممکن در مورد PDF" }, - "extractPage": { + "pageExtracter": { "title": "استخراج صفحه(ها)", "desc": "استخراج صفحات انتخابی از PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "صفحه بزرگ واحد", "desc": "ادغام تمام صفحات PDF در یک صفحه بزرگ واحد" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF به CSV", "desc": "جداول را از PDF استخراج کرده و به CSV تبدیل می‌کند" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "تقسیم خودکار بر اساس اندازه/تعداد", "desc": "تقسیم یک PDF به چند سند بر اساس اندازه، تعداد صفحات، یا تعداد اسناد" }, @@ -563,11 +563,11 @@ "title": "افزودن مهر به PDF", "desc": "افزودن مهر متنی یا تصویری در مکان‌های مشخص" }, - "removeImagePdf": { + "removeImage": { "title": "حذف تصویر", "desc": "حذف تصاویر از PDF برای کاهش حجم فایل" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "تقسیم PDF بر اساس فصل‌ها", "desc": "تقسیم PDF به چند فایل بر اساس ساختار فصل‌ها" }, @@ -575,7 +575,7 @@ "title": "اعتبارسنجی امضای PDF", "desc": "تأیید امضاها و گواهی‌های دیجیتال در اسناد PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "جایگزینی و معکوس کردن رنگ", "desc": "جایگزینی رنگ متن و پس‌زمینه در PDF و معکوس کردن کل رنگ‌ها برای کاهش حجم فایل" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/fr-FR/translation.json b/frontend/public/locales/fr-FR/translation.json index 6d88493ca..1dc46a24a 100644 --- a/frontend/public/locales/fr-FR/translation.json +++ b/frontend/public/locales/fr-FR/translation.json @@ -347,7 +347,7 @@ "title": "Pivoter", "desc": "Faites pivoter facilement vos PDF." }, - "imageToPdf": { + "imageToPDF": { "title": "Image en PDF", "desc": "Convertissez une image (PNG, JPEG, GIF) en PDF." }, @@ -371,7 +371,7 @@ "title": "Modifier les permissions", "desc": "Modifiez les permissions de votre PDF." }, - "removePages": { + "pageRemover": { "title": "Supprimer", "desc": "Supprimez les pages inutiles de votre PDF." }, @@ -383,7 +383,7 @@ "title": "Supprimer le mot de passe", "desc": "Supprimez la protection par mot de passe de votre PDF." }, - "compressPdfs": { + "compress": { "title": "Compresser", "desc": "Compressez les PDF pour réduire leur tailles." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Exécutez plusieurs actions sur les PDF en définissant des scripts de pipeline." }, - "add-page-numbers": { + "addPageNumbers": { "title": "Ajouter des numéros de page", "desc": "Ajoutez des numéros de page dans un PDF à un emplacement défini." }, @@ -487,7 +487,7 @@ "title": "Renommer automatiquement", "desc": "Renommez automatiquement un fichier PDF en fonction de son en-tête détecté." }, - "adjust-contrast": { + "adjustContrast": { "title": "Ajuster les couleurs", "desc": "Ajustez le contraste, la saturation et la luminosité d'un PDF." }, @@ -499,7 +499,7 @@ "title": "Séparer automatiquement les pages", "desc": "Séparez automatiquement le PDF numérisé avec le code QR du diviseur de page numérisé." }, - "sanitizePdf": { + "sanitizePDF": { "title": "Assainir", "desc": "Supprimez les scripts et autres éléments des PDF." }, @@ -523,11 +523,11 @@ "title": "Récupérer les informations", "desc": "Récupérez toutes les informations possibles sur un PDF." }, - "extractPage": { + "pageExtracter": { "title": "Extraire des pages", "desc": "Extrayez certaines pages du PDF." }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Fusionner en une seule page", "desc": "Fusionnez toutes les pages PDF en une seule grande page." }, @@ -543,11 +543,11 @@ "title": "Caviardage manuel", "desc": "Caviarder un PDF en fonction de texte sélectionné, formes dessinées et/ou des pages sélectionnées." }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF en CSV", "desc": "Extrait les tableaux d'un PDF et les transforme en CSV." }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Séparer automatiquement par taille/nombre", "desc": "Séparer un PDF unique en plusieurs documents en fonction de la taille, du nombre de pages ou du nombre de documents." }, @@ -563,11 +563,11 @@ "title": "Ajouter un tampon sur un PDF", "desc": "Ajouter un texte ou l'image d'un tampon à un emplacement défini." }, - "removeImagePdf": { + "removeImage": { "title": "Supprimer les images", "desc": "Supprimez les images d'un PDF pour réduire sa taille" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Séparer un PDF par chapitres", "desc": "Séparez un PDF en fichiers multiples en fonction de sa structure par chapitres." }, @@ -575,7 +575,7 @@ "title": "Valider la signature du fichier PDF", "desc": "Vérifier les signatures numériques et les certificats des documents PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Remplacer et Inverser Couleur", "desc": "Remplacer la couleur pour le texte et l'arrière-plan dans le PDF et inverser la couleur complète du PDF pour réduire la taille du fichier" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ga-IE/translation.json b/frontend/public/locales/ga-IE/translation.json index 917cd9bea..9ea16d9cb 100644 --- a/frontend/public/locales/ga-IE/translation.json +++ b/frontend/public/locales/ga-IE/translation.json @@ -347,7 +347,7 @@ "title": "Rothlaigh", "desc": "Rothlaigh do PDFanna go héasca." }, - "imageToPdf": { + "imageToPDF": { "title": "Íomhá go PDF", "desc": "Tiontaigh íomhá (PNG, JPEG, GIF) go PDF." }, @@ -371,7 +371,7 @@ "title": "Athrú Ceadanna", "desc": "Athraigh ceadanna do dhoiciméad PDF" }, - "removePages": { + "pageRemover": { "title": "Bain", "desc": "Scrios leathanaigh nach dteastaíonn ó do dhoiciméad PDF." }, @@ -383,7 +383,7 @@ "title": "Bain Pasfhocal", "desc": "Bain cosaint phasfhocal ó do dhoiciméad PDF." }, - "compressPdfs": { + "compress": { "title": "Comhbhrúigh", "desc": "Comhbhrúigh PDFanna chun a méid comhaid a laghdú." }, @@ -479,7 +479,7 @@ "title": "Píblíne (Ardleibhéal)", "desc": "Rith gníomhartha iolracha ar PDFanna trí scripteanna píblíne a shainiú" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Cuir Uimhreacha Leathanaigh leis", "desc": "Cuir uimhreacha Leathanach leis an doiciméad i suíomh socraithe" }, @@ -487,7 +487,7 @@ "title": "Comhad PDF a athainmniú go huathoibríoch", "desc": "Athainmníonn Auto comhad PDF bunaithe ar a cheanntásc braite" }, - "adjust-contrast": { + "adjustContrast": { "title": "Coigeartaigh Dathanna/Codarsnacht", "desc": "Coigeartaigh Codarsnacht, Sáithiú agus Gile PDF" }, @@ -499,7 +499,7 @@ "title": "Leathanaigh Scoilte Uathoibríoch", "desc": "Auto Scoilt PDF Scanta le Cód QR scoilteoir leathanach scanadh fisiciúil" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sláintíocht", "desc": "Bain scripteanna agus gnéithe eile ó chomhaid PDF" }, @@ -523,11 +523,11 @@ "title": "Faigh GACH Eolas ar PDF", "desc": "Grab aon fhaisnéis agus is féidir ar PDFs" }, - "extractPage": { + "pageExtracter": { "title": "Sliocht leathanach(eacha)", "desc": "Sleachta roghnaigh leathanaigh ó PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF go leathanach mór amháin", "desc": "Cumasc gach leathanach PDF isteach i leathanach mór amháin" }, @@ -543,11 +543,11 @@ "title": "Athchóiriú de Láimh", "desc": "Réiteann sé PDF bunaithe ar théacs roghnaithe, cruthanna tarraingthe agus/nó leathanaigh roghnaithe" }, - "tableExtraxt": { + "PDFToCSV": { "title": "Ó CSV go PDF", "desc": "Sleachta Táblaí ó PDF agus é a thiontú go CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto Scoilte de réir Méid/Comhaireamh", "desc": "Scoilt PDF amháin i ndoiciméid iolracha bunaithe ar mhéid, líon na leathanach, nó comhaireamh doiciméad" }, @@ -563,11 +563,11 @@ "title": "Cuir Stampa go PDF", "desc": "Cuir téacs leis nó cuir stampaí íomhá leis ag láithreacha socraithe" }, - "removeImagePdf": { + "removeImage": { "title": "Bain íomhá", "desc": "Bain íomhá de PDF chun méid comhaid a laghdú" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Scoil PDF ar Chaibidlí", "desc": "Scoilt PDF ina chomhaid iolracha bunaithe ar a struchtúr caibidle." }, @@ -575,7 +575,7 @@ "title": "Bailíochtaigh Síniú PDF", "desc": "Fíoraigh sínithe digiteacha agus teastais i gcáipéisí PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Athchuir agus Inbhéartaigh Dath", "desc": "Athchuir dath an téacs agus an chúlra i bhformáid PDF agus inbhéartaigh dath iomlán pdf chun méid comhaid a laghdú" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/hi-IN/translation.json b/frontend/public/locales/hi-IN/translation.json index 5b0a2d68b..420c9c725 100644 --- a/frontend/public/locales/hi-IN/translation.json +++ b/frontend/public/locales/hi-IN/translation.json @@ -347,7 +347,7 @@ "title": "घुमाएं", "desc": "अपनी PDF को आसानी से घुमाएं।" }, - "imageToPdf": { + "imageToPDF": { "title": "छवि से PDF", "desc": "छवि (PNG, JPEG, GIF) को PDF में बदलें।" }, @@ -371,7 +371,7 @@ "title": "अनुमतियां बदलें", "desc": "अपने PDF दस्तावेज की अनुमतियां बदलें" }, - "removePages": { + "pageRemover": { "title": "निकालें", "desc": "अपने PDF दस्तावेज से अवांछित पृष्ठ हटाएं।" }, @@ -383,7 +383,7 @@ "title": "पासवर्ड हटाएं", "desc": "अपने PDF दस्तावेज से पासवर्ड सुरक्षा हटाएं।" }, - "compressPdfs": { + "compress": { "title": "कम्प्रेस", "desc": "PDF को कम्प्रेस करें ताकि उनका फ़ाइल आकार कम हो जाए।" }, @@ -479,7 +479,7 @@ "title": "पाइपलाइन", "desc": "पाइपलाइन स्क्रिप्ट परिभाषित करके PDF पर कई कार्य करें" }, - "add-page-numbers": { + "addPageNumbers": { "title": "पृष्ठ संख्या जोड़ें", "desc": "दस्तावेज़ में एक निर्धारित स्थान पर पृष्ठ संख्या जोड़ें" }, @@ -487,7 +487,7 @@ "title": "स्वतः PDF फ़ाइल का नाम बदलें", "desc": "पाए गए हेडर के आधार पर PDF फ़ाइल का नाम स्वचालित रूप से बदलें" }, - "adjust-contrast": { + "adjustContrast": { "title": "रंग/कंट्रास्ट समायोजित करें", "desc": "PDF का कंट्रास्ट, संतृप्ति और चमक समायोजित करें" }, @@ -499,7 +499,7 @@ "title": "स्वतः पृष्ठ विभाजित करें", "desc": "भौतिक स्कैन किए गए पृष्ठ विभाजक QR कोड के साथ स्कैन की गई PDF को स्वतः विभाजित करें" }, - "sanitizePdf": { + "sanitizePDF": { "title": "सैनिटाइज़", "desc": "PDF फ़ाइलों से स्क्रिप्ट और अन्य तत्वों को हटाएं" }, @@ -523,11 +523,11 @@ "title": "PDF की सभी जानकारी प्राप्त करें", "desc": "PDF से संभव सभी जानकारी प्राप्त करें" }, - "extractPage": { + "pageExtracter": { "title": "पृष्ठ निकालें", "desc": "PDF से चयनित पृष्ठों को निकालें" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "एक बड़ा पृष्ठ", "desc": "सभी PDF पृष्ठों को एक बड़े एकल पृष्ठ में मर्ज करें" }, @@ -543,11 +543,11 @@ "title": "मैनुअल गोपनीयकरण", "desc": "चयनित टेक्स्ट, बनाई गई आकृतियों और/या चयनित पृष्ठों के आधार पर PDF को गोपनीयकृत करें" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF से CSV", "desc": "PDF से तालिकाओं को निकालकर CSV में बदलें" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "आकार/संख्या के आधार पर स्वतः विभाजित करें", "desc": "एक PDF को आकार, पृष्ठ संख्या, या दस्तावेज़ संख्या के आधार पर कई दस्तावेज़ों में विभाजित करें" }, @@ -563,11 +563,11 @@ "title": "PDF में स्टैम्प जोड़ें", "desc": "निर्धारित स्थानों पर टेक्स्ट या छवि स्टैम्प जोड़ें" }, - "removeImagePdf": { + "removeImage": { "title": "छवि हटाएं", "desc": "फ़ाइल आकार कम करने के लिए PDF से छवि हटाएं" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "अध्यायों द्वारा PDF विभाजित करें", "desc": "PDF को उसकी अध्याय संरचना के आधार पर कई फ़ाइलों में विभाजित करें।" }, @@ -575,7 +575,7 @@ "title": "PDF हस्ताक्षर सत्यापित करें", "desc": "PDF दस्तावेजों में डिजिटल हस्ताक्षर और प्रमाणपत्रों को सत्यापित करें" }, - "replaceColorPdf": { + "replace-color": { "title": "रंग बदलें और उल्टा करें", "desc": "PDF में टेक्स्ट और पृष्ठभूमि के लिए रंग बदलें और फ़ाइल आकार कम करने के लिए पूर्ण रंग को उल्टा करें" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/hr-HR/translation.json b/frontend/public/locales/hr-HR/translation.json index d5bb80545..e90081545 100644 --- a/frontend/public/locales/hr-HR/translation.json +++ b/frontend/public/locales/hr-HR/translation.json @@ -347,7 +347,7 @@ "title": "Rotacija", "desc": "Jednostavno rotirajte vaše PDF-ove." }, - "imageToPdf": { + "imageToPDF": { "title": "Slika u PDF", "desc": "Pretvorite sliku (PNG, JPEG, GIF) u PDF." }, @@ -371,7 +371,7 @@ "title": "Promjena dopuštenja", "desc": "Promijenite dopuštenja svog PDF dokumenta" }, - "removePages": { + "pageRemover": { "title": "Ukloniti", "desc": "Izbrišite neželjene stranice iz svog PDF dokumenta." }, @@ -383,7 +383,7 @@ "title": "Ukloni lozinku", "desc": "Uklonite zaštitu lozinkom sa svog PDF dokumenta.." }, - "compressPdfs": { + "compress": { "title": "Komprimiraj", "desc": "Komprimirajte PDF-ove kako biste smanjili njihovu veličinu." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Izvršite više radnji na PDF-ovima definiranjem skripti u pipeline-u" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Dodaj brojeve stranica", "desc": "Dodajte brojeve stranica kroz dokument na određeno mjesto" }, @@ -487,7 +487,7 @@ "title": "Automatsko preimenovanje PDF datoteka", "desc": "Automatski preimenuje PDF datoteku na temelju otkrivenog zaglavlja" }, - "adjust-contrast": { + "adjustContrast": { "title": "Podesi boje/kontrast", "desc": "Podesite kontrast, zasićenost i svjetlinu PDF-a" }, @@ -499,7 +499,7 @@ "title": "Automatsko dijeljenje stranica", "desc": "Automatsko dijeljenje skeniranog PDF-a s fizičkim QR kodom za dijeljenje stranica" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Dezinficirati (Sanitize)", "desc": "Uklonite skripte i druge elemente iz PDF datoteka" }, @@ -523,11 +523,11 @@ "title": "Dohvati SVE informacije o PDF-u", "desc": "Dohvaća sve moguće informacije o PDF-ovima" }, - "extractPage": { + "pageExtracter": { "title": "Izdvoji stranicu(e)", "desc": "Izdvaja odabrane stranice iz PDF-a" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF u Jednu Veliku Stranicu", "desc": "Spaja sve PDF stranice u jednu veliku stranicu" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF u CSV", "desc": "Izdvaja tablice iz PDF-a pretvarajući ga u CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Automatska podjela po veličini/broju", "desc": "Podijelite jedan PDF na više dokumenata na temelju veličine, broja stranica ili broja dokumenata" }, @@ -563,11 +563,11 @@ "title": "Dodaj pečat u PDF", "desc": "Dodajte tekst ili dodajte slikovne oznake na postavljenim mjestima" }, - "removeImagePdf": { + "removeImage": { "title": "Ukloni sliku", "desc": "Ukloni sliku iz PDF-a kako bi se smanjio veličina datoteke" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Podijeli PDF prema glavama", "desc": "Podijeli PDF na više datoteka prema njegovom strukturnom obliku glava." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Zamenite boju teksta i pozadine u PDF-u te inverzirajte cijeli PDF kako bi se smanjila veličina datoteke." } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/hu-HU/translation.json b/frontend/public/locales/hu-HU/translation.json index 886811a76..2292bb65c 100644 --- a/frontend/public/locales/hu-HU/translation.json +++ b/frontend/public/locales/hu-HU/translation.json @@ -347,7 +347,7 @@ "title": "Forgatás", "desc": "PDF-ek egyszerű forgatása." }, - "imageToPdf": { + "imageToPDF": { "title": "Kép PDF-be", "desc": "Kép (PNG, JPEG, GIF) konvertálása PDF-fé." }, @@ -371,7 +371,7 @@ "title": "Jogosultságok módosítása", "desc": "PDF dokumentum jogosultságainak módosítása" }, - "removePages": { + "pageRemover": { "title": "Eltávolítás", "desc": "Felesleges oldalak törlése a PDF dokumentumból." }, @@ -383,7 +383,7 @@ "title": "Jelszó eltávolítása", "desc": "Jelszavas védelem eltávolítása a PDF dokumentumból" }, - "compressPdfs": { + "compress": { "title": "Tömörítés", "desc": "PDF-ek tömörítése a fájlméret csökkentése érdekében" }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Több művelet végrehajtása PDF-eken pipeline szkriptek definiálásával" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Oldalszámozás hozzáadása", "desc": "Oldalszámok hozzáadása a dokumentumhoz meghatározott helyen" }, @@ -487,7 +487,7 @@ "title": "PDF automatikus átnevezése", "desc": "PDF fájl automatikus átnevezése a felismert fejléc alapján" }, - "adjust-contrast": { + "adjustContrast": { "title": "Színek/kontraszt beállítása", "desc": "PDF kontraszt, telítettség és fényerő beállítása" }, @@ -499,7 +499,7 @@ "title": "Automatikus oldalfelosztás", "desc": "Szkennelt PDF automatikus felosztása QR-kód alapú oldalelválasztóval" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Tisztítás", "desc": "Szkriptek és egyéb elemek eltávolítása PDF fájlokból" }, @@ -523,11 +523,11 @@ "title": "PDF összes információjának lekérése", "desc": "Minden elérhető információ lekérése PDF-ekről" }, - "extractPage": { + "pageExtracter": { "title": "Oldalak kinyerése", "desc": "Kiválasztott oldalak kinyerése PDF-ből" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Egyoldalas nagy PDF", "desc": "Minden PDF oldal egyesítése egyetlen nagy oldalba" }, @@ -543,11 +543,11 @@ "title": "Kézi kitakarás", "desc": "PDF kitakarása kiválasztott szöveg, rajzolt alakzatok és/vagy kiválasztott oldalak alapján" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF konvertálása CSV-be", "desc": "Táblázatok kinyerése PDF-ből és konvertálása CSV formátumba" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Automatikus felosztás méret/darabszám szerint", "desc": "Egyetlen PDF felosztása több dokumentumra méret, oldalszám vagy dokumentumszám alapján" }, @@ -563,11 +563,11 @@ "title": "Pecsét hozzáadása PDF-hez", "desc": "Szöveges vagy képes pecsét hozzáadása megadott helyekre" }, - "removeImagePdf": { + "removeImage": { "title": "Képek eltávolítása", "desc": "Képek eltávolítása PDF-ből a fájlméret csökkentése érdekében" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "PDF felosztása fejezetek szerint", "desc": "PDF felosztása több fájlra a fejezetstruktúra alapján" }, @@ -575,7 +575,7 @@ "title": "PDF aláírás ellenőrzése", "desc": "Digitális aláírások és tanúsítványok ellenőrzése PDF dokumentumokban" }, - "replaceColorPdf": { + "replace-color": { "title": "Színek cseréje és invertálása", "desc": "PDF szöveg és háttérszíneinek cseréje és teljes színinvertálás a fájlméret csökkentése érdekében" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/id-ID/translation.json b/frontend/public/locales/id-ID/translation.json index 9690a6b2d..c4d638ff8 100644 --- a/frontend/public/locales/id-ID/translation.json +++ b/frontend/public/locales/id-ID/translation.json @@ -347,7 +347,7 @@ "title": "Putar", "desc": "Memutar PDF Anda dengan mudah." }, - "imageToPdf": { + "imageToPDF": { "title": "Gambar ke PDF", "desc": "Mengonversi gambar (PNG, JPEG, GIF) ke PDF." }, @@ -371,7 +371,7 @@ "title": "Izin Perubahan", "desc": "Mengubah izin dokumen PDF Anda" }, - "removePages": { + "pageRemover": { "title": "Menghapus", "desc": "Menghapus halaman yang tidak diinginkan dari dokumen PDF Anda." }, @@ -383,7 +383,7 @@ "title": "Hapus Kata Sandi", "desc": "Menghapus perlindungan kata sandi dari dokumen PDF Anda." }, - "compressPdfs": { + "compress": { "title": "Kompres", "desc": "Kompres PDF untuk mengurangi ukuran berkas." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Menjalankan beberapa tindakan pada PDF dengan mendefinisikan skrip pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Tambahkan Nomor Halaman", "desc": "Menambahkan nomor Halaman di seluruh dokumen di lokasi yang ditetapkan" }, @@ -487,7 +487,7 @@ "title": "Ubah Nama Berkas PDF Secara Otomatis", "desc": "Mengganti nama berkas PDF secara otomatis berdasarkan tajuk yang terdeteksi" }, - "adjust-contrast": { + "adjustContrast": { "title": "Menyesuaikan Warna/Kontras", "desc": "Sesuaikan Kontras, Saturasi, dan Kecerahan PDF" }, @@ -499,7 +499,7 @@ "title": "Membagi Halaman Secara Otomatis", "desc": "Membagi PDF yang dipindai secara otomatis dengan Kode QR pembagi halaman yang dipindai secara fisik" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanitasi", "desc": "Menghapus skrip dan elemen lain dari file PDF" }, @@ -523,11 +523,11 @@ "title": "Dapatkan Semua Info tentang PDF", "desc": "Mengambil setiap dan semua informasi yang mungkin ada pada PDF" }, - "extractPage": { + "pageExtracter": { "title": "Ekstrak halaman", "desc": "Mengekstrak halaman tertentu dari PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF ke Satu Halaman Besar", "desc": "Menggabungkan semua halaman PDF menjadi satu halaman besar" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF ke CSV", "desc": "Mengekstrak Tabel dari PDF yang mengonversinya menjadi CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Pemisahan Otomatis berdasarkan Ukuran/Hitungan", "desc": "Membagi satu PDF menjadi beberapa dokumen berdasarkan ukuran, jumlah halaman, atau jumlah dokumen" }, @@ -563,11 +563,11 @@ "title": "Tambahkan Tanda Tangan ke PDF", "desc": "Tambahkan teks atau gambar tanda tangan di lokasi yang ditentukan" }, - "removeImagePdf": { + "removeImage": { "title": "Hapus Gambar", "desc": "Hapus gambar dari PDF untuk mengurangi ukuran file" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Pisahkan PDF berdasarkan Bab", "desc": "Memisahkan PDF menjadi beberapa file berdasarkan struktur babnya." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Ganti dan Inversi Warna", "desc": "Ganti warna untuk teks dan latar belakang dalam PDF dan inversi seluruh warna PDF untuk mengurangi ukuran file" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/it-IT/translation.json b/frontend/public/locales/it-IT/translation.json index c61e49e13..179552e56 100644 --- a/frontend/public/locales/it-IT/translation.json +++ b/frontend/public/locales/it-IT/translation.json @@ -347,7 +347,7 @@ "title": "Ruota", "desc": "Ruota un PDF." }, - "imageToPdf": { + "imageToPDF": { "title": "Da immagine a PDF", "desc": "Converti un'immagine (PNG, JPEG, GIF) in PDF." }, @@ -371,7 +371,7 @@ "title": "Cambia Permessi", "desc": "Cambia i permessi del tuo PDF." }, - "removePages": { + "pageRemover": { "title": "Rimuovi", "desc": "Elimina alcune pagine dal PDF." }, @@ -383,7 +383,7 @@ "title": "Rimuovi Password", "desc": "Rimuovi la password dal tuo PDF." }, - "compressPdfs": { + "compress": { "title": "Comprimi", "desc": "Comprimi PDF per ridurne le dimensioni." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Esegui più azioni sui PDF definendo script di pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Aggiungi numeri di pagina", "desc": "Aggiungi numeri di pagina in tutto un documento in una posizione prestabilita" }, @@ -487,7 +487,7 @@ "title": "Rinomina automaticamente il file PDF", "desc": "Rinomina automaticamente un file PDF in base all'intestazione rilevata" }, - "adjust-contrast": { + "adjustContrast": { "title": "Regola colori/contrasto", "desc": "Regola contrasto, saturazione e luminosità di un PDF" }, @@ -499,7 +499,7 @@ "title": "Pagine divise automaticamente", "desc": "Dividi automaticamente il PDF scansionato con il codice QR dello divisore di pagina fisico scansionato" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Pulire", "desc": "Rimuovi script e altri elementi dai file PDF" }, @@ -523,11 +523,11 @@ "title": "Ottieni TUTTE le informazioni in PDF", "desc": "Raccogli tutte le informazioni possibili sui PDF" }, - "extractPage": { + "pageExtracter": { "title": "Estrai pagina/e", "desc": "Estrae le pagine selezionate dal PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF in un'unica pagina di grandi dimensioni", "desc": "Unisce tutte le pagine PDF in un'unica grande pagina" }, @@ -543,11 +543,11 @@ "title": "Redazione manuale", "desc": "Redige un PDF in base al testo selezionato, alle forme disegnate e/o alle pagina selezionata(e)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "Da PDF a CSV", "desc": "Estrae tabelle da un PDF convertendolo in CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Divisione automatica per dimensione/numero", "desc": "Dividi un singolo PDF in più documenti in base alle dimensioni, al numero di pagine o al numero di documenti" }, @@ -563,11 +563,11 @@ "title": "Aggiungi timbro al PDF", "desc": "Aggiungi testo o aggiungi timbri immagine nelle posizioni prestabilite" }, - "removeImagePdf": { + "removeImage": { "title": "Rimuovi immagine", "desc": "Rimuovi le immagini dal PDF per ridurre la dimensione del file" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Dividi PDF per capitoli", "desc": "Dividi un PDF in più file in base alla struttura dei capitoli." }, @@ -575,7 +575,7 @@ "title": "Convalida la firma PDF", "desc": "Verificare le firme digitali e i certificati nei documenti PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Sostituisci e inverti il colore", "desc": "Sostituisci il colore del testo e dello sfondo nel PDF e inverti il ​​colore completo del PDF per ridurre le dimensioni del file" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ja-JP/translation.json b/frontend/public/locales/ja-JP/translation.json index 76b1bb87b..7c5d5043b 100644 --- a/frontend/public/locales/ja-JP/translation.json +++ b/frontend/public/locales/ja-JP/translation.json @@ -347,7 +347,7 @@ "title": "回転", "desc": "PDFを回転します。" }, - "imageToPdf": { + "imageToPDF": { "title": "画像をPDFに変換", "desc": "画像 (PNG, JPEG, GIF) をPDFに変換します。" }, @@ -371,7 +371,7 @@ "title": "権限の変更", "desc": "PDFの権限を変更します。" }, - "removePages": { + "pageRemover": { "title": "削除", "desc": "PDFから不要なページを削除します。" }, @@ -383,7 +383,7 @@ "title": "パスワードの削除", "desc": "PDFからパスワードの削除します。" }, - "compressPdfs": { + "compress": { "title": "圧縮", "desc": "PDFを圧縮してファイルサイズを小さくします。" }, @@ -479,7 +479,7 @@ "title": "パイプライン", "desc": "パイプラインスクリプトを定義してPDF上で複数のアクションを実行します。" }, - "add-page-numbers": { + "addPageNumbers": { "title": "ページ番号の追加", "desc": "ドキュメント全体の設定された場所にページ番号を追加します。" }, @@ -487,7 +487,7 @@ "title": "PDFファイル名の自動変更", "desc": "検出されたヘッダーに基づいてPDFファイルの名前を自動的に変更します。" }, - "adjust-contrast": { + "adjustContrast": { "title": "色/コントラストの調整", "desc": "PDFのコントラスト、彩度、明るさを調整します。" }, @@ -499,7 +499,7 @@ "title": "ページの自動分割", "desc": "ページ分割用QRコードを使用したスキャンしたPDFを自動分割します。" }, - "sanitizePdf": { + "sanitizePDF": { "title": "サニタイズ", "desc": "PDFファイルからスクリプトやその他の要素を削除します。" }, @@ -523,11 +523,11 @@ "title": "PDFのすべての情報を入手", "desc": "PDFのあらゆる情報を取得します。" }, - "extractPage": { + "pageExtracter": { "title": "ページの抽出", "desc": "PDFから選択したページを抽出します。" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDFを単一の大きなページに変換", "desc": "PDFのすべてのページを1つの大きな単一ページに結合します" }, @@ -543,11 +543,11 @@ "title": "手動墨消し", "desc": "選択したテキスト、描画した図形、選択したページに基づいてPDFを墨消します。" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDFをCSVに変換", "desc": "PDFから表を抽出しCSVに変換します。" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "サイズ・数による自動分割", "desc": "サイズ・ページ数またはドキュメント数に基づいて、1つのPDFを複数のドキュメントに分割します。" }, @@ -563,11 +563,11 @@ "title": "PDFにスタンプを追加", "desc": "設定した位置にテキストや画像のスタンプを追加できます" }, - "removeImagePdf": { + "removeImage": { "title": "画像の削除", "desc": "PDFから画像を削除してファイルサイズを小さくします" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "PDFをチャプターごとに分割", "desc": "チャプターの構造に基づいてPDFを複数のファイルに分割します" }, @@ -575,7 +575,7 @@ "title": "PDF署名の検証", "desc": "PDF文書のデジタル署名と証明書を検証します" }, - "replaceColorPdf": { + "replace-color": { "title": "色の置換と反転", "desc": "PDF内のテキストと背景の色を置き換え、PDFのフルカラーを反転してファイルサイズを縮小します。" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ko-KR/translation.json b/frontend/public/locales/ko-KR/translation.json index 0552d717f..d392e4663 100644 --- a/frontend/public/locales/ko-KR/translation.json +++ b/frontend/public/locales/ko-KR/translation.json @@ -347,7 +347,7 @@ "title": "회전", "desc": "PDF를 쉽게 회전합니다." }, - "imageToPdf": { + "imageToPDF": { "title": "이미지를 PDF로", "desc": "이미지(PNG, JPEG, GIF)를 PDF로 변환합니다." }, @@ -371,7 +371,7 @@ "title": "권한 변경", "desc": "PDF 문서의 권한을 변경합니다" }, - "removePages": { + "pageRemover": { "title": "제거", "desc": "PDF 문서에서 원하지 않는 페이지를 삭제합니다." }, @@ -383,7 +383,7 @@ "title": "비밀번호 제거", "desc": "PDF 문서에서 비밀번호 보호를 제거합니다." }, - "compressPdfs": { + "compress": { "title": "압축", "desc": "PDF를 압축하여 파일 크기를 줄입니다." }, @@ -479,7 +479,7 @@ "title": "파이프라인", "desc": "파이프라인 스크립트를 정의하여 PDF에서 여러 작업 실행" }, - "add-page-numbers": { + "addPageNumbers": { "title": "페이지 번호 추가", "desc": "문서 전체에 지정된 위치에 페이지 번호 추가" }, @@ -487,7 +487,7 @@ "title": "PDF 파일 자동 이름 변경", "desc": "감지된 헤더를 기반으로 PDF 파일 이름 자동 변경" }, - "adjust-contrast": { + "adjustContrast": { "title": "색상/대비 조정", "desc": "PDF의 대비, 채도 및 밝기 조정" }, @@ -499,7 +499,7 @@ "title": "자동 페이지 분할", "desc": "물리적 스캔 페이지 분할기 QR 코드가 있는 스캔된 PDF 자동 분할" }, - "sanitizePdf": { + "sanitizePDF": { "title": "정리", "desc": "PDF 파일에서 스크립트 및 기타 요소 제거" }, @@ -523,11 +523,11 @@ "title": "PDF 모든 정보 가져오기", "desc": "PDF에서 가능한 모든 정보 가져오기" }, - "extractPage": { + "pageExtracter": { "title": "페이지 추출", "desc": "PDF에서 선택한 페이지 추출" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "단일 큰 페이지", "desc": "모든 PDF 페이지를 하나의 큰 단일 페이지로 병합" }, @@ -543,11 +543,11 @@ "title": "수동 검열", "desc": "선택한 텍스트, 그린 도형 및/또는 선택한 페이지를 기반으로 PDF 검열" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF를 CSV로", "desc": "PDF에서 표를 추출하여 CSV로 변환" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "크기/개수별 자동 분할", "desc": "단일 PDF를 크기, 페이지 수 또는 문서 수를 기준으로 여러 문서로 분할" }, @@ -563,11 +563,11 @@ "title": "PDF에 스탬프 추가", "desc": "지정된 위치에 텍스트 또는 이미지 스탬프 추가" }, - "removeImagePdf": { + "removeImage": { "title": "이미지 제거", "desc": "파일 크기를 줄이기 위해 PDF에서 이미지 제거" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "챕터별 PDF 분할", "desc": "PDF를 챕터 구조에 따라 여러 파일로 분할합니다." }, @@ -575,7 +575,7 @@ "title": "PDF 서명 검증", "desc": "PDF 문서의 디지털 서명과 인증서 검증" }, - "replaceColorPdf": { + "replace-color": { "title": "색상 교체 및 반전", "desc": "PDF에서 텍스트와 배경의 색상을 교체하고 파일 크기를 줄이기 위해 전체 PDF 색상을 반전" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ml-ML/translation.json b/frontend/public/locales/ml-ML/translation.json index 79ca47b00..b272c0ee2 100644 --- a/frontend/public/locales/ml-ML/translation.json +++ b/frontend/public/locales/ml-ML/translation.json @@ -347,7 +347,7 @@ "title": "തിരിക്കുക", "desc": "നിങ്ങളുടെ PDF-കൾ എളുപ്പത്തിൽ തിരിക്കുക." }, - "imageToPdf": { + "imageToPDF": { "title": "ചിത്രം PDF-ലേക്ക്", "desc": "ഒരു ചിത്രം (PNG, JPEG, GIF) PDF-ലേക്ക് മാറ്റുക." }, @@ -371,7 +371,7 @@ "title": "അനുമതികൾ മാറ്റുക", "desc": "നിങ്ങളുടെ PDF പ്രമാണത്തിന്റെ അനുമതികൾ മാറ്റുക" }, - "removePages": { + "pageRemover": { "title": "നീക്കം ചെയ്യുക", "desc": "നിങ്ങളുടെ PDF പ്രമാണത്തിൽ നിന്ന് ആവശ്യമില്ലാത്ത പേജുകൾ ഇല്ലാതാക്കുക." }, @@ -383,7 +383,7 @@ "title": "പാസ്‌വേഡ് നീക്കം ചെയ്യുക", "desc": "നിങ്ങളുടെ PDF പ്രമാണത്തിൽ നിന്ന് പാസ്‌വേഡ് സംരക്ഷണം നീക്കം ചെയ്യുക." }, - "compressPdfs": { + "compress": { "title": "കംപ്രസ് ചെയ്യുക", "desc": "ഫയൽ വലുപ്പം കുറയ്ക്കുന്നതിന് PDF-കൾ കംപ്രസ് ചെയ്യുക." }, @@ -479,7 +479,7 @@ "title": "പൈപ്പ്ലൈൻ", "desc": "പൈപ്പ്ലൈൻ സ്ക്രിപ്റ്റുകൾ നിർവചിച്ചുകൊണ്ട് PDF-കളിൽ ഒന്നിലധികം പ്രവർത്തനങ്ങൾ നടത്തുക" }, - "add-page-numbers": { + "addPageNumbers": { "title": "പേജ് നമ്പറുകൾ ചേർക്കുക", "desc": "ഒരു പ്രമാണത്തിലുടനീളം ഒരു നിശ്ചിത സ്ഥാനത്ത് പേജ് നമ്പറുകൾ ചേർക്കുക" }, @@ -487,7 +487,7 @@ "title": "PDF ഫയൽ സ്വയം പുനർനാമകരണം ചെയ്യുക", "desc": "കണ്ടെത്തിയ തലക്കെട്ടിനെ അടിസ്ഥാനമാക്കി ഒരു PDF ഫയൽ സ്വയം പുനർനാമകരണം ചെയ്യുന്നു" }, - "adjust-contrast": { + "adjustContrast": { "title": "നിറങ്ങൾ/കോൺട്രാസ്റ്റ് ക്രമീകരിക്കുക", "desc": "ഒരു PDF-ന്റെ കോൺട്രാസ്റ്റ്, സാച്ചുറേഷൻ, തെളിച്ചം എന്നിവ ക്രമീകരിക്കുക" }, @@ -499,7 +499,7 @@ "title": "പേജുകൾ സ്വയം വിഭജിക്കുക", "desc": "ഭൗതികമായി സ്കാൻ ചെയ്ത പേജ് സ്പ്ലിറ്റർ QR കോഡ് ഉപയോഗിച്ച് സ്കാൻ ചെയ്ത PDF സ്വയം വിഭജിക്കുക" }, - "sanitizePdf": { + "sanitizePDF": { "title": "ശുദ്ധീകരിക്കുക", "desc": "PDF ഫയലുകളിൽ നിന്ന് സ്ക്രിപ്റ്റുകളും മറ്റ് ഘടകങ്ങളും നീക്കം ചെയ്യുക" }, @@ -523,11 +523,11 @@ "title": "PDF-നെക്കുറിച്ചുള്ള എല്ലാ വിവരങ്ങളും നേടുക", "desc": "PDF-കളെക്കുറിച്ചുള്ള സാധ്യമായ എല്ലാ വിവരങ്ങളും നേടുന്നു" }, - "extractPage": { + "pageExtracter": { "title": "പേജ്(കൾ) വേർതിരിച്ചെടുക്കുക", "desc": "PDF-ൽ നിന്ന് തിരഞ്ഞെടുത്ത പേജുകൾ വേർതിരിച്ചെടുക്കുന്നു" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "ഒരൊറ്റ വലിയ പേജ്", "desc": "എല്ലാ PDF പേജുകളും ഒരൊറ്റ വലിയ പേജിലേക്ക് ലയിപ്പിക്കുന്നു" }, @@ -543,11 +543,11 @@ "title": "സ്വയം റെഡാക്ഷൻ", "desc": "തിരഞ്ഞെടുത്ത ടെക്സ്റ്റ്, വരച്ച രൂപങ്ങൾ കൂടാതെ/അല്ലെങ്കിൽ തിരഞ്ഞെടുത്ത പേജ്(കൾ) അടിസ്ഥാനമാക്കി ഒരു PDF റെഡാക്റ്റ് ചെയ്യുന്നു" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF CSV-ലേക്ക്", "desc": "ഒരു PDF-ൽ നിന്ന് പട്ടികകൾ വേർതിരിച്ചെടുത്ത് CSV-ലേക്ക് മാറ്റുന്നു" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "വലുപ്പം/എണ്ണം അനുസരിച്ച് സ്വയം വിഭജിക്കുക", "desc": "വലുപ്പം, പേജ് എണ്ണം, അല്ലെങ്കിൽ പ്രമാണങ്ങളുടെ എണ്ണം എന്നിവ അടിസ്ഥാനമാക്കി ഒരൊറ്റ PDF ഒന്നിലധികം പ്രമാണങ്ങളായി വിഭജിക്കുക" }, @@ -563,11 +563,11 @@ "title": "PDF-ൽ സ്റ്റാമ്പ് ചേർക്കുക", "desc": "നിശ്ചിത സ്ഥാനങ്ങളിൽ ടെക്സ്റ്റ് അല്ലെങ്കിൽ ഇമേജ് സ്റ്റാമ്പുകൾ ചേർക്കുക" }, - "removeImagePdf": { + "removeImage": { "title": "ചിത്രം നീക്കം ചെയ്യുക", "desc": "ഫയൽ വലുപ്പം കുറയ്ക്കാൻ PDF-ൽ നിന്ന് ചിത്രം നീക്കം ചെയ്യുക" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "അധ്യായങ്ങൾ അനുസരിച്ച് PDF വിഭജിക്കുക", "desc": "അതിന്റെ അധ്യായ ഘടനയെ അടിസ്ഥാനമാക്കി ഒരു PDF ഒന്നിലധികം ഫയലുകളായി വിഭജിക്കുക." }, @@ -575,7 +575,7 @@ "title": "PDF ഒപ്പ് സാധൂകരിക്കുക", "desc": "PDF പ്രമാണങ്ങളിലെ ഡിജിറ്റൽ ഒപ്പുകളും സർട്ടിഫിക്കറ്റുകളും പരിശോധിക്കുക" }, - "replaceColorPdf": { + "replace-color": { "title": "നിറം മാറ്റുകയും വിപരീതമാക്കുകയും ചെയ്യുക", "desc": "PDF-ലെ ടെക്സ്റ്റിനും പശ്ചാത്തലത്തിനും നിറം മാറ്റുകയും ഫയൽ വലുപ്പം കുറയ്ക്കുന്നതിന് PDF-ന്റെ മുഴുവൻ നിറവും വിപരീതമാക്കുകയും ചെയ്യുക" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/nl-NL/translation.json b/frontend/public/locales/nl-NL/translation.json index 7f82e8529..9054007ca 100644 --- a/frontend/public/locales/nl-NL/translation.json +++ b/frontend/public/locales/nl-NL/translation.json @@ -347,7 +347,7 @@ "title": "Roteren", "desc": "Roteer eenvoudig je PDF's." }, - "imageToPdf": { + "imageToPDF": { "title": "Afbeelding naar PDF", "desc": "Converteer een afbeelding (PNG, JPEG, GIF) naar PDF." }, @@ -371,7 +371,7 @@ "title": "Permissies wijzigen", "desc": "Wijzig de permissies van je PDF-document" }, - "removePages": { + "pageRemover": { "title": "Verwijderen", "desc": "Verwijder ongewenste pagina's uit je PDF-document." }, @@ -383,7 +383,7 @@ "title": "Wachtwoord verwijderen", "desc": "Verwijder wachtwoordbeveiliging van je PDF-document." }, - "compressPdfs": { + "compress": { "title": "Comprimeren", "desc": "Comprimeer PDF's om hun bestandsgrootte te verkleinen." }, @@ -479,7 +479,7 @@ "title": "Pijplijn", "desc": "Voer meerdere acties uit op PDF's door pipelinescripts te definiëren" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Paginanummers toevoegen", "desc": "Voeg paginanummers toe binnen het volledige document op een vastgestelde locatie" }, @@ -487,7 +487,7 @@ "title": "Automatisch hernoemen PDF-bestand", "desc": "Hernoemt automatisch een PDF-bestand op basis van de gedetecteerde header" }, - "adjust-contrast": { + "adjustContrast": { "title": "Kleuren/contrast aanpassen", "desc": "Pas contrast, verzadiging en helderheid van een PDF aan" }, @@ -499,7 +499,7 @@ "title": "Automatisch splitsen pagina's", "desc": "Automatisch splitsen van gescande PDF met fysieke gescande paginasplitter QR-code" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Opschonen", "desc": "Verwijder scripts en andere elementen uit PDF-bestanden" }, @@ -523,11 +523,11 @@ "title": "Haal ALLE informatie op over PDF", "desc": "Haalt alle mogelijke informatie op van PDF's" }, - "extractPage": { + "pageExtracter": { "title": "Pagina('s) extraheren", "desc": "Extraheert geselecteerde pagina's uit PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF naar één grote pagina", "desc": "Voegt alle PDF-pagina's samen tot één grote pagina" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF naar CSV", "desc": "Haalt tabellen uit een PDF en converteert ze naar CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Automatisch splitsen op grootte/aantal", "desc": "Splits een enkele PDF in meerdere documenten op basis van grootte, aantal pagina's of aantal documenten" }, @@ -563,11 +563,11 @@ "title": "Stempel toevoegen aan PDF", "desc": "Voeg tekst of afbeeldingsstempels toe op vaste locaties" }, - "removeImagePdf": { + "removeImage": { "title": "Afbeelding verwijderen", "desc": "Afbeeldingen uit PDF verwijderen om het bestandsgrootte te verminderen" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "PDF op hoofdstukken splitsen", "desc": "Splits een PDF op basis van zijn hoofdstukstructuur in meerdere bestanden." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Vervang de kleur van tekst en achtergrond in een PDF en omverkeer de volledige kleur van het document om bestandsgrootte te verkleinen." } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/no-NB/translation.json b/frontend/public/locales/no-NB/translation.json index d50fed454..37b8f9ee6 100644 --- a/frontend/public/locales/no-NB/translation.json +++ b/frontend/public/locales/no-NB/translation.json @@ -347,7 +347,7 @@ "title": "Roter", "desc": "Roter enkelt dine PDF-er." }, - "imageToPdf": { + "imageToPDF": { "title": "Bilde til PDF", "desc": "Konverter et bilde (PNG, JPEG, GIF) til PDF." }, @@ -371,7 +371,7 @@ "title": "Endre Tillatelser", "desc": "Endre tillatelsene til din PDF-dokument" }, - "removePages": { + "pageRemover": { "title": "Fjern", "desc": "Slett uønskede sider fra din PDF-dokument." }, @@ -383,7 +383,7 @@ "title": "Fjern Passord", "desc": "Fjern passordbeskyttelse fra din PDF-dokument." }, - "compressPdfs": { + "compress": { "title": "Komprimer", "desc": "Komprimer PDF-er for å redusere filstørrelsen." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Avansert)", "desc": "Utfør flere handlinger på PDF-er ved å definere pipelineskripter" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Legg til Sidetall", "desc": "Legg til sidetall gjennom et dokument på en angitt plassering" }, @@ -487,7 +487,7 @@ "title": "Auto Omdøp PDF Fil", "desc": "Omdøper automatisk en PDF-fil basert på dens oppdagede overskrift" }, - "adjust-contrast": { + "adjustContrast": { "title": "Juster Farger/Kontrast", "desc": "Juster kontrast, metning og lysstyrke i en PDF" }, @@ -499,7 +499,7 @@ "title": "Auto Del Sider", "desc": "Auto Del Skannet PDF med fysisk skannet sidesplitter QR-kode" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanitiser", "desc": "Fjern skript og andre elementer fra PDF-filer" }, @@ -523,11 +523,11 @@ "title": "Få ALL informasjon om PDF", "desc": "Fanger opp all tilgjengelig informasjon om PDF-er" }, - "extractPage": { + "pageExtracter": { "title": "Ekstraher side(r)", "desc": "Ekstraher valgte sider fra PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF til Enkelt Stor Side", "desc": "Slår sammen alle PDF-sider til en stor enkeltside" }, @@ -543,11 +543,11 @@ "title": "Manuell Sensurering", "desc": "Sensurerer en PDF basert på valgt tekst, tegnede former og/eller valgte side(r)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF til CSV", "desc": "Ekstraherer tabeller fra en PDF og konverterer dem til CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto Del etter Størrelse/Antall", "desc": "Del en enkelt PDF i flere dokumenter basert på størrelse, antall sider eller dokumenter" }, @@ -563,11 +563,11 @@ "title": "Legg til Stempel i PDF", "desc": "Legg til tekst eller bilde stempler på angitte steder" }, - "removeImagePdf": { + "removeImage": { "title": "Fjern bilde", "desc": "Fjern bilde fra PDF for å redusere filstørrelsen" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Valider PDF-signatur", "desc": "Verifiser digitale signaturer og sertifikater i PDF-dokumenter" }, - "replaceColorPdf": { + "replace-color": { "title": "Erstatt og Inverter Farge", "desc": "Erstatt farge for tekst og bakgrunn i PDF og inverter full farge av pdf for å redusere filstørrelsen" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/pl-PL/translation.json b/frontend/public/locales/pl-PL/translation.json index 86eff3348..4d1656f6a 100644 --- a/frontend/public/locales/pl-PL/translation.json +++ b/frontend/public/locales/pl-PL/translation.json @@ -347,7 +347,7 @@ "title": "Obróć", "desc": "Łatwo obracaj dokumenty PDF." }, - "imageToPdf": { + "imageToPDF": { "title": "Obraz na PDF", "desc": "Konwertuj obraz (PNG, JPEG, GIF) do dokumentu PDF." }, @@ -371,7 +371,7 @@ "title": "Zmień uprawnienia", "desc": "Zmień uprawnienia dokumentu PDF" }, - "removePages": { + "pageRemover": { "title": "Usuń", "desc": "Usuń niechciane strony z dokumentu PDF." }, @@ -383,7 +383,7 @@ "title": "Usuń hasło", "desc": "Usuń ochronę hasłem z dokumentu PDF." }, - "compressPdfs": { + "compress": { "title": "Kompresuj", "desc": "Kompresuj dokumenty PDF, aby zmniejszyć ich rozmiar." }, @@ -479,7 +479,7 @@ "title": "Automatyzacja", "desc": "Wykonaj wiele akcji na dokumentach PDF, tworząc automatyzację" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Dodaj numery stron", "desc": "Dodaj numery strony w dokumencie PDF w podanej lokalizacji" }, @@ -487,7 +487,7 @@ "title": "Automatycznie zmień nazwę PDF", "desc": "Automatycznie zmień nazwę PDF bazując na nagłówku" }, - "adjust-contrast": { + "adjustContrast": { "title": "Zmień kolor/nasycenie/jasność", "desc": "Zmień kolor/nasycenie/jasność w dokumencie PDF" }, @@ -499,7 +499,7 @@ "title": "Automatycznie podziel strony", "desc": "Automatycznie podziel dokument na strony" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Dezynfekcja", "desc": "Usuń skrypt i inne elementy z dokumentu PDF" }, @@ -523,11 +523,11 @@ "title": "Pobierz informacje o pliku PDF", "desc": "Pobiera wszelkie informacje o pliku PDF" }, - "extractPage": { + "pageExtracter": { "title": "Wyciągnij stronę z PDF", "desc": "Wyciąga stronę z dokumentu PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF do jednej strony", "desc": "Łączy wszystkie strony PDFa w jedną wielką stronę PDF" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF do CSV", "desc": "Konwertuje tabele z PDF do pliku CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Podziel (Rozmiar/Ilość stron)", "desc": "Rozdziela dokument PDF na wiele dokumentów bazując na podanym rozmiarze, ilości stron bądź ilości dokumentów" }, @@ -563,11 +563,11 @@ "title": "Dodaj pieczęć", "desc": "Dodaj pieczęć tekstową/obrazową w wyznaczonej lokalizacji dokumentu" }, - "removeImagePdf": { + "removeImage": { "title": "Usuń obraz", "desc": "Usuń obraz z pliku PDF, aby zmniejszyć rozmiar pliku" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Podziel PDF według rozdziałów", "desc": "Podział pliku PDF na wiele plików na podstawie struktury rozdziałów." }, @@ -575,7 +575,7 @@ "title": "Sprawdź poprawność podpisu PDF", "desc": "Weryfikuj podpisy cyfrowe i certyfikaty w dokumentach PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Zastąp i Odwróć Kolor", "desc": "Zastąp kolor tekstu i tła w pliku PDF i odwróć pełen kolor pliku PDF, aby zmniejszyć rozmiar pliku" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/pt-BR/translation.json b/frontend/public/locales/pt-BR/translation.json index 45a2d2d94..2b0976400 100644 --- a/frontend/public/locales/pt-BR/translation.json +++ b/frontend/public/locales/pt-BR/translation.json @@ -347,7 +347,7 @@ "title": "Girar", "desc": "Gire facilmente seus PDFs." }, - "imageToPdf": { + "imageToPDF": { "title": "Imagem para PDF", "desc": "Converter uma imagem (PNG, JPG, GIF) em PDF." }, @@ -371,7 +371,7 @@ "title": "Alterar Permissões", "desc": "Alterar as permissões do seu PDF." }, - "removePages": { + "pageRemover": { "title": "Remover Páginas", "desc": "Excluir páginas indesejadas do seu PDF." }, @@ -383,7 +383,7 @@ "title": "Desproteger PDF", "desc": "Descriptografar o PDF realizando a remoção da senha." }, - "compressPdfs": { + "compress": { "title": "Comprimir", "desc": "Comprimir PDFs para reduzir o tamanho do arquivo." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Executar várias ações em PDFs seguindo scripts de operações." }, - "add-page-numbers": { + "addPageNumbers": { "title": "Adicionar Números de Página", "desc": "Adicionar números de página no documento, em um local definido." }, @@ -487,7 +487,7 @@ "title": "Renomeação Automática do PDF", "desc": "Renomeia automaticamente o PDF com base no cabeçalho detectado." }, - "adjust-contrast": { + "adjustContrast": { "title": "Ajuste Visual do PDF", "desc": "Ajustar Contraste, Saturação e Brilho de um PDF." }, @@ -499,7 +499,7 @@ "title": "Divisão Automática de Páginas", "desc": "Dividir automaticamente um PDF digitalizado utilizando um separador de páginas físico com QR Code." }, - "sanitizePdf": { + "sanitizePDF": { "title": "Higienizar", "desc": "Remover scripts, links, metadados e outros elementos de um PDF." }, @@ -523,11 +523,11 @@ "title": "Obter Informações de um PDF", "desc": "Obtém informações (metadata) de um PDF." }, - "extractPage": { + "pageExtracter": { "title": "Extrair Página(s)", "desc": "Extrair determinadas páginas de um PDF." }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF para Página Única", "desc": "Combina todas as páginas de um PDF em uma única página." }, @@ -543,11 +543,11 @@ "title": "Ocultação de Texto Manual", "desc": "Ocultação de texto manual baseada em um texto selecionado, desenho de formas ou/e páginas selecionadas." }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF para CSV", "desc": "Extração de tabelas de um PDF convertendo para CSV." }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Divisão Manual do PDF", "desc": "Divida um PDF em vários, com base no tamanho, contagem de páginas ou contagem de documentos." }, @@ -563,11 +563,11 @@ "title": "Adicionar Carimbo ao PDF", "desc": "Adicione texto ou carimbos de imagem em locais definidos." }, - "removeImagePdf": { + "removeImage": { "title": "Remover Imagem", "desc": "Remova imagens do PDF para reduzir o tamanho do arquivo." }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Divide PDF por Capítulos", "desc": "Divide um PDF em vários arquivos baseado na sua estrutura de capítulos." }, @@ -575,7 +575,7 @@ "title": "Verificar Assinatura com Certificado", "desc": "Verifica assinatura digital e certificado em um PDF." }, - "replaceColorPdf": { + "replace-color": { "title": "Substitui e Inverte Cores", "desc": "Substitui cor do texto e plano de fundo de um PDF e/ou inverte a toda cor do PDF para reduzir o tamanho." } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/pt-PT/translation.json b/frontend/public/locales/pt-PT/translation.json index 9ecc39e51..516be580f 100644 --- a/frontend/public/locales/pt-PT/translation.json +++ b/frontend/public/locales/pt-PT/translation.json @@ -347,7 +347,7 @@ "title": "Rodar", "desc": "Rode facilmente os seus PDFs." }, - "imageToPdf": { + "imageToPDF": { "title": "Imagem para PDF", "desc": "Converter uma imagem (PNG, JPEG, GIF) para PDF." }, @@ -371,7 +371,7 @@ "title": "Alterar Permissões", "desc": "Alterar as permissões do seu documento PDF" }, - "removePages": { + "pageRemover": { "title": "Remover", "desc": "Eliminar páginas indesejadas do seu documento PDF." }, @@ -383,7 +383,7 @@ "title": "Remover Palavra-passe", "desc": "Remover proteção por palavra-passe do seu documento PDF." }, - "compressPdfs": { + "compress": { "title": "Comprimir", "desc": "Comprimir PDFs para reduzir o seu tamanho." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Executar múltiplas ações em PDFs definindo scripts pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Adicionar Números de Página", "desc": "Adicionar números de página ao longo de um documento numa localização definida" }, @@ -487,7 +487,7 @@ "title": "Renomear Automaticamente Ficheiro PDF", "desc": "Renomeia automaticamente um ficheiro PDF baseado no cabeçalho detetado" }, - "adjust-contrast": { + "adjustContrast": { "title": "Ajustar Cores/Contraste", "desc": "Ajustar Contraste, Saturação e Brilho de um PDF" }, @@ -499,7 +499,7 @@ "title": "Divisão Automática de Páginas", "desc": "Dividir automaticamente PDF digitalizado com separador de páginas físico com Código QR" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanitizar", "desc": "Remover scripts e outros elementos de ficheiros PDF" }, @@ -523,11 +523,11 @@ "title": "Obter TODA Informação sobre PDF", "desc": "Obtém qualquer e toda informação possível sobre PDFs" }, - "extractPage": { + "pageExtracter": { "title": "Extrair página(s)", "desc": "Extrai páginas selecionadas do PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Página Única Grande", "desc": "Junta todas as páginas do PDF numa única página grande" }, @@ -543,11 +543,11 @@ "title": "Redação Manual", "desc": "Redacta um PDF baseado em texto selecionado, formas desenhadas e/ou página(s) selecionada(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF para CSV", "desc": "Extrai Tabelas de um PDF convertendo para CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Divisão Automática por Tamanho/Contagem", "desc": "Dividir um único PDF em múltiplos documentos baseado em tamanho, contagem de páginas, ou contagem de documentos" }, @@ -563,11 +563,11 @@ "title": "Adicionar Carimbo a PDF", "desc": "Adicionar carimbos de texto ou adicionar carimbos de imagem em localizações definidas" }, - "removeImagePdf": { + "removeImage": { "title": "Remover imagem", "desc": "Remover imagem do PDF para reduzir tamanho do ficheiro" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Dividir PDF por Capítulos", "desc": "Dividir um PDF em múltiplos ficheiros baseado na sua estrutura de capítulos." }, @@ -575,7 +575,7 @@ "title": "Validar Assinatura PDF", "desc": "Verificar assinaturas digitais e certificados em documentos PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Substituir e Inverter Cor", "desc": "Substituir cor para texto e fundo em PDF e inverter cor completa do pdf para reduzir tamanho do ficheiro" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ro-RO/translation.json b/frontend/public/locales/ro-RO/translation.json index 4e22c0cc3..460623ed0 100644 --- a/frontend/public/locales/ro-RO/translation.json +++ b/frontend/public/locales/ro-RO/translation.json @@ -347,7 +347,7 @@ "title": "Rotește", "desc": "Rotește cu ușurință fișierele PDF." }, - "imageToPdf": { + "imageToPDF": { "title": "Imagine în PDF", "desc": "Convertește o imagine (PNG, JPEG, GIF) în PDF." }, @@ -371,7 +371,7 @@ "title": "Schimbă permisiuni", "desc": "Schimbă permisiunile documentului PDF" }, - "removePages": { + "pageRemover": { "title": "Elimină", "desc": "Șterge paginile nedorite din documentul PDF." }, @@ -383,7 +383,7 @@ "title": "Elimină Parola", "desc": "Elimină protecția cu parolă din documentul PDF." }, - "compressPdfs": { + "compress": { "title": "Comprimă", "desc": "Comprimă fișierele PDF pentru a reduce dimensiunea lor." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Avansat)", "desc": "Rulează multiple acțiuni pe PDF-uri definind scripturi pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Adaugă Numere de Pagină", "desc": "Adaugă numere de pagină în tot documentul într-o locație setată" }, @@ -487,7 +487,7 @@ "title": "Redenumire Automată Fișier PDF", "desc": "Redenumește automat un fișier PDF bazat pe antetul detectat" }, - "adjust-contrast": { + "adjustContrast": { "title": "Ajustează Culorile/Contrastul", "desc": "Ajustează Contrastul, Saturația și Luminozitatea unui PDF" }, @@ -499,7 +499,7 @@ "title": "Desparte Automat Paginile", "desc": "Desparte Automat PDF-ul Scanat cu separator fizic de pagini scanate cu Cod QR" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Igienizează", "desc": "Elimină scripturile și alte elemente din fișierele PDF" }, @@ -523,11 +523,11 @@ "title": "Obține TOATE Informațiile despre PDF", "desc": "Extrage orice și toate informațiile posibile despre PDF-uri" }, - "extractPage": { + "pageExtracter": { "title": "Extrage pagină(i)", "desc": "Extrage paginile selectate din PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF într-o Singură Pagină Mare", "desc": "Îmbină toate paginile PDF într-o singură pagină mare" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF în CSV", "desc": "Extrage Tabelele dintr-un PDF convertindu-l în CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Despărțire Automată după Dimensiune/Număr", "desc": "Împarte un singur PDF în mai multe documente bazat pe dimensiune, număr de pagini sau număr de documente" }, @@ -563,11 +563,11 @@ "title": "Adaugă Ștampilă la PDF", "desc": "Adaugă text sau adaugă ștampile imagine în locații setate" }, - "removeImagePdf": { + "removeImage": { "title": "Elimină imagine", "desc": "Elimină imaginea din PDF pentru a reduce dimensiunea fișierului" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/ru-RU/translation.json b/frontend/public/locales/ru-RU/translation.json index 79bfecf9d..86b23c566 100644 --- a/frontend/public/locales/ru-RU/translation.json +++ b/frontend/public/locales/ru-RU/translation.json @@ -347,7 +347,7 @@ "title": "Повернуть", "desc": "Легко поворачивайте ваши PDF-файлы." }, - "imageToPdf": { + "imageToPDF": { "title": "Изображение в PDF", "desc": "Преобразование изображения (PNG, JPEG, GIF) в PDF." }, @@ -371,7 +371,7 @@ "title": "Изменить разрешения", "desc": "Измените разрешения вашего PDF-документа" }, - "removePages": { + "pageRemover": { "title": "Удалить", "desc": "Удалите ненужные страницы из вашего PDF-документа." }, @@ -383,7 +383,7 @@ "title": "Удалить пароль", "desc": "Удалите защиту паролем из вашего PDF-документа." }, - "compressPdfs": { + "compress": { "title": "Сжать", "desc": "Сжимайте PDF-файлы для уменьшения их размера." }, @@ -479,7 +479,7 @@ "title": "Конвейер", "desc": "Выполняйте несколько действий с PDF, определяя сценарии конвейера" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Добавить нумерацию страниц", "desc": "Добавить номера страниц по всему документу в указанном месте" }, @@ -487,7 +487,7 @@ "title": "Автопереименование PDF-файла", "desc": "Автоматически переименовывает PDF-файл на основе обнаруженного заголовка" }, - "adjust-contrast": { + "adjustContrast": { "title": "Настройка цветов/контраста", "desc": "Настройка контраста, насыщенности и яркости PDF" }, @@ -499,7 +499,7 @@ "title": "Авторазделение страниц", "desc": "Автоматическое разделение сканированного PDF с физическим разделителем страниц по QR-коду" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Очистка", "desc": "Удаление скриптов и других элементов из PDF-файлов" }, @@ -523,11 +523,11 @@ "title": "Получить ВСЮ информацию о PDF", "desc": "Собирает всю возможную информацию о PDF" }, - "extractPage": { + "pageExtracter": { "title": "Извлечь страницу(ы)", "desc": "Извлекает выбранные страницы из PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "Одна большая страница", "desc": "Объединяет все страницы PDF в одну большую страницу" }, @@ -543,11 +543,11 @@ "title": "Ручное редактирование", "desc": "Редактирует PDF на основе выбранного текста, нарисованных форм и/или выбранных страниц" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF в CSV", "desc": "Извлекает таблицы из PDF с преобразованием в CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Авторазделение по размеру/количеству", "desc": "Разделяет один PDF на несколько документов на основе размера, количества страниц или количества документов" }, @@ -563,11 +563,11 @@ "title": "Добавить штамп в PDF", "desc": "Добавляет текстовые или графические штампы в указанных местах" }, - "removeImagePdf": { + "removeImage": { "title": "Удалить изображение", "desc": "Удаляет изображения из PDF для уменьшения размера файла" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Разделить PDF по главам", "desc": "Разделяет PDF на несколько файлов на основе структуры его глав" }, @@ -575,7 +575,7 @@ "title": "Проверка подписи PDF", "desc": "Проверка цифровых подписей и сертификатов в PDF-документах" }, - "replaceColorPdf": { + "replace-color": { "title": "Замена и инверсия цвета", "desc": "Заменяет цвет текста и фона в PDF и инвертирует все цвета PDF для уменьшения размера файла" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/sk-SK/translation.json b/frontend/public/locales/sk-SK/translation.json index bbdf5f676..467e93434 100644 --- a/frontend/public/locales/sk-SK/translation.json +++ b/frontend/public/locales/sk-SK/translation.json @@ -347,7 +347,7 @@ "title": "Otočiť", "desc": "Jednoducho otáčajte svoje PDF súbory." }, - "imageToPdf": { + "imageToPDF": { "title": "Obrázok na PDF", "desc": "Konvertujte obrázok (PNG, JPEG, GIF) na PDF." }, @@ -371,7 +371,7 @@ "title": "Zmeniť povolenia", "desc": "Zmena povolení vášho PDF dokumentu" }, - "removePages": { + "pageRemover": { "title": "Odstrániť", "desc": "Odstrániť nechcené stránky z vášho PDF dokumentu." }, @@ -383,7 +383,7 @@ "title": "Odstrániť heslo", "desc": "Odstrániť ochranu heslom z vášho PDF dokumentu." }, - "compressPdfs": { + "compress": { "title": "Komprimovať", "desc": "Komprimujte PDF na zmenšenie jeho veľkosti." }, @@ -479,7 +479,7 @@ "title": "Pipeline", "desc": "Spustiť viacero akcií na PDF definovaním pipeline skriptov" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Pridať čísla stránok", "desc": "Pridať čísla stránok po celom dokumente na určenom mieste" }, @@ -487,7 +487,7 @@ "title": "Automatické premenovanie PDF súboru", "desc": "Automaticky premenuje PDF súbor na základe zisteného záhlavia" }, - "adjust-contrast": { + "adjustContrast": { "title": "Upraviť farby/kontrast", "desc": "Upravte kontrast, sýtosť a jas PDF" }, @@ -499,7 +499,7 @@ "title": "Automatické rozdelenie stránok", "desc": "Automatické rozdelenie skenovaného PDF pomocou fyzického skenovaného rozdeľovača stránok QR kódom" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Vyčistiť", "desc": "Odstrániť skripty a ďalšie prvky z PDF súborov" }, @@ -523,11 +523,11 @@ "title": "Získať všetky informácie o PDF", "desc": "Získava všetky dostupné informácie o PDF" }, - "extractPage": { + "pageExtracter": { "title": "Extrahovať stránku(y)", "desc": "Extrahuje vybrané stránky z PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF na jednu veľkú stránku", "desc": "Zlúči všetky stránky PDF do jednej veľkej stránky" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF do CSV", "desc": "Extrahuje tabuľky z PDF a konvertuje ich do CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Automatické rozdelenie podľa veľkosti/počtu", "desc": "Rozdelí jeden PDF na viacero dokumentov na základe veľkosti, počtu stránok alebo počtu dokumentov" }, @@ -563,11 +563,11 @@ "title": "Pridať pečiatku do PDF", "desc": "Pridať text alebo obrázkové pečiatky na určené miesta" }, - "removeImagePdf": { + "removeImage": { "title": "Remove image", "desc": "Remove image from PDF to reduce file size" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/sl-SI/translation.json b/frontend/public/locales/sl-SI/translation.json index 68f9e3eb5..848d0b4e6 100644 --- a/frontend/public/locales/sl-SI/translation.json +++ b/frontend/public/locales/sl-SI/translation.json @@ -347,7 +347,7 @@ "title": "Zavrti", "desc": "Preprosto zavrtite svoje PDF-je." }, - "imageToPdf": { + "imageToPDF": { "title": "Slika v PDF", "desc": "Pretvori sliko (PNG, JPEG, GIF) v PDF." }, @@ -371,7 +371,7 @@ "title": "Spremeni dovoljenja", "desc": "Spremenite dovoljenja vašega dokumenta PDF" }, - "removePages": { + "pageRemover": { "title": "Odstrani", "desc": "Izbrišite neželene strani iz dokumenta PDF." }, @@ -383,7 +383,7 @@ "title": "Odstrani geslo", "desc": "Odstranite zaščito z geslom iz vašega dokumenta PDF." }, - "compressPdfs": { + "compress": { "title": "Stisni", "desc": "Stisnite PDF-je, da zmanjšate njihovo velikost." }, @@ -479,7 +479,7 @@ "title": "Cevovod", "desc": "Zaženi več dejanj na PDF-jih z definiranjem cevovodnih skriptov" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Dodaj številke strani", "desc": "Dodaj številke strani skozi dokument na določeno mesto" }, @@ -487,7 +487,7 @@ "title": "Samodejno preimenuj datoteko PDF", "desc": "Samodejno preimenuje datoteko PDF glede na zaznano glavo" }, - "adjust-contrast": { + "adjustContrast": { "title": "Prilagodi barve/kontrast", "desc": "Prilagodi kontrast, nasičenost in svetlost PDF-ja" }, @@ -499,7 +499,7 @@ "title": "Samodejno razdeli strani", "desc": "Samodejno razdeli optično prebrane PDF-je s fizično QR kodo razdelilnika optično prebranih strani" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Razkuži", "desc": "Odstrani skripte in druge elemente iz datotek PDF" }, @@ -523,11 +523,11 @@ "title": "Pridobite VSE informacije o PDF-ju", "desc": "Zgrabi vse možne informacije o PDF-jih" }, - "extractPage": { + "pageExtracter": { "title": "Izvleček strani(e)", "desc": "Izvleče izbrane strani iz PDF-ja" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF na eno veliko stran", "desc": "Združi vse strani PDF v eno samo veliko stran" }, @@ -543,11 +543,11 @@ "title": "Ročna redakcija", "desc": "Preredi PDF na podlagi izbranega besedila, narisanih oblik in/ali izbranih strani(-e)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF v CSV", "desc": "Izvleče tabele iz PDF in jih pretvori v CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Samodejna razdelitev po velikosti/številu", "desc": "Razdeli en PDF na več dokumentov glede na velikost, število strani ali število dokumentov" }, @@ -563,11 +563,11 @@ "title": "Dodaj žig v PDF", "desc": "Dodaj besedilo ali slikovne žige na nastavljenih lokacijah" }, - "removeImagePdf": { + "removeImage": { "title": "Odstrani sliko", "desc": "Odstranite sliko iz PDF-ja, da zmanjšate velikost datoteke" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Razdeli PDF po poglavjih", "desc": "Razdeli PDF na več datotek glede na strukturo poglavij." }, @@ -575,7 +575,7 @@ "title": "Preveri podpis PDF", "desc": "Preveri digitalne podpise in potrdila v dokumentih PDF" }, - "replaceColorPdf": { + "replace-color": { "title": "Napredne barvne možnosti", "desc": "Zamenjaj barvo besedila in ozadja v PDF-ju in obrni celotno barvo PDF-ja, da zmanjšaš velikost datoteke" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/sr-LATN-RS/translation.json b/frontend/public/locales/sr-LATN-RS/translation.json index 2821b0ffd..9533b8707 100644 --- a/frontend/public/locales/sr-LATN-RS/translation.json +++ b/frontend/public/locales/sr-LATN-RS/translation.json @@ -347,7 +347,7 @@ "title": "Rotacija", "desc": "Lako rotirajte vaše PDF-ove." }, - "imageToPdf": { + "imageToPDF": { "title": "Slika u PDF", "desc": "Konvertujte sliku (PNG, JPEG, GIF) u PDF." }, @@ -371,7 +371,7 @@ "title": "Promeni dozvole", "desc": "Promenite dozvole vašeg PDF dokumenta" }, - "removePages": { + "pageRemover": { "title": "Ukloni", "desc": "Obrišite nepotrebne stranice iz vašeg PDF dokumenta." }, @@ -383,7 +383,7 @@ "title": "Ukloni lozinku", "desc": "Uklonite zaštitu lozinkom sa vašeg PDF dokumenta." }, - "compressPdfs": { + "compress": { "title": "Kompresuj", "desc": "Kompresujte PDF-ove kako bi smanjili veličinu fajla." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Napredno)", "desc": "Pokreće više akcija na PDF-ovima definisanjem skripti u pipelinu" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Dodaj brojeve stranica", "desc": "Dodaje brojeve stranica u dokumentu na određeno mesto" }, @@ -487,7 +487,7 @@ "title": "Automatsko preimenovanje PDF fajla", "desc": "Automatski menja ime PDF fajla na osnovu detektovanog zaglavlja" }, - "adjust-contrast": { + "adjustContrast": { "title": "Podesi boje/kontrast", "desc": "Podesi kontrast, zasićenost i osvetljenost PDF-a" }, @@ -499,7 +499,7 @@ "title": "Automatsko razdvajanje stranica", "desc": "Automatski deli skenirane PDF-ove pomoću fizičkog skenera QR koda" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanitizacija", "desc": "Uklanja skripte i druge elemente iz PDF fajlova" }, @@ -523,11 +523,11 @@ "title": "Dohvati SVE informacije o PDF-u", "desc": "Dobavlja sve moguće informacije o PDF-ovima" }, - "extractPage": { + "pageExtracter": { "title": "Izdvajanje stranica", "desc": "Izdvaja odabrane stranice iz PDF-a" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF u Jednu Veliku Stranicu", "desc": "Spaja sve stranice PDF-a u jednu veliku stranicu" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF u CSV", "desc": "Izdvaja tabele iz PDF-a pretvarajući ih u CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Automatsko Deljenje po Veličini/Broju", "desc": "Deljenje jednog PDF-a na više dokumenata na osnovu veličine, broja stranica ili broja dokumenata" }, @@ -563,11 +563,11 @@ "title": "Add Stamp to PDF", "desc": "Add text or add image stamps at set locations" }, - "removeImagePdf": { + "removeImage": { "title": "Remove image", "desc": "Remove image from PDF to reduce file size" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/sv-SE/translation.json b/frontend/public/locales/sv-SE/translation.json index 158f5b762..a94174627 100644 --- a/frontend/public/locales/sv-SE/translation.json +++ b/frontend/public/locales/sv-SE/translation.json @@ -347,7 +347,7 @@ "title": "Rotera", "desc": "Rotera enkelt dina PDF-filer." }, - "imageToPdf": { + "imageToPDF": { "title": "Bild till PDF", "desc": "Konvertera en bild (PNG, JPEG, GIF) till PDF." }, @@ -371,7 +371,7 @@ "title": "Ändra behörigheter", "desc": "Ändra behörigheterna för ditt PDF-dokument" }, - "removePages": { + "pageRemover": { "title": "Ta bort", "desc": "Ta bort oönskade sidor från ditt PDF-dokument." }, @@ -383,7 +383,7 @@ "title": "Ta bort lösenord", "desc": "Ta bort lösenordsskydd från ditt PDF-dokument." }, - "compressPdfs": { + "compress": { "title": "Komprimera", "desc": "Komprimera PDF-filer för att minska deras filstorlek." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Avancerat)", "desc": "Kör flera åtgärder på PDF:er genom att definiera pipeline-skript" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Lägg till sidnummer", "desc": "Lägg till sidnummer genom hela dokumentet på en angiven plats" }, @@ -487,7 +487,7 @@ "title": "Automatiskt byt namn på PDF-fil", "desc": "Byter automatiskt namn på en PDF-fil baserat på dess detekterade rubrik" }, - "adjust-contrast": { + "adjustContrast": { "title": "Justera färger/kontrast", "desc": "Justera kontrast, mättnad och ljusstyrka i en PDF" }, @@ -499,7 +499,7 @@ "title": "Auto-dela sidor", "desc": "Auto-dela skannad PDF med fysisk skannad sidseparator QR-kod" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Sanera", "desc": "Ta bort skript och andra element från PDF-filer" }, @@ -523,11 +523,11 @@ "title": "Hämta ALL information om PDF", "desc": "Hämtar all möjlig information om PDF:er" }, - "extractPage": { + "pageExtracter": { "title": "Extrahera sida(or)", "desc": "Extraherar valda sidor från PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF till en enda stor sida", "desc": "Slår samman alla PDF-sidor till en enda stor sida" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF till CSV", "desc": "Extraherar tabeller från en PDF och konverterar dem till CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Auto-dela efter storlek/antal", "desc": "Dela en enda PDF till flera dokument baserat på storlek, sidantal eller dokumentantal" }, @@ -563,11 +563,11 @@ "title": "Lägg till stämpel på PDF", "desc": "Lägg till text eller bildstämplar på angivna platser" }, - "removeImagePdf": { + "removeImage": { "title": "Ta bort bild", "desc": "Ta bort bild från PDF för att minska filstorlek" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Dela upp PDF efter kapitel", "desc": "Dela upp en PDF till flera filer baserat på dess kapitelstruktur." }, @@ -575,7 +575,7 @@ "title": "Validera PDF signature", "desc": "Verifiera digitala signaturer och certifiakt i PDF dokument" }, - "replaceColorPdf": { + "replace-color": { "title": "Ersätt och Invertera färg", "desc": "Ersätt färg för text och bakgrund i PDF och invertera hela färgen på PDF för att minska filstorlek" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/th-TH/translation.json b/frontend/public/locales/th-TH/translation.json index 8dee79b00..cf6df8f74 100644 --- a/frontend/public/locales/th-TH/translation.json +++ b/frontend/public/locales/th-TH/translation.json @@ -347,7 +347,7 @@ "title": "หมุน", "desc": "หมุน PDF ของคุณได้อย่างง่ายดาย" }, - "imageToPdf": { + "imageToPDF": { "title": "รูปภาพเป็น PDF", "desc": "แปลงรูปภาพ (PNG, JPEG, GIF) เป็น PDF" }, @@ -371,7 +371,7 @@ "title": "เปลี่ยนสิทธิ์", "desc": "เปลี่ยนสิทธิ์ของเอกสาร PDF ของคุณ" }, - "removePages": { + "pageRemover": { "title": "ลบ", "desc": "ลบหน้าที่ไม่ต้องการจากเอกสาร PDF ของคุณ" }, @@ -383,7 +383,7 @@ "title": "ลบรหัสผ่าน", "desc": "ลบรหัสผ่านจากการป้องกันเอกสาร PDF ของคุณ" }, - "compressPdfs": { + "compress": { "title": "บีบอัด", "desc": "บีบอัด PDF เพื่อลดขนาดไฟล์" }, @@ -479,7 +479,7 @@ "title": "ทิศทางงาน", "desc": "เรียกใช้งานหลายการกระทำใน PDF โดยกำหนดสคริปต์ pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "เพิ่มหมายเลขหน้า", "desc": "เพิ่มหมายเลขหน้าตลอดทั้งเอกสารในตำแหน่งที่กำหนด" }, @@ -487,7 +487,7 @@ "title": "เปลี่ยนชื่อ PDF อัตโนมัติ", "desc": "เปลี่ยนชื่อไฟล์ PDF โดยอัตโนมัติตามหัวข้อที่ตรวจจับได้" }, - "adjust-contrast": { + "adjustContrast": { "title": "ปรับสี/คอนทราสต์", "desc": "ปรับคอนทราสต์ ความอิ่มตัว และความสว่างของ PDF" }, @@ -499,7 +499,7 @@ "title": "แยกหน้าอัตโนมัติ", "desc": "แยก PDF ที่สแกนโดยใช้ QR Code แยกหน้า" }, - "sanitizePdf": { + "sanitizePDF": { "title": "ทำความสะอาด", "desc": "ลบสคริปต์และองค์ประกอบอื่นๆ จากไฟล์ PDF" }, @@ -523,11 +523,11 @@ "title": "รับข้อมูลทั้งหมดเกี่ยวกับ PDF", "desc": "รับข้อมูลที่เป็นไปได้ทั้งหมดเกี่ยวกับ PDF" }, - "extractPage": { + "pageExtracter": { "title": "แยกหน้า", "desc": "แยกหน้าที่เลือกจาก PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "หน้าขนาดใหญ่เพียงหน้าเดียว", "desc": "รวมหน้าทั้งหมดของ PDF เป็นหน้าเดียวขนาดใหญ่" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF เป็น CSV", "desc": "แยกตารางจาก PDF แปลงเป็น CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "แยกตามขนาด/จำนวน", "desc": "แยก PDF เป็นเอกสารหลายฉบับตามขนาด จำนวนหน้า หรือจำนวนเอกสาร" }, @@ -563,11 +563,11 @@ "title": "เพิ่มตราประทับลงใน PDF", "desc": "เพิ่มข้อความหรือตราประทับรูปภาพในตำแหน่งที่กำหนด" }, - "removeImagePdf": { + "removeImage": { "title": "ลบภาพออกจาก PDF", "desc": "ลบภาพออกจาก PDF เพื่อลดขนาดไฟล์" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/tr-TR/translation.json b/frontend/public/locales/tr-TR/translation.json index 1700a35f7..dc3758e46 100644 --- a/frontend/public/locales/tr-TR/translation.json +++ b/frontend/public/locales/tr-TR/translation.json @@ -347,7 +347,7 @@ "title": "Döndür", "desc": "PDF'lerinizi kolayca döndürün." }, - "imageToPdf": { + "imageToPDF": { "title": "Resimden PDF'e", "desc": "Bir resmi (PNG, JPEG, GIF) PDF'e dönüştürün." }, @@ -371,7 +371,7 @@ "title": "İzinleri Değiştir", "desc": "PDF belgenizin izinlerini değiştirin" }, - "removePages": { + "pageRemover": { "title": "Kaldır", "desc": "PDF belgenizden istenmeyen sayfaları silin." }, @@ -383,7 +383,7 @@ "title": "Parolayı Kaldır", "desc": "PDF belgenizden parola korumasını kaldırın." }, - "compressPdfs": { + "compress": { "title": "Sıkıştır", "desc": "PDF'lerin dosya boyutunu azaltmak için sıkıştırın." }, @@ -479,7 +479,7 @@ "title": "Çoklu İşlemler", "desc": "Çoklu İşlemler tanımlayarak PDF'lere birden fazla işlemi çalıştır" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Sayfa Numaraları Ekle", "desc": "Bir belgeye belirli bir konuma sayfa numaraları ekler" }, @@ -487,7 +487,7 @@ "title": "PDF Dosyasını Otomatik Yeniden Adlandır", "desc": "Tespit edilen başlığa dayanarak bir PDF dosyasını otomatik olarak yeniden adlandırır" }, - "adjust-contrast": { + "adjustContrast": { "title": "Renkleri/Kontrastı Ayarla", "desc": "Bir PDF'in Kontrastını, Doygunluğunu ve Parlaklığını ayarlar" }, @@ -499,7 +499,7 @@ "title": "Sayfaları Otomatik Böl", "desc": "Fiziksel taranmış sayfa bölücü QR Kod ile Taranmış PDF'i Otomatik Böl" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Temizle", "desc": "PDF dosyalarından betikleri ve diğer öğeleri kaldırır" }, @@ -523,11 +523,11 @@ "title": "PDF Hakkında TÜM Bilgiyi Al", "desc": "PDF'ler hakkında mümkün olan her türlü bilgiyi toplar" }, - "extractPage": { + "pageExtracter": { "title": "Sayfa(ları) Çıkar", "desc": "PDF'ten seçili sayfaları çıkarır" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF'i Tek Büyük Sayfaya", "desc": "Tüm PDF sayfalarını tek büyük bir sayfada birleştirir" }, @@ -543,11 +543,11 @@ "title": "Manuel Sansürleme", "desc": "Seçilen metinler, çizilen şekiller ve/veya belirli sayfalar üzerinden PDF'yi sansürler" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF'den CSV'ye", "desc": "PDF'den Tabloları çıkarır ve CSV'ye dönüştürür" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Boyut/Sayıya Göre Otomatik Bölme", "desc": "Tek bir PDF'yi boyut, sayfa sayısı veya belge sayısına göre birden fazla belgeye bölün" }, @@ -563,11 +563,11 @@ "title": "PDF'ye Damga Ekleme", "desc": "Belirlenen konumlara metin veya resim damgaları ekleyin" }, - "removeImagePdf": { + "removeImage": { "title": "Resmi kaldır", "desc": "Dosya boyutunu küçültmek için PDF'den resmi kaldırın" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "PDF'yi Bölümlere Göre Böl", "desc": "PDF'yi bölüm yapısına göre birden fazla dosyaya ayırın." }, @@ -575,7 +575,7 @@ "title": "PDF İmzasını Doğrula", "desc": "PDF belgelerindeki dijital imzaları ve sertifikaları doğrulayın" }, - "replaceColorPdf": { + "replace-color": { "title": "Renkleri Değiştir ve Tersine Çevir", "desc": "PDF'deki metin ve arka plan renklerini değiştirin ve PDF'nin tüm renklerini tersine çevirerek dosya boyutunu azaltın" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/uk-UA/translation.json b/frontend/public/locales/uk-UA/translation.json index d87033abf..31ecfe6ac 100644 --- a/frontend/public/locales/uk-UA/translation.json +++ b/frontend/public/locales/uk-UA/translation.json @@ -347,7 +347,7 @@ "title": "Повернути", "desc": "Легко повертайте ваші PDF-файли." }, - "imageToPdf": { + "imageToPDF": { "title": "Зображення в PDF", "desc": "Перетворення зображення (PNG, JPEG, GIF) в PDF." }, @@ -371,7 +371,7 @@ "title": "Змінити дозволи", "desc": "Змініть дозволи вашого документа PDF" }, - "removePages": { + "pageRemover": { "title": "Видалення", "desc": "Видаліть непотрібні сторінки з документа PDF." }, @@ -383,7 +383,7 @@ "title": "Видалити пароль", "desc": "Зніміть захист паролем з вашого документа PDF." }, - "compressPdfs": { + "compress": { "title": "Стиснути", "desc": "Стискайте PDF-файли, щоб зменшити їх розмір." }, @@ -479,7 +479,7 @@ "title": "Конвеєр (розширений)", "desc": "Виконуйте кілька дій з PDF-файлами, визначаючи сценарії конвеєрної обробки." }, - "add-page-numbers": { + "addPageNumbers": { "title": "Додати номера сторінок", "desc": "Додає номера сторінок по всьому документу в заданому місці" }, @@ -487,7 +487,7 @@ "title": "Автоматичне перейменування PDF-файлу", "desc": "Автоматичне перейменування файлу PDF на основі його виявленого заголовку" }, - "adjust-contrast": { + "adjustContrast": { "title": "Налаштування кольорів/контрастності", "desc": "Налаштування контрастності, насиченості та яскравості файлу PDF" }, @@ -499,7 +499,7 @@ "title": "Автоматичне розділення сторінок", "desc": "Автоматичне розділення відсканованого PDF-файлу за допомогою фізичного роздільника відсканованих сторінок QR-коду" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Санітарна обробка", "desc": "Видалення скриптів та інших елементів з PDF-файлів" }, @@ -523,11 +523,11 @@ "title": "Отримати ВСЮ інформацію у форматі PDF", "desc": "Збирає будь-яку можливу інформацію у PDF-файлах." }, - "extractPage": { + "pageExtracter": { "title": "Видобути сторінку(и)", "desc": "Видобуває обрані сторінки з PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF на одну велику сторінку", "desc": "Об'єднує всі сторінки PDF в одну велику сторінку." }, @@ -543,11 +543,11 @@ "title": "Ручне редагування", "desc": "Редагує PDF-файл на основі виділеного тексту, намальованих форм і/або вибраних сторінок" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF в CSV", "desc": "Видобуває таблиці з PDF та перетворює їх у CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Автоматичне розділення за розміром/кількістю", "desc": "Розділяє один PDF на кілька документів на основі розміру, кількості сторінок або кількості документів" }, @@ -563,11 +563,11 @@ "title": "Додати печатку на PDF", "desc": "Додавання текстової або зображення печатки у вказані місця" }, - "removeImagePdf": { + "removeImage": { "title": "Видалити зображення", "desc": "Видаляє зображення з PDF для зменшення розміру файлу" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Розділити PDF за розділами", "desc": "Розділяє PDF на кілька файлів на основі структури його розділів" }, @@ -575,7 +575,7 @@ "title": "Перевірка підпису PDF", "desc": "Перевірка цифрових підписів та сертифікатів у PDF-документах" }, - "replaceColorPdf": { + "replace-color": { "title": "Заміна та інверсія кольору", "desc": "Замінює колір тексту та фону у PDF та інвертує всі кольори PDF для зменшення розміру файлу" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/vi-VN/translation.json b/frontend/public/locales/vi-VN/translation.json index 900288953..58332a99b 100644 --- a/frontend/public/locales/vi-VN/translation.json +++ b/frontend/public/locales/vi-VN/translation.json @@ -347,7 +347,7 @@ "title": "Xoay", "desc": "Dễ dàng xoay PDF của bạn." }, - "imageToPdf": { + "imageToPDF": { "title": "Hình ảnh sang PDF", "desc": "Chuyển đổi hình ảnh (PNG, JPEG, GIF) sang PDF." }, @@ -371,7 +371,7 @@ "title": "Thay đổi quyền", "desc": "Thay đổi quyền của tài liệu PDF của bạn" }, - "removePages": { + "pageRemover": { "title": "Xóa", "desc": "Xóa các trang không mong muốn khỏi tài liệu PDF của bạn." }, @@ -383,7 +383,7 @@ "title": "Xóa mật khẩu", "desc": "Xóa bảo vệ mật khẩu khỏi tài liệu PDF của bạn." }, - "compressPdfs": { + "compress": { "title": "Nén", "desc": "Nén PDF để giảm kích thước tệp." }, @@ -479,7 +479,7 @@ "title": "Pipeline (Nâng cao)", "desc": "Chạy nhiều thao tác trên PDF bằng cách định nghĩa các tập lệnh pipeline" }, - "add-page-numbers": { + "addPageNumbers": { "title": "Thêm số trang", "desc": "Thêm số trang xuyên suốt tài liệu ở vị trí cố định" }, @@ -487,7 +487,7 @@ "title": "Tự động đổi tên tệp PDF", "desc": "Tự động đổi tên tệp PDF dựa trên tiêu đề được phát hiện" }, - "adjust-contrast": { + "adjustContrast": { "title": "Điều chỉnh màu sắc/tương phản", "desc": "Điều chỉnh độ tương phản, độ bão hòa và độ sáng của PDF" }, @@ -499,7 +499,7 @@ "title": "Tự động tách trang", "desc": "Tự động tách PDF đã quét với mã QR tách trang quét vật lý" }, - "sanitizePdf": { + "sanitizePDF": { "title": "Làm sạch", "desc": "Xóa các tập lệnh và phần tử khác khỏi các tệp PDF" }, @@ -523,11 +523,11 @@ "title": "Lấy TẤT CẢ thông tin về PDF", "desc": "Lấy bất kỳ và tất cả thông tin có thể về PDF" }, - "extractPage": { + "pageExtracter": { "title": "Trích xuất (các) trang", "desc": "Trích xuất các trang được chọn từ PDF" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF sang một trang lớn", "desc": "Ghép tất cả các trang PDF thành một trang lớn duy nhất" }, @@ -543,11 +543,11 @@ "title": "Manual Redaction", "desc": "Redacts a PDF based on selected text, drawn shapes and/or selected page(s)" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF sang CSV", "desc": "Trích xuất bảng từ PDF chuyển đổi thành CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "Tự động chia theo kích thước/số lượng", "desc": "Chia một tệp PDF thành nhiều tài liệu dựa trên kích thước, số trang hoặc số lượng tài liệu" }, @@ -563,11 +563,11 @@ "title": "Thêm dấu vào PDF", "desc": "Thêm văn bản hoặc hình ảnh dấu tại vị trí cố định" }, - "removeImagePdf": { + "removeImage": { "title": "Remove image", "desc": "Remove image from PDF to reduce file size" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "Split PDF by Chapters", "desc": "Split a PDF into multiple files based on its chapter structure." }, @@ -575,7 +575,7 @@ "title": "Validate PDF Signature", "desc": "Verify digital signatures and certificates in PDF documents" }, - "replaceColorPdf": { + "replace-color": { "title": "Replace and Invert Color", "desc": "Replace color for text and background in PDF and invert full color of pdf to reduce file size" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/zh-BO/translation.json b/frontend/public/locales/zh-BO/translation.json index 7386ee7fd..b98ba42d9 100644 --- a/frontend/public/locales/zh-BO/translation.json +++ b/frontend/public/locales/zh-BO/translation.json @@ -347,7 +347,7 @@ "title": "འཁོར་སྐྱོད།", "desc": "PDF ལས་སླ་པོའི་ངང་འཁོར་སྐྱོད་བྱེད་པ།" }, - "imageToPdf": { + "imageToPDF": { "title": "པར་རིས་ནས་ PDF ལ།", "desc": "པར་རིས་ (PNG, JPEG, GIF) ནས་ PDF ལ་བསྒྱུར་བ།" }, @@ -371,7 +371,7 @@ "title": "ཆོག་མཆན་བསྒྱུར་བ།", "desc": "PDF ཡིག་ཆའི་ཆོག་མཆན་བསྒྱུར་བ།" }, - "removePages": { + "pageRemover": { "title": "སུབ་པ།", "desc": "PDF ཡིག་ཆ་ནས་མི་དགོས་པའི་ཤོག་ངོས་རྣམས་སུབ་པ།" }, @@ -383,7 +383,7 @@ "title": "གསང་ཚིག་སུབ་པ།", "desc": "PDF ཡིག་ཆ་ནས་གསང་ཚིག་སྲུང་སྐྱོབ་སུབ་པ།" }, - "compressPdfs": { + "compress": { "title": "སྡུད་སྒྲིལ།", "desc": "ཡིག་ཆའི་ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ PDF སྡུད་སྒྲིལ་བྱེད་པ།" }, @@ -479,7 +479,7 @@ "title": "བརྒྱུད་རིམ།", "desc": "བརྒྱུད་རིམ་འཁྲབ་གཞུང་བཟོས་ནས་ PDF ལ་བྱ་བ་མང་པོ་འཁོར་སྐྱོད་བྱེད་པ།" }, - "add-page-numbers": { + "addPageNumbers": { "title": "ཤོག་གྲངས་སྣོན་པ།", "desc": "ཡིག་ཆའི་ནང་གནས་ས་ངེས་ཅན་དུ་ཤོག་གྲངས་སྣོན་པ།" }, @@ -487,7 +487,7 @@ "title": "PDF ཡིག་ཆའི་མིང་རང་འགུལ་བསྐྱར་འདོགས།", "desc": "ངོས་འཛིན་བྱས་པའི་འགོ་བརྗོད་ལ་གཞིགས་ནས་ PDF ཡིག་ཆའི་མིང་རང་འགུལ་བསྐྱར་འདོགས་བྱེད་པ།" }, - "adjust-contrast": { + "adjustContrast": { "title": "ཚོས་གཞི་/འོད་ཁྱད་སྙོམ་སྒྲིག", "desc": "PDF ཡི་འོད་ཁྱད། ཚོས་ཟིལ། དང་གསལ་ཚད་སྙོམ་སྒྲིག་བྱེད་པ།" }, @@ -499,7 +499,7 @@ "title": "ཤོག་ངོས་རང་འགུལ་ཁ་གྱེས།", "desc": "བཤེར་འབེབས་བྱས་པའི་ PDF ནང་གི་དངོས་ཡོད་བཤེར་འབེབས་ཤོག་ངོས་ཁ་གྱེས་ QR Code བེད་སྤྱོད་བྱས་ནས་རང་འགུལ་ཁ་གྱེས་བྱེད་པ།" }, - "sanitizePdf": { + "sanitizePDF": { "title": "གཙང་སེལ།", "desc": "PDF ཡིག་ཆ་ནས་འཁྲབ་གཞུང་དང་ཆ་ཤས་གཞན་དག་སུབ་པ།" }, @@ -523,11 +523,11 @@ "title": "PDF ཡི་གནས་ཚུལ་ཆ་ཚང་ལེན་པ།", "desc": "PDF ཡི་གནས་ཚུལ་ཡོད་ཚད་ལེན་པ།" }, - "extractPage": { + "pageExtracter": { "title": "ཤོག་ངོས་ཕྱིར་འདོན།", "desc": "PDF ནས་འདེམས་སྒྲུག་བྱས་པའི་ཤོག་ངོས་རྣམས་ཕྱིར་འདོན་པ།" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF ནས་ཤོག་ངོས་ཆེན་པོ་གཅིག་ལ།", "desc": "PDF ཡི་ཤོག་ངོས་ཚང་མ་ཤོག་ངོས་ཆེན་པོ་གཅིག་ཏུ་སྡེབ་སྦྱོར་བྱེད་པ།" }, @@ -543,11 +543,11 @@ "title": "ལག་བཟོས་སྒྲིབ་སྲུང་།", "desc": "འདེམས་སྒྲུག་བྱས་པའི་ཡི་གེ། བྲིས་པའི་དབྱིབས། དང་/ཡང་ན་འདེམས་སྒྲུག་བྱས་པའི་ཤོག་ངོས་གཞིར་བཟུང་ནས་ PDF སྒྲིབ་སྲུང་བྱེད་པ།" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF ནས་ CSV ལ།", "desc": "PDF ནས་རེའུ་མིག་རྣམས་ CSV ལ་ཕྱིར་འདོན་པ།" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "ཆེ་ཆུང་/གྲངས་ཀ་ལྟར་རང་འགུལ་ཁ་གྱེས།", "desc": "PDF གཅིག་ནས་ཡིག་ཆ་མང་པོར་ཆེ་ཆུང་། ཤོག་གྲངས། ཡང་ན་ཡིག་ཆའི་གྲངས་ཀ་གཞིར་བཟུང་ནས་ཁ་གྱེས་བྱེད་པ།" }, @@ -563,11 +563,11 @@ "title": "PDF ལ་ཐེལ་ཙེ་སྣོན་པ།", "desc": "གནས་ས་ངེས་ཅན་དུ་ཡི་གེའམ་པར་རིས་ཀྱི་ཐེལ་ཙེ་སྣོན་པ།" }, - "removeImagePdf": { + "removeImage": { "title": "པར་རིས་སུབ་པ།", "desc": "ཡིག་ཆའི་ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ PDF ནས་པར་རིས་སུབ་པ།" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "ལེའུ་ལྟར་ PDF ཁ་གྱེས།", "desc": "PDF ཡི་ལེའུའི་སྒྲོམ་གཞི་གཞིར་བཟུང་ནས་ཡིག་ཆ་མང་པོར་ཁ་གྱེས་བྱེད་པ།" }, @@ -575,7 +575,7 @@ "title": "PDF མིང་རྟགས་ར་སྤྲོད།", "desc": "PDF ཡིག་ཆའི་ནང་གི་ཨང་ཀིའི་མིང་རྟགས་དང་ལག་ཁྱེར་ར་སྤྲོད་བྱེད་པ།" }, - "replaceColorPdf": { + "replace-color": { "title": "ཚོས་གཞིའི་གདམ་ག་མཐོ་རིམ།", "desc": "PDF ནང་གི་ཡི་གེ་དང་རྒྱབ་ལྗོངས་ཀྱི་ཚོས་གཞི་བརྗེ་སྒྱུར་བྱེད་པ་དང་ཡིག་ཆའི་ཆེ་ཆུང་ཆུང་དུ་གཏོང་ཆེད་ཚོས་གཞི་ཡོངས་རྫོགས་ལྡོག་སྒྱུར་བྱེད་པ།" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/zh-CN/translation.json b/frontend/public/locales/zh-CN/translation.json index eeecb643a..0f0734761 100644 --- a/frontend/public/locales/zh-CN/translation.json +++ b/frontend/public/locales/zh-CN/translation.json @@ -347,7 +347,7 @@ "title": "旋转", "desc": "旋转 PDF。" }, - "imageToPdf": { + "imageToPDF": { "title": "转换图像到 PDF", "desc": "将图像（PNG、JPEG、GIF）转换为 PDF。" }, @@ -371,7 +371,7 @@ "title": "更改权限", "desc": "更改 PDF 文档的权限。" }, - "removePages": { + "pageRemover": { "title": "删除", "desc": "从 PDF 文档中删除不需要的页面。" }, @@ -383,7 +383,7 @@ "title": "删除密码", "desc": "从 PDF 文档中移除密码保护。" }, - "compressPdfs": { + "compress": { "title": "压缩", "desc": "压缩 PDF 文件以减小文件大小。" }, @@ -479,7 +479,7 @@ "title": "流水线（高级版）", "desc": "通过定义流水线脚本在 PDF 上运行多个操作" }, - "add-page-numbers": { + "addPageNumbers": { "title": "添加页码", "desc": "在文档的指定位置添加页码" }, @@ -487,7 +487,7 @@ "title": "自动重命名 PDF 文件", "desc": "根据检测到的标题自动对 PDF 文件进行重命名" }, - "adjust-contrast": { + "adjustContrast": { "title": "调整颜色/对比度", "desc": "调整 PDF 的对比度、饱和度和亮度" }, @@ -499,7 +499,7 @@ "title": "自动拆分页面", "desc": "使用物理扫描页面分割器 QR 代码自动拆分扫描的 PDF" }, - "sanitizePdf": { + "sanitizePDF": { "title": "清理", "desc": "从 PDF 文件中删除脚本和其他元素" }, @@ -523,11 +523,11 @@ "title": "获取 PDF 的所有信息", "desc": "获取 PDF 的所有可能的信息" }, - "extractPage": { + "pageExtracter": { "title": "提取页面", "desc": "从 PDF 中提取选定的页面" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF 转单一大页", "desc": "将所有 PDF 页面合并为一个大的单页" }, @@ -543,11 +543,11 @@ "title": "手动修订", "desc": "根据选定的文本、绘制的形状和/或选定的页面编辑PDF" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF 转 CSV", "desc": "从 PDF 中提取表格并将其转换为 CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "自动根据大小/数目拆分 PDF", "desc": "将单个 PDF 拆分为多个文档，基于大小、页数或文档数" }, @@ -563,11 +563,11 @@ "title": "添加图章", "desc": "在指定位置添加文本或图片图章" }, - "removeImagePdf": { + "removeImage": { "title": "删除图像", "desc": "删除图像减少 PDF 大小" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "按章节拆分 PDF", "desc": "根据其章节结构将 PDF 拆分为多个文件。" }, @@ -575,7 +575,7 @@ "title": "验证 PDF 签名", "desc": "验证 PDF 文档中的数字签名和证书" }, - "replaceColorPdf": { + "replace-color": { "title": "替换和反转颜色", "desc": "替换 PDF 中文本和背景的颜色，并将PDF全色反转以减小文件大小" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/locales/zh-TW/translation.json b/frontend/public/locales/zh-TW/translation.json index 43d456623..c7bb7c930 100644 --- a/frontend/public/locales/zh-TW/translation.json +++ b/frontend/public/locales/zh-TW/translation.json @@ -347,7 +347,7 @@ "title": "旋轉", "desc": "輕鬆旋轉您的 PDF。" }, - "imageToPdf": { + "imageToPDF": { "title": "圖片轉 PDF", "desc": "將圖片（PNG、JPEG、GIF）轉換為 PDF。" }, @@ -371,7 +371,7 @@ "title": "修改權限", "desc": "修改您的 PDF 檔案權限" }, - "removePages": { + "pageRemover": { "title": "移除", "desc": "從您的 PDF 檔案中刪除不需要的頁面。" }, @@ -383,7 +383,7 @@ "title": "移除密碼", "desc": "從您的 PDF 檔案中移除密碼保護。" }, - "compressPdfs": { + "compress": { "title": "壓縮", "desc": "壓縮 PDF 以減少其檔案大小。" }, @@ -479,7 +479,7 @@ "title": "管道（進階）", "desc": "透過定義管道指令碼在 PDF 上執行多個操作" }, - "add-page-numbers": { + "addPageNumbers": { "title": "新增頁碼", "desc": "在文件的設定位置新增頁碼" }, @@ -487,7 +487,7 @@ "title": "自動重新命名 PDF 檔案", "desc": "根據其偵測到的標頭自動重新命名 PDF 檔案" }, - "adjust-contrast": { + "adjustContrast": { "title": "調整顏色/對比度", "desc": "調整 PDF 的對比度、飽和度和亮度" }, @@ -499,7 +499,7 @@ "title": "自動分割頁面", "desc": "自動分割掃描的 PDF，使用實體掃描頁面分割器 QR Code" }, - "sanitizePdf": { + "sanitizePDF": { "title": "清理", "desc": "從 PDF 檔案中移除指令碼和其他元素" }, @@ -523,11 +523,11 @@ "title": "取得 PDF 的所有資訊", "desc": "取得 PDF 的所有可能資訊" }, - "extractPage": { + "pageExtracter": { "title": "提取多個頁面", "desc": "從 PDF 中提取選定的頁面" }, - "PdfToSinglePage": { + "pdfToSinglePage": { "title": "PDF 轉單一大頁面", "desc": "將所有 PDF 頁面合併為一個大的單一頁面" }, @@ -543,11 +543,11 @@ "title": "手動塗黑", "desc": "依據選取的文字、繪製的形狀和選取的頁面塗黑 PDF" }, - "tableExtraxt": { + "PDFToCSV": { "title": "PDF 轉 CSV", "desc": "從 PDF 中提取表格並將其轉換為 CSV" }, - "autoSizeSplitPDF": { + "split-by-size-or-count": { "title": "根據大小/數量自動分割", "desc": "根據大小、頁數或文件數將單一 PDF 分割為多個文件" }, @@ -563,11 +563,11 @@ "title": "將圖章新增到 PDF", "desc": "在設定位置新增文字或新增影像圖章" }, - "removeImagePdf": { + "removeImage": { "title": "移除圖片", "desc": "從 PDF 中移除圖片以減少檔案大小" }, - "splitPdfByChapters": { + "splitByChapters": { "title": "依章節分割 PDF", "desc": "根據 PDF 的章節結構將其分割成多個檔案。" }, @@ -575,7 +575,7 @@ "title": "驗證 PDF 簽章", "desc": "驗證 PDF 文件中的數位簽章與憑證" }, - "replaceColorPdf": { + "replace-color": { "title": "取代與反轉顏色", "desc": "取代 PDF 中文字和背景的顏色，並反轉整個 PDF 的顏色以減少檔案大小" } @@ -1558,4 +1558,4 @@ } } } -} \ No newline at end of file +} diff --git a/frontend/public/og_images/add-attachments.png b/frontend/public/og_images/add-attachments.png new file mode 100644 index 000000000..6fa6c30ad Binary files /dev/null and b/frontend/public/og_images/add-attachments.png differ diff --git a/frontend/public/og_images/add-image.png b/frontend/public/og_images/add-image.png new file mode 100644 index 000000000..a440568a8 Binary files /dev/null and b/frontend/public/og_images/add-image.png differ diff --git a/frontend/public/og_images/add-page-numbers.png b/frontend/public/og_images/add-page-numbers.png new file mode 100644 index 000000000..13a5ff64e Binary files /dev/null and b/frontend/public/og_images/add-page-numbers.png differ diff --git a/frontend/public/og_images/add-password.png b/frontend/public/og_images/add-password.png new file mode 100644 index 000000000..2da6fffaf Binary files /dev/null and b/frontend/public/og_images/add-password.png differ diff --git a/frontend/public/og_images/add-stamp.png b/frontend/public/og_images/add-stamp.png new file mode 100644 index 000000000..6427e67fa Binary files /dev/null and b/frontend/public/og_images/add-stamp.png differ diff --git a/frontend/public/og_images/add-watermark.png b/frontend/public/og_images/add-watermark.png new file mode 100644 index 000000000..eded1f352 Binary files /dev/null and b/frontend/public/og_images/add-watermark.png differ diff --git a/frontend/public/og_images/adjust-colors-contrast.png b/frontend/public/og_images/adjust-colors-contrast.png new file mode 100644 index 000000000..9a9164c9f Binary files /dev/null and b/frontend/public/og_images/adjust-colors-contrast.png differ diff --git a/frontend/public/og_images/adjust-page-size-scale.png b/frontend/public/og_images/adjust-page-size-scale.png new file mode 100644 index 000000000..ac17d0b54 Binary files /dev/null and b/frontend/public/og_images/adjust-page-size-scale.png differ diff --git a/frontend/public/og_images/auto-rename-pdf-file.png b/frontend/public/og_images/auto-rename-pdf-file.png new file mode 100644 index 000000000..540780798 Binary files /dev/null and b/frontend/public/og_images/auto-rename-pdf-file.png differ diff --git a/frontend/public/og_images/auto-split-by-size-count.png b/frontend/public/og_images/auto-split-by-size-count.png new file mode 100644 index 000000000..59c7ed77c Binary files /dev/null and b/frontend/public/og_images/auto-split-by-size-count.png differ diff --git a/frontend/public/og_images/auto-split-pages.png b/frontend/public/og_images/auto-split-pages.png new file mode 100644 index 000000000..6929078e7 Binary files /dev/null and b/frontend/public/og_images/auto-split-pages.png differ diff --git a/frontend/public/og_images/automate.png b/frontend/public/og_images/automate.png new file mode 100644 index 000000000..a06310701 Binary files /dev/null and b/frontend/public/og_images/automate.png differ diff --git a/frontend/public/og_images/certSign.png b/frontend/public/og_images/certSign.png new file mode 100644 index 000000000..ce587e2ef Binary files /dev/null and b/frontend/public/og_images/certSign.png differ diff --git a/frontend/public/og_images/change-metadata.png b/frontend/public/og_images/change-metadata.png new file mode 100644 index 000000000..fb283aa8c Binary files /dev/null and b/frontend/public/og_images/change-metadata.png differ diff --git a/frontend/public/og_images/change-permissions.png b/frontend/public/og_images/change-permissions.png new file mode 100644 index 000000000..c4e1a11e7 Binary files /dev/null and b/frontend/public/og_images/change-permissions.png differ diff --git a/frontend/public/og_images/compare.png b/frontend/public/og_images/compare.png new file mode 100644 index 000000000..708c28837 Binary files /dev/null and b/frontend/public/og_images/compare.png differ diff --git a/frontend/public/og_images/compress.png b/frontend/public/og_images/compress.png new file mode 100644 index 000000000..1a75b905f Binary files /dev/null and b/frontend/public/og_images/compress.png differ diff --git a/frontend/public/og_images/convert.png b/frontend/public/og_images/convert.png new file mode 100644 index 000000000..3c2210ca0 Binary files /dev/null and b/frontend/public/og_images/convert.png differ diff --git a/frontend/public/og_images/cropPdf.png b/frontend/public/og_images/cropPdf.png new file mode 100644 index 000000000..59590d4df Binary files /dev/null and b/frontend/public/og_images/cropPdf.png differ diff --git a/frontend/public/og_images/detect-split-scanned-photos.png b/frontend/public/og_images/detect-split-scanned-photos.png new file mode 100644 index 000000000..2ba6cf63f Binary files /dev/null and b/frontend/public/og_images/detect-split-scanned-photos.png differ diff --git a/frontend/public/og_images/edit-table-of-contents.png b/frontend/public/og_images/edit-table-of-contents.png new file mode 100644 index 000000000..64092cbbe Binary files /dev/null and b/frontend/public/og_images/edit-table-of-contents.png differ diff --git a/frontend/public/og_images/extract-images.png b/frontend/public/og_images/extract-images.png new file mode 100644 index 000000000..5d403dbc3 Binary files /dev/null and b/frontend/public/og_images/extract-images.png differ diff --git a/frontend/public/og_images/extract-pages.png b/frontend/public/og_images/extract-pages.png new file mode 100644 index 000000000..075c8f763 Binary files /dev/null and b/frontend/public/og_images/extract-pages.png differ diff --git a/frontend/public/og_images/flatten.png b/frontend/public/og_images/flatten.png new file mode 100644 index 000000000..f9a449a20 Binary files /dev/null and b/frontend/public/og_images/flatten.png differ diff --git a/frontend/public/og_images/get-all-info-on-pdf.png b/frontend/public/og_images/get-all-info-on-pdf.png new file mode 100644 index 000000000..77fc4cf0f Binary files /dev/null and b/frontend/public/og_images/get-all-info-on-pdf.png differ diff --git a/frontend/public/og_images/home.png b/frontend/public/og_images/home.png new file mode 100644 index 000000000..577f8f476 Binary files /dev/null and b/frontend/public/og_images/home.png differ diff --git a/frontend/public/og_images/manage-certificates.png b/frontend/public/og_images/manage-certificates.png new file mode 100644 index 000000000..da02e0847 Binary files /dev/null and b/frontend/public/og_images/manage-certificates.png differ diff --git a/frontend/public/og_images/mergePdfs.png b/frontend/public/og_images/mergePdfs.png new file mode 100644 index 000000000..cd496d70e Binary files /dev/null and b/frontend/public/og_images/mergePdfs.png differ diff --git a/frontend/public/og_images/multi-page-layout.png b/frontend/public/og_images/multi-page-layout.png new file mode 100644 index 000000000..e6eb5514b Binary files /dev/null and b/frontend/public/og_images/multi-page-layout.png differ diff --git a/frontend/public/og_images/multi-tool.png b/frontend/public/og_images/multi-tool.png new file mode 100644 index 000000000..b9f0812bf Binary files /dev/null and b/frontend/public/og_images/multi-tool.png differ diff --git a/frontend/public/og_images/ocr.png b/frontend/public/og_images/ocr.png new file mode 100644 index 000000000..caf133e92 Binary files /dev/null and b/frontend/public/og_images/ocr.png differ diff --git a/frontend/public/og_images/overlay-pdfs.png b/frontend/public/og_images/overlay-pdfs.png new file mode 100644 index 000000000..da5484ba9 Binary files /dev/null and b/frontend/public/og_images/overlay-pdfs.png differ diff --git a/frontend/public/og_images/read.png b/frontend/public/og_images/read.png new file mode 100644 index 000000000..3f88441b0 Binary files /dev/null and b/frontend/public/og_images/read.png differ diff --git a/frontend/public/og_images/redact.png b/frontend/public/og_images/redact.png new file mode 100644 index 000000000..69d7d5b5d Binary files /dev/null and b/frontend/public/og_images/redact.png differ diff --git a/frontend/public/og_images/remove-annotations.png b/frontend/public/og_images/remove-annotations.png new file mode 100644 index 000000000..12b7de671 Binary files /dev/null and b/frontend/public/og_images/remove-annotations.png differ diff --git a/frontend/public/og_images/remove-blank-pages.png b/frontend/public/og_images/remove-blank-pages.png new file mode 100644 index 000000000..1675c0754 Binary files /dev/null and b/frontend/public/og_images/remove-blank-pages.png differ diff --git a/frontend/public/og_images/remove-certificate-sign.png b/frontend/public/og_images/remove-certificate-sign.png new file mode 100644 index 000000000..0a97e97f3 Binary files /dev/null and b/frontend/public/og_images/remove-certificate-sign.png differ diff --git a/frontend/public/og_images/remove-image.png b/frontend/public/og_images/remove-image.png new file mode 100644 index 000000000..74a7067f2 Binary files /dev/null and b/frontend/public/og_images/remove-image.png differ diff --git a/frontend/public/og_images/remove-password.png b/frontend/public/og_images/remove-password.png new file mode 100644 index 000000000..7022b7e4d Binary files /dev/null and b/frontend/public/og_images/remove-password.png differ diff --git a/frontend/public/og_images/remove.png b/frontend/public/og_images/remove.png new file mode 100644 index 000000000..a0e66d1fd Binary files /dev/null and b/frontend/public/og_images/remove.png differ diff --git a/frontend/public/og_images/reorganize-pages.png b/frontend/public/og_images/reorganize-pages.png new file mode 100644 index 000000000..7dbaf6824 Binary files /dev/null and b/frontend/public/og_images/reorganize-pages.png differ diff --git a/frontend/public/og_images/repair.png b/frontend/public/og_images/repair.png new file mode 100644 index 000000000..a531c1ef8 Binary files /dev/null and b/frontend/public/og_images/repair.png differ diff --git a/frontend/public/og_images/replace-and-invert-color.png b/frontend/public/og_images/replace-and-invert-color.png new file mode 100644 index 000000000..d476a9d17 Binary files /dev/null and b/frontend/public/og_images/replace-and-invert-color.png differ diff --git a/frontend/public/og_images/rotate.png b/frontend/public/og_images/rotate.png new file mode 100644 index 000000000..c2eeb8170 Binary files /dev/null and b/frontend/public/og_images/rotate.png differ diff --git a/frontend/public/og_images/sanitize.png b/frontend/public/og_images/sanitize.png new file mode 100644 index 000000000..efceca8b0 Binary files /dev/null and b/frontend/public/og_images/sanitize.png differ diff --git a/frontend/public/og_images/scanner-effect.png b/frontend/public/og_images/scanner-effect.png new file mode 100644 index 000000000..b46275cd8 Binary files /dev/null and b/frontend/public/og_images/scanner-effect.png differ diff --git a/frontend/public/og_images/show-javascript.png b/frontend/public/og_images/show-javascript.png new file mode 100644 index 000000000..812e06553 Binary files /dev/null and b/frontend/public/og_images/show-javascript.png differ diff --git a/frontend/public/og_images/sign.png b/frontend/public/og_images/sign.png new file mode 100644 index 000000000..773a5e37f Binary files /dev/null and b/frontend/public/og_images/sign.png differ diff --git a/frontend/public/og_images/single-large-page.png b/frontend/public/og_images/single-large-page.png new file mode 100644 index 000000000..3bc457a99 Binary files /dev/null and b/frontend/public/og_images/single-large-page.png differ diff --git a/frontend/public/og_images/split-by-chapters.png b/frontend/public/og_images/split-by-chapters.png new file mode 100644 index 000000000..26db04b4c Binary files /dev/null and b/frontend/public/og_images/split-by-chapters.png differ diff --git a/frontend/public/og_images/split-by-sections.png b/frontend/public/og_images/split-by-sections.png new file mode 100644 index 000000000..e3601ddda Binary files /dev/null and b/frontend/public/og_images/split-by-sections.png differ diff --git a/frontend/public/og_images/split.png b/frontend/public/og_images/split.png new file mode 100644 index 000000000..a77a065b4 Binary files /dev/null and b/frontend/public/og_images/split.png differ diff --git a/frontend/public/og_images/splitPdf.png b/frontend/public/og_images/splitPdf.png new file mode 100644 index 000000000..a77a065b4 Binary files /dev/null and b/frontend/public/og_images/splitPdf.png differ diff --git a/frontend/public/og_images/unlock-pdf-forms.png b/frontend/public/og_images/unlock-pdf-forms.png new file mode 100644 index 000000000..3e637cc4e Binary files /dev/null and b/frontend/public/og_images/unlock-pdf-forms.png differ diff --git a/frontend/public/og_images/validate-pdf-signature.png b/frontend/public/og_images/validate-pdf-signature.png new file mode 100644 index 000000000..020ccd883 Binary files /dev/null and b/frontend/public/og_images/validate-pdf-signature.png differ diff --git a/frontend/public/og_images/view-pdf.png b/frontend/public/og_images/view-pdf.png new file mode 100644 index 000000000..bef62ad51 Binary files /dev/null and b/frontend/public/og_images/view-pdf.png differ diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 852204b25..d2aec8242 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { Suspense } from 'react'; import { RainbowThemeProvider } from './components/shared/RainbowThemeProvider'; import { FileContextProvider } from './contexts/FileContext'; import { FilesModalProvider } from './contexts/FilesModalContext'; @@ -8,14 +8,30 @@ import HomePage from './pages/HomePage'; import './styles/tailwind.css'; import './index.css'; +// Loading component for i18next suspense +const LoadingFallback = () => ( +
+ Loading... +
+); + export default function App() { return ( - - - - - - - + }> + + + + + + + + ); } diff --git a/frontend/src/components/FileManager.tsx b/frontend/src/components/FileManager.tsx index 02f9af5e4..5f6af568b 100644 --- a/frontend/src/components/FileManager.tsx +++ b/frontend/src/components/FileManager.tsx @@ -108,7 +108,7 @@ const FileManager: React.FC = ({ selectedTool }) => { className="overflow-hidden p-0" withCloseButton={false} styles={{ - content: { + content: { position: 'relative', margin: isMobile ? '1rem' : '2rem' }, @@ -116,12 +116,12 @@ const FileManager: React.FC = ({ selectedTool }) => { header: { display: 'none' } }} > -
= ({ selectedTool }) => { onDrop={handleNewFileUpload} onDragEnter={() => setIsDragging(true)} onDragLeave={() => setIsDragging(false)} - accept={["*/*"]} + accept={["*/*"] as any} multiple={true} activateOnClick={false} - style={{ - height: '100%', + style={{ + height: '100%', width: '100%', border: 'none', borderRadius: '30px', @@ -158,11 +158,11 @@ const FileManager: React.FC = ({ selectedTool }) => { {isMobile ? : } - +
); }; -export default FileManager; \ No newline at end of file +export default FileManager; diff --git a/frontend/src/components/fileEditor/FileEditor.tsx b/frontend/src/components/fileEditor/FileEditor.tsx index 1494dfa9a..c45e7e902 100644 --- a/frontend/src/components/fileEditor/FileEditor.tsx +++ b/frontend/src/components/fileEditor/FileEditor.tsx @@ -664,7 +664,6 @@ const FileEditor = ({ return ( = ({ return ( {/* Section 1: Thumbnail Preview */} - + + + {/* Section 2: File Details */} void; - onNext: () => void; -} - -const FilePreview: React.FC = ({ - currentFile, - thumbnail, - numberOfFiles, - isAnimating, - modalHeight, - onPrevious, - onNext -}) => { - const hasMultipleFiles = numberOfFiles > 1; - // Common style objects - const navigationArrowStyle = { - position: 'absolute' as const, - top: '50%', - transform: 'translateY(-50%)', - zIndex: 10 - }; - - const stackDocumentBaseStyle = { - position: 'absolute' as const, - width: '100%', - height: '100%' - }; - - const animationStyle = { - transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)', - transform: isAnimating ? 'scale(0.95) translateX(1.25rem)' : 'scale(1) translateX(0)', - opacity: isAnimating ? 0.7 : 1 - }; - - const mainDocumentShadow = '0 6px 16px rgba(0, 0, 0, 0.2)'; - const stackDocumentShadows = { - back: '0 2px 8px rgba(0, 0, 0, 0.1)', - middle: '0 3px 10px rgba(0, 0, 0, 0.12)' - }; - - return ( - - - {/* Left Navigation Arrow */} - {hasMultipleFiles && ( - - - - )} - - {/* Document Stack Container */} - - {/* Background documents (stack effect) */} - {/* Show 2 shadow pages for 3+ files */} - {numberOfFiles >= 3 && ( - - )} - - {/* Show 1 shadow page for 2+ files */} - {numberOfFiles >= 2 && ( - - )} - - {/* Main document */} - {currentFile && thumbnail ? ( - {currentFile.name} - ) : currentFile ? ( -
- -
- ) : null} - - - {/* Right Navigation Arrow */} - {hasMultipleFiles && ( - - - - )} - - - ); -}; - -export default FilePreview; \ No newline at end of file diff --git a/frontend/src/components/fileManager/HiddenFileInput.tsx b/frontend/src/components/fileManager/HiddenFileInput.tsx index 6f2834267..05f35aae1 100644 --- a/frontend/src/components/fileManager/HiddenFileInput.tsx +++ b/frontend/src/components/fileManager/HiddenFileInput.tsx @@ -9,7 +9,7 @@ const HiddenFileInput: React.FC = () => { ref={fileInputRef} type="file" multiple={true} - accept="*/*" + accept={["*/*"] as any} onChange={onFileInputChange} style={{ display: 'none' }} data-testid="file-input" @@ -17,4 +17,4 @@ const HiddenFileInput: React.FC = () => { ); }; -export default HiddenFileInput; \ No newline at end of file +export default HiddenFileInput; diff --git a/frontend/src/components/pageEditor/FileThumbnail.tsx b/frontend/src/components/pageEditor/FileThumbnail.tsx index eba9a12c5..c328a350d 100644 --- a/frontend/src/components/pageEditor/FileThumbnail.tsx +++ b/frontend/src/components/pageEditor/FileThumbnail.tsx @@ -4,9 +4,12 @@ import { useTranslation } from 'react-i18next'; import CloseIcon from '@mui/icons-material/Close'; import VisibilityIcon from '@mui/icons-material/Visibility'; import HistoryIcon from '@mui/icons-material/History'; +import PushPinIcon from '@mui/icons-material/PushPin'; +import PushPinOutlinedIcon from '@mui/icons-material/PushPinOutlined'; import DragIndicatorIcon from '@mui/icons-material/DragIndicator'; import styles from './PageEditor.module.css'; import FileOperationHistory from '../history/FileOperationHistory'; +import { useFileContext } from '../../contexts/FileContext'; interface FileItem { id: string; @@ -66,6 +69,10 @@ const FileThumbnail = ({ }: FileThumbnailProps) => { const { t } = useTranslation(); const [showHistory, setShowHistory] = useState(false); + const { pinnedFiles, pinFile, unpinFile, isFilePinned, activeFiles } = useFileContext(); + + // Find the actual File object that corresponds to this FileItem + const actualFile = activeFiles.find(f => f.name === file.name && f.size === file.size); const formatFileSize = (bytes: number) => { if (bytes === 0) return '0 B'; @@ -301,6 +308,32 @@ const FileThumbnail = ({ + {actualFile && ( + + { + e.stopPropagation(); + if (isFilePinned(actualFile)) { + unpinFile(actualFile); + onSetStatus(`Unpinned ${file.name}`); + } else { + pinFile(actualFile); + onSetStatus(`Pinned ${file.name}`); + } + }} + > + {isFilePinned(actualFile) ? ( + + ) : ( + + )} + + + )} + void; + onPrevious?: () => void; + onNext?: () => void; +} + +const FilePreview: React.FC = ({ + file, + thumbnail, + showStacking = false, + showHoverOverlay = false, + showNavigation = false, + totalFiles = 1, + isAnimating = false, + onFileClick, + onPrevious, + onNext +}) => { + if (!file) return null; + + const hasMultipleFiles = totalFiles > 1; + + // Animation styles + const animationStyle = isAnimating ? { + transition: 'all 0.3s cubic-bezier(0.4, 0, 0.2, 1)', + transform: 'scale(0.95) translateX(1.25rem)', + opacity: 0.7 + } : {}; + + // Build the component composition + let content = ( + onFileClick?.(file)} + /> + ); + + // Wrap with hover overlay if needed + if (showHoverOverlay && onFileClick) { + content = {content}; + } + + // Wrap with document stack if needed + if (showStacking) { + content = ( + + {content} + + ); + } + + // Wrap with navigation if needed + if (showNavigation && hasMultipleFiles && onPrevious && onNext) { + content = ( + + {content} + + ); + } + + return ( + + {content} + + ); +}; + +export default FilePreview; \ No newline at end of file diff --git a/frontend/src/components/shared/LandingPage.tsx b/frontend/src/components/shared/LandingPage.tsx index 40b765547..52d410cdb 100644 --- a/frontend/src/components/shared/LandingPage.tsx +++ b/frontend/src/components/shared/LandingPage.tsx @@ -33,7 +33,7 @@ const LandingPage = () => { {/* White PDF Page Background */} { > - {t('fileUpload.addFiles', 'Add Files')} + {t('fileUpload.uploadFiles', 'Upload Files')} @@ -125,7 +125,7 @@ const LandingPage = () => { ref={fileInputRef} type="file" multiple - accept=".pdf,.zip" + accept="*/*" onChange={handleFileSelect} style={{ display: 'none' }} /> @@ -137,7 +137,7 @@ const LandingPage = () => { className="text-[var(--accent-interactive)]" style={{ fontSize: '.8rem' }} > - {t('fileUpload.dragFilesInOrClick', 'Drag files in or click "Add Files" to browse')} + {t('fileUpload.dropFilesHere', 'Drop files here or click to upload')} @@ -145,4 +145,4 @@ const LandingPage = () => { ); }; -export default LandingPage; \ No newline at end of file +export default LandingPage; diff --git a/frontend/src/components/shared/filePreview/DocumentStack.tsx b/frontend/src/components/shared/filePreview/DocumentStack.tsx new file mode 100644 index 000000000..16168f6c9 --- /dev/null +++ b/frontend/src/components/shared/filePreview/DocumentStack.tsx @@ -0,0 +1,65 @@ +import React from 'react'; +import { Box } from '@mantine/core'; + +export interface DocumentStackProps { + totalFiles: number; + children: React.ReactNode; +} + +const DocumentStack: React.FC = ({ + totalFiles, + children +}) => { + const stackDocumentBaseStyle = { + position: 'absolute' as const, + width: '100%', + height: '100%' + }; + + const stackDocumentShadows = { + back: '0 2px 8px rgba(0, 0, 0, 0.1)', + middle: '0 3px 10px rgba(0, 0, 0, 0.12)' + }; + + return ( + + {/* Background documents (stack effect) */} + {totalFiles >= 3 && ( + + )} + + {totalFiles >= 2 && ( + + )} + + {/* Main document container */} + + {children} + + + ); +}; + +export default DocumentStack; \ No newline at end of file diff --git a/frontend/src/components/shared/filePreview/DocumentThumbnail.tsx b/frontend/src/components/shared/filePreview/DocumentThumbnail.tsx new file mode 100644 index 000000000..661947be2 --- /dev/null +++ b/frontend/src/components/shared/filePreview/DocumentThumbnail.tsx @@ -0,0 +1,64 @@ +import React from 'react'; +import { Box, Center, Image } from '@mantine/core'; +import PictureAsPdfIcon from '@mui/icons-material/PictureAsPdf'; +import { FileWithUrl } from '../../../types/file'; + +export interface DocumentThumbnailProps { + file: File | FileWithUrl | null; + thumbnail?: string | null; + style?: React.CSSProperties; + onClick?: () => void; + children?: React.ReactNode; +} + +const DocumentThumbnail: React.FC = ({ + file, + thumbnail, + style = {}, + onClick, + children +}) => { + if (!file) return null; + + const containerStyle = { + position: 'relative' as const, + cursor: onClick ? 'pointer' : 'default', + transition: 'opacity 0.2s ease', + width: '100%', + height: '100%', + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + ...style + }; + + if (thumbnail) { + return ( + + {`Preview + {children} + + ); + } + + return ( + +
+ +
+ {children} + + ); +}; + +export default DocumentThumbnail; \ No newline at end of file diff --git a/frontend/src/components/shared/filePreview/HoverOverlay.tsx b/frontend/src/components/shared/filePreview/HoverOverlay.tsx new file mode 100644 index 000000000..f09808982 --- /dev/null +++ b/frontend/src/components/shared/filePreview/HoverOverlay.tsx @@ -0,0 +1,63 @@ +import React from 'react'; +import { Box } from '@mantine/core'; +import VisibilityIcon from '@mui/icons-material/Visibility'; + +export interface HoverOverlayProps { + onMouseEnter?: (e: React.MouseEvent) => void; + onMouseLeave?: (e: React.MouseEvent) => void; + children: React.ReactNode; +} + +const HoverOverlay: React.FC = ({ + onMouseEnter, + onMouseLeave, + children +}) => { + const defaultMouseEnter = (e: React.MouseEvent) => { + const overlay = e.currentTarget.querySelector('.hover-overlay') as HTMLElement; + if (overlay) overlay.style.opacity = '1'; + }; + + const defaultMouseLeave = (e: React.MouseEvent) => { + const overlay = e.currentTarget.querySelector('.hover-overlay') as HTMLElement; + if (overlay) overlay.style.opacity = '0'; + }; + + return ( + + {children} + + {/* Hover overlay */} + + + + + ); +}; + +export default HoverOverlay; \ No newline at end of file diff --git a/frontend/src/components/shared/filePreview/NavigationArrows.tsx b/frontend/src/components/shared/filePreview/NavigationArrows.tsx new file mode 100644 index 000000000..e9fc96719 --- /dev/null +++ b/frontend/src/components/shared/filePreview/NavigationArrows.tsx @@ -0,0 +1,66 @@ +import React from 'react'; +import { Box, ActionIcon } from '@mantine/core'; +import ChevronLeftIcon from '@mui/icons-material/ChevronLeft'; +import ChevronRightIcon from '@mui/icons-material/ChevronRight'; + +export interface NavigationArrowsProps { + onPrevious: () => void; + onNext: () => void; + disabled?: boolean; + children: React.ReactNode; +} + +const NavigationArrows: React.FC = ({ + onPrevious, + onNext, + disabled = false, + children +}) => { + const navigationArrowStyle = { + position: 'absolute' as const, + top: '50%', + transform: 'translateY(-50%)', + zIndex: 10 + }; + + return ( + + {/* Left Navigation Arrow */} + + + + + {/* Content */} + + {children} + + + {/* Right Navigation Arrow */} + + + + + ); +}; + +export default NavigationArrows; \ No newline at end of file diff --git a/frontend/src/components/tools/ToolPanel.tsx b/frontend/src/components/tools/ToolPanel.tsx index 9d8575685..5cbed5118 100644 --- a/frontend/src/components/tools/ToolPanel.tsx +++ b/frontend/src/components/tools/ToolPanel.tsx @@ -39,7 +39,10 @@ export default function ToolPanel() { className={`h-screen flex flex-col overflow-hidden bg-[var(--bg-toolbar)] border-r border-[var(--border-subtle)] transition-all duration-300 ease-out ${ isRainbowMode ? rainbowStyles.rainbowPaper : '' }`} - style={{width: isPanelVisible ? '20rem' : '0'}} + style={{ + width: isPanelVisible ? '20rem' : '0', + padding: '0' + }} >
`mock-${key}`); +vi.mock('react-i18next', () => ({ + useTranslation: () => ({ t: mockT }) +})); + +// Wrapper component to provide Mantine context +const TestWrapper = ({ children }: { children: React.ReactNode }) => ( + {children} +); + +describe('AddPasswordSettings', () => { + const mockOnParameterChange = vi.fn(); + + beforeEach(() => { + vi.clearAllMocks(); + }); + + test('should render password input fields', () => { + render( + + + + ); + + // Should render user and owner password fields labels + expect(screen.getByText('mock-addPassword.passwords.user.label')).toBeInTheDocument(); + expect(screen.getByText('mock-addPassword.passwords.owner.label')).toBeInTheDocument(); + }); + + test('should render encryption key length select', () => { + render( + + + + ); + + // Should render key length select input + expect(screen.getByRole('textbox', { name: /keyLength/i })).toBeInTheDocument(); + }); + + test('should render main component sections', () => { + render( + + + + ); + + // Check that main section titles are rendered + expect(screen.getByText('mock-addPassword.passwords.user.label')).toBeInTheDocument(); + expect(screen.getByText('mock-addPassword.encryption.keyLength.label')).toBeInTheDocument(); + }); + + test('should call onParameterChange when password fields are modified', () => { + render( + + + + ); + + // This test is complex with Mantine's PasswordInput, just verify the component renders + expect(screen.getByText('mock-addPassword.passwords.user.label')).toBeInTheDocument(); + }); + + test('should call onParameterChange when key length is changed', () => { + render( + + + + ); + + // Find key length select and change it + const keyLengthSelect = screen.getByText('mock-addPassword.encryption.keyLength.128bit'); + + fireEvent.mouseDown(keyLengthSelect); + const option256 = screen.getByText('mock-addPassword.encryption.keyLength.256bit'); + fireEvent.click(option256); + + expect(mockOnParameterChange).toHaveBeenCalledWith('keyLength', 256); + }); + + test('should disable all form elements when disabled prop is true', () => { + render( + + + + ); + + // Check password inputs are disabled + const passwordInputs = screen.getAllByRole('textbox'); + passwordInputs.forEach(input => { + expect(input).toBeDisabled(); + }); + + // Check key length select is disabled - simplified test due to Mantine complexity + expect(screen.getByText('mock-addPassword.encryption.keyLength.128bit')).toBeInTheDocument(); + }); + + test('should enable all form elements when disabled prop is false', () => { + render( + + + + ); + + // Check password inputs are enabled + const passwordInputs = screen.getAllByRole('textbox'); + passwordInputs.forEach(input => { + expect(input).not.toBeDisabled(); + }); + + // Check key length select is enabled - simplified test due to Mantine complexity + expect(screen.getByText('mock-addPassword.encryption.keyLength.128bit')).toBeInTheDocument(); + }); + + test('should call translation function with correct keys', () => { + render( + + + + ); + + // Verify that translation keys are being called + expect(mockT).toHaveBeenCalledWith('addPassword.passwords.user.label', 'User Password'); + expect(mockT).toHaveBeenCalledWith('addPassword.passwords.owner.label', 'Owner Password'); + }); + + test.each([ + { keyLength: 40, expectedLabel: 'mock-addPassword.encryption.keyLength.40bit' }, + { keyLength: 128, expectedLabel: 'mock-addPassword.encryption.keyLength.128bit' }, + { keyLength: 256, expectedLabel: 'mock-addPassword.encryption.keyLength.256bit' } + ])('should handle key length $keyLength correctly', ({ keyLength, expectedLabel }) => { + render( + + + + ); + + expect(screen.getByText(expectedLabel)).toBeInTheDocument(); + }); +}); diff --git a/frontend/src/components/tools/addPassword/AddPasswordSettings.tsx b/frontend/src/components/tools/addPassword/AddPasswordSettings.tsx new file mode 100644 index 000000000..96ce6aad5 --- /dev/null +++ b/frontend/src/components/tools/addPassword/AddPasswordSettings.tsx @@ -0,0 +1,58 @@ +import React from "react"; +import { Stack, Text, PasswordInput, Select } from "@mantine/core"; +import { useTranslation } from "react-i18next"; +import { AddPasswordParameters } from "../../../hooks/tools/addPassword/useAddPasswordParameters"; + +interface AddPasswordSettingsProps { + parameters: AddPasswordParameters; + onParameterChange: (key: keyof AddPasswordParameters, value: any) => void; + disabled?: boolean; +} + +const AddPasswordSettings = ({ parameters, onParameterChange, disabled = false }: AddPasswordSettingsProps) => { + const { t } = useTranslation(); + + return ( + + {/* Password Settings */} + + onParameterChange('password', e.target.value)} + disabled={disabled} + /> + onParameterChange('ownerPassword', e.target.value)} + disabled={disabled} + /> + + + {/* Encryption Settings */} + + setIsSliding(true)} onTouchEnd={() => setIsSliding(false)} disabled={disabled} - style={{ + style={{ width: '100%', height: '6px', borderRadius: '3px', @@ -107,6 +103,8 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C )} + + {/* File Size Input */} {parameters.compressionMethod === 'filesize' && ( @@ -141,7 +139,7 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C {/* Compression Options */} -