Merge pull request #1394 from Stirling-Tools/disableConfigUpdater

Disable config updater

.github/FUNDING.yml

@@ -10,4 +10,4 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: ['https://paypal.me/froodleplex?country.x=GB&locale.x=en_GB'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://www.paypal.com/donate/?hosted_button_id=MN7JPG5G6G3JL'] # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/build.yml

@@ -3,14 +3,8 @@ name: "Build repo"
 on:
   push:
     branches: ["main"]
-    paths-ignore:
-      - ".github/**"
-      - "**/*.md"
   pull_request:
     branches: ["main"]
-    paths-ignore:
-      - ".github/**"
-      - "**/*.md"
 
 jobs:
   build:
@@ -36,7 +30,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 7.6
+          gradle-version: 8.7
 
       - name: Build with Gradle
         run: ./gradlew build --no-build-cache

.github/workflows/push-docker.yml

@@ -24,7 +24,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 7.6
+          gradle-version: 8.7
 
       - name: Run Gradle Command
         run: ./gradlew clean build
@@ -110,3 +110,31 @@ jobs:
           labels: ${{ steps.meta2.outputs.labels }}
           build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
           platforms: linux/amd64,linux/arm64/v8
+
+
+      - name: Generate tags fat
+        id: meta3
+        uses: docker/metadata-action@v5
+        if: github.ref != 'refs/heads/main'
+        with:
+          images: |
+            ${{ secrets.DOCKER_HUB_USERNAME }}/s-pdf
+            ghcr.io/${{ steps.repoowner.outputs.lowercase }}/s-pdf
+          tags: |
+            type=raw,value=${{ steps.versionNumber.outputs.versionNumber }}-fat,enable=${{ github.ref == 'refs/heads/master' }}
+            type=raw,value=latest-fat,enable=${{ github.ref == 'refs/heads/master' }}
+
+      - name: Build and push main Dockerfile fat
+        uses: docker/build-push-action@v5
+        if: github.ref != 'refs/heads/main'
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: ./Dockerfile-fat
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.meta3.outputs.tags }}
+          labels: ${{ steps.meta3.outputs.labels }}
+          build-args: VERSION_TAG=${{ steps.versionNumber.outputs.versionNumber }}
+          platforms: linux/amd64,linux/arm64/v8

.github/workflows/releaseArtifacts.yml

@@ -29,7 +29,7 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: 7.6
+          gradle-version: 8.7
 
       - name: Generate jar (With Security=${{ matrix.enable_security }})
         run: ./gradlew clean createExe

.github/workflows/test.yml

@@ -32,6 +32,15 @@ jobs:
           sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           # sudo chmod +x /usr/local/bin/docker-compose
 
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.7"
+          
+      - name: Pip requirements
+        run: |
+           pip install -r ./cucumber/requirements.txt
+              
       - name: Run Docker Compose Tests
         run: |
           chmod +x ./test.sh

.gitignore

@@ -124,4 +124,7 @@ watchedFolders/
 
 # Ignore Mac DS_Store files
 .DS_Store
-**/.DS_Store
+**/.DS_Store
+
+#cucumber
+/cucumber/reports/**

CONTRIBUTING.md

@@ -29,7 +29,7 @@ If you would like to add or modify a translation, please see [How to add new lan
 
 ## Docs
 
-Documentation for Stirling-PDF is handled in a seperate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
+Documentation for Stirling-PDF is handled in a separate repository. Please see [Docs repository](https://github.com/Stirling-Tools/Stirling-Tools.github.io) or use "edit this page"-button at the bottom of each page at [https://stirlingtools.com/docs/](https://stirlingtools.com/docs/).
 
 ## Fixing Bugs or Adding a New Feature
 

Dockerfile

@@ -1,5 +1,5 @@
 # Main stage
-FROM alpine:20240329
+FROM alpine:3.20.0
 
 # Copy necessary files
 COPY scripts /scripts
@@ -10,35 +10,33 @@ COPY build/libs/*.jar app.jar
 
 ARG VERSION_TAG
 
-
 # Set Environment Variables
 ENV DOCKER_ENABLE_SECURITY=false \
     VERSION_TAG=$VERSION_TAG \
     JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
-	HOME=/home/stirlingpdfuser \
+    HOME=/home/stirlingpdfuser \
-	PUID=1000 \
+    PUID=1000 \
     PGID=1000 \
     UMASK=022
 
-
 # JDK for app
 RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
     echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
-    apk update && \
+    apk upgrade --no-cache -a && \
     apk add --no-cache \
         ca-certificates \
         tzdata \
         tini \
-        openssl \
-openssl-dev \
         bash \
         curl \
-        openjdk21-jre \
-        su-exec \
         shadow \
+        su-exec \
+        openssl \
+        openssl-dev \
+        openjdk21-jre \
 # Doc conversion
-        libreoffice@testing \
+        libreoffice \
 # pdftohtml
         poppler-utils \
 # OCR MY PDF (unpaper for descew and other advanced featues)
@@ -60,10 +58,9 @@ openssl-dev \
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
-    tesseract --list-langs && \
+    tesseract --list-langs
-    rm -rf /var/cache/apk/*
 
-EXPOSE 8080
+EXPOSE 8080/tcp
 
 # Set user and run command
 ENTRYPOINT ["tini", "--", "/scripts/init.sh"]

Dockerfile-fat

@@ -0,0 +1,84 @@
+# Build the application
+FROM gradle:7.6-jdk17 AS build
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the entire project to the working directory
+COPY . .
+
+# Build the application with DOCKER_ENABLE_SECURITY=false
+RUN DOCKER_ENABLE_SECURITY=true \
+./gradlew clean build 
+
+# Main stage
+FROM alpine:3.20.0
+
+# Copy necessary files
+COPY scripts /scripts
+COPY pipeline /pipeline
+COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
+COPY --from=build /app/build/libs/*.jar app.jar
+
+ARG VERSION_TAG
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+    VERSION_TAG=$VERSION_TAG \
+    JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
+    HOME=/home/stirlingpdfuser \
+    PUID=1000 \
+    PGID=1000 \
+    UMASK=022 \
+    FAT_DOCKER=true \
+    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=true
+    
+
+# JDK for app
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    apk upgrade --no-cache -a && \
+    apk add --no-cache \
+        ca-certificates \
+        tzdata \
+        tini \
+        bash \
+        curl \
+        calibre@testing \
+        shadow \
+        su-exec \
+        openssl \
+        openssl-dev \
+        openjdk21-jre \
+# Doc conversion
+        libreoffice \
+# pdftohtml
+        poppler-utils \
+# OCR MY PDF (unpaper for descew and other advanced featues)
+        ocrmypdf \
+        tesseract-ocr-data-eng \
+        font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
+# CV
+        py3-opencv \
+# python3/pip
+        python3 && \
+    wget https://bootstrap.pypa.io/get-pip.py -qO - | python3 - --break-system-packages --no-cache-dir --upgrade && \
+# uno unoconv and HTML
+    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint && \
+    mv /usr/share/tessdata /usr/share/tessdata-original && \
+    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
+    fc-cache -f -v && \
+    chmod +x /scripts/* && \
+    chmod +x /scripts/init.sh && \
+# User permissions
+    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
+    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
+    chown stirlingpdfuser:stirlingpdfgroup /app.jar && \
+    tesseract --list-langs
+
+EXPOSE 8080/tcp
+
+# Set user and run command
+ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
+CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Dockerfile-ultra-lite

@@ -1,5 +1,5 @@
 # use alpine
-FROM alpine:3.19.1
+FROM alpine:3.20.0
 
 ARG VERSION_TAG
 
@@ -8,7 +8,7 @@ ENV DOCKER_ENABLE_SECURITY=false \
     HOME=/home/stirlingpdfuser \
     VERSION_TAG=$VERSION_TAG \
     JAVA_TOOL_OPTIONS="$JAVA_TOOL_OPTIONS -XX:MaxRAMPercentage=75" \
-	PUID=1000 \
+    PUID=1000 \
     PGID=1000 \
     UMASK=022
 
@@ -18,24 +18,23 @@ COPY scripts/init-without-ocr.sh /scripts/init-without-ocr.sh
 COPY pipeline /pipeline
 COPY build/libs/*.jar app.jar
 
-
 # Set up necessary directories and permissions
-
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-RUN mkdir /configs /logs /customFiles && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
-    chmod +x /scripts/*.sh && \
+    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
+    apk upgrade --no-cache -a && \
     apk add --no-cache \
         ca-certificates \
         tzdata \
         tini \
         bash \
         curl \
-        su-exec \
         shadow \
+        su-exec \
         openjdk21-jre && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
     # User permissions
+    mkdir /configs /logs /customFiles && \
+    chmod +x /scripts/*.sh && \
     addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
     chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts  /configs /customFiles /pipeline && \
     chown stirlingpdfuser:stirlingpdfgroup /app.jar    
@@ -43,9 +42,8 @@ RUN mkdir /configs /logs /customFiles && \
 # Set environment variables
 ENV ENDPOINTS_GROUPS_TO_REMOVE=CLI
 
-EXPOSE 8080
+EXPOSE 8080/tcp
-
-ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"]
 
 # Run the application
+ENTRYPOINT ["tini", "--", "/scripts/init-without-ocr.sh"]
 CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]

Endpoint-groups.md

@@ -1,46 +1,47 @@
-| Operation           | PageOps | Convert | Security | Other | CLI  | Python | OpenCV | LibreOffice | OCRmyPDF | Java     | Javascript |
+| Operation           | PageOps | Convert | Security | Other | CLI | Python | OpenCV | LibreOffice | OCRmyPDF | Java | Javascript |
-|---------------------|---------|---------|----------|-------|------|--------|--------|-------------|----------|----------|------------|
+| ------------------- | ------- | ------- | -------- | ----- | --- | ------ | ------ | ----------- | -------- | ---- | ---------- |
-| adjust-contrast     |    ✔️    |         |          |       |      |        |        |             |          |           |    ✔️      |
+| adjust-contrast     | ✔️       |         |          |       |     |        |        |             |          |      | ✔️          |
-| auto-split-pdf      |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| auto-split-pdf      | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| crop                |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| crop                | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| extract-page        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| extract-page        | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| merge-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| merge-pdfs          | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| multi-page-layout   |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| multi-page-layout   | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| pdf-organizer       |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |    ✔️       |
+| pdf-organizer       | ✔️       |         |          |       |     |        |        |             |          | ✔️    | ✔️          |
-| pdf-to-single-page  |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-to-single-page  | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| remove-pages        |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| remove-pages        | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| rotate-pdf          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| rotate-pdf          | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| scale-pages         |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| scale-pages         | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| split-pdfs          |    ✔️    |         |          |       |      |        |        |             |          |    ✔️     |            |
+| split-pdfs          | ✔️       |         |          |       |     |        |        |             |          | ✔️    |            |
-| file-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| file-to-pdf         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| img-to-pdf          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
+| img-to-pdf          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
-| pdf-to-html         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-html         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| pdf-to-img          |         |    ✔️    |          |       |      |        |        |             |          |    ✔️     |            |
+| pdf-to-img          |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
-| pdf-to-pdfa         |         |    ✔️    |          |       |  ✔️   |        |        |             |    ✔️     |          |            |
+| pdf-to-pdfa         |         | ✔️       |          |       | ✔️   |        |        |             | ✔️        |      |            |
-| pdf-to-markdown     |         |    ✔️    |          |       |      |        |        |             |            |    ✔️      |            |
+| pdf-to-markdown     |         | ✔️       |          |       |     |        |        |             |          | ✔️    |            |
-| pdf-to-presentation |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-presentation |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| pdf-to-text         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-text         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| pdf-to-word         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-word         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| pdf-to-xml          |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| pdf-to-xml          |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| xlsx-to-pdf         |         |    ✔️    |          |       |  ✔️   |        |        |     ✔️       |          |          |            |
+| xlsx-to-pdf         |         | ✔️       |          |       | ✔️   |        |        | ✔️           |          |      |            |
-| add-password        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| add-password        |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| add-watermark       |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| add-watermark       |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| cert-sign           |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| cert-sign           |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| change-permissions  |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| remove-cert-sign    |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| remove-password     |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| change-permissions  |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| sanitize-pdf        |         |         |    ✔️     |       |      |        |        |             |          |    ✔️     |            |
+| remove-password     |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| add-image           |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| sanitize-pdf        |         |         | ✔️        |       |     |        |        |             |          | ✔️    |            |
-| add-page-numbers    |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| add-image           |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |
-| auto-rename         |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| add-page-numbers    |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |
-| change-metadata     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| auto-rename         |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |
-| compare             |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| change-metadata     |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |
-| compress-pdf        |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
+| compare             |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |
-| extract-image-scans |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
+| compress-pdf        |         |         |          | ✔️     | ✔️   |        |        |             | ✔️        |      |            |
-| extract-images      |         |         |          |  ✔️    |      |        |        |             |          |    ✔️     |            |
+| extract-image-scans |         |         |          | ✔️     | ✔️   | ✔️      | ✔️      |             |          |      |            |
-| flatten             |         |         |          |  ✔️    |      |        |        |             |          |          |      ✔️      |
+| extract-images      |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |
-| get-info-on-pdf     |         |         |          |  ✔️    |      |        |        |             |          |    ✔️      |            |
+| flatten             |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |
-| ocr-pdf             |         |         |          |  ✔️    |  ✔️   |        |        |             |    ✔️     |          |            |
+| get-info-on-pdf     |         |         |          | ✔️     |     |        |        |             |          | ✔️    |            |
-| remove-blanks       |         |         |          |  ✔️    |  ✔️   |   ✔️    |   ✔️    |             |          |          |            |
+| ocr-pdf             |         |         |          | ✔️     | ✔️   |        |        |             | ✔️        |      |            |
-| repair              |         |         |          |  ✔️    |  ✔️   |        |        |     ✔️       |          |          |            |
+| remove-blanks       |         |         |          | ✔️     | ✔️   | ✔️      | ✔️      |             |          |      |            |
-| show-javascript     |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| repair              |         |         |          | ✔️     | ✔️   |        |        | ✔️           |          |      |            |
-| sign                |         |         |          |  ✔️    |      |        |        |             |          |          |    ✔️       |
+| show-javascript     |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |
+| sign                |         |         |          | ✔️     |     |        |        |             |          |      | ✔️          |

README.md

@@ -5,7 +5,7 @@
 [![Discord](https://img.shields.io/discord/1068636748814483718?label=Discord)](https://discord.gg/Cn8pWhQRxZ)
 [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/frooodle/s-pdf/latest)](https://github.com/Stirling-Tools/Stirling-PDF/)
 [![GitHub Repo stars](https://img.shields.io/github/stars/stirling-tools/stirling-pdf?style=social)](https://github.com/Stirling-Tools/stirling-pdf)
-[![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/paypalme/froodleplex)
+[![Paypal Donate](https://img.shields.io/badge/Paypal%20Donate-yellow?style=flat&logo=paypal)](https://www.paypal.com/donate/?hosted_button_id=MN7JPG5G6G3JL)
 [![Github Sponsor](https://img.shields.io/badge/Github%20Sponsor-yellow?style=flat&logo=github)](https://github.com/sponsors/Frooodle)
 
 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/Stirling-Tools/Stirling-PDF/tree/digitalOcean&refcode=c3210994b1af)
@@ -159,38 +159,41 @@ Please view https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToUseOCR
 
 ## Supported Languages
 
-Stirling PDF currently supports 27!
+Stirling PDF currently supports 32!
 
 | Language                                    | Progress                               |
 | ------------------------------------------- | -------------------------------------- |
 | English (English) (en_GB)                   | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
-| Arabic (العربية) (ar_AR)                    | ![41%](https://geps.dev/progress/41)   |
+| Arabic (العربية) (ar_AR)                    | ![40%](https://geps.dev/progress/40)   |
-| German (Deutsch) (de_DE)                    | ![97%](https://geps.dev/progress/97)   |
+| German (Deutsch) (de_DE)                    | ![99%](https://geps.dev/progress/99)   |
-| French (Français) (fr_FR)                   | ![89%](https://geps.dev/progress/89)   |
+| French (Français) (fr_FR)                   | ![93%](https://geps.dev/progress/93)   |
-| Spanish (Español) (es_ES)                   | ![97%](https://geps.dev/progress/97)   |
+| Spanish (Español) (es_ES)                   | ![95%](https://geps.dev/progress/95)   |
-| Simplified Chinese (简体中文) (zh_CN)       | ![96%](https://geps.dev/progress/96)   |
+| Simplified Chinese (简体中文) (zh_CN)       | ![95%](https://geps.dev/progress/95)   |
-| Traditional Chinese (繁體中文) (zh_TW)      | ![96%](https://geps.dev/progress/96)   |
+| Traditional Chinese (繁體中文) (zh_TW)      | ![94%](https://geps.dev/progress/94)   |
-| Catalan (Català) (ca_CA)                    | ![50%](https://geps.dev/progress/50)   |
+| Catalan (Català) (ca_CA)                    | ![49%](https://geps.dev/progress/49)   |
-| Italian (Italiano) (it_IT)                  | ![99%](https://geps.dev/progress/99)   |
+| Italian (Italiano) (it_IT)                  | ![98%](https://geps.dev/progress/98)   |
-| Swedish (Svenska) (sv_SE)                   | ![41%](https://geps.dev/progress/41)   |
+| Swedish (Svenska) (sv_SE)                   | ![40%](https://geps.dev/progress/40)   |
-| Polish (Polski) (pl_PL)                     | ![43%](https://geps.dev/progress/43)   |
+| Polish (Polski) (pl_PL)                     | ![42%](https://geps.dev/progress/42)   |
-| Romanian (Română) (ro_RO)                   | ![40%](https://geps.dev/progress/40)   |
+| Romanian (Română) (ro_RO)                   | ![39%](https://geps.dev/progress/39)   |
-| Korean (한국어) (ko_KR)                     | ![89%](https://geps.dev/progress/89)   |
+| Korean (한국어) (ko_KR)                     | ![87%](https://geps.dev/progress/87)   |
-| Portuguese Brazilian (Português) (pt_BR)    | ![62%](https://geps.dev/progress/62)   |
+| Portuguese Brazilian (Português) (pt_BR)    | ![61%](https://geps.dev/progress/61)   |
-| Russian (Русский) (ru_RU)                   | ![89%](https://geps.dev/progress/89)   |
+| Russian (Русский) (ru_RU)                   | ![87%](https://geps.dev/progress/87)   |
-| Basque (Euskara) (eu_ES)                    | ![65%](https://geps.dev/progress/65)   |
+| Basque (Euskara) (eu_ES)                    | ![63%](https://geps.dev/progress/63)   |
-| Japanese (日本語) (ja_JP)                   | ![89%](https://geps.dev/progress/89)   |
+| Japanese (日本語) (ja_JP)                   | ![87%](https://geps.dev/progress/87)   |
-| Dutch (Nederlands) (nl_NL)                  | ![86%](https://geps.dev/progress/86)   |
+| Dutch (Nederlands) (nl_NL)                  | ![85%](https://geps.dev/progress/85)   |
-| Greek (Ελληνικά) (el_GR)                    | ![87%](https://geps.dev/progress/87)   |
+| Greek (Ελληνικά) (el_GR)                    | ![85%](https://geps.dev/progress/85)   |
-| Turkish (Türkçe) (tr_TR)                    | ![99%](https://geps.dev/progress/99)   |
+| Turkish (Türkçe) (tr_TR)                    | ![97%](https://geps.dev/progress/97)   |
-| Indonesia (Bahasa Indonesia) (id_ID)        | ![80%](https://geps.dev/progress/80)   |
+| Indonesia (Bahasa Indonesia) (id_ID)        | ![78%](https://geps.dev/progress/78)   |
-| Hindi (हिंदी) (hi_IN)                          | ![81%](https://geps.dev/progress/81)   |
+| Hindi (हिंदी) (hi_IN)                          | ![79%](https://geps.dev/progress/79)   |
-| Hungarian (Magyar) (hu_HU)                  | ![79%](https://geps.dev/progress/79)   |
+| Hungarian (Magyar) (hu_HU)                  | ![78%](https://geps.dev/progress/78)   |
-| Bulgarian (Български) (bg_BG)               | ![96%](https://geps.dev/progress/96)   |
+| Bulgarian (Български) (bg_BG)               | ![98%](https://geps.dev/progress/98)   |
-| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![82%](https://geps.dev/progress/82)   |
+| Sebian Latin alphabet (Srpski) (sr_LATN_RS) | ![80%](https://geps.dev/progress/80)   |
-| Ukrainian (Українська) (uk_UA)              | ![88%](https://geps.dev/progress/88)   |
+| Ukrainian (Українська) (uk_UA)              | ![86%](https://geps.dev/progress/86)   |
-| Slovakian (Slovensky) (sk_SK)               | ![96%](https://geps.dev/progress/96)   |
+| Slovakian (Slovensky) (sk_SK)               | ![95%](https://geps.dev/progress/95)   |
+| Czech (Česky) (cs_CZ)                       | ![94%](https://geps.dev/progress/94)   |
+| Croatian (Hrvatski) (hr_HR)                 | ![98%](https://geps.dev/progress/98)   |
+| Norwegian (Norsk) (no_NB)                   | ![98%](https://geps.dev/progress/98)   |
 
 ## Contributing (creating issues, translations, fixing bugs, etc.)
 
@@ -212,10 +215,10 @@ For example in the settings.yml you have
 
 ```yaml
 system:
-  defaultLocale: 'en-US'
+  enableLogin: 'true'
 ```
 
-To have this via an environment variable you would have ``SYSTEM_DEFAULTLOCALE``
+To have this via an environment variable you would have ``SYSTEM_ENABLELOGIN``
 
 The Current list of settings is
 
@@ -224,9 +227,9 @@ security:
   enableLogin: false # set to 'true' to enable login
   csrfDisabled: true # Set to 'true' to disable CSRF protection (not recommended for production)
   loginAttemptCount: 5 # lock user account after 5 tries
-  loginResetTimeMinutes : 120 # lock account for 2 hours after x attempts
+  loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
 #  initialLogin:
-#    username: "admin" # Initial username for the first login (these are defaulted)
+#    username: "admin" # Initial username for the first login
 #    password: "stirling" # Initial password for the first login
 #  oauth2:
 #    enabled: false # set to 'true' to enable login (Note: enableLogin must also be 'true' for this to work)
@@ -237,6 +240,23 @@ security:
 #    useAsUsername: "email" # Default is 'email'; custom fields can be used as the username
 #    scopes: "openid, profile, email" # Specify the scopes for which the application will request permissions
 #    provider: "google" # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
+#    client:
+#      google:
+#        clientId: "" # Client ID for Google OAuth2
+#        clientSecret: "" # Client Secret for Google OAuth2
+#        scopes: "https://www.googleapis.com/auth/userinfo.email, https://www.googleapis.com/auth/userinfo.profile" # Scopes for Google OAuth2
+#        useAsUsername: "email" # Field to use as the username for Google OAuth2
+#      github:
+#        clientId: "" # Client ID for GitHub OAuth2
+#        clientSecret: "" # Client Secret for GitHub OAuth2
+#        scopes: "read:user" # Scope for GitHub OAuth2
+#        useAsUsername: "login" # Field to use as the username for GitHub OAuth2
+#      keycloak:
+#        issuer: "http://192.168.0.123:8888/realms/stirling-pdf" # URL of the Keycloak realm's OpenID Connect Discovery endpoint
+#        clientId: "stirling-pdf" # Client ID for Keycloak OAuth2
+#        clientSecret: "" # Client Secret for Keycloak OAuth2
+#        scopes: "openid, profile, email" # Scopes for Keycloak OAuth2
+#        useAsUsername: "email" # Field to use as the username for Keycloak OAuth2
 
 system:
   defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)

Version-groups.md

@@ -1,52 +1,53 @@
-| Technology     | Ultra-Lite | Full |
+| Technology | Ultra-Lite | Full  |
-|----------------|:----------:|:----:|
+| ---------- | :--------: | :---: |
-| Java           |     ✔️      |  ✔️  |
+| Java       |     ✔️      |   ✔️   |
-| JavaScript     |     ✔️      |  ✔️  |
+| JavaScript |     ✔️      |   ✔️   |
-| Libre          |            |  ✔️  |
+| Libre      |            |   ✔️   |
-| Python         |            |  ✔️  |
+| Python     |            |   ✔️   |
-| OpenCV         |            |  ✔️  |
+| OpenCV     |            |   ✔️   |
-| OCRmyPDF       |            |  ✔️  |
+| OCRmyPDF   |            |   ✔️   |
 
-Operation                | Ultra-Lite | Full
+| Operation              | Ultra-Lite | Full |
--------------------------|------------|-----
+| ---------------------- | ---------- | ---- |
-add-page-numbers         |     ✔️      |  ✔️
+| add-page-numbers       | ✔️          | ✔️    |
-add-password             |     ✔️      |  ✔️
+| add-password           | ✔️          | ✔️    |
-add-image                |     ✔️      |  ✔️
+| add-image              | ✔️          | ✔️    |
-add-watermark            |     ✔️      |  ✔️
+| add-watermark          | ✔️          | ✔️    |
-adjust-contrast          |     ✔️      |  ✔️
+| adjust-contrast        | ✔️          | ✔️    |
-auto-split-pdf           |     ✔️      |  ✔️
+| auto-split-pdf         | ✔️          | ✔️    |
-auto-redact              |     ✔️      |  ✔️
+| auto-redact            | ✔️          | ✔️    |
-auto-rename              |     ✔️      |  ✔️
+| auto-rename            | ✔️          | ✔️    |
-cert-sign                |     ✔️      |  ✔️
+| cert-sign              | ✔️          | ✔️    |
-crop                     |     ✔️      |  ✔️
+| remove-cert-sign       | ✔️          | ✔️    |
-change-metadata          |     ✔️      |  ✔️
+| crop                   | ✔️          | ✔️    |
-change-permissions       |     ✔️      |  ✔️
+| change-metadata        | ✔️          | ✔️    |
-compare                  |     ✔️      |  ✔️
+| change-permissions     | ✔️          | ✔️    |
-extract-page             |     ✔️      |  ✔️
+| compare                | ✔️          | ✔️    |
-extract-images           |     ✔️      |  ✔️
+| extract-page           | ✔️          | ✔️    |
-flatten                  |     ✔️      |  ✔️
+| extract-images         | ✔️          | ✔️    |
-get-info-on-pdf          |     ✔️      |  ✔️
+| flatten                | ✔️          | ✔️    |
-img-to-pdf               |     ✔️      |  ✔️
+| get-info-on-pdf        | ✔️          | ✔️    |
-markdown-to-pdf          |     ✔️      |  ✔️
+| img-to-pdf             | ✔️          | ✔️    |
-merge-pdfs               |     ✔️      |  ✔️
+| markdown-to-pdf        | ✔️          | ✔️    |
-multi-page-layout        |     ✔️      |  ✔️
+| merge-pdfs             | ✔️          | ✔️    |
-overlay-pdf              |     ✔️      |  ✔️
+| multi-page-layout      | ✔️          | ✔️    |
-pdf-organizer            |     ✔️      |  ✔️
+| overlay-pdf            | ✔️          | ✔️    |
-pdf-to-csv               |     ✔️      |  ✔️
+| pdf-organizer          | ✔️          | ✔️    |
-pdf-to-img               |     ✔️      |  ✔️
+| pdf-to-csv             | ✔️          | ✔️    |
-pdf-to-single-page       |     ✔️      |  ✔️
+| pdf-to-img             | ✔️          | ✔️    |
-remove-pages             |     ✔️      |  ✔️
+| pdf-to-single-page     | ✔️          | ✔️    |
-remove-password          |     ✔️      |  ✔️
+| remove-pages           | ✔️          | ✔️    |
-rotate-pdf               |     ✔️      |  ✔️
+| remove-password        | ✔️          | ✔️    |
-sanitize-pdf             |     ✔️      |  ✔️
+| rotate-pdf             | ✔️          | ✔️    |
-scale-pages              |     ✔️      |  ✔️
+| sanitize-pdf           | ✔️          | ✔️    |
-sign                     |     ✔️      |  ✔️
+| scale-pages            | ✔️          | ✔️    |
-show-javascript          |     ✔️      |  ✔️
+| sign                   | ✔️          | ✔️    |
-split-by-size-or-count   |     ✔️      |  ✔️
+| show-javascript        | ✔️          | ✔️    |
-split-pdf-by-sections    |     ✔️      |  ✔️
+| split-by-size-or-count | ✔️          | ✔️    |
-split-pdfs               |     ✔️      |  ✔️
+| split-pdf-by-sections  | ✔️          | ✔️    |
-compress-pdf             |            |  ✔️
+| split-pdfs             | ✔️          | ✔️    |
-extract-image-scans      |            |  ✔️
+| compress-pdf           |            | ✔️    |
-ocr-pdf                  |            |  ✔️
+| extract-image-scans    |            | ✔️    |
-pdf-to-pdfa              |            |  ✔️
+| ocr-pdf                |            | ✔️    |
-remove-blanks            |            |  ✔️
+| pdf-to-pdfa            |            | ✔️    |
+| remove-blanks          |            | ✔️    |

build.gradle

@@ -12,7 +12,7 @@ plugins {
 import com.github.jk1.license.render.*
 
 group = 'stirling.software'
-version = '0.24.2'
+version = '0.25.2'
 
 //17 is lowest but we support and recommend 21
 sourceCompatibility = '17'
@@ -21,7 +21,6 @@ repositories {
     mavenCentral()
 }
 
-
 licenseReport {
     renderers = [new JsonReportRenderer()]
 }
@@ -94,7 +93,13 @@ dependencies {
     implementation("io.github.pixee:java-security-toolkit:1.1.3")
 
     implementation 'org.yaml:snakeyaml:2.2'
-    implementation 'org.springframework.boot:spring-boot-starter-web:3.2.4'
+    
+    // Exclude Tomcat and include Jetty
+    implementation('org.springframework.boot:spring-boot-starter-web:3.2.4') {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
+    implementation 'org.springframework.boot:spring-boot-starter-jetty:3.2.4'
+    
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.4'
 
     if (System.getenv('DOCKER_ENABLE_SECURITY') != 'false') {
@@ -166,14 +171,14 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.32'
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     dependsOn 'spotlessApply'
 }
 compileJava {
     options.compilerArgs << '-parameters'
 }
 
-task writeVersion {
+tasks.register('writeVersion') {
     def propsFile = file('src/main/resources/version.properties')
     def props = new Properties()
     props.setProperty('version', version)
@@ -190,8 +195,6 @@ swaggerhubUpload {
     oas '3.0.0'  // The version of the OpenAPI Specification you're using
 }
 
-
-
 jar {
     enabled = false
     manifest {
@@ -205,6 +208,6 @@ tasks.named('test') {
     useJUnitPlatform()
 }
 
-task printVersion {
+tasks.register('printVersion') {
-  println project.version
+    println project.version
 }

chart/stirling-pdf/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.24.2
+appVersion: 0.25.2
 description: locally hosted web application that allows you to perform various operations
   on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF

cucumber/exampleFiles/example.rtf

@@ -0,0 +1,158 @@
+{\rtf1\ansi\ansicpg1252\uc0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deff0\adeff0{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f2\fswiss\fcharset0\fprq2{\*\panose 020b0604020202020204}Arial;}}{\colortbl;\red0\green0\blue0;\red67\green67\blue67;
+\red102\green102\blue102;}{\stylesheet{\s0\snext0\sqformat\spriority0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1 Normal;}{\s1\sbasedon0\snext0\styrsid15694742
+\sqformat\spriority0\keep\keepn\fi0\sb400\sa120\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs40\ltrch\b0\i0\fs40\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1 heading 1;}{\s2\sbasedon0\snext0\styrsid15694742
+\sqformat\spriority0\keep\keepn\fi0\sb360\sa120\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs32\ltrch\b0\i0\fs32\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1 heading 2;}{\s3\sbasedon0\snext0\styrsid15694742
+\sqformat\spriority0\keep\keepn\fi0\sb320\sa80\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs28\ltrch\b0\i0\fs28\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf2 heading 3;}{\s4\sbasedon0\snext0\styrsid15694742
+\sqformat\spriority0\keep\keepn\fi0\sb280\sa80\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs24\ltrch\b0\i0\fs24\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf3 heading 4;}{\s5\sbasedon0\snext0\styrsid15694742
+\sqformat\spriority0\keep\keepn\fi0\sb240\sa80\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf3 heading 5;}{\s6\sbasedon0\snext0\styrsid15694742
+\sqformat\spriority0\keep\keepn\fi0\sb240\sa80\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai\af2\afs22\ltrch\b0\i\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf3 heading 6;}{\*\cs10\additive\ssemihidden\spriority0 Default Paragraph Font;
+}{\*\ts11\tsrowd\snext11\ssemihidden\spriority0\aspalpha\aspnum\adjustright\ltrpar\li0\lin0\ri0\rin0\ql\faauto\tsvertalt\tsbrdrl\tsbrdrr\tsbrdrt\tsbrdrb\tsbrdrdgr\tsbrdrdgl\tsbrdrh\tsbrdrv\trpaddl108\trpaddfl3\trwWidthB0\trftsWidthB3\trpaddt0\trpaddft3\trpaddb0
+\trpaddfb3\trpaddr108\trpaddfr3 Normal Table;}{\s15\sbasedon0\snext15\styrsid15694742\sqformat\spriority0\keep\keepn\fi0\sb0\sa60\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs52\ltrch\b0\i0\fs52\loch\af2
+\dbch\af2\hich\f2\strike0\ulnone\cf1 Title;}{\s16\sbasedon0\snext16\styrsid15694742\sqformat\spriority0\keep\keepn\fi0\sb0\sa320\aspalpha\aspnum\adjustright\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl240\slmult1\rtlch\ab0\ai0\af2\afs30\ltrch\b0\i0\fs30
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf3 Subtitle;}}{\*\rsidtbl\rsid10976062\rsid13249109}{\*\generator Aspose.Words for Java 23.4.0;}{\info\version1\edmins0\nofpages1\nofwords0\nofchars0\nofcharsws0}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0{
+\mmathPr\mbrkBin0\mbrkBinSub0\mdefJc1\mdispDef1\minterSp0\mintLim0\mintraSp0\mlMargin0\mmathFont0\mnaryLim1\mpostSp0\mpreSp0\mrMargin0\msmallFrac0\mwrapIndent1440\mwrapRight0}\deflang1033\deflangfe2052\adeflang1025\jexpand\showxmlerrors1\validatexml1{
+\*\wgrffmtfilter 013f}\viewkind1\viewscale100\fet0\ftnbj\aenddoc\ftnrstcont\aftnrstcont\ftnnar\aftnnrlc\widowctrl\nospaceforul\nolnhtadjtbl\alntblind\lyttblrtgr\dntblnsbdb\noxlattoyen\wrppunct\nobrkwrptbl\expshrtn\snaptogridincell\asianbrkrule\htmautsp\noultrlspc
+\useltbaln\splytwnine\ftnlytwnine\lytcalctblwd\allowfieldendsel\lnbrkrule\nouicompat\nofeaturethrottle1\utinl\formshade\nojkernpunct\dghspace180\dgvspace180\dghorigin1800\dgvorigin1440\dghshow1\dgvshow1\dgmargin\pgbrdrhead\pgbrdrfoot\rsidroot10976062\sectd\sectlinegrid360\pgwsxn12240\pghsxn15840\marglsxn1440\margrsxn1440\margtsxn1440\margbsxn1440\guttersxn0\headery720\footery720\colsx720\ltrsect\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar
+\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\alang1025\afs22\ltrch\b0\i0\fs22\lang1033\langnp1033\langfe1033\langfenp1033\loch\af2\dbch\af2
+\hich\f2\strike0\ulnone\cf1 A}{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar
+\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\alang1025\afs22\ltrch\b0\i0\fs22\lang1033\langnp1033\langfe1033\langfenp1033\loch\af2
+\dbch\af2\hich\f2\strike0\ulnone\cf1 B}{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar
+\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard
+\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0
+\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0
+\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0
+\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0
+\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2
+\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw
+\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}
+\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22
+\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}\pard\plain\itap0\s0\ilvl0\fi0\sb0\sa0\aspalpha\aspnum\adjustright\brdrt\brdrl\brdrb
+\brdrr\brdrbtw\brdrbar\widctlpar\ltrpar\li0\lin0\ri0\rin0\ql\faauto\sl276\slmult1\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1{\rtlch\ab0\ai0\af2\alang1025\afs22\ltrch\b0\i0\fs22\lang1033\langnp1033\langfe1033\langfenp1033
+\loch\af2\dbch\af2\hich\f2\strike0\ulnone\cf1 C}{\rtlch\ab0\ai0\af2\afs22\ltrch\b0\i0\fs22\loch\af2\dbch\af2\hich\f2\insrsid10976062\strike0\ulnone\cf1\par}{
+\*\latentstyles\lsdstimax267\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef0{\lsdlockedexcept\lsdqformat1 Normal;\lsdqformat1 heading 1;\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 2;\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 3;
+\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 4;\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 5;\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 6;\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 7;\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 8;
+\lsdsemihidden1\lsdunhideused1\lsdqformat1 heading 9;\lsdsemihidden1\lsdunhideused1\lsdqformat1 caption;\lsdqformat1 Title;\lsdqformat1 Subtitle;\lsdqformat1 Strong;\lsdqformat1 Emphasis;\lsdsemihidden1\lsdpriority99 Placeholder Text;\lsdqformat1\lsdpriority1 No Spacing;
+\lsdpriority60 Light Shading;\lsdpriority61 Light List;\lsdpriority62 Light Grid;\lsdpriority63 Medium Shading 1;\lsdpriority64 Medium Shading 2;\lsdpriority65 Medium List 1;\lsdpriority66 Medium List 2;\lsdpriority67 Medium Grid 1;\lsdpriority68 Medium Grid 2;
+\lsdpriority69 Medium Grid 3;\lsdpriority70 Dark List;\lsdpriority71 Colorful Shading;\lsdpriority72 Colorful List;\lsdpriority73 Colorful Grid;\lsdpriority60 Light Shading Accent 1;\lsdpriority61 Light List Accent 1;\lsdpriority62 Light Grid Accent 1;\lsdpriority63 Medium Shading 1 Accent 1;
+\lsdpriority64 Medium Shading 2 Accent 1;\lsdpriority65 Medium List 1 Accent 1;\lsdsemihidden1\lsdpriority99 Revision;\lsdqformat1\lsdpriority34 List Paragraph;\lsdqformat1\lsdpriority29 Quote;\lsdqformat1\lsdpriority30 Intense Quote;\lsdpriority66 Medium List 2 Accent 1;
+\lsdpriority67 Medium Grid 1 Accent 1;\lsdpriority68 Medium Grid 2 Accent 1;\lsdpriority69 Medium Grid 3 Accent 1;\lsdpriority70 Dark List Accent 1;\lsdpriority71 Colorful Shading Accent 1;\lsdpriority72 Colorful List Accent 1;\lsdpriority73 Colorful Grid Accent 1;
+\lsdpriority60 Light Shading Accent 2;\lsdpriority61 Light List Accent 2;\lsdpriority62 Light Grid Accent 2;\lsdpriority63 Medium Shading 1 Accent 2;\lsdpriority64 Medium Shading 2 Accent 2;\lsdpriority65 Medium List 1 Accent 2;\lsdpriority66 Medium List 2 Accent 2;
+\lsdpriority67 Medium Grid 1 Accent 2;\lsdpriority68 Medium Grid 2 Accent 2;\lsdpriority69 Medium Grid 3 Accent 2;\lsdpriority70 Dark List Accent 2;\lsdpriority71 Colorful Shading Accent 2;\lsdpriority72 Colorful List Accent 2;\lsdpriority73 Colorful Grid Accent 2;
+\lsdpriority60 Light Shading Accent 3;\lsdpriority61 Light List Accent 3;\lsdpriority62 Light Grid Accent 3;\lsdpriority63 Medium Shading 1 Accent 3;\lsdpriority64 Medium Shading 2 Accent 3;\lsdpriority65 Medium List 1 Accent 3;\lsdpriority66 Medium List 2 Accent 3;
+\lsdpriority67 Medium Grid 1 Accent 3;\lsdpriority68 Medium Grid 2 Accent 3;\lsdpriority69 Medium Grid 3 Accent 3;\lsdpriority70 Dark List Accent 3;\lsdpriority71 Colorful Shading Accent 3;\lsdpriority72 Colorful List Accent 3;\lsdpriority73 Colorful Grid Accent 3;
+\lsdpriority60 Light Shading Accent 4;\lsdpriority61 Light List Accent 4;\lsdpriority62 Light Grid Accent 4;\lsdpriority63 Medium Shading 1 Accent 4;\lsdpriority64 Medium Shading 2 Accent 4;\lsdpriority65 Medium List 1 Accent 4;\lsdpriority66 Medium List 2 Accent 4;
+\lsdpriority67 Medium Grid 1 Accent 4;\lsdpriority68 Medium Grid 2 Accent 4;\lsdpriority69 Medium Grid 3 Accent 4;\lsdpriority70 Dark List Accent 4;\lsdpriority71 Colorful Shading Accent 4;\lsdpriority72 Colorful List Accent 4;\lsdpriority73 Colorful Grid Accent 4;
+\lsdpriority60 Light Shading Accent 5;\lsdpriority61 Light List Accent 5;\lsdpriority62 Light Grid Accent 5;\lsdpriority63 Medium Shading 1 Accent 5;\lsdpriority64 Medium Shading 2 Accent 5;\lsdpriority65 Medium List 1 Accent 5;\lsdpriority66 Medium List 2 Accent 5;
+\lsdpriority67 Medium Grid 1 Accent 5;\lsdpriority68 Medium Grid 2 Accent 5;\lsdpriority69 Medium Grid 3 Accent 5;\lsdpriority70 Dark List Accent 5;\lsdpriority71 Colorful Shading Accent 5;\lsdpriority72 Colorful List Accent 5;\lsdpriority73 Colorful Grid Accent 5;
+\lsdpriority60 Light Shading Accent 6;\lsdpriority61 Light List Accent 6;\lsdpriority62 Light Grid Accent 6;\lsdpriority63 Medium Shading 1 Accent 6;\lsdpriority64 Medium Shading 2 Accent 6;\lsdpriority65 Medium List 1 Accent 6;\lsdpriority66 Medium List 2 Accent 6;
+\lsdpriority67 Medium Grid 1 Accent 6;\lsdpriority68 Medium Grid 2 Accent 6;\lsdpriority69 Medium Grid 3 Accent 6;\lsdpriority70 Dark List Accent 6;\lsdpriority71 Colorful Shading Accent 6;\lsdpriority72 Colorful List Accent 6;\lsdpriority73 Colorful Grid Accent 6;
+\lsdqformat1\lsdpriority19 Subtle Emphasis;\lsdqformat1\lsdpriority21 Intense Emphasis;\lsdqformat1\lsdpriority31 Subtle Reference;\lsdqformat1\lsdpriority32 Intense Reference;\lsdqformat1\lsdpriority33 Book Title;\lsdsemihidden1\lsdunhideused1\lsdpriority37 Bibliography;
+\lsdsemihidden1\lsdunhideused1\lsdqformat1\lsdpriority39 TOC Heading;}}}

cucumber/features/environment.py

@@ -0,0 +1,16 @@
+import os
+
+def before_all(context):
+    context.endpoint = None
+    context.request_data = None
+    context.files = {}
+    context.response = None
+
+def after_scenario(context, scenario):
+    if hasattr(context, 'files'):
+        for file in context.files.values():
+            file.close()
+    if os.path.exists('response_file'):
+        os.remove('response_file')
+    if hasattr(context, 'file_name') and os.path.exists(context.file_name):
+        os.remove(context.file_name)

cucumber/features/examples.feature

@@ -0,0 +1,130 @@
+@example
+Feature: API Validation
+
+  @positive @password
+  Scenario: Remove password 
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages
+    And the pdf is encrypted with password "password123"
+    And the request data includes
+      | parameter | value       |
+      | password  | password123 |
+    When I send the API request to the endpoint "/api/v1/security/remove-password"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+    And the response PDF is not passworded
+	And the response status code should be 200
+
+  @negative @password
+  Scenario: Remove password wrong password
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages
+    And the pdf is encrypted with password "password123"
+    And the request data includes
+      | parameter | value       |
+      | password  | wrongPassword |
+    When I send the API request to the endpoint "/api/v1/security/remove-password"
+    Then the response status code should be 500
+    And the response should contain error message "Internal Server Error"
+
+  @positive @info
+  Scenario: Get info
+    Given I generate a PDF file as "fileInput"
+    When I send the API request to the endpoint "/api/v1/security/get-info-on-pdf"
+    Then the response content type should be "application/json"
+    And the response file should have size greater than 100
+	And the response status code should be 200
+
+  @positive @password
+  Scenario: Add password
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages
+    And the request data includes
+      | parameter | value       |
+      | password  | password123 |
+    When I send the API request to the endpoint "/api/v1/security/add-password"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 100
+    And the response PDF is passworded
+	And the response status code should be 200
+	
+  @positive @password
+  Scenario: Add password with other params 
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages
+    And the request data includes
+      | parameter      | value       |
+      | ownerPassword  | ownerPass   |
+      | password       | password123 |
+      | keyLength      | 256         |
+      | canPrint       | true        |
+      | canModify      | false       |
+    When I send the API request to the endpoint "/api/v1/security/add-password"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 100
+    And the response PDF is passworded
+	And the response status code should be 200
+	
+  @positive @watermark
+  Scenario: Add watermark
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages
+    And the request data includes
+      | parameter     | value            |
+      | watermarkType | text             |
+      | watermarkText | Sample Watermark |
+      | fontSize      | 30               |
+      | rotation      | 45               |
+      | opacity       | 0.5              |
+      | widthSpacer   | 50               |
+      | heightSpacer  | 50               |
+    When I send the API request to the endpoint "/api/v1/security/add-watermark"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 100
+	And the response status code should be 200
+
+  @positive
+  Scenario: Remove blank pages
+    Given I generate a PDF file as "fileInput"
+	And the pdf contains 3 blank pages
+    And the request data includes
+      | parameter    | value       |
+      | threshold    | 90          |
+      | whitePercent | 99.9        |
+    When I send the API request to the endpoint "/api/v1/misc/remove-blanks"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+    And the response PDF should contain 0 pages
+	And the response status code should be 200
+
+  @positive @flatten
+  Scenario: Flatten PDF
+    Given I generate a PDF file as "fileInput"
+    And the request data includes
+      | parameter         | value   |
+      | flattenOnlyForms  | false    |
+    When I send the API request to the endpoint "/api/v1/misc/flatten"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+	And the response status code should be 200
+	
+  @positive @metadata
+  Scenario: Update metadata
+    Given I generate a PDF file as "fileInput"
+    And the request data includes
+      | parameter        | value             |
+      | author           | John Doe          |
+      | title            | Sample Title      |
+      | subject          | Sample Subject    |
+      | keywords         | sample, test      |
+      | producer         | Test Producer     |
+    When I send the API request to the endpoint "/api/v1/misc/update-metadata"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+    And the response PDF metadata should include "Author" as "John Doe"
+	And the response PDF metadata should include "Keywords" as "sample, test"
+	And the response PDF metadata should include "Subject" as "Sample Subject"
+	And the response PDF metadata should include "Title" as "Sample Title"
+	And the response status code should be 200
+
+  

cucumber/features/external.feature

@@ -0,0 +1,228 @@
+Feature: API Validation
+
+
+  @libre @positive
+  Scenario: Repair PDF
+    Given I generate a PDF file as "fileInput"
+    When I send the API request to the endpoint "/api/v1/misc/repair"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+	And the response status code should be 200
+	
+
+  @ocr @positive
+  Scenario: Process PDF with OCR
+    Given I generate a PDF file as "fileInput"
+    And the request data includes
+      | parameter        | value       |
+      | languages        | eng         |
+      | sidecar          | false        |
+      | deskew           | true        |
+      | clean            | true        |
+      | cleanFinal       | true        |
+      | ocrType          | Normal      |
+      | ocrRenderType    | hocr        |
+      | removeImagesAfter| false       |
+    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+	And the response status code should be 200
+
+
+  @ocr @positive
+  Scenario: Extract Image Scans
+    Given I generate a PDF file as "fileInput"
+	And the pdf contains 3 images on 2 pages
+    And the request data includes
+      | parameter        | value       |
+      | angleThreshold        | 5         |
+      | tolerance          | 20        |
+      | minArea           | 8000        |
+      | minContourArea            | 500        |
+      | borderSize       | 1        |
+    When I send the API request to the endpoint "/api/v1/misc/extract-image-scans"
+    Then the response content type should be "application/octet-stream"
+	And the response file should have extension ".zip"
+	And the response ZIP should contain 2 files
+    And the response file should have size greater than 0
+	And the response status code should be 200
+	
+	
+	
+  @ocr @negative
+  Scenario: Process PDF with text and OCR with type normal 
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+    And the request data includes
+      | parameter        | value       |
+      | languages        | eng         |
+      | sidecar          | false        |
+      | deskew           | true        |
+      | clean            | true        |
+      | cleanFinal       | true        |
+      | ocrType          | Normal      |
+      | ocrRenderType    | hocr        |
+      | removeImagesAfter| false       |
+    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
+	Then the response status code should be 500
+	
+  @ocr @positive
+  Scenario: Process PDF with OCR
+    Given I generate a PDF file as "fileInput"
+    And the request data includes
+      | parameter        | value       |
+      | languages        | eng         |
+      | sidecar          | false        |
+      | deskew           | true        |
+      | clean            | true        |
+      | cleanFinal       | true        |
+      | ocrType          | Force      |
+      | ocrRenderType    | hocr        |
+      | removeImagesAfter| false       |
+    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 0
+	And the response status code should be 200
+	
+  @ocr @positive
+  Scenario: Process PDF with OCR with sidecar
+    Given I generate a PDF file as "fileInput"
+    And the request data includes
+      | parameter        | value       |
+      | languages        | eng         |
+      | sidecar          | true        |
+      | deskew           | true        |
+      | clean            | true        |
+      | cleanFinal       | true        |
+      | ocrType          | Force      |
+      | ocrRenderType    | hocr        |
+      | removeImagesAfter| false       |
+    When I send the API request to the endpoint "/api/v1/misc/ocr-pdf"
+    Then the response content type should be "application/octet-stream"
+	And the response file should have extension ".zip"
+	And the response ZIP should contain 2 files
+    And the response file should have size greater than 0
+	And the response status code should be 200
+
+
+  @libre @positive
+  Scenario Outline: Convert PDF to various word formats
+  Given I generate a PDF file as "fileInput"
+  And the pdf contains 3 pages with random text
+  And the request data includes
+    | parameter    | value       |
+    | outputFormat | <format>    |
+  When I send the API request to the endpoint "/api/v1/convert/pdf/word"
+  Then the response status code should be 200
+  And the response file should have size greater than 100
+  And the response file should have extension "<extension>"
+
+  Examples:
+    | format | extension |
+    | docx   | .docx     |
+    | odt    | .odt      |
+    | doc    | .doc      |
+
+  @ocr
+  Scenario: PDFA
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+	And the request data includes
+      | parameter        | value     |
+      | outputFormat     | pdfa       |
+    When I send the API request to the endpoint "/api/v1/convert/pdf/pdfa"
+	Then the response status code should be 200
+    And the response file should have extension ".pdf"
+    And the response file should have size greater than 100
+	
+  @ocr
+  Scenario: PDFA1
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+	And the request data includes
+      | parameter        | value     |
+      | outputFormat     | pdfa-1       |
+    When I send the API request to the endpoint "/api/v1/convert/pdf/pdfa"
+	Then the response status code should be 200
+    And the response file should have extension ".pdf"
+    And the response file should have size greater than 100
+	
+  @compress @ghostscript @positive
+  Scenario: Compress
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+	And the request data includes
+      | parameter        | value     |
+      | optimizeLevel     | 4       |
+    When I send the API request to the endpoint "/api/v1/misc/compress-pdf"
+	Then the response status code should be 200
+    And the response file should have extension ".pdf"
+    And the response file should have size greater than 100
+	
+  @compress @ghostscript @positive
+  Scenario: Compress
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+	And the request data includes
+      | parameter        | value     |
+      | optimizeLevel     | 1       |
+	  | expectedOutputSize | 5KB |
+    When I send the API request to the endpoint "/api/v1/misc/compress-pdf"
+	Then the response status code should be 200
+    And the response file should have extension ".pdf"
+    And the response file should have size greater than 100
+	
+	
+  @compress @ghostscript @positive
+  Scenario: Compress
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 3 pages with random text
+	And the request data includes
+      | parameter        | value     |
+      | optimizeLevel     | 1       |
+	  | expectedOutputSize | 5KB |
+    When I send the API request to the endpoint "/api/v1/misc/compress-pdf"
+	Then the response status code should be 200
+    And the response file should have extension ".pdf"
+    And the response file should have size greater than 100	
+	
+  @libre @positive
+  Scenario Outline: Convert PDF to various types
+  Given I generate a PDF file as "fileInput"
+  And the pdf contains 3 pages with random text
+  And the request data includes
+    | parameter    | value       |
+    | outputFormat | <format>    |
+  When I send the API request to the endpoint "/api/v1/convert/pdf/<type>"
+  Then the response status code should be 200
+  And the response file should have size greater than 100
+  And the response file should have extension "<extension>"
+
+  Examples:
+   | type | format | extension |
+   |  text   | rtf   | .rtf     |
+   |  text   | txt    | .txt      |
+   |  presentation   | ppt   | .ppt     |
+   |  presentation   | pptx    | .pptx      |
+   |  presentation   | odp   | .odp     |
+   |  html   | html    | .zip      |
+
+	
+  @libre @positive @topdf
+  Scenario Outline: Convert PDF to various types
+  Given I use an example file at "exampleFiles/example<extension>" as parameter "fileInput"
+  When I send the API request to the endpoint "/api/v1/convert/file/pdf"
+  Then the response status code should be 200
+  And the response file should have size greater than 100
+  And the response file should have extension ".pdf"
+
+  Examples:
+   | extension | 
+   |   .docx  |
+   |  .odp   |
+   |  .odt   | 
+   |  .pptx   | 
+   |  .rtf   | 
+
+
+		

cucumber/features/general.feature

@@ -0,0 +1,96 @@
+@general
+Feature: API Validation
+
+	
+  @split-pdf-by-sections @positive
+  Scenario Outline: split-pdf-by-sections with different parameters
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 2 pages
+    And the request data includes
+      | parameter           | value       |
+      | horizontalDivisions | <horizontalDivisions> |
+      | verticalDivisions   | <verticalDivisions> |
+      | merge               | true |
+    When I send the API request to the endpoint "/api/v1/general/split-pdf-by-sections"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 200
+    And the response status code should be 200
+    And the response PDF should contain <page_count> pages
+
+  Examples:
+    | horizontalDivisions | verticalDivisions | page_count |
+    | 0                   | 1                 | 4          |
+    | 1                   | 1                 | 8          |
+    | 1                   | 2                 | 12          |
+    | 2                   | 2                 | 18          |
+
+  @split-pdf-by-sections @positive
+  Scenario Outline: split-pdf-by-sections with different parameters
+    Given I generate a PDF file as "fileInput"
+    And the pdf contains 2 pages
+    And the request data includes
+      | parameter           | value       |
+      | horizontalDivisions | <horizontalDivisions> |
+      | verticalDivisions   | <verticalDivisions> |
+      | merge               | true |
+    When I send the API request to the endpoint "/api/v1/general/split-pdf-by-sections"
+    Then the response content type should be "application/pdf"
+    And the response file should have size greater than 200
+    And the response status code should be 200
+    And the response PDF should contain <page_count> pages
+
+  Examples:
+    | horizontalDivisions | verticalDivisions | page_count |
+    | 0                   | 1                 | 4          |
+    | 1                   | 1                 | 8          |
+    | 1                   | 2                 | 12          |
+    | 2                   | 2                 | 18          |
+
+
+
+  @split-pdf-by-pages @positive
+  Scenario Outline: split-pdf-by-pages with different parameters
+  Given I generate a PDF file as "fileInput"
+  And the pdf contains 20 pages
+  And the request data includes
+    | parameter     | value         |
+    | fileInput     | fileInput     |
+    | pageNumbers   | <pageNumbers> |
+  When I send the API request to the endpoint "/api/v1/general/split-pages"
+  Then the response content type should be "application/octet-stream"
+  And the response status code should be 200
+  And the response file should have size greater than 200
+  And the response ZIP should contain <file_count> files
+
+  Examples:
+    | pageNumbers | file_count |
+    | 1,3,5-9     | 8          |
+    | all         | 20         |
+    | 2n+1        | 11         |
+    | 3n          | 7          |
+
+
+
+  @split-pdf-by-size-or-count @positive
+  Scenario Outline: split-pdf-by-size-or-count with different parameters
+  Given I generate a PDF file as "fileInput"
+  And the pdf contains 20 pages
+  And the request data includes
+    | parameter  | value          |
+    | fileInput  | fileInput      |
+    | splitType  | <splitType>    |
+    | splitValue | <splitValue>   |
+  When I send the API request to the endpoint "/api/v1/general/split-by-size-or-count"
+  Then the response content type should be "application/octet-stream"
+  And the response status code should be 200
+  And the response file should have size greater than 200
+  And the response ZIP file should contain <doc_count> documents each having <pages_per_doc> pages
+
+  Examples:
+    | splitType | splitValue | doc_count | pages_per_doc |
+    | 1         | 5          | 4         | 5             |
+    | 2         | 2          | 2         | 10            |
+    | 2         | 4          | 4         | 5             |
+    | 1         | 10         | 2         | 10            |
+
+

cucumber/features/steps/step_definitions.py

@@ -0,0 +1,307 @@
+import os
+import requests
+from behave import given, when, then
+from PyPDF2 import PdfWriter, PdfReader
+import io
+import random
+import string
+from reportlab.lib.pagesizes import letter
+from reportlab.pdfgen import canvas
+import mimetypes
+import requests
+import zipfile
+import shutil
+
+#########
+# GIVEN #
+#########
+
+@given('I generate a PDF file as "{fileInput}"')
+def step_generate_pdf(context, fileInput):
+    context.param_name = fileInput
+    context.file_name = "genericNonCustomisableName.pdf"
+    writer = PdfWriter()
+    writer.add_blank_page(width=72, height=72)  # Single blank page
+    with open(context.file_name, 'wb') as f:
+        writer.write(f)
+    if not hasattr(context, 'files'):
+        context.files = {}
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+
+@given('I use an example file at "{filePath}" as parameter "{fileInput}"')
+def step_use_example_file(context, filePath, fileInput):
+    context.param_name = fileInput
+    context.file_name = filePath.split('/')[-1]
+    if not hasattr(context, 'files'):
+        context.files = {}
+    
+    # Ensure the file exists before opening
+    try:
+        example_file = open(filePath, 'rb')
+        context.files[context.param_name] = example_file
+    except FileNotFoundError:
+        raise FileNotFoundError(f"The example file '{filePath}' does not exist.")
+
+        
+
+@given('the pdf contains {page_count:d} pages')
+def step_pdf_contains_pages(context, page_count):
+    writer = PdfWriter()
+    for i in range(page_count):
+        writer.add_blank_page(width=72, height=72)
+    with open(context.file_name, 'wb') as f:
+        writer.write(f)
+    context.files[context.param_name].close()
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+# Duplicate for now...
+@given('the pdf contains {page_count:d} blank pages')
+def step_pdf_contains_blank_pages(context, page_count):
+    writer = PdfWriter()
+    for i in range(page_count):
+        writer.add_blank_page(width=72, height=72)
+    with open(context.file_name, 'wb') as f:
+        writer.write(f)
+    context.files[context.param_name].close()
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+
+
+def create_black_box_image(file_name, size):
+    can = canvas.Canvas(file_name, pagesize=size)
+    width, height = size
+    can.setFillColorRGB(0, 0, 0)
+    can.rect(0, 0, width, height, fill=1)
+    can.showPage()
+    can.save()
+
+def create_pdf_with_black_boxes(file_name, image_count, page_count):
+    page_width, page_height = letter
+    box_size = 72  # 1 inch by 1 inch black box
+    boxes_per_page = image_count // page_count + (1 if image_count % page_count != 0 else 0)
+    
+    writer = PdfWriter()
+    box_counter = 0
+    
+    for page in range(page_count):
+        packet = io.BytesIO()
+        can = canvas.Canvas(packet, pagesize=letter)
+        
+        for i in range(boxes_per_page):
+            if box_counter >= image_count:
+                break
+            x = (i % (page_width // box_size)) * box_size
+            y = page_height - ((i // (page_width // box_size) + 1) * box_size)
+            can.setFillColorRGB(0, 0, 0)
+            can.rect(x, y, box_size, box_size, fill=1)
+            box_counter += 1
+            
+        can.showPage()
+        can.save()
+        packet.seek(0)
+        new_pdf = PdfReader(packet)
+        writer.add_page(new_pdf.pages[0])
+    
+    with open(file_name, 'wb') as f:
+        writer.write(f)
+
+@given('the pdf contains {image_count:d} images on {page_count:d} pages')
+def step_pdf_contains_images(context, image_count, page_count):
+    if not hasattr(context, 'param_name'):
+        context.param_name = "default"
+    context.file_name = "genericNonCustomisableName.pdf"
+    create_pdf_with_black_boxes(context.file_name, image_count, page_count)
+    if not hasattr(context, 'files'):
+        context.files = {}
+    if context.param_name in context.files:
+        context.files[context.param_name].close()
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+    
+@given('the pdf contains {page_count:d} pages with random text')
+def step_pdf_contains_pages_with_random_text(context, page_count):
+    buffer = io.BytesIO()
+    c = canvas.Canvas(buffer, pagesize=letter)
+    width, height = letter
+    
+    for _ in range(page_count):
+        text = ''.join(random.choices(string.ascii_letters + string.digits, k=100))
+        c.drawString(100, height - 100, text)
+        c.showPage()
+        
+    c.save()
+    
+    with open(context.file_name, 'wb') as f:
+        f.write(buffer.getvalue())
+        
+    context.files[context.param_name].close()
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+@given('the pdf pages all contain the text "{text}"')
+def step_pdf_pages_contain_text(context, text):
+    buffer = io.BytesIO()
+    c = canvas.Canvas(buffer, pagesize=letter)
+    width, height = letter
+    
+    for _ in range(len(PdfReader(context.file_name).pages)):
+        c.drawString(100, height - 100, text)
+        c.showPage()
+        
+    c.save()
+    
+    with open(context.file_name, 'wb') as f:
+        f.write(buffer.getvalue())
+        
+    context.files[context.param_name].close()
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+@given('the pdf is encrypted with password "{password}"')
+def step_encrypt_pdf(context, password):
+    writer = PdfWriter()
+    reader = PdfReader(context.file_name)
+    for i in range(len(reader.pages)):
+        writer.add_page(reader.pages[i])
+    writer.encrypt(password)
+    with open(context.file_name, 'wb') as f:
+        writer.write(f)
+    context.files[context.param_name].close()
+    context.files[context.param_name] = open(context.file_name, 'rb')
+
+@given('the request data is')
+def step_request_data(context):
+    context.request_data = eval(context.text)
+
+@given('the request data includes')
+def step_request_data_table(context):
+    context.request_data = {row['parameter']: row['value'] for row in context.table}
+
+@given('save the generated PDF file as "{filename}" for debugging')
+def save_generated_pdf(context, filename):
+    with open(filename, 'wb') as f:
+        f.write(context.files[context.param_name].read())
+    print(f"Saved generated PDF content to {filename}")
+
+########
+# WHEN #
+########
+
+@when('I send the API request to the endpoint "{endpoint}"')
+def step_send_api_request(context, endpoint):
+    url = f"http://localhost:8080{endpoint}"
+    files = context.files if hasattr(context, 'files') else {}
+
+    if not hasattr(context, 'request_data') or context.request_data is None:
+        context.request_data = {}
+
+    form_data = []
+    for key, value in context.request_data.items():
+        form_data.append((key, (None, value)))
+
+    for key, file in files.items():
+        mime_type, _ = mimetypes.guess_type(file.name)
+        mime_type = mime_type or 'application/octet-stream'
+        print(f"form_data {file.name} with {mime_type}")
+        form_data.append((key, (file.name, file, mime_type)))
+
+    response = requests.post(url, files=form_data)
+    context.response = response
+
+########
+# THEN #
+########
+
+@then('the response content type should be "{content_type}"')
+def step_check_response_content_type(context, content_type):
+    actual_content_type = context.response.headers.get('Content-Type', '')
+    assert actual_content_type.startswith(content_type), f"Expected {content_type} but got {actual_content_type}. Response content: {context.response.content}"
+
+@then('the response file should have size greater than {size:d}')
+def step_check_response_file_size(context, size):
+    response_file = io.BytesIO(context.response.content)
+    assert len(response_file.getvalue()) > size
+
+@then('the response PDF is not passworded')
+def step_check_response_pdf_not_passworded(context):
+    response_file = io.BytesIO(context.response.content)
+    reader = PdfReader(response_file)
+    assert not reader.is_encrypted
+
+@then('the response PDF is passworded')
+def step_check_response_pdf_passworded(context):
+    response_file = io.BytesIO(context.response.content)
+    try:
+        reader = PdfReader(response_file)
+        assert reader.is_encrypted
+    except PdfReadError as e:
+        raise AssertionError(f"Failed to read PDF: {str(e)}. Response content: {context.response.content}")
+    except Exception as e:
+        raise AssertionError(f"An error occurred: {str(e)}. Response content: {context.response.content}")
+
+@then('the response status code should be {status_code:d}')
+def step_check_response_status_code(context, status_code):
+    assert context.response.status_code == status_code, f"Expected status code {status_code} but got {context.response.status_code}"
+
+@then('the response should contain error message "{message}"')
+def step_check_response_error_message(context, message):
+    response_json = context.response.json()
+    assert response_json.get('error') == message, f"Expected error message '{message}' but got '{response_json.get('error')}'"
+
+@then('the response PDF should contain {page_count:d} pages')
+def step_check_response_pdf_page_count(context, page_count):
+    response_file = io.BytesIO(context.response.content)
+    reader = PdfReader(response_file)
+    assert len(reader.pages) == page_count, f"Expected {page_count} pages but got {len(reader.pages)} pages"
+
+@then('the response PDF metadata should include "{metadata_key}" as "{metadata_value}"')
+def step_check_response_pdf_metadata(context, metadata_key, metadata_value):
+    response_file = io.BytesIO(context.response.content)
+    reader = PdfReader(response_file)
+    metadata = reader.metadata
+    assert metadata.get("/" + metadata_key) == metadata_value, f"Expected {metadata_key} to be '{metadata_value}' but got '{metadata.get(metadata_key)}'"
+
+@then('the response file should have extension "{extension}"')
+def step_check_response_file_extension(context, extension):
+    content_disposition = context.response.headers.get('Content-Disposition', '')
+    filename = ""
+    if content_disposition:
+        parts = content_disposition.split(';')
+        for part in parts:
+            if part.strip().startswith('filename'):
+                filename = part.split('=')[1].strip().strip('"')
+                break
+    assert filename.endswith(extension), f"Expected file extension {extension} but got {filename}. Response content: {context.response.content}"
+
+@then('save the response file as "{filename}" for debugging')
+def step_save_response_file(context, filename):
+    with open(filename, 'wb') as f:
+        f.write(context.response.content)
+    print(f"Saved response content to {filename}")
+
+
+@then('the response PDF should contain {page_count:d} pages')
+def step_check_response_pdf_page_count(context, page_count):
+    response_file = io.BytesIO(context.response.content)
+    reader = PdfReader(io.BytesIO(response_file.getvalue()))
+    actual_page_count = len(reader.pages)
+    assert actual_page_count == page_count, f"Expected {page_count} pages but got {actual_page_count} pages"
+
+@then('the response ZIP should contain {file_count:d} files')
+def step_check_response_zip_file_count(context, file_count):
+    response_file = io.BytesIO(context.response.content)
+    with zipfile.ZipFile(io.BytesIO(response_file.getvalue())) as zip_file:
+      actual_file_count = len(zip_file.namelist())
+    assert actual_file_count == file_count, f"Expected {file_count} files but got {actual_file_count} files"
+
+@then('the response ZIP file should contain {doc_count:d} documents each having {pages_per_doc:d} pages')
+def step_check_response_zip_doc_page_count(context, doc_count, pages_per_doc):
+    response_file = io.BytesIO(context.response.content)
+    with zipfile.ZipFile(io.BytesIO(response_file.getvalue())) as zip_file:
+        actual_doc_count = len(zip_file.namelist())
+        assert actual_doc_count == doc_count, f"Expected {doc_count} documents but got {actual_doc_count} documents"
+        
+        for file_name in zip_file.namelist():
+            with zip_file.open(file_name) as pdf_file:
+                reader = PdfReader(pdf_file)
+                actual_pages_per_doc = len(reader.pages)
+                assert actual_pages_per_doc == pages_per_doc, f"Expected {pages_per_doc} pages per document but got {actual_pages_per_doc} pages in document {file_name}"

cucumber/requirements.txt

@@ -0,0 +1,5 @@
+behave
+requests
+PyPDF2
+reportlab
+PyCryptodome

exampleYmlFiles/docker-compose-latest-fat-security.yml

@@ -0,0 +1,34 @@
+version: '3.3'
+services:
+  stirling-pdf:
+    container_name: Stirling-PDF-Security-Fat
+    image: frooodle/s-pdf:latest-fat
+    deploy:
+      resources:
+        limits:
+          memory: 4G
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/api/v1/info/status | grep -q 'UP' && curl -fL http://localhost:8080/ | grep -q 'Please sign in'"]
+      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:
+      DOCKER_ENABLE_SECURITY: "true"
+      SECURITY_ENABLELOGIN: "true"
+      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"
+    restart: on-failure:5

exampleYmlFiles/docker-compose-latest-security-with-sso.yml

@@ -13,7 +13,7 @@ services:
       timeout: 10s
       retries: 16
     ports:
-      - 8080:8080
+      - "8080:8080"
     volumes:
       - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw
@@ -22,10 +22,13 @@ services:
       DOCKER_ENABLE_SECURITY: "true"
       SECURITY_ENABLELOGIN: "true"
       SECURITY_OAUTH2_ENABLED: "true"
-      SECURITY_OAUTH2_AUTOCREATEUSER: "true" # This is set to true to allow auto-creation of non-existing users in Striling-PDF
+      SECURITY_OAUTH2_AUTOCREATEUSER: "true" # This is set to true to allow auto-creation of non-existing users in Stirling-PDF
       SECURITY_OAUTH2_ISSUER: "https://accounts.google.com"  # Change with any other provider that supports OpenID Connect Discovery (/.well-known/openid-configuration) end-point
       SECURITY_OAUTH2_CLIENTID: "<YOUR CLIENT ID>.apps.googleusercontent.com" # Client ID from your provider
       SECURITY_OAUTH2_CLIENTSECRET: "<YOUR CLIENT SECRET>"  # Client Secret from your provider
+      SECURITY_OAUTH2_SCOPES: "openid,profile,email" # Expected OAuth2 Scope
+      SECURITY_OAUTH2_USEASUSERNAME: "email" # Default is 'email'; custom fields can be used as the username
+      SECURITY_OAUTH2_PROVIDER: "google" # Set this to your OAuth provider's name, e.g., 'google' or 'keycloak'
       PUID: 1002
       PGID: 1002
       UMASK: "022"

exampleYmlFiles/docker-compose-latest-security.yml

@@ -13,7 +13,7 @@ services:
       timeout: 10s
       retries: 16
     ports:
-      - 8080:8080
+      - "8080:8080"
     volumes:
       - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw

exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml

@@ -13,7 +13,7 @@ services:
       timeout: 10s
       retries: 16
     ports:
-      - 8080:8080
+      - "8080:8080"
     volumes:
       - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw

exampleYmlFiles/docker-compose-latest-ultra-lite.yml

@@ -13,7 +13,7 @@ services:
       timeout: 10s
       retries: 16
     ports:
-      - 8080:8080
+      - "8080:8080"
     volumes:
       - /stirling/latest/config:/configs:rw
       - /stirling/latest/logs:/logs:rw

exampleYmlFiles/docker-compose-latest.yml

@@ -13,7 +13,7 @@ services:
       timeout: 10s
       retries: 16
     ports:
-      - 8080:8080
+      - "8080:8080"
     volumes:
       - /stirling/latest/data:/usr/share/tessdata:rw
       - /stirling/latest/config:/configs:rw

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/init-without-ocr.sh

@@ -11,14 +11,16 @@ if [ ! -z "$PGID" ] && [ "$PGID" != "$(getent group stirlingpdfgroup | cut -d: -
 fi
 umask "$UMASK" || true
 
-if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" ]]; then
+if [[ "$INSTALL_BOOK_AND_ADVANCED_HTML_OPS" == "true" && "$FAT_DOCKER" != "true" ]]; then
   apk add --no-cache calibre@testing
 fi
 
-/scripts/download-security-jar.sh
+if [[ "$FAT_DOCKER" != "true" ]]; then
+  /scripts/download-security-jar.sh	
+fi
 
 if [[ -n "$LANGS" ]]; then
-	/scripts/installFonts.sh $LANGS
+  /scripts/installFonts.sh $LANGS
 fi
 
 echo "Setting permissions and ownership for necessary directories..."

scripts/translation_status.toml

@@ -13,6 +13,14 @@ ignore = [
     'language.direction',
 ]
 
+[cs_CZ]
+ignore = [
+    'info',
+    'language.direction',
+    'pipeline.header',
+    'text',
+]
+
 [de_DE]
 ignore = [
     'AddStampRequest.alphabet',
@@ -60,6 +68,16 @@ ignore = [
     'language.direction',
 ]
 
+[hr_HR]
+ignore = [
+    'font',
+    'home.pipeline.title',
+    'info',
+    'language.direction',
+    'pdfOrganiser.tags',
+    'showJS.tags',
+]
+
 [hu_HU]
 ignore = [
     'language.direction',
@@ -98,6 +116,11 @@ ignore = [
     'language.direction',
 ]
 
+[no_NB]
+ignore = [
+    'language.direction',
+]
+
 [pl_PL]
 ignore = [
     'language.direction',

src/main/java/stirling/software/SPDF/LibreOfficeListener.java

@@ -6,11 +6,15 @@ import java.net.Socket;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import io.github.pixee.security.SystemCommand;
 
 public class LibreOfficeListener {
 
-    private static final long ACTIVITY_TIMEOUT = 20 * 60 * 1000; // 20 minutes
+    private static final Logger logger = LoggerFactory.getLogger(LibreOfficeListener.class);
+    private static final long ACTIVITY_TIMEOUT = 20L * 60 * 1000; // 20 minutes
 
     private static final LibreOfficeListener INSTANCE = new LibreOfficeListener();
     private static final int LISTENER_PORT = 2002;
@@ -27,14 +31,12 @@ public class LibreOfficeListener {
     private LibreOfficeListener() {}
 
     private boolean isListenerRunning() {
-        try {
+        System.out.println("waiting for listener to start");
-            System.out.println("waiting for listener to start");
+        try (Socket socket = new Socket()) {
-            Socket socket = new Socket();
             socket.connect(
                     new InetSocketAddress("localhost", 2002), 1000); // Timeout after 1 second
-            socket.close();
             return true;
-        } catch (IOException e) {
+        } catch (Exception e) {
             return false;
         }
     }
@@ -63,6 +65,7 @@ public class LibreOfficeListener {
                         try {
                             Thread.sleep(5000); // Check for inactivity every 5 seconds
                         } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
                             break;
                         }
                     }
@@ -80,8 +83,8 @@ public class LibreOfficeListener {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
+                Thread.currentThread().interrupt();
-                e.printStackTrace();
+                logger.error("exception", e);
             } // Check every 1 second
         }
     }

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -2,9 +2,13 @@ package stirling.software.SPDF.config;
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
+import java.util.function.Predicate;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -22,6 +26,8 @@ import stirling.software.SPDF.model.ApplicationProperties;
 @Lazy
 public class AppConfig {
 
+    private static final Logger logger = LoggerFactory.getLogger(AppConfig.class);
+
     @Autowired ApplicationProperties applicationProperties;
 
     @Bean
@@ -54,7 +60,7 @@ public class AppConfig {
             props.load(resource.getInputStream());
             return props.getProperty("version");
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         }
         return "0.0.0";
     }
@@ -108,4 +114,26 @@ public class AppConfig {
     public boolean missingActivSecurity() {
         return false;
     }
+
+    @Bean(name = "watchedFoldersDir")
+    public String watchedFoldersDir() {
+        return "./pipeline/watchedFolders/";
+    }
+
+    @Bean(name = "finishedFoldersDir")
+    public String finishedFoldersDir() {
+        return "./pipeline/finishedFolders/";
+    }
+
+    @Bean(name = "directoryFilter")
+    public Predicate<Path> processPDFOnlyFilter() {
+        return path -> {
+            if (Files.isDirectory(path)) {
+                return !path.toString().contains("processing");
+            } else {
+                String fileName = path.getFileName().toString();
+                return fileName.endsWith(".pdf");
+            }
+        };
+    }
 }

src/main/java/stirling/software/SPDF/config/ConfigInitializer.java

@@ -7,12 +7,7 @@ import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -49,46 +44,47 @@ public class ConfigInitializer
                 }
             }
         } else {
-            Path templatePath =
+            //            Path templatePath =
-                    Paths.get(
+            //                    Paths.get(
-                            getClass()
+            //                            getClass()
-                                    .getClassLoader()
+            //                                    .getClassLoader()
-                                    .getResource("settings.yml.template")
+            //                                    .getResource("settings.yml.template")
-                                    .toURI());
+            //                                    .toURI());
-            Path userPath = Paths.get("configs", "settings.yml");
+            //            Path userPath = Paths.get("configs", "settings.yml");
-
+            //
-            List<String> templateLines = Files.readAllLines(templatePath);
+            //            List<String> templateLines = Files.readAllLines(templatePath);
-            List<String> userLines =
+            //            List<String> userLines =
-                    Files.exists(userPath) ? Files.readAllLines(userPath) : new ArrayList<>();
+            //                    Files.exists(userPath) ? Files.readAllLines(userPath) : new
-
+            // ArrayList<>();
-            List<String> resultLines = new ArrayList<>();
+            //
-
+            //            List<String> resultLines = new ArrayList<>();
-            for (String templateLine : templateLines) {
+            //            int position = 0;
-                // Check if the line is a comment
+            //            for (String templateLine : templateLines) {
-                if (templateLine.trim().startsWith("#")) {
+            //                // Check if the line is a comment
-                    String entry = templateLine.trim().substring(1).trim();
+            //                if (templateLine.trim().startsWith("#")) {
-                    if (!entry.isEmpty()) {
+            //                    String entry = templateLine.trim().substring(1).trim();
-                        // Check if this comment has been uncommented in userLines
+            //                    if (!entry.isEmpty()) {
-                        String key = entry.split(":")[0].trim();
+            //                        // Check if this comment has been uncommented in userLines
-                        System.out.println("key=" + key + ", entry=" + entry );
+            //                        String key = entry.split(":")[0].trim();
-                        addLine(resultLines, userLines, templateLine, key);
+            //                        addLine(resultLines, userLines, templateLine, key, position);
-                    } else {
+            //                    } else {
-                        resultLines.add(templateLine);
+            //                        resultLines.add(templateLine);
-                    }
+            //                    }
-                }
+            //                }
-                // Check if the line is a key-value pair
+            //                // Check if the line is a key-value pair
-                else if (templateLine.contains(":")) {
+            //                else if (templateLine.contains(":")) {
-                    String key = templateLine.split(":")[0].trim();
+            //                    String key = templateLine.split(":")[0].trim();
-                    addLine(resultLines, userLines, templateLine, key);
+            //                    addLine(resultLines, userLines, templateLine, key, position);
-                }
+            //                }
-                // Handle empty lines
+            //                // Handle empty lines
-                else if (templateLine.trim().length() == 0) {
+            //                else if (templateLine.trim().length() == 0) {
-                    resultLines.add("");
+            //                    resultLines.add("");
-                }
+            //                }
-            }
+            //                position++;
-            
+            //            }
-         // Write the result to the user settings file
+            //
-            Files.write(userPath, resultLines);
+            //            // Write the result to the user settings file
+            //            Files.write(userPath, resultLines);
         }
 
         Path customSettingsPath = Paths.get("configs", "custom_settings.yml");
@@ -96,16 +92,19 @@ public class ConfigInitializer
             Files.createFile(customSettingsPath);
         }
     }
-    
+
-    
+    // TODO check parent value instead of just indent lines for duplicate keys (like enabled etc)
-    
+    private static void addLine(
-    //TODO check parent value instead of just indent lines for duplicate keys (like enabled etc)
+            List<String> resultLines,
-    private static void addLine(List<String> resultLines, List<String> userLines, String templateLine, String key) {
+            List<String> userLines,
+            String templateLine,
+            String key,
+            int position) {
         boolean added = false;
         int templateIndentationLevel = getIndentationLevel(templateLine);
+        int pos = 0;
         for (String settingsLine : userLines) {
-        	if(settingsLine.contains("oauth2") || settingsLine.contains("enabled") )
+            if (settingsLine.trim().startsWith(key + ":") && position == pos) {
-            if (settingsLine.trim().startsWith(key + ":")) {
                 int settingsIndentationLevel = getIndentationLevel(settingsLine);
                 // Check if it is correct settingsLine and has the same parent as templateLine
                 if (settingsIndentationLevel == templateIndentationLevel) {
@@ -114,17 +113,18 @@ public class ConfigInitializer
                     break;
                 }
             }
+            pos++;
         }
         if (!added) {
             resultLines.add(templateLine);
         }
-    } 
+    }
 
     private static int getIndentationLevel(String line) {
         int indentationLevel = 0;
         String trimmedLine = line.trim();
         if (trimmedLine.startsWith("#")) {
-        	line = trimmedLine.substring(1);
+            line = trimmedLine.substring(1);
         }
         for (char c : line.toCharArray()) {
             if (c == ' ') {

src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java

@@ -116,6 +116,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Security", "change-permissions");
         addEndpointToGroup("Security", "add-watermark");
         addEndpointToGroup("Security", "cert-sign");
+        addEndpointToGroup("Security", "remove-cert-sign");
         addEndpointToGroup("Security", "sanitize-pdf");
         addEndpointToGroup("Security", "auto-redact");
 
@@ -200,6 +201,7 @@ public class EndpointConfiguration {
         addEndpointToGroup("Java", "extract-images");
         addEndpointToGroup("Java", "change-metadata");
         addEndpointToGroup("Java", "cert-sign");
+        addEndpointToGroup("Java", "remove-cert-sign");
         addEndpointToGroup("Java", "multi-page-layout");
         addEndpointToGroup("Java", "scale-pages");
         addEndpointToGroup("Java", "add-page-numbers");

src/main/java/stirling/software/SPDF/config/FileFallbackTemplateResolver.java

@@ -1,16 +1,18 @@
 package stirling.software.SPDF.config;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Map;
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
-import org.thymeleaf.templateresource.ClassLoaderTemplateResource;
 import org.thymeleaf.templateresource.FileTemplateResource;
 import org.thymeleaf.templateresource.ITemplateResource;
 
+import stirling.software.SPDF.model.InputStreamTemplateResource;
+
 public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateResolver {
 
     private final ResourceLoader resourceLoader;
@@ -40,9 +42,13 @@ public class FileFallbackTemplateResolver extends AbstractConfigurableTemplateRe
 
         }
 
-        return new ClassLoaderTemplateResource(
+        InputStream inputStream =
-                Thread.currentThread().getContextClassLoader(),
+                Thread.currentThread()
-                "classpath:/templates/" + resourceName,
+                        .getContextClassLoader()
-                characterEncoding);
+                        .getResourceAsStream("templates/" + resourceName);
+        if (inputStream != null) {
+            return new InputStreamTemplateResource(inputStream, "UTF-8");
+        }
+        return null;
     }
 }

src/main/java/stirling/software/SPDF/config/MetricsFilter.java

@@ -36,7 +36,6 @@ public class MetricsFilter extends OncePerRequestFilter {
                 || uri.startsWith("/v1/api-docs")
                 || uri.endsWith("robots.txt")
                 || uri.startsWith("/images")
-                || uri.startsWith("/images")
                 || uri.endsWith(".png")
                 || uri.endsWith(".ico")
                 || uri.endsWith(".css")

src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationFailureHandler.java

@@ -49,10 +49,12 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         }
 
         String username = request.getParameter("username");
-        if (username != null && !isDemoUser(username)) {
+        Optional<User> optUser = userService.findByUsernameIgnoreCase(username);
+
+        if (username != null && optUser.isPresent() && !isDemoUser(optUser)) {
             logger.info(
                     "Remaining attempts for user {}: {}",
-                    username,
+                    optUser.get().getUsername(),
                     loginAttemptService.getRemainingAttempts(username));
             loginAttemptService.loginFailed(username);
             if (loginAttemptService.isBlocked(username)
@@ -70,8 +72,7 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
         super.onAuthenticationFailure(request, response, exception);
     }
 
-    private boolean isDemoUser(String username) {
+    private boolean isDemoUser(Optional<User> user) {
-        Optional<User> user = userService.findByUsernameIgnoreCase(username);
         return user.isPresent()
                 && user.get().getAuthorities().stream()
                         .anyMatch(authority -> "ROLE_DEMO_USER".equals(authority.getAuthority()));

src/main/java/stirling/software/SPDF/config/security/LoginAttemptService.java

@@ -33,7 +33,6 @@ public class LoginAttemptService {
     }
 
     public void loginSucceeded(String key) {
-        logger.info(key + " " + attemptsCache.mappingCount());
         if (key == null || key.trim().isEmpty()) {
             return;
         }

src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java

@@ -2,6 +2,8 @@ package stirling.software.SPDF.config.security;
 
 import java.util.*;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -36,7 +38,11 @@ import stirling.software.SPDF.config.security.oauth2.CustomOAuth2AuthenticationS
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2LogoutSuccessHandler;
 import stirling.software.SPDF.config.security.oauth2.CustomOAuth2UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.GithubProvider;
+import stirling.software.SPDF.model.ApplicationProperties.GoogleProvider;
+import stirling.software.SPDF.model.ApplicationProperties.KeycloakProvider;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.JPATokenRepositoryImpl;
 
@@ -47,6 +53,8 @@ public class SecurityConfiguration {
 
     @Autowired private CustomUserDetailsService userDetailsService;
 
+    private static final Logger logger = LoggerFactory.getLogger(SecurityConfiguration.class);
+
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
@@ -140,6 +148,7 @@ public class SecurityConfiguration {
                                                                 || trimmedUri.startsWith("/images/")
                                                                 || trimmedUri.startsWith("/public/")
                                                                 || trimmedUri.startsWith("/css/")
+                                                                || trimmedUri.startsWith("/fonts/")
                                                                 || trimmedUri.startsWith("/js/")
                                                                 || trimmedUri.startsWith(
                                                                         "/api/v1/info/status");
@@ -150,7 +159,8 @@ public class SecurityConfiguration {
                     .authenticationProvider(authenticationProvider());
 
             // Handle OAUTH2 Logins
-            if (applicationProperties.getSecurity().getOAUTH2().getEnabled()) {
+            if (applicationProperties.getSecurity().getOAUTH2() != null
+                    && applicationProperties.getSecurity().getOAUTH2().getEnabled()) {
 
                 http.oauth2Login(
                                 oauth2 ->
@@ -181,9 +191,10 @@ public class SecurityConfiguration {
                         .logout(
                                 logout ->
                                         logout.logoutSuccessHandler(
-                                                new CustomOAuth2LogoutSuccessHandler(
+                                                        new CustomOAuth2LogoutSuccessHandler(
-                                                        this.applicationProperties,
+                                                                this.applicationProperties,
-                                                        sessionRegistry())));
+                                                                sessionRegistry()))
+                                                .invalidateHttpSession(true));
             }
         } else {
             http.csrf(csrf -> csrf.disable())
@@ -200,19 +211,127 @@ public class SecurityConfiguration {
             havingValue = "true",
             matchIfMissing = false)
     public ClientRegistrationRepository clientRegistrationRepository() {
-        return new InMemoryClientRegistrationRepository(this.oidcClientRegistration());
+        List<ClientRegistration> registrations = new ArrayList<>();
+
+        githubClientRegistration().ifPresent(registrations::add);
+        oidcClientRegistration().ifPresent(registrations::add);
+        googleClientRegistration().ifPresent(registrations::add);
+        keycloakClientRegistration().ifPresent(registrations::add);
+
+        if (registrations.isEmpty()) {
+            logger.error("At least one OAuth2 provider must be configured");
+            System.exit(1);
+        }
+
+        return new InMemoryClientRegistrationRepository(registrations);
     }
 
-    private ClientRegistration oidcClientRegistration() {
+    private Optional<ClientRegistration> googleClientRegistration() {
         OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-        return ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
+        if (oauth == null || !oauth.getEnabled()) {
-                .registrationId("oidc")
+            return Optional.empty();
-                .clientId(oauth.getClientId())
+        }
-                .clientSecret(oauth.getClientSecret())
+        Client client = oauth.getClient();
-                .scope(oauth.getScopes())
+        if (client == null) {
-                .userNameAttributeName(oauth.getUseAsUsername())
+            return Optional.empty();
-                .clientName("OIDC")
+        }
-                .build();
+        GoogleProvider google = client.getGoogle();
+        return google != null && google.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistration.withRegistrationId(google.getName())
+                                .clientId(google.getClientId())
+                                .clientSecret(google.getClientSecret())
+                                .scope(google.getScopes())
+                                .authorizationUri(google.getAuthorizationuri())
+                                .tokenUri(google.getTokenuri())
+                                .userInfoUri(google.getUserinfouri())
+                                .userNameAttributeName(google.getUseAsUsername())
+                                .clientName(google.getClientName())
+                                .redirectUri("{baseUrl}/login/oauth2/code/" + google.getName())
+                                .authorizationGrantType(
+                                        org.springframework.security.oauth2.core
+                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> keycloakClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        KeycloakProvider keycloak = client.getKeycloak();
+
+        return keycloak != null && keycloak.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistrations.fromIssuerLocation(keycloak.getIssuer())
+                                .registrationId(keycloak.getName())
+                                .clientId(keycloak.getClientId())
+                                .clientSecret(keycloak.getClientSecret())
+                                .scope(keycloak.getScopes())
+                                .userNameAttributeName(keycloak.getUseAsUsername())
+                                .clientName(keycloak.getClientName())
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> githubClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null || !oauth.getEnabled()) {
+            return Optional.empty();
+        }
+        Client client = oauth.getClient();
+        if (client == null) {
+            return Optional.empty();
+        }
+        GithubProvider github = client.getGithub();
+        return github != null && github.isSettingsValid()
+                ? Optional.of(
+                        ClientRegistration.withRegistrationId(github.getName())
+                                .clientId(github.getClientId())
+                                .clientSecret(github.getClientSecret())
+                                .scope(github.getScopes())
+                                .authorizationUri(github.getAuthorizationuri())
+                                .tokenUri(github.getTokenuri())
+                                .userInfoUri(github.getUserinfouri())
+                                .userNameAttributeName(github.getUseAsUsername())
+                                .clientName(github.getClientName())
+                                .redirectUri("{baseUrl}/login/oauth2/code/" + github.getName())
+                                .authorizationGrantType(
+                                        org.springframework.security.oauth2.core
+                                                .AuthorizationGrantType.AUTHORIZATION_CODE)
+                                .build())
+                : Optional.empty();
+    }
+
+    private Optional<ClientRegistration> oidcClientRegistration() {
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth == null
+                || oauth.getIssuer() == null
+                || oauth.getIssuer().isEmpty()
+                || oauth.getClientId() == null
+                || oauth.getClientId().isEmpty()
+                || oauth.getClientSecret() == null
+                || oauth.getClientSecret().isEmpty()
+                || oauth.getScopes() == null
+                || oauth.getScopes().isEmpty()
+                || oauth.getUseAsUsername() == null
+                || oauth.getUseAsUsername().isEmpty()) {
+            return Optional.empty();
+        }
+        return Optional.of(
+                ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
+                        .registrationId("oidc")
+                        .clientId(oauth.getClientId())
+                        .clientSecret(oauth.getClientSecret())
+                        .scope(oauth.getScopes())
+                        .userNameAttributeName(oauth.getUseAsUsername())
+                        .clientName("OIDC")
+                        .build());
     }
 
     /*

src/main/java/stirling/software/SPDF/config/security/UserAuthenticationFilter.java

@@ -101,6 +101,7 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
             contextPath + "/images/",
             contextPath + "/public/",
             contextPath + "/css/",
+            contextPath + "/fonts/",
             contextPath + "/js/",
             contextPath + "/pdfjs/",
             contextPath + "/api/v1/info/status",

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java

@@ -41,6 +41,7 @@ public class CustomOAuth2AuthenticationFailureHandler
         } else if (exception instanceof LockedException) {
             logger.error("Account locked: ", exception);
             getRedirectStrategy().sendRedirect(request, response, "/logout?error=locked");
+            return;
         } else {
             logger.error("Unhandled authentication exception", exception);
             super.onAuthenticationFailure(request, response, exception);

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2LogoutSuccessHandler.java

@@ -6,6 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.session.SessionRegistry;
+import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
 
 import jakarta.servlet.ServletException;
@@ -14,6 +15,8 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.Provider;
+import stirling.software.SPDF.utils.UrlUtils;
 
 public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
 
@@ -33,54 +36,87 @@ public class CustomOAuth2LogoutSuccessHandler extends SimpleUrlLogoutSuccessHand
     public void onLogoutSuccess(
             HttpServletRequest request, HttpServletResponse response, Authentication authentication)
             throws IOException, ServletException {
-
         String param = "logout=true";
+        String registrationId = null;
+        String issuer = null;
+        String clientId = null;
 
         OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
-        String provider = oauth.getProvider() != null ? oauth.getProvider() : "";
 
+        if (authentication instanceof OAuth2AuthenticationToken) {
+            OAuth2AuthenticationToken oauthToken = (OAuth2AuthenticationToken) authentication;
+            registrationId = oauthToken.getAuthorizedClientRegistrationId();
+
+            try {
+                Provider provider = oauth.getClient().get(registrationId);
+                issuer = provider.getIssuer();
+                clientId = provider.getClientId();
+            } catch (Exception e) {
+                logger.error("exception", e);
+            }
+
+        } else {
+            registrationId = oauth.getProvider() != null ? oauth.getProvider() : "";
+            issuer = oauth.getIssuer();
+            clientId = oauth.getClientId();
+        }
+        String errorMessage = "";
         if (request.getParameter("oauth2AuthenticationErrorWeb") != null) {
             param = "erroroauth=oauth2AuthenticationErrorWeb";
-        } else if (request.getParameter("error") != null) {
+        } else if ((errorMessage = request.getParameter("error")) != null) {
-            param = "error=" + request.getParameter("error");
+            param = "error=" + sanitizeInput(errorMessage);
-        } else if (request.getParameter("erroroauth") != null) {
+        } else if ((errorMessage = request.getParameter("erroroauth")) != null) {
-            param = "erroroauth=" + request.getParameter("erroroauth");
+            param = "erroroauth=" + sanitizeInput(errorMessage);
         } else if (request.getParameter("oauth2AutoCreateDisabled") != null) {
             param = "error=oauth2AutoCreateDisabled";
         }
 
+        String redirect_url = UrlUtils.getOrigin(request) + "/login?" + param;
+
         HttpSession session = request.getSession(false);
         if (session != null) {
             String sessionId = session.getId();
             sessionRegistry.removeSessionInformation(sessionId);
             session.invalidate();
-            logger.debug("Session invalidated: " + sessionId);
+            logger.info("Session invalidated: " + sessionId);
         }
 
-        switch (provider) {
+        switch (registrationId.toLowerCase()) {
             case "keycloak":
+                // Add Keycloak specific logout URL if needed
                 String logoutUrl =
-                        oauth.getIssuer()
+                        issuer
                                 + "/protocol/openid-connect/logout"
                                 + "?client_id="
-                                + oauth.getClientId()
+                                + clientId
                                 + "&post_logout_redirect_uri="
-                                + response.encodeRedirectURL(
+                                + response.encodeRedirectURL(redirect_url);
-                                        request.getScheme()
+                logger.info("Redirecting to Keycloak logout URL: " + logoutUrl);
-                                                + "://"
-                                                + request.getHeader("host")
-                                                + "/login?"
-                                                + param);
-                logger.debug("Redirecting to Keycloak logout URL: " + logoutUrl);
                 response.sendRedirect(logoutUrl);
                 break;
+            case "github":
+                // Add GitHub specific logout URL if needed
+                String githubLogoutUrl = "https://github.com/logout";
+                logger.info("Redirecting to GitHub logout URL: " + githubLogoutUrl);
+                response.sendRedirect(githubLogoutUrl);
+                break;
             case "google":
                 // Add Google specific logout URL if needed
+                // String googleLogoutUrl =
+                // "https://accounts.google.com/Logout?continue=https://appengine.google.com/_ah/logout?continue="
+                //                 + response.encodeRedirectURL(redirect_url);
+                // logger.info("Redirecting to Google logout URL: " + googleLogoutUrl);
+                // response.sendRedirect(googleLogoutUrl);
+                // break;
             default:
                 String redirectUrl = request.getContextPath() + "/login?" + param;
-                logger.debug("Redirecting to default logout URL: " + redirectUrl);
+                logger.info("Redirecting to default logout URL: " + redirectUrl);
                 response.sendRedirect(redirectUrl);
                 break;
         }
     }
+
+    private String sanitizeInput(String input) {
+        return input.replaceAll("[^a-zA-Z0-9 ]", "");
+    }
 }

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuth2UserService.java

@@ -16,6 +16,8 @@ import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import stirling.software.SPDF.config.security.LoginAttemptService;
 import stirling.software.SPDF.config.security.UserService;
 import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.User;
 
 public class CustomOAuth2UserService implements OAuth2UserService<OidcUserRequest, OidcUser> {
@@ -41,11 +43,27 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
 
     @Override
     public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
-        String usernameAttribute =
+        OAUTH2 oauth2 = applicationProperties.getSecurity().getOAUTH2();
-                applicationProperties.getSecurity().getOAUTH2().getUseAsUsername();
+        String usernameAttribute = oauth2.getUseAsUsername();
+        if (usernameAttribute == null || usernameAttribute.trim().isEmpty()) {
+            Client client = oauth2.getClient();
+            if (client != null && client.getKeycloak() != null) {
+                usernameAttribute = client.getKeycloak().getUseAsUsername();
+            } else {
+                usernameAttribute = "email";
+            }
+        }
+
         try {
             OidcUser user = delegate.loadUser(userRequest);
             String username = user.getUserInfo().getClaimAsString(usernameAttribute);
+
+            // Check if the username claim is null or empty
+            if (username == null || username.trim().isEmpty()) {
+                throw new IllegalArgumentException(
+                        "Claim '" + usernameAttribute + "' cannot be null or empty");
+            }
+
             Optional<User> duser = userService.findByUsernameIgnoreCase(username);
             if (duser.isPresent()) {
                 if (loginAttemptService.isBlocked(username)) {
@@ -56,13 +74,14 @@ public class CustomOAuth2UserService implements OAuth2UserService<OidcUserReques
                     throw new IllegalArgumentException("Password must not be null");
                 }
             }
+
             // Return a new OidcUser with adjusted attributes
             return new DefaultOidcUser(
                     user.getAuthorities(),
                     userRequest.getIdToken(),
                     user.getUserInfo(),
                     usernameAttribute);
-        } catch (java.lang.IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             logger.error("Error loading OIDC user: {}", e.getMessage());
             throw new OAuth2AuthenticationException(new OAuth2Error(e.getMessage()), e);
         } catch (Exception e) {

src/main/java/stirling/software/SPDF/config/security/oauth2/CustomOAuthUserService.java

@@ -1,57 +0,0 @@
-package stirling.software.SPDF.config.security.oauth2;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
-import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
-import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
-import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
-import org.springframework.security.oauth2.core.OAuth2Error;
-import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
-import org.springframework.security.oauth2.core.oidc.user.OidcUser;
-
-import stirling.software.SPDF.model.ApplicationProperties;
-
-public class CustomOAuthUserService implements OAuth2UserService<OidcUserRequest, OidcUser> {
-
-    private static final Logger logger = LoggerFactory.getLogger(CustomOAuthUserService.class);
-
-    private final OidcUserService delegate = new OidcUserService();
-
-    private ApplicationProperties applicationProperties;
-
-    public CustomOAuthUserService(ApplicationProperties applicationProperties) {
-        this.applicationProperties = applicationProperties;
-    }
-
-    @Override
-    public OidcUser loadUser(OidcUserRequest userRequest) throws OAuth2AuthenticationException {
-        String usernameAttribute =
-                applicationProperties.getSecurity().getOAUTH2().getUseAsUsername();
-        try {
-
-            OidcUser user = delegate.loadUser(userRequest);
-            Map<String, Object> attributes = new HashMap<>(user.getAttributes());
-
-            // Ensure the preferred username attribute is present
-            if (!attributes.containsKey(usernameAttribute)) {
-                attributes.put(usernameAttribute, attributes.getOrDefault("email", ""));
-                usernameAttribute = "email";
-                logger.info("Adjusted username attribute to use email");
-            }
-
-            // Return a new OidcUser with adjusted attributes
-            return new DefaultOidcUser(
-                    user.getAuthorities(),
-                    userRequest.getIdToken(),
-                    user.getUserInfo(),
-                    usernameAttribute);
-        } catch (java.lang.IllegalArgumentException e) {
-            throw new OAuth2AuthenticationException(
-                    new OAuth2Error(e.getMessage()), e.getMessage(), e);
-        }
-    }
-}

src/main/java/stirling/software/SPDF/controller/api/MergeController.java

@@ -135,7 +135,9 @@ public class MergeController {
             throw ex;
         } finally {
             for (File file : filesToDelete) {
-                file.delete();
+                if (file != null) {
+                    Files.deleteIfExists(file.toPath());
+                }
             }
         }
     }

src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java

@@ -87,12 +87,12 @@ public class PdfOverlayController {
         } finally {
             for (File overlayPdfFile : overlayPdfFiles) {
                 if (overlayPdfFile != null) {
-                    overlayPdfFile.delete();
+                    Files.deleteIfExists(overlayPdfFile.toPath());
                 }
             }
             for (File tempFile : tempFiles) { // Delete temporary files
                 if (tempFile != null) {
-                    tempFile.delete();
+                    Files.deleteIfExists(tempFile.toPath());
                 }
             }
         }

src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java

@@ -121,7 +121,7 @@ public class SplitPDFController {
 
         logger.info("Successfully created zip file with split documents: {}", zipFile.toString());
         byte[] data = Files.readAllBytes(zipFile);
-        Files.delete(zipFile);
+        Files.deleteIfExists(zipFile);
 
         // return the Resource in the response
         return WebResponseUtils.bytesToWebResponse(

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java

@@ -18,6 +18,8 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.util.Matrix;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -38,6 +40,9 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfBySectionsController {
 
+    private static final Logger logger =
+            LoggerFactory.getLogger(SplitPdfBySectionsController.class);
+
     @PostMapping(value = "/split-pdf-by-sections", consumes = "multipart/form-data")
     @Operation(
             summary = "Split PDF pages into smaller sections",
@@ -63,10 +68,7 @@ public class SplitPdfBySectionsController {
             MergeController mergeController = new MergeController();
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             mergeController.mergeDocuments(splitDocuments).save(baos);
-            return WebResponseUtils.bytesToWebResponse(
+            return WebResponseUtils.bytesToWebResponse(baos.toByteArray(), filename + "_split.pdf");
-                    baos.toByteArray(),
-                    filename + "_split.pdf",
-                    MediaType.APPLICATION_OCTET_STREAM);
         }
         for (PDDocument doc : splitDocuments) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -95,10 +97,10 @@ public class SplitPdfBySectionsController {
                 if (sectionNum == horiz * verti) pageNum++;
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         } finally {
             data = Files.readAllBytes(zipFile);
-            Files.delete(zipFile);
+            Files.deleteIfExists(zipFile);
         }
 
         return WebResponseUtils.bytesToWebResponse(

src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java

@@ -10,6 +10,8 @@ import java.util.zip.ZipOutputStream;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -31,6 +33,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "General", description = "General APIs")
 public class SplitPdfBySizeController {
 
+    private static final Logger logger = LoggerFactory.getLogger(SplitPdfBySizeController.class);
+
     @PostMapping(value = "/split-by-size-or-count", consumes = "multipart/form-data")
     @Operation(
             summary = "Auto split PDF pages into separate documents based on size or count",
@@ -66,7 +70,7 @@ public class SplitPdfBySizeController {
             }
 
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         } finally {
             data = Files.readAllBytes(zipFile);
             Files.deleteIfExists(zipFile);

src/main/java/stirling/software/SPDF/controller/api/UserController.java

@@ -66,46 +66,46 @@ public class UserController {
             RedirectAttributes redirectAttributes) {
 
         if (!userService.isUsernameValid(newUsername)) {
-            return new RedirectView("/account?messageType=invalidUsername");
+            return new RedirectView("/account?messageType=invalidUsername", true);
         }
 
         if (principal == null) {
-            return new RedirectView("/account?messageType=notAuthenticated");
+            return new RedirectView("/account?messageType=notAuthenticated", true);
         }
 
         // The username MUST be unique when renaming
         Optional<User> userOpt = userService.findByUsername(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
-            return new RedirectView("/account?messageType=userNotFound");
+            return new RedirectView("/account?messageType=userNotFound", true);
         }
 
         User user = userOpt.get();
 
         if (user.getUsername().equals(newUsername)) {
-            return new RedirectView("/account?messageType=usernameExists");
+            return new RedirectView("/account?messageType=usernameExists", true);
         }
 
         if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return new RedirectView("/account?messageType=incorrectPassword");
+            return new RedirectView("/account?messageType=incorrectPassword", true);
         }
 
         if (!user.getUsername().equals(newUsername) && userService.usernameExists(newUsername)) {
-            return new RedirectView("/account?messageType=usernameExists");
+            return new RedirectView("/account?messageType=usernameExists", true);
         }
 
         if (newUsername != null && newUsername.length() > 0) {
             try {
                 userService.changeUsername(user, newUsername);
             } catch (IllegalArgumentException e) {
-                return new RedirectView("/account?messageType=invalidUsername");
+                return new RedirectView("/account?messageType=invalidUsername", true);
             }
         }
 
         // Logout using Spring's utility
         new SecurityContextLogoutHandler().logout(request, response, null);
 
-        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED);
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -118,19 +118,19 @@ public class UserController {
             HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
         if (principal == null) {
-            return new RedirectView("/change-creds?messageType=notAuthenticated");
+            return new RedirectView("/change-creds?messageType=notAuthenticated", true);
         }
 
         Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
-            return new RedirectView("/change-creds?messageType=userNotFound");
+            return new RedirectView("/change-creds?messageType=userNotFound", true);
         }
 
         User user = userOpt.get();
 
         if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return new RedirectView("/change-creds?messageType=incorrectPassword");
+            return new RedirectView("/change-creds?messageType=incorrectPassword", true);
         }
 
         userService.changePassword(user, newPassword);
@@ -138,7 +138,7 @@ public class UserController {
         // Logout using Spring's utility
         new SecurityContextLogoutHandler().logout(request, response, null);
 
-        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED);
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -151,19 +151,19 @@ public class UserController {
             HttpServletResponse response,
             RedirectAttributes redirectAttributes) {
         if (principal == null) {
-            return new RedirectView("/account?messageType=notAuthenticated");
+            return new RedirectView("/account?messageType=notAuthenticated", true);
         }
 
         Optional<User> userOpt = userService.findByUsernameIgnoreCase(principal.getName());
 
         if (userOpt == null || userOpt.isEmpty()) {
-            return new RedirectView("/account?messageType=userNotFound");
+            return new RedirectView("/account?messageType=userNotFound", true);
         }
 
         User user = userOpt.get();
 
         if (!userService.isPasswordCorrect(user, currentPassword)) {
-            return new RedirectView("/account?messageType=incorrectPassword");
+            return new RedirectView("/account?messageType=incorrectPassword", true);
         }
 
         userService.changePassword(user, newPassword);
@@ -171,7 +171,7 @@ public class UserController {
         // Logout using Spring's utility
         new SecurityContextLogoutHandler().logout(request, response, null);
 
-        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED);
+        return new RedirectView(LOGIN_MESSAGETYPE_CREDSUPDATED, true);
     }
 
     @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
@@ -204,7 +204,7 @@ public class UserController {
                     boolean forceChange) {
 
         if (!userService.isUsernameValid(username)) {
-            return new RedirectView("/addUsers?messageType=invalidUsername");
+            return new RedirectView("/addUsers?messageType=invalidUsername", true);
         }
 
         Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
@@ -212,26 +212,27 @@ public class UserController {
         if (userOpt.isPresent()) {
             User user = userOpt.get();
             if (user != null && user.getUsername().equalsIgnoreCase(username)) {
-                return new RedirectView("/addUsers?messageType=usernameExists");
+                return new RedirectView("/addUsers?messageType=usernameExists", true);
             }
         }
         if (userService.usernameExistsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=usernameExists");
+            return new RedirectView("/addUsers?messageType=usernameExists", true);
         }
         try {
             // Validate the role
             Role roleEnum = Role.fromString(role);
             if (roleEnum == Role.INTERNAL_API_USER) {
                 // If the role is INTERNAL_API_USER, reject the request
-                return new RedirectView("/addUsers?messageType=invalidRole");
+                return new RedirectView("/addUsers?messageType=invalidRole", true);
             }
         } catch (IllegalArgumentException e) {
             // If the role ID is not valid, redirect with an error message
-            return new RedirectView("/addUsers?messageType=invalidRole");
+            return new RedirectView("/addUsers?messageType=invalidRole", true);
         }
 
         userService.saveUser(username, password, role, forceChange);
-        return new RedirectView("/addUsers"); // Redirect to account page after adding the user
+        return new RedirectView(
+                "/addUsers", true); // Redirect to account page after adding the user
     }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -244,33 +245,34 @@ public class UserController {
         Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
 
         if (!userOpt.isPresent()) {
-            return new RedirectView("/addUsers?messageType=userNotFound");
+            return new RedirectView("/addUsers?messageType=userNotFound", true);
         }
         if (!userService.usernameExistsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=userNotFound");
+            return new RedirectView("/addUsers?messageType=userNotFound", true);
         }
         // Get the currently authenticated username
         String currentUsername = authentication.getName();
 
         // Check if the provided username matches the current session's username
         if (currentUsername.equalsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=downgradeCurrentUser");
+            return new RedirectView("/addUsers?messageType=downgradeCurrentUser", true);
         }
         try {
             // Validate the role
             Role roleEnum = Role.fromString(role);
             if (roleEnum == Role.INTERNAL_API_USER) {
                 // If the role is INTERNAL_API_USER, reject the request
-                return new RedirectView("/addUsers?messageType=invalidRole");
+                return new RedirectView("/addUsers?messageType=invalidRole", true);
             }
         } catch (IllegalArgumentException e) {
             // If the role ID is not valid, redirect with an error message
-            return new RedirectView("/addUsers?messageType=invalidRole");
+            return new RedirectView("/addUsers?messageType=invalidRole", true);
         }
         User user = userOpt.get();
 
         userService.changeRole(user, role);
-        return new RedirectView("/addUsers"); // Redirect to account page after adding the user
+        return new RedirectView(
+                "/addUsers", true); // Redirect to account page after adding the user
     }
 
     @PreAuthorize("hasRole('ROLE_ADMIN')")
@@ -279,7 +281,7 @@ public class UserController {
             @PathVariable(name = "username") String username, Authentication authentication) {
 
         if (!userService.usernameExistsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=deleteUsernameExists");
+            return new RedirectView("/addUsers?messageType=deleteUsernameExists", true);
         }
 
         // Get the currently authenticated username
@@ -287,11 +289,11 @@ public class UserController {
 
         // Check if the provided username matches the current session's username
         if (currentUsername.equalsIgnoreCase(username)) {
-            return new RedirectView("/addUsers?messageType=deleteCurrentUser");
+            return new RedirectView("/addUsers?messageType=deleteCurrentUser", true);
         }
         invalidateUserSessions(username);
         userService.deleteUser(username);
-        return new RedirectView("/addUsers");
+        return new RedirectView("/addUsers", true);
     }
 
     @Autowired private SessionRegistry sessionRegistry;

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java

@@ -56,7 +56,7 @@ public class ConvertImgPDFController {
         String filename =
                 Filenames.toSimpleFileName(file.getOriginalFilename())
                         .replaceFirst("[.][^.]+$", "");
-        
+
         result =
                 PdfUtils.convertFromPdf(
                         pdfBytes,
@@ -65,10 +65,9 @@ public class ConvertImgPDFController {
                         singleImage,
                         Integer.valueOf(dpi),
                         filename);
-        
 
-        if(result == null || result.length == 0) {
+        if (result == null || result.length == 0) {
-        	logger.error("resultant bytes for {} is null, error converting ", filename);
+            logger.error("resultant bytes for {} is null, error converting ", filename);
         }
         if (singleImage) {
             String docName = filename + "." + imageFormat;

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java

@@ -3,7 +3,6 @@ package stirling.software.SPDF.controller.api.converters;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -41,34 +40,35 @@ public class ConvertOfficeController {
         // Save the uploaded file to a temporary location
         Path tempInputFile =
                 Files.createTempFile("input_", "." + FilenameUtils.getExtension(originalFilename));
-        Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
+        inputFile.transferTo(tempInputFile);
 
         // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
 
-        // Run the LibreOffice command
+        try {
-        List<String> command =
+            // Run the LibreOffice command
-                new ArrayList<>(
+            List<String> command =
-                        Arrays.asList(
+                    new ArrayList<>(
-                                "unoconv",
+                            Arrays.asList(
-                                "-vvv",
+                                    "unoconv",
-                                "-f",
+                                    "-vvv",
-                                "pdf",
+                                    "-f",
-                                "-o",
+                                    "pdf",
-                                tempOutputFile.toString(),
+                                    "-o",
-                                tempInputFile.toString()));
+                                    tempOutputFile.toString(),
-        ProcessExecutorResult returnCode =
+                                    tempInputFile.toString()));
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+            ProcessExecutorResult returnCode =
-                        .runCommandWithOutputHandling(command);
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.LIBRE_OFFICE)
+                            .runCommandWithOutputHandling(command);
 
-        // Read the converted PDF file
+            // Read the converted PDF file
-        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+            byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
-
+            return pdfBytes;
-        // Clean up the temporary files
+        } finally {
-        Files.delete(tempInputFile);
+            // Clean up the temporary files
-        Files.delete(tempOutputFile);
+            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
-
+            Files.deleteIfExists(tempOutputFile);
-        return pdfBytes;
+        }
     }
 
     private boolean isValidFileExtension(String fileExtension) {

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java

@@ -1,10 +1,22 @@
 package stirling.software.SPDF.controller.api.converters;
 
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,6 +38,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Convert", description = "Convert APIs")
 public class ConvertPDFToPDFA {
 
+    private static final Logger logger = LoggerFactory.getLogger(ConvertPDFToPDFA.class);
+
     @PostMapping(consumes = "multipart/form-data", value = "/pdf/pdfa")
     @Operation(
             summary = "Convert a PDF to a PDF/A",
@@ -36,9 +50,39 @@ public class ConvertPDFToPDFA {
         MultipartFile inputFile = request.getFileInput();
         String outputFormat = request.getOutputFormat();
 
-        // Save the uploaded file to a temporary location
+        // Convert MultipartFile to byte[]
+        byte[] pdfBytes = inputFile.getBytes();
+
+        // Load the PDF document
+        PDDocument document = Loader.loadPDF(pdfBytes);
+
+        // Get the document catalog
+        PDDocumentCatalog catalog = document.getDocumentCatalog();
+
+        // Get the AcroForm
+        PDAcroForm acroForm = catalog.getAcroForm();
+        if (acroForm != null) {
+            // Remove signature fields safely
+            List<PDField> fieldsToRemove =
+                    acroForm.getFields().stream()
+                            .filter(field -> field instanceof PDSignatureField)
+                            .collect(Collectors.toList());
+
+            if (!fieldsToRemove.isEmpty()) {
+                acroForm.flatten(fieldsToRemove, false);
+
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                document.save(baos);
+                pdfBytes = baos.toByteArray();
+            }
+        }
+        document.close();
+
+        // Save the uploaded (and possibly modified) file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        inputFile.transferTo(tempInputFile.toFile());
+        try (OutputStream outputStream = new FileOutputStream(tempInputFile.toFile())) {
+            outputStream.write(pdfBytes);
+        }
 
         // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
@@ -58,17 +102,17 @@ public class ConvertPDFToPDFA {
                         .runCommandWithOutputHandling(command);
 
         // Read the optimized PDF file
-        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+        byte[] optimizedPdfBytes = Files.readAllBytes(tempOutputFile);
 
         // Clean up the temporary files
-        Files.delete(tempInputFile);
+        Files.deleteIfExists(tempInputFile);
-        Files.delete(tempOutputFile);
+        Files.deleteIfExists(tempOutputFile);
 
         // Return the optimized PDF as a response
         String outputFilename =
                 Filenames.toSimpleFileName(inputFile.getOriginalFilename())
                                 .replaceFirst("[.][^.]+$", "")
                         + "_PDFA.pdf";
-        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+        return WebResponseUtils.bytesToWebResponse(optimizedPdfBytes, outputFilename);
     }
 }

src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java

@@ -59,7 +59,7 @@ public class ConvertWebsiteToPDF {
             pdfBytes = Files.readAllBytes(tempOutputFile);
         } finally {
             // Clean up the temporary files
-            Files.delete(tempOutputFile);
+            Files.deleteIfExists(tempOutputFile);
         }
         // Convert URL to a safe filename
         String outputFilename = convertURLToFileName(URL);

src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java

@@ -15,6 +15,8 @@ import java.util.zip.ZipOutputStream;
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -43,6 +45,7 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class AutoSplitPdfController {
 
+    private static final Logger logger = LoggerFactory.getLogger(AutoSplitPdfController.class);
     private static final String QR_CONTENT = "https://github.com/Stirling-Tools/Stirling-PDF";
     private static final String QR_CONTENT_OLD = "https://github.com/Frooodle/Stirling-PDF";
 
@@ -115,10 +118,10 @@ public class AutoSplitPdfController {
                 zipOut.closeEntry();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         } finally {
             data = Files.readAllBytes(zipFile);
-            Files.delete(zipFile);
+            Files.deleteIfExists(zipFile);
         }
 
         return WebResponseUtils.bytesToWebResponse(

src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java

@@ -67,7 +67,7 @@ public class BlankPageController {
                 String pageText = textStripper.getText(document);
                 boolean hasText = !pageText.trim().isEmpty();
 
-                Boolean blank = false;
+                Boolean blank = true;
                 if (hasText) {
                     logger.info("page " + pageIndex + " has text, not blank");
                     blank = false;
@@ -106,7 +106,7 @@ public class BlankPageController {
                                     .replaceFirst("[.][^.]+$", "")
                             + "_blanksRemoved.pdf");
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error("exception", e);
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         } finally {
             if (document != null) document.close();

src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java

@@ -136,10 +136,10 @@ public class CompressController {
                     // Increase optimization level for next iteration
                     optimizeLevel++;
                     if (autoMode && optimizeLevel > 4) {
-                        System.out.println("Skipping level 5 due to bad results in auto mode");
+                        logger.info("Skipping level 5 due to bad results in auto mode");
                         sizeMet = true;
                     } else {
-                        System.out.println(
+                        logger.info(
                                 "Increasing ghostscript optimisation level to " + optimizeLevel);
                     }
                 }
@@ -230,10 +230,10 @@ public class CompressController {
                             if (currentSize > expectedOutputSize) {
                                 // Log the current file size and scaleFactor
 
-                                System.out.println(
+                                logger.info(
                                         "Current file size: "
                                                 + FileUtils.byteCountToDisplaySize(currentSize));
-                                System.out.println("Current scale factor: " + scaleFactor);
+                                logger.info("Current scale factor: " + scaleFactor);
 
                                 // The file is still too large, reduce scaleFactor and try again
                                 scaleFactor *= 0.9f; // reduce scaleFactor by 10%
@@ -256,7 +256,6 @@ public class CompressController {
                     }
                 }
             }
-
             // Read the optimized PDF file
             pdfBytes = Files.readAllBytes(tempOutputFile);
 
@@ -269,17 +268,18 @@ public class CompressController {
                 // Read the original file again
                 pdfBytes = Files.readAllBytes(tempInputFile);
             }
+            // Return the optimized PDF as a response
+            String outputFilename =
+                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                                    .replaceFirst("[.][^.]+$", "")
+                            + "_Optimized.pdf";
+            return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+
         } finally {
             // Clean up the temporary files
-            Files.delete(tempInputFile);
+            // deleted by multipart file handler deu to transferTo?
-            Files.delete(tempOutputFile);
+            // Files.deleteIfExists(tempInputFile);
+            Files.deleteIfExists(tempOutputFile);
         }
-
-        // Return the optimized PDF as a response
-        String outputFilename =
-                Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                .replaceFirst("[.][^.]+$", "")
-                        + "_Optimized.pdf";
-        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
     }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java

@@ -5,7 +5,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -103,10 +102,7 @@ public class ExtractImageScansController {
                 }
             } else {
                 tempInputFile = Files.createTempFile("input_", "." + extension);
-                Files.copy(
+                form.getFileInput().transferTo(tempInputFile);
-                        form.getFileInput().getInputStream(),
-                        tempInputFile,
-                        StandardCopyOption.REPLACE_EXISTING);
                 // Add input file path to images list
                 images.add(tempInputFile.toString());
             }
@@ -176,11 +172,15 @@ public class ExtractImageScansController {
                 byte[] zipBytes = Files.readAllBytes(tempZipFile);
 
                 // Clean up the temporary zip file
-                Files.delete(tempZipFile);
+                Files.deleteIfExists(tempZipFile);
 
                 return WebResponseUtils.bytesToWebResponse(
                         zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+            }
+            if (processedImageBytes.size() == 0) {
+                throw new IllegalArgumentException("No images detected");
             } else {
+
                 // Return the processed image as a response
                 byte[] imageBytes = processedImageBytes.get(0);
                 return WebResponseUtils.bytesToWebResponse(
@@ -201,7 +201,7 @@ public class ExtractImageScansController {
 
             if (tempZipFile != null && Files.exists(tempZipFile)) {
                 try {
-                    Files.delete(tempZipFile);
+                    Files.deleteIfExists(tempZipFile);
                 } catch (IOException e) {
                     logger.error("Failed to delete temporary zip file: " + tempZipFile, e);
                 }

src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java

@@ -110,8 +110,8 @@ public class FakeScanControllerWIP {
     private BufferedImage rotate(BufferedImage image, double rotation) {
 
         double rotationRequired = Math.toRadians(rotation);
-        double locationX = image.getWidth() / 2;
+        double locationX = (double) image.getWidth() / 2;
-        double locationY = image.getHeight() / 2;
+        double locationY = (double) image.getHeight() / 2;
         AffineTransform tx =
                 AffineTransform.getRotateInstance(rotationRequired, locationX, locationY);
         AffineTransformOp op = new AffineTransformOp(tx, AffineTransformOp.TYPE_BICUBIC);
@@ -127,8 +127,8 @@ public class FakeScanControllerWIP {
 
         for (int i = -radius; i <= radius; i++) {
             for (int j = -radius; j <= radius; j++) {
-                double xDistance = i * i;
+                double xDistance = (double) i * i;
-                double yDistance = j * j;
+                double yDistance = (double) j * j;
                 double g = Math.exp(-(xDistance + yDistance) / (2 * sigma * sigma));
                 data[(i + radius) * size + j + radius] = (float) g;
                 sum += g;
@@ -137,7 +137,7 @@ public class FakeScanControllerWIP {
 
         // Normalize the kernel
         for (int i = 0; i < data.length; i++) {
-            data[i] /= sum;
+            if (sum != 0) data[i] /= sum;
         }
 
         Kernel kernel = new Kernel(size, size, data);
@@ -166,7 +166,7 @@ public class FakeScanControllerWIP {
                         0,
                         new Color(0, 0, 0, 1f),
                         0,
-                        featherRadius * 2,
+                        featherRadius * 2f,
                         new Color(0, 0, 0, 0f)));
         g2.fillRect(0, 0, width, featherRadius);
 
@@ -174,7 +174,7 @@ public class FakeScanControllerWIP {
         g2.setPaint(
                 new GradientPaint(
                         0,
-                        height - featherRadius * 2,
+                        height - featherRadius * 2f,
                         new Color(0, 0, 0, 0f),
                         0,
                         height,
@@ -187,7 +187,7 @@ public class FakeScanControllerWIP {
                         0,
                         0,
                         new Color(0, 0, 0, 1f),
-                        featherRadius * 2,
+                        featherRadius * 2f,
                         0,
                         new Color(0, 0, 0, 0f)));
         g2.fillRect(0, 0, featherRadius, height);
@@ -195,7 +195,7 @@ public class FakeScanControllerWIP {
         // Right edge
         g2.setPaint(
                 new GradientPaint(
-                        width - featherRadius * 2,
+                        width - featherRadius * 2f,
                         0,
                         new Color(0, 0, 0, 0f),
                         width,
@@ -244,7 +244,7 @@ public class FakeScanControllerWIP {
             int y2 = y1 + random.nextInt(20) - 10;
             Path2D.Double hair = new Path2D.Double();
             hair.moveTo(x1, y1);
-            hair.curveTo(x1, y1, (x1 + x2) / 2, (y1 + y2) / 2, x2, y2);
+            hair.curveTo(x1, y1, (double) (x1 + x2) / 2, (double) (y1 + y2) / 2, x2, y2);
             g2d.draw(hair);
         }
 

src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java

@@ -12,6 +12,8 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +35,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class FlattenController {
 
+    private static final Logger logger = LoggerFactory.getLogger(FlattenController.class);
+
     @PostMapping(consumes = "multipart/form-data", value = "/flatten")
     @Operation(
             summary = "Flatten PDF form fields or full page",
@@ -73,7 +77,7 @@ public class FlattenController {
                         contentStream.drawImage(pdImage, 0, 0, pageWidth, pageHeight);
                     }
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    logger.error("exception", e);
                 }
             }
             PdfUtils.setMetadataToPdf(newDocument, metadata);

src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java

@@ -11,6 +11,8 @@ import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -30,6 +32,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Misc", description = "Miscellaneous APIs")
 public class MetadataController {
 
+    private static final Logger logger = LoggerFactory.getLogger(MetadataController.class);
+
     private String checkUndefined(String entry) {
         // Check if the string is "undefined"
         if ("undefined".equals(entry)) {
@@ -136,7 +140,7 @@ public class MetadataController {
                 creationDateCal.setTime(
                         new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(creationDate));
             } catch (ParseException e) {
-                e.printStackTrace();
+                logger.error("exception", e);
             }
             info.setCreationDate(creationDateCal);
         } else {
@@ -148,7 +152,7 @@ public class MetadataController {
                 modificationDateCal.setTime(
                         new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").parse(modificationDate));
             } catch (ParseException e) {
-                e.printStackTrace();
+                logger.error("exception", e);
             }
             info.setModificationDate(modificationDateCal);
         } else {

src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java

@@ -5,7 +5,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -91,139 +90,145 @@ public class OCRController {
         }
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        Files.copy(inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
-
-        // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
-
-        // Prepare the output file path
         Path sidecarTextPath = null;
 
-        // Run OCR Command
+        try {
-        String languageOption = String.join("+", selectedLanguages);
+            inputFile.transferTo(tempInputFile.toFile());
 
-        List<String> command =
+            // Run OCR Command
-                new ArrayList<>(
+            String languageOption = String.join("+", selectedLanguages);
-                        Arrays.asList(
-                                "ocrmypdf",
-                                "--verbose",
-                                "2",
-                                "--output-type",
-                                "pdf",
-                                "--pdf-renderer",
-                                ocrRenderType));
 
-        if (sidecar != null && sidecar) {
+            List<String> command =
-            sidecarTextPath = Files.createTempFile("sidecar", ".txt");
+                    new ArrayList<>(
-            command.add("--sidecar");
+                            Arrays.asList(
-            command.add(sidecarTextPath.toString());
+                                    "ocrmypdf",
-        }
+                                    "--verbose",
-
+                                    "2",
-        if (deskew != null && deskew) {
+                                    "--output-type",
-            command.add("--deskew");
+                                    "pdf",
-        }
+                                    "--pdf-renderer",
-        if (clean != null && clean) {
+                                    ocrRenderType));
-            command.add("--clean");
-        }
-        if (cleanFinal != null && cleanFinal) {
-            command.add("--clean-final");
-        }
-        if (ocrType != null && !"".equals(ocrType)) {
-            if ("skip-text".equals(ocrType)) {
-                command.add("--skip-text");
-            } else if ("force-ocr".equals(ocrType)) {
-                command.add("--force-ocr");
-            } else if ("Normal".equals(ocrType)) {
 
+            if (sidecar != null && sidecar) {
+                sidecarTextPath = Files.createTempFile("sidecar", ".txt");
+                command.add("--sidecar");
+                command.add(sidecarTextPath.toString());
             }
-        }
 
-        command.addAll(
+            if (deskew != null && deskew) {
-                Arrays.asList(
+                command.add("--deskew");
-                        "--language",
+            }
-                        languageOption,
+            if (clean != null && clean) {
-                        tempInputFile.toString(),
+                command.add("--clean");
-                        tempOutputFile.toString()));
+            }
+            if (cleanFinal != null && cleanFinal) {
+                command.add("--clean-final");
+            }
+            if (ocrType != null && !"".equals(ocrType)) {
+                if ("skip-text".equals(ocrType)) {
+                    command.add("--skip-text");
+                } else if ("force-ocr".equals(ocrType)) {
+                    command.add("--force-ocr");
+                } else if ("Normal".equals(ocrType)) {
 
-        // Run CLI command
+                }
-        ProcessExecutorResult result =
+            }
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
+
-                        .runCommandWithOutputHandling(command);
+            command.addAll(
-        if (result.getRc() != 0
+                    Arrays.asList(
-                && result.getMessages().contains("multiprocessing/synchronize.py")
+                            "--language",
-                && result.getMessages().contains("OSError: [Errno 38] Function not implemented")) {
+                            languageOption,
-            command.add("--jobs");
+                            tempInputFile.toString(),
-            command.add("1");
+                            tempOutputFile.toString()));
-            result =
+
+            // Run CLI command
+            ProcessExecutorResult result =
                     ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
                             .runCommandWithOutputHandling(command);
-        }
+            if (result.getRc() != 0
-
+                    && result.getMessages().contains("multiprocessing/synchronize.py")
-        // Remove images from the OCR processed PDF if the flag is set to true
+                    && result.getMessages()
-        if (removeImagesAfter != null && removeImagesAfter) {
+                            .contains("OSError: [Errno 38] Function not implemented")) {
-            Path tempPdfWithoutImages = Files.createTempFile("output_", "_no_images.pdf");
+                command.add("--jobs");
-
+                command.add("1");
-            List<String> gsCommand =
+                result =
-                    Arrays.asList(
+                        ProcessExecutor.getInstance(ProcessExecutor.Processes.OCR_MY_PDF)
-                            "gs",
+                                .runCommandWithOutputHandling(command);
-                            "-sDEVICE=pdfwrite",
-                            "-dFILTERIMAGE",
-                            "-o",
-                            tempPdfWithoutImages.toString(),
-                            tempOutputFile.toString());
-
-            ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                    .runCommandWithOutputHandling(gsCommand);
-            tempOutputFile = tempPdfWithoutImages;
-        }
-        // Read the OCR processed PDF file
-        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
-        // Clean up the temporary files
-        Files.delete(tempInputFile);
-
-        // Return the OCR processed PDF as a response
-        String outputFilename =
-                Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                .replaceFirst("[.][^.]+$", "")
-                        + "_OCR.pdf";
-
-        if (sidecar != null && sidecar) {
-            // Create a zip file containing both the PDF and the text file
-            String outputZipFilename =
-                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-                                    .replaceFirst("[.][^.]+$", "")
-                            + "_OCR.zip";
-            Path tempZipFile = Files.createTempFile("output_", ".zip");
-
-            try (ZipOutputStream zipOut =
-                    new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
-                // Add PDF file to the zip
-                ZipEntry pdfEntry = new ZipEntry(outputFilename);
-                zipOut.putNextEntry(pdfEntry);
-                Files.copy(tempOutputFile, zipOut);
-                zipOut.closeEntry();
-
-                // Add text file to the zip
-                ZipEntry txtEntry = new ZipEntry(outputFilename.replace(".pdf", ".txt"));
-                zipOut.putNextEntry(txtEntry);
-                Files.copy(sidecarTextPath, zipOut);
-                zipOut.closeEntry();
             }
 
-            byte[] zipBytes = Files.readAllBytes(tempZipFile);
+            // Remove images from the OCR processed PDF if the flag is set to true
+            if (removeImagesAfter != null && removeImagesAfter) {
+                Path tempPdfWithoutImages = Files.createTempFile("output_", "_no_images.pdf");
 
-            // Clean up the temporary zip file
+                List<String> gsCommand =
-            Files.delete(tempZipFile);
+                        Arrays.asList(
-            Files.delete(tempOutputFile);
+                                "gs",
-            Files.delete(sidecarTextPath);
+                                "-sDEVICE=pdfwrite",
+                                "-dFILTERIMAGE",
+                                "-o",
+                                tempPdfWithoutImages.toString(),
+                                tempOutputFile.toString());
+
+                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                        .runCommandWithOutputHandling(gsCommand);
+                tempOutputFile = tempPdfWithoutImages;
+            }
+            // Read the OCR processed PDF file
+            byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
 
-            // Return the zip file containing both the PDF and the text file
-            return WebResponseUtils.bytesToWebResponse(
-                    zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
-        } else {
             // Return the OCR processed PDF as a response
-            Files.delete(tempOutputFile);
+            String outputFilename =
-            return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                                    .replaceFirst("[.][^.]+$", "")
+                            + "_OCR.pdf";
+
+            if (sidecar != null && sidecar) {
+                // Create a zip file containing both the PDF and the text file
+                String outputZipFilename =
+                        Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+                                        .replaceFirst("[.][^.]+$", "")
+                                + "_OCR.zip";
+                Path tempZipFile = Files.createTempFile("output_", ".zip");
+
+                try (ZipOutputStream zipOut =
+                        new ZipOutputStream(new FileOutputStream(tempZipFile.toFile()))) {
+                    // Add PDF file to the zip
+                    ZipEntry pdfEntry = new ZipEntry(outputFilename);
+                    zipOut.putNextEntry(pdfEntry);
+                    Files.copy(tempOutputFile, zipOut);
+                    zipOut.closeEntry();
+
+                    // Add text file to the zip
+                    ZipEntry txtEntry = new ZipEntry(outputFilename.replace(".pdf", ".txt"));
+                    zipOut.putNextEntry(txtEntry);
+                    Files.copy(sidecarTextPath, zipOut);
+                    zipOut.closeEntry();
+                }
+
+                byte[] zipBytes = Files.readAllBytes(tempZipFile);
+
+                // Clean up the temporary zip file
+                Files.deleteIfExists(tempZipFile);
+                Files.deleteIfExists(tempOutputFile);
+                Files.deleteIfExists(sidecarTextPath);
+
+                // Return the zip file containing both the PDF and the text file
+                return WebResponseUtils.bytesToWebResponse(
+                        zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
+            } else {
+                // Return the OCR processed PDF as a response
+                Files.deleteIfExists(tempOutputFile);
+                return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+            }
+        } finally {
+            // Clean up the temporary files
+            Files.deleteIfExists(tempOutputFile);
+            // Comment out as transferTo makes multipart handle cleanup
+            // Files.deleteIfExists(tempInputFile);
+            if (sidecarTextPath != null) {
+                Files.deleteIfExists(sidecarTextPath);
+            }
         }
     }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java

@@ -41,34 +41,35 @@ public class RepairController {
         MultipartFile inputFile = request.getFileInput();
         // Save the uploaded file to a temporary location
         Path tempInputFile = Files.createTempFile("input_", ".pdf");
-        inputFile.transferTo(tempInputFile.toFile());
-
-        // Prepare the output file path
         Path tempOutputFile = Files.createTempFile("output_", ".pdf");
+        byte[] pdfBytes = null;
+        inputFile.transferTo(tempInputFile.toFile());
+        try {
 
-        List<String> command = new ArrayList<>();
+            List<String> command = new ArrayList<>();
-        command.add("gs");
+            command.add("gs");
-        command.add("-o");
+            command.add("-o");
-        command.add(tempOutputFile.toString());
+            command.add(tempOutputFile.toString());
-        command.add("-sDEVICE=pdfwrite");
+            command.add("-sDEVICE=pdfwrite");
-        command.add(tempInputFile.toString());
+            command.add(tempInputFile.toString());
 
-        ProcessExecutorResult returnCode =
+            ProcessExecutorResult returnCode =
-                ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.GHOSTSCRIPT)
-                        .runCommandWithOutputHandling(command);
+                            .runCommandWithOutputHandling(command);
 
-        // Read the optimized PDF file
+            // Read the optimized PDF file
-        byte[] pdfBytes = Files.readAllBytes(tempOutputFile);
+            pdfBytes = Files.readAllBytes(tempOutputFile);
 
-        // Clean up the temporary files
+            // Return the optimized PDF as a response
-        Files.delete(tempInputFile);
+            String outputFilename =
-        Files.delete(tempOutputFile);
+                    Filenames.toSimpleFileName(inputFile.getOriginalFilename())
-
+                                    .replaceFirst("[.][^.]+$", "")
-        // Return the optimized PDF as a response
+                            + "_repaired.pdf";
-        String outputFilename =
+            return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
-                Filenames.toSimpleFileName(inputFile.getOriginalFilename())
+        } finally {
-                                .replaceFirst("[.][^.]+$", "")
+            // Clean up the temporary files
-                        + "_repaired.pdf";
+            Files.deleteIfExists(tempInputFile);
-        return WebResponseUtils.bytesToWebResponse(pdfBytes, outputFilename);
+            Files.deleteIfExists(tempOutputFile);
+        }
     }
 }

src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java

@@ -185,10 +185,12 @@ public class StampController {
             try (InputStream is = classPathResource.getInputStream();
                     FileOutputStream os = new FileOutputStream(tempFile)) {
                 IOUtils.copy(is, os);
+                font = PDType0Font.load(document, tempFile);
+            } finally {
+                if (tempFile != null) {
+                    Files.deleteIfExists(tempFile.toPath());
+                }
             }
-
-            font = PDType0Font.load(document, tempFile);
-            tempFile.deleteOnExit();
         }
 
         contentStream.setFont(font, fontSize);

src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java

@@ -19,6 +19,7 @@ import java.util.stream.Stream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -28,6 +29,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
+import stirling.software.SPDF.utils.FileMonitor;
 
 @Service
 public class PipelineDirectoryProcessor {
@@ -35,11 +37,18 @@ public class PipelineDirectoryProcessor {
     private static final Logger logger = LoggerFactory.getLogger(PipelineDirectoryProcessor.class);
     @Autowired private ObjectMapper objectMapper;
     @Autowired private ApiDocService apiDocService;
-
-    final String watchedFoldersDir = "./pipeline/watchedFolders/";
-    final String finishedFoldersDir = "./pipeline/finishedFolders/";
-
     @Autowired PipelineProcessor processor;
+    @Autowired FileMonitor fileMonitor;
+
+    final String watchedFoldersDir;
+    final String finishedFoldersDir;
+
+    public PipelineDirectoryProcessor(
+            @Qualifier("watchedFoldersDir") String watchedFoldersDir,
+            @Qualifier("finishedFoldersDir") String finishedFoldersDir) {
+        this.watchedFoldersDir = watchedFoldersDir;
+        this.finishedFoldersDir = finishedFoldersDir;
+    }
 
     @Scheduled(fixedRate = 60000)
     public void scanFolders() {
@@ -130,7 +139,11 @@ public class PipelineDirectoryProcessor {
             throws IOException {
         try (Stream<Path> paths = Files.list(dir)) {
             if ("automated".equals(operation.getParameters().get("fileInput"))) {
-                return paths.filter(path -> !Files.isDirectory(path) && !path.equals(jsonFile))
+                return paths.filter(
+                                path ->
+                                        !Files.isDirectory(path)
+                                                && !path.equals(jsonFile)
+                                                && fileMonitor.isFileReadyForProcessing(path))
                         .map(Path::toFile)
                         .toArray(File[]::new);
             } else {

src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java

@@ -148,7 +148,7 @@ public class CertSignController {
             doc.addSignature(signature, instance);
             doc.saveIncremental(output);
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         }
     }
 

src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java

@@ -56,6 +56,8 @@ import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.xml.DomXmpParser;
 import org.apache.xmpbox.xml.XmpParsingException;
 import org.apache.xmpbox.xml.XmpSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -79,6 +81,8 @@ import stirling.software.SPDF.utils.WebResponseUtils;
 @Tag(name = "Security", description = "Security APIs")
 public class GetInfoOnPDF {
 
+    private static final Logger logger = LoggerFactory.getLogger(GetInfoOnPDF.class);
+
     static ObjectMapper objectMapper = new ObjectMapper();
 
     @PostMapping(consumes = "multipart/form-data", value = "/get-info-on-pdf")
@@ -220,7 +224,7 @@ public class GetInfoOnPDF {
                             javascriptArray.add(jsNode);
                         }
                     } catch (IOException e) {
-                        e.printStackTrace();
+                        logger.error("exception", e);
                     }
                 }
             }
@@ -253,7 +257,7 @@ public class GetInfoOnPDF {
                 }
             } catch (Exception e) {
                 // TODO Auto-generated catch block
-                e.printStackTrace();
+                logger.error("exception", e);
             }
 
             boolean isPdfACompliant = checkForStandard(pdfBoxDoc, "PDF/A");
@@ -305,7 +309,7 @@ public class GetInfoOnPDF {
                     new XmpSerializer().serialize(xmpMeta, os, true);
                     xmpString = new String(os.toByteArray(), StandardCharsets.UTF_8);
                 } catch (XmpParsingException | IOException e) {
-                    e.printStackTrace();
+                    logger.error("exception", e);
                 }
             }
 
@@ -593,7 +597,7 @@ public class GetInfoOnPDF {
                     MediaType.APPLICATION_JSON);
 
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         }
         return null;
     }
@@ -691,7 +695,7 @@ public class GetInfoOnPDF {
                 Exception
                         e) { // Catching general exception for brevity, ideally you'd catch specific
             // exceptions.
-            e.printStackTrace();
+            logger.error("exception", e);
         }
 
         return false;

src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java

@@ -0,0 +1,81 @@
+package stirling.software.SPDF.controller.api.security;
+
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
+import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
+import org.apache.pdfbox.pdmodel.interactive.form.PDField;
+import org.apache.pdfbox.pdmodel.interactive.form.PDSignatureField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.github.pixee.security.Filenames;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import stirling.software.SPDF.model.api.PDFFile;
+import stirling.software.SPDF.utils.WebResponseUtils;
+
+@RestController
+@RequestMapping("/api/v1/security")
+@Tag(name = "Security", description = "Security APIs")
+public class RemoveCertSignController {
+
+    private static final Logger logger = LoggerFactory.getLogger(RemoveCertSignController.class);
+
+    @PostMapping(consumes = "multipart/form-data", value = "/remove-cert-sign")
+    @Operation(
+            summary = "Remove digital signature from PDF",
+            description =
+                    "This endpoint accepts a PDF file and returns the PDF file without the digital signature. Input: PDF, Output: PDF")
+    public ResponseEntity<byte[]> removeCertSignPDF(@ModelAttribute PDFFile request)
+            throws Exception {
+        MultipartFile pdf = request.getFileInput();
+
+        // Convert MultipartFile to byte[]
+        byte[] pdfBytes = pdf.getBytes();
+
+        // Create a ByteArrayOutputStream to hold the resulting PDF
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+        // Load the PDF document
+        PDDocument document = Loader.loadPDF(pdfBytes);
+
+        // Get the document catalog
+        PDDocumentCatalog catalog = document.getDocumentCatalog();
+
+        // Get the AcroForm
+        PDAcroForm acroForm = catalog.getAcroForm();
+        if (acroForm != null) {
+            // Remove signature fields safely
+            List<PDField> fieldsToRemove =
+                    acroForm.getFields().stream()
+                            .filter(field -> field instanceof PDSignatureField)
+                            .collect(Collectors.toList());
+
+            if (!fieldsToRemove.isEmpty()) {
+                acroForm.flatten(fieldsToRemove, false);
+            }
+        }
+
+        // Save the modified document to the ByteArrayOutputStream
+        document.save(baos);
+        document.close();
+
+        // Return the modified PDF as a response
+        return WebResponseUtils.boasToWebResponse(
+                baos,
+                Filenames.toSimpleFileName(pdf.getOriginalFilename()).replaceFirst("[.][^.]+$", "")
+                        + "_unsigned.pdf");
+    }
+}

src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java

@@ -150,10 +150,10 @@ public class WatermarkController {
             try (InputStream is = classPathResource.getInputStream();
                     FileOutputStream os = new FileOutputStream(tempFile)) {
                 IOUtils.copy(is, os);
+                font = PDType0Font.load(document, tempFile);
+            } finally {
+                if (tempFile != null) Files.deleteIfExists(tempFile.toPath());
             }
-
-            font = PDType0Font.load(document, tempFile);
-            tempFile.deleteOnExit();
         }
 
         contentStream.setFont(font, fontSize);

src/main/java/stirling/software/SPDF/controller/api/strippers/PDFTableStripper.java

@@ -117,7 +117,6 @@ public class PDFTableStripper extends PDFTextStripper {
     /**
      * Instantiate a new PDFTableStripper object.
      *
-     * @param document
      * @throws IOException If there is an error loading the properties.
      */
     public PDFTableStripper() throws IOException {

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -1,10 +1,13 @@
 package stirling.software.SPDF.controller.web;
 
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
@@ -21,6 +24,11 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 
 import jakarta.servlet.http.HttpServletRequest;
 import stirling.software.SPDF.model.ApplicationProperties;
+import stirling.software.SPDF.model.ApplicationProperties.GithubProvider;
+import stirling.software.SPDF.model.ApplicationProperties.GoogleProvider;
+import stirling.software.SPDF.model.ApplicationProperties.KeycloakProvider;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2;
+import stirling.software.SPDF.model.ApplicationProperties.Security.OAUTH2.Client;
 import stirling.software.SPDF.model.Authority;
 import stirling.software.SPDF.model.Role;
 import stirling.software.SPDF.model.User;
@@ -31,6 +39,7 @@ import stirling.software.SPDF.repository.UserRepository;
 public class AccountWebController {
 
     @Autowired ApplicationProperties applicationProperties;
+    private static final Logger logger = LoggerFactory.getLogger(AccountWebController.class);
 
     @GetMapping("/login")
     public String login(HttpServletRequest request, Model model, Authentication authentication) {
@@ -38,6 +47,33 @@ public class AccountWebController {
             return "redirect:/";
         }
 
+        Map<String, String> providerList = new HashMap<>();
+
+        OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();
+        if (oauth != null) {
+            if (oauth.isSettingsValid()) {
+                providerList.put("oidc", oauth.getProvider());
+            }
+            Client client = oauth.getClient();
+            if (client != null) {
+                GoogleProvider google = client.getGoogle();
+                if (google.isSettingsValid()) {
+                    providerList.put(google.getName(), google.getClientName());
+                }
+
+                GithubProvider github = client.getGithub();
+                if (github.isSettingsValid()) {
+                    providerList.put(github.getName(), github.getClientName());
+                }
+
+                KeycloakProvider keycloak = client.getKeycloak();
+                if (keycloak.isSettingsValid()) {
+                    providerList.put(keycloak.getName(), keycloak.getClientName());
+                }
+            }
+        }
+        model.addAttribute("providerlist", providerList);
+
         model.addAttribute(
                 "oAuth2Enabled", applicationProperties.getSecurity().getOAUTH2().getEnabled());
 
@@ -80,6 +116,21 @@ public class AccountWebController {
                     break;
                 case "invalid_token_response":
                     erroroauth = "login.oauth2InvalidTokenResponse";
+                    break;
+                case "authorization_request_not_found":
+                    erroroauth = "login.oauth2RequestNotFound";
+                    break;
+                case "access_denied":
+                    erroroauth = "login.oauth2AccessDenied";
+                    break;
+                case "invalid_user_info_response":
+                    erroroauth = "login.oauth2InvalidUserInfoResponse";
+                    break;
+                case "invalid_request":
+                    erroroauth = "login.oauth2invalidRequest";
+                    break;
+                case "invalid_id_token":
+                    erroroauth = "login.oauth2InvalidIdToken";
                 default:
                     break;
             }
@@ -211,8 +262,7 @@ public class AccountWebController {
                         userRepository.findByUsernameIgnoreCase(
                                 username); // Assuming findByUsername method exists
                 if (!user.isPresent()) {
-                    // Handle error appropriately
+                    return "redirect:/error";
-                    return "redirect:/error"; // Example redirection in case of error
                 }
 
                 // Convert settings map to JSON string
@@ -222,8 +272,8 @@ public class AccountWebController {
                     settingsJson = objectMapper.writeValueAsString(user.get().getSettings());
                 } catch (JsonProcessingException e) {
                     // Handle JSON conversion error
-                    e.printStackTrace();
+                    logger.error("exception", e);
-                    return "redirect:/error"; // Example redirection in case of error
+                    return "redirect:/error";
                 }
 
                 String messageType = request.getParameter("messageType");

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -15,6 +15,8 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -33,6 +35,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 @Tag(name = "General", description = "General APIs")
 public class GeneralWebController {
 
+    private static final Logger logger = LoggerFactory.getLogger(GeneralWebController.class);
+
     @GetMapping("/pipeline")
     @Hidden
     public String pipelineForm(Model model) {
@@ -74,7 +78,7 @@ public class GeneralWebController {
                 }
 
             } catch (IOException e) {
-                e.printStackTrace();
+                logger.error("exception", e);
             }
         }
         if (pipelineConfigsWithNames.size() == 0) {

src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java

@@ -6,6 +6,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
@@ -26,6 +28,8 @@ import stirling.software.SPDF.model.Dependency;
 @Controller
 public class HomeWebController {
 
+    private static final Logger logger = LoggerFactory.getLogger(HomeWebController.class);
+
     @GetMapping("/about")
     @Hidden
     public String gameForm(Model model) {
@@ -46,7 +50,7 @@ public class HomeWebController {
                     mapper.readValue(json, new TypeReference<Map<String, List<Dependency>>>() {});
             model.addAttribute("dependencies", data.get("dependencies"));
         } catch (IOException e) {
-            e.printStackTrace();
+            logger.error("exception", e);
         }
         return "licenses";
     }

src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java

@@ -53,6 +53,13 @@ public class SecurityWebController {
         return "security/cert-sign";
     }
 
+    @GetMapping("/remove-cert-sign")
+    @Hidden
+    public String certUnSignForm(Model model) {
+        model.addAttribute("currentPage", "remove-cert-sign");
+        return "security/remove-cert-sign";
+    }
+
     @GetMapping("/sanitize-pdf")
     @Hidden
     public String sanitizeForm(Model model) {

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -6,6 +6,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
@@ -23,6 +25,7 @@ public class ApplicationProperties {
     private Metrics metrics;
     private AutomaticallyGenerated automaticallyGenerated;
     private AutoPipeline autoPipeline;
+    private static final Logger logger = LoggerFactory.getLogger(ApplicationProperties.class);
 
     public AutoPipeline getAutoPipeline() {
         return autoPipeline != null ? autoPipeline : new AutoPipeline();
@@ -182,13 +185,12 @@ public class ApplicationProperties {
                     + oauth2
                     + ", initialLogin="
                     + initialLogin
-                    + ",  csrfDisabled="
+                    + ", csrfDisabled="
                     + csrfDisabled
                     + "]";
         }
 
         public static class InitialLogin {
-
             private String username;
             private String password;
 
@@ -219,22 +221,21 @@ public class ApplicationProperties {
         }
 
         public static class OAUTH2 {
-
+            private Boolean enabled = false;
-            private boolean enabled;
             private String issuer;
             private String clientId;
             private String clientSecret;
-            private boolean autoCreateUser;
+            private Boolean autoCreateUser = false;
             private String useAsUsername;
+            private Collection<String> scopes = new ArrayList<>();
             private String provider;
+            private Client client = new Client();
 
-            private Collection<String> scopes = new ArrayList<String>();
+            public Boolean getEnabled() {
-
-            public boolean getEnabled() {
                 return enabled;
             }
 
-            public void setEnabled(boolean enabled) {
+            public void setEnabled(Boolean enabled) {
                 this.enabled = enabled;
             }
 
@@ -262,19 +263,16 @@ public class ApplicationProperties {
                 this.clientSecret = clientSecret;
             }
 
-            public boolean getAutoCreateUser() {
+            public Boolean getAutoCreateUser() {
                 return autoCreateUser;
             }
 
-            public void setAutoCreateUser(boolean autoCreateUser) {
+            public void setAutoCreateUser(Boolean autoCreateUser) {
                 this.autoCreateUser = autoCreateUser;
             }
 
             public String getUseAsUsername() {
-                if (useAsUsername != null && useAsUsername.trim().length() > 0) {
+                return useAsUsername;
-                    return useAsUsername;
-                }
-                return "email";
             }
 
             public void setUseAsUsername(String useAsUsername) {
@@ -293,14 +291,44 @@ public class ApplicationProperties {
                 return scopes;
             }
 
-            public void setScopes(String scpoes) {
+            public void setScopes(String scopes) {
                 List<String> scopesList =
-                        Arrays.stream(scpoes.split(","))
+                        Arrays.stream(scopes.split(","))
                                 .map(String::trim)
                                 .collect(Collectors.toList());
                 this.scopes.addAll(scopesList);
             }
 
+            public Client getClient() {
+                return client;
+            }
+
+            public void setClient(Client client) {
+                this.client = client;
+            }
+
+            protected boolean isValid(String value, String name) {
+                if (value != null && !value.trim().isEmpty()) {
+                    return true;
+                }
+                return false;
+            }
+
+            protected boolean isValid(Collection<String> value, String name) {
+                if (value != null && !value.isEmpty()) {
+                    return true;
+                }
+                return false;
+            }
+
+            public boolean isSettingsValid() {
+                return isValid(this.getIssuer(), "issuer")
+                        && isValid(this.getClientId(), "clientId")
+                        && isValid(this.getClientSecret(), "clientSecret")
+                        && isValid(this.getScopes(), "scopes")
+                        && isValid(this.getUseAsUsername(), "useAsUsername");
+            }
+
             @Override
             public String toString() {
                 return "OAUTH2 [enabled="
@@ -315,12 +343,370 @@ public class ApplicationProperties {
                         + autoCreateUser
                         + ", useAsUsername="
                         + useAsUsername
-                        + ", provider"
+                        + ", provider="
                         + provider
                         + ", scopes="
                         + scopes
                         + "]";
             }
+
+            public static class Client {
+                private GoogleProvider google = new GoogleProvider();
+                private GithubProvider github = new GithubProvider();
+                private KeycloakProvider keycloak = new KeycloakProvider();
+
+                public Provider get(String registrationId) throws Exception {
+                    switch (registrationId.toLowerCase()) {
+                        case "google":
+                            return getGoogle();
+                        case "github":
+                            return getGithub();
+                        case "keycloak":
+                            return getKeycloak();
+                        default:
+                            break;
+                    }
+                    throw new Exception("Provider not supported, use custom setting.");
+                }
+
+                public GoogleProvider getGoogle() {
+                    return google;
+                }
+
+                public void setGoogle(GoogleProvider google) {
+                    this.google = google;
+                }
+
+                public GithubProvider getGithub() {
+                    return github;
+                }
+
+                public void setGithub(GithubProvider github) {
+                    this.github = github;
+                }
+
+                public KeycloakProvider getKeycloak() {
+                    return keycloak;
+                }
+
+                public void setKeycloak(KeycloakProvider keycloak) {
+                    this.keycloak = keycloak;
+                }
+
+                @Override
+                public String toString() {
+                    return "Client [google="
+                            + google
+                            + ", github="
+                            + github
+                            + ", keycloak="
+                            + keycloak
+                            + "]";
+                }
+            }
+        }
+    }
+
+    public static class GoogleProvider extends Provider {
+
+        private static final String authorizationUri =
+                "https://accounts.google.com/o/oauth2/v2/auth";
+        private static final String tokenUri = "https://www.googleapis.com/oauth2/v4/token";
+        private static final String userInfoUri =
+                "https://www.googleapis.com/oauth2/v3/userinfo?alt=json";
+
+        public String getAuthorizationuri() {
+            return authorizationUri;
+        }
+
+        public String getTokenuri() {
+            return tokenUri;
+        }
+
+        public String getUserinfouri() {
+            return userInfoUri;
+        }
+
+        private String clientId;
+        private String clientSecret;
+        private Collection<String> scopes = new ArrayList<>();
+        private String useAsUsername = "email";
+
+        @Override
+        public String getClientId() {
+            return this.clientId;
+        }
+
+        @Override
+        public void setClientId(String clientId) {
+            this.clientId = clientId;
+        }
+
+        @Override
+        public String getClientSecret() {
+            return this.clientSecret;
+        }
+
+        @Override
+        public void setClientSecret(String clientSecret) {
+            this.clientSecret = clientSecret;
+        }
+
+        @Override
+        public Collection<String> getScopes() {
+            if (scopes == null || scopes.isEmpty()) {
+                scopes = new ArrayList<>();
+                scopes.add("https://www.googleapis.com/auth/userinfo.email");
+                scopes.add("https://www.googleapis.com/auth/userinfo.profile");
+            }
+            return scopes;
+        }
+
+        @Override
+        public void setScopes(String scopes) {
+            this.scopes =
+                    Arrays.stream(scopes.split(",")).map(String::trim).collect(Collectors.toList());
+        }
+
+        @Override
+        public String getUseAsUsername() {
+            return this.useAsUsername;
+        }
+
+        @Override
+        public void setUseAsUsername(String useAsUsername) {
+            this.useAsUsername = useAsUsername;
+        }
+
+        @Override
+        public String toString() {
+            return "Google [clientId="
+                    + clientId
+                    + ", clientSecret="
+                    + (clientSecret != null && !clientSecret.isEmpty() ? "MASKED" : "NULL")
+                    + ", scopes="
+                    + scopes
+                    + ", useAsUsername="
+                    + useAsUsername
+                    + "]";
+        }
+
+        @Override
+        public String getName() {
+            return "google";
+        }
+
+        @Override
+        public String getClientName() {
+            return "Google";
+        }
+
+        public boolean isSettingsValid() {
+            return super.isValid(this.getClientId(), "clientId")
+                    && super.isValid(this.getClientSecret(), "clientSecret")
+                    && super.isValid(this.getScopes(), "scopes")
+                    && isValid(this.getUseAsUsername(), "useAsUsername");
+        }
+    }
+
+    public static class GithubProvider extends Provider {
+        private static final String authorizationUri = "https://github.com/login/oauth/authorize";
+        private static final String tokenUri = "https://github.com/login/oauth/access_token";
+        private static final String userInfoUri = "https://api.github.com/user";
+
+        public String getAuthorizationuri() {
+            return authorizationUri;
+        }
+
+        public String getTokenuri() {
+            return tokenUri;
+        }
+
+        public String getUserinfouri() {
+            return userInfoUri;
+        }
+
+        private String clientId;
+        private String clientSecret;
+        private Collection<String> scopes = new ArrayList<>();
+        private String useAsUsername = "login";
+
+        @Override
+        public String getIssuer() {
+            return new String();
+        }
+
+        @Override
+        public void setIssuer(String issuer) {}
+
+        @Override
+        public String getClientId() {
+            return this.clientId;
+        }
+
+        @Override
+        public void setClientId(String clientId) {
+            this.clientId = clientId;
+        }
+
+        @Override
+        public String getClientSecret() {
+            return this.clientSecret;
+        }
+
+        @Override
+        public void setClientSecret(String clientSecret) {
+            this.clientSecret = clientSecret;
+        }
+
+        public Collection<String> getScopes() {
+            if (scopes == null || scopes.isEmpty()) {
+                scopes = new ArrayList<>();
+                scopes.add("read:user");
+            }
+            return scopes;
+        }
+
+        @Override
+        public void setScopes(String scopes) {
+            this.scopes =
+                    Arrays.stream(scopes.split(",")).map(String::trim).collect(Collectors.toList());
+        }
+
+        @Override
+        public String getUseAsUsername() {
+            return this.useAsUsername;
+        }
+
+        @Override
+        public void setUseAsUsername(String useAsUsername) {
+            this.useAsUsername = useAsUsername;
+        }
+
+        @Override
+        public String toString() {
+            return "GitHub [clientId="
+                    + clientId
+                    + ", clientSecret="
+                    + (clientSecret != null && !clientSecret.isEmpty() ? "MASKED" : "NULL")
+                    + ", scopes="
+                    + scopes
+                    + ", useAsUsername="
+                    + useAsUsername
+                    + "]";
+        }
+
+        @Override
+        public String getName() {
+            return "github";
+        }
+
+        @Override
+        public String getClientName() {
+            return "GitHub";
+        }
+
+        public boolean isSettingsValid() {
+            return super.isValid(this.getClientId(), "clientId")
+                    && super.isValid(this.getClientSecret(), "clientSecret")
+                    && super.isValid(this.getScopes(), "scopes")
+                    && isValid(this.getUseAsUsername(), "useAsUsername");
+        }
+    }
+
+    public static class KeycloakProvider extends Provider {
+        private String issuer;
+        private String clientId;
+        private String clientSecret;
+        private Collection<String> scopes = new ArrayList<>();
+        private String useAsUsername = "email";
+
+        @Override
+        public String getIssuer() {
+            return this.issuer;
+        }
+
+        @Override
+        public void setIssuer(String issuer) {
+            this.issuer = issuer;
+        }
+
+        @Override
+        public String getClientId() {
+            return this.clientId;
+        }
+
+        @Override
+        public void setClientId(String clientId) {
+            this.clientId = clientId;
+        }
+
+        @Override
+        public String getClientSecret() {
+            return this.clientSecret;
+        }
+
+        @Override
+        public void setClientSecret(String clientSecret) {
+            this.clientSecret = clientSecret;
+        }
+
+        @Override
+        public Collection<String> getScopes() {
+            if (scopes == null || scopes.isEmpty()) {
+                scopes = new ArrayList<>();
+                scopes.add("profile");
+                scopes.add("email");
+            }
+            return scopes;
+        }
+
+        public void setScopes(String scopes) {
+            this.scopes =
+                    Arrays.stream(scopes.split(",")).map(String::trim).collect(Collectors.toList());
+        }
+
+        @Override
+        public String getUseAsUsername() {
+            return this.useAsUsername;
+        }
+
+        @Override
+        public void setUseAsUsername(String useAsUsername) {
+            this.useAsUsername = useAsUsername;
+        }
+
+        @Override
+        public String toString() {
+            return "Keycloak [issuer="
+                    + issuer
+                    + ", clientId="
+                    + clientId
+                    + ", clientSecret="
+                    + (clientSecret != null && !clientSecret.isEmpty() ? "MASKED" : "NULL")
+                    + ", scopes="
+                    + scopes
+                    + ", useAsUsername="
+                    + useAsUsername
+                    + "]";
+        }
+
+        @Override
+        public String getName() {
+            return "keycloak";
+        }
+
+        @Override
+        public String getClientName() {
+            return "Keycloak";
+        }
+
+        public boolean isSettingsValid() {
+            return isValid(this.getIssuer(), "issuer")
+                    && isValid(this.getClientId(), "clientId")
+                    && isValid(this.getClientSecret(), "clientSecret")
+                    && isValid(this.getScopes(), "scopes")
+                    && isValid(this.getUseAsUsername(), "useAsUsername");
         }
     }
 
@@ -381,9 +767,6 @@ public class ApplicationProperties {
             this.googlevisibility = googlevisibility;
         }
 
-      
-
-
         @Override
         public String toString() {
             return "System [defaultLocale="

src/main/java/stirling/software/SPDF/model/InputStreamTemplateResource.java

@@ -0,0 +1,45 @@
+package stirling.software.SPDF.model;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import org.thymeleaf.templateresource.ITemplateResource;
+
+public class InputStreamTemplateResource implements ITemplateResource {
+    private InputStream inputStream;
+    private String characterEncoding;
+
+    public InputStreamTemplateResource(InputStream inputStream, String characterEncoding) {
+        this.inputStream = inputStream;
+        this.characterEncoding = characterEncoding;
+    }
+
+    @Override
+    public Reader reader() throws IOException {
+        return new InputStreamReader(inputStream, characterEncoding);
+    }
+
+    @Override
+    public ITemplateResource relative(String relativeLocation) {
+        // Implement logic for relative resources, if needed
+        throw new UnsupportedOperationException("Relative resources not supported");
+    }
+
+    @Override
+    public String getDescription() {
+        return "InputStream resource [Stream]";
+    }
+
+    @Override
+    public String getBaseName() {
+        return "streamResource";
+    }
+
+    @Override
+    public boolean exists() {
+        // TODO Auto-generated method stub
+        return false;
+    }
+}

src/main/java/stirling/software/SPDF/model/Provider.java

@@ -0,0 +1,92 @@
+package stirling.software.SPDF.model;
+
+import java.util.Collection;
+
+public class Provider implements ProviderInterface {
+    private String name;
+    private String clientName;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getClientName() {
+        return clientName;
+    }
+
+    protected boolean isValid(String value, String name) {
+        if (value != null && !value.trim().isEmpty()) {
+            return true;
+        }
+        return false;
+        // throw new IllegalArgumentException(getName() + ": " + name + " is required!");
+    }
+
+    protected boolean isValid(Collection<String> value, String name) {
+        if (value != null && !value.isEmpty()) {
+            return true;
+        }
+        return false;
+        // throw new IllegalArgumentException(getName() + ": " + name + " is required!");
+    }
+
+    @Override
+    public Collection<String> getScopes() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getScope'");
+    }
+
+    @Override
+    public void setScopes(String scopes) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'setScope'");
+    }
+
+    @Override
+    public String getUseAsUsername() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getUseAsUsername'");
+    }
+
+    @Override
+    public void setUseAsUsername(String useAsUsername) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'setUseAsUsername'");
+    }
+
+    @Override
+    public String getIssuer() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getIssuer'");
+    }
+
+    @Override
+    public void setIssuer(String issuer) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'setIssuer'");
+    }
+
+    @Override
+    public String getClientSecret() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getClientSecret'");
+    }
+
+    @Override
+    public void setClientSecret(String clientSecret) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'setClientSecret'");
+    }
+
+    @Override
+    public String getClientId() {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'getClientId'");
+    }
+
+    @Override
+    public void setClientId(String clientId) {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'setClientId'");
+    }
+}

src/main/java/stirling/software/SPDF/model/ProviderInterface.java

@@ -0,0 +1,26 @@
+package stirling.software.SPDF.model;
+
+import java.util.Collection;
+
+public interface ProviderInterface {
+
+    public Collection<String> getScopes();
+
+    public void setScopes(String scopes);
+
+    public String getUseAsUsername();
+
+    public void setUseAsUsername(String useAsUsername);
+
+    public String getIssuer();
+
+    public void setIssuer(String issuer);
+
+    public String getClientSecret();
+
+    public void setClientSecret(String clientSecret);
+
+    public String getClientId();
+
+    public void setClientId(String clientId);
+}

src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,6 +21,8 @@ import stirling.software.SPDF.utils.GeneralUtils;
 @EqualsAndHashCode(callSuper = true)
 public class PDFWithPageNums extends PDFFile {
 
+    private static final Logger logger = LoggerFactory.getLogger(PDFWithPageNums.class);
+
     @Schema(
             description =
                     "The pages to select, Supports ranges (e.g., '1,3,5-9'), or 'all' or functions in the format 'an+b' where 'a' is the multiplier of the page number 'n', and 'b' is a constant (e.g., '2n+1', '3n', '6n-5')\"")
@@ -31,7 +35,7 @@ public class PDFWithPageNums extends PDFFile {
             pageCount = Loader.loadPDF(getFileInput().getBytes()).getNumberOfPages();
         } catch (IOException e) {
             // TODO Auto-generated catch block
-            e.printStackTrace();
+            logger.error("exception", e);
         }
         return GeneralUtils.parsePageList(pageNumbers, pageCount, zeroCount);
     }

src/main/java/stirling/software/SPDF/utils/FileMonitor.java

@@ -0,0 +1,168 @@
+package stirling.software.SPDF.utils;
+
+import static java.nio.file.StandardWatchEventKinds.*;
+
+import java.io.IOException;
+import java.nio.file.*;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class FileMonitor {
+    private static final Logger logger = LoggerFactory.getLogger(FileMonitor.class);
+    private final Map<Path, WatchKey> path2KeyMapping;
+    private final Set<Path> newlyDiscoveredFiles;
+    private final ConcurrentHashMap.KeySetView<Path, Boolean> readyForProcessingFiles;
+    private final WatchService watchService;
+    private final Predicate<Path> pathFilter;
+    private final Path rootDir;
+    private Set<Path> stagingFiles;
+
+    /**
+     * @param rootDirectory the root directory to monitor
+     * @param pathFilter the filter to apply to the paths, return true if the path should be
+     *     monitored, false otherwise
+     */
+    @Autowired
+    public FileMonitor(
+            @Qualifier("watchedFoldersDir") String rootDirectory,
+            @Qualifier("directoryFilter") Predicate<Path> pathFilter)
+            throws IOException {
+        this.newlyDiscoveredFiles = new HashSet<>();
+        this.path2KeyMapping = new HashMap<>();
+        this.stagingFiles = new HashSet<>();
+        this.pathFilter = pathFilter;
+        this.readyForProcessingFiles = ConcurrentHashMap.newKeySet();
+        this.watchService = FileSystems.getDefault().newWatchService();
+        this.rootDir = Path.of(rootDirectory);
+    }
+
+    private boolean shouldNotProcess(Path path) {
+        return !pathFilter.test(path);
+    }
+
+    private void recursivelyRegisterEntry(Path dir) throws IOException {
+        WatchKey key = dir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
+        path2KeyMapping.put(dir, key);
+        logger.info("Registered directory: {}", dir);
+
+        try (Stream<Path> directoryVisitor = Files.walk(dir, 1)) {
+            final Iterator<Path> iterator = directoryVisitor.iterator();
+            while (iterator.hasNext()) {
+                Path path = iterator.next();
+                if (path.equals(dir) || shouldNotProcess(path)) continue;
+
+                if (Files.isDirectory(path)) {
+                    recursivelyRegisterEntry(path);
+                } else if (Files.isRegularFile(path)) {
+                    handleFileCreation(path);
+                }
+            }
+        }
+    }
+
+    @Scheduled(fixedRate = 5000)
+    public void trackFiles() {
+        /*
+         All files observed changes in the last iteration will be considered as staging files.
+         If those files are not modified in current iteration, they will be considered as ready for processing.
+        */
+        stagingFiles = new HashSet<>(newlyDiscoveredFiles);
+        readyForProcessingFiles.clear();
+
+        if (path2KeyMapping.isEmpty()) {
+            logger.warn(
+                    "not monitoring any directory, even the root directory itself: {}", rootDir);
+            if (Files.exists(
+                    rootDir)) { // if the root directory exists, re-register the root directory
+                try {
+                    recursivelyRegisterEntry(rootDir);
+                } catch (IOException e) {
+                    logger.error("unable to register monitoring", e);
+                }
+            }
+        }
+
+        WatchKey key;
+        while ((key = watchService.poll()) != null) {
+            final Path watchingDir = (Path) key.watchable();
+            key.pollEvents()
+                    .forEach(
+                            (evt) -> {
+                                final Path path = (Path) evt.context();
+                                final WatchEvent.Kind<?> kind = evt.kind();
+                                if (shouldNotProcess(path)) return;
+
+                                try {
+                                    if (Files.isDirectory(path)) {
+                                        if (kind == ENTRY_CREATE) {
+                                            handleDirectoryCreation(path);
+                                        }
+                                        /*
+                                         we don't need to handle directory deletion or modification
+                                         - directory deletion will be handled by key.reset()
+                                         - directory modification indicates a new file creation or deletion, which is handled by below
+                                        */
+                                    }
+                                    Path relativePathFromRoot = watchingDir.resolve(path);
+                                    if (kind == ENTRY_CREATE) {
+                                        handleFileCreation(relativePathFromRoot);
+                                    } else if (kind == ENTRY_DELETE) {
+                                        handleFileRemoval(relativePathFromRoot);
+                                    } else if (kind == ENTRY_MODIFY) {
+                                        handleFileModification(relativePathFromRoot);
+                                    }
+                                } catch (Exception e) {
+                                    logger.error("Error while processing file: {}", path, e);
+                                }
+                            });
+
+            boolean isKeyValid = key.reset();
+            if (!isKeyValid) { // key is invalid when the directory itself is no longer exists
+                path2KeyMapping.remove((Path) key.watchable());
+            }
+        }
+        readyForProcessingFiles.addAll(stagingFiles);
+    }
+
+    private void handleDirectoryCreation(Path dir) throws IOException {
+        WatchKey key = dir.register(watchService, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
+        path2KeyMapping.put(dir, key);
+    }
+
+    private void handleFileRemoval(Path path) {
+        newlyDiscoveredFiles.remove(path);
+        stagingFiles.remove(path);
+    }
+
+    private void handleFileCreation(Path path) {
+        newlyDiscoveredFiles.add(path);
+        stagingFiles.remove(path);
+    }
+
+    private void handleFileModification(Path path) {
+        // the logic is the same
+        handleFileCreation(path);
+    }
+
+    /**
+     * Check if the file is ready for processing.
+     *
+     * <p>A file is ready for processing if it is not being modified for 5000ms.
+     *
+     * @param path the path of the file
+     * @return true if the file is ready for processing, false otherwise
+     */
+    public boolean isFileReadyForProcessing(Path path) {
+        return readyForProcessingFiles.contains(path);
+    }
+}

src/main/java/stirling/software/SPDF/utils/FileToPdf.java

@@ -42,6 +42,7 @@ public class FileToPdf {
             List<String> command = new ArrayList<>();
             if (!htmlFormatsInstalled) {
                 command.add("weasyprint");
+                command.add("-e utf-8");
                 command.add(tempInputFile.toString());
                 command.add(tempOutputFile.toString());
 
@@ -52,7 +53,7 @@ public class FileToPdf {
                 command.add("--paper-size");
                 command.add("a4");
 
-                if (request.getZoom() != 1.0) {
+                if (request != null && request.getZoom() != 1.0) {
                     // Create a temporary CSS file
                     File tempCssFile = Files.createTempFile("customStyle", ".css").toFile();
                     try (FileWriter writer = new FileWriter(tempCssFile)) {
@@ -79,8 +80,8 @@ public class FileToPdf {
         } finally {
 
             // Clean up temporary files
-            Files.delete(tempOutputFile);
+            Files.deleteIfExists(tempOutputFile);
-            Files.delete(tempInputFile);
+            Files.deleteIfExists(tempInputFile);
         }
 
         return pdfBytes;

src/main/java/stirling/software/SPDF/utils/GeneralUtils.java

@@ -14,6 +14,8 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.fathzer.soft.javaluator.DoubleEvaluator;
@@ -23,6 +25,8 @@ import io.github.pixee.security.Urls;
 
 public class GeneralUtils {
 
+    private static final Logger logger = LoggerFactory.getLogger(GeneralUtils.class);
+
     public static File convertMultipartFileToFile(MultipartFile multipartFile) throws IOException {
         File tempFile = Files.createTempFile("temp", null).toFile();
         try (FileOutputStream os = new FileOutputStream(tempFile)) {
@@ -38,14 +42,14 @@ public class GeneralUtils {
                     @Override
                     public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
                             throws IOException {
-                        Files.delete(file);
+                        Files.deleteIfExists(file);
                         return FileVisitResult.CONTINUE;
                     }
 
                     @Override
                     public FileVisitResult postVisitDirectory(Path dir, IOException exc)
                             throws IOException {
-                        Files.delete(dir);
+                        Files.deleteIfExists(dir);
                         return FileVisitResult.CONTINUE;
                     }
                 });
@@ -234,7 +238,7 @@ public class GeneralUtils {
             try {
                 Files.createDirectories(folder);
             } catch (IOException e) {
-                e.printStackTrace();
+                logger.error("exception", e);
                 return false;
             }
         }

src/main/java/stirling/software/SPDF/utils/PDFToFile.java

@@ -6,7 +6,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -15,6 +14,8 @@ import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -25,6 +26,7 @@ import io.github.pixee.security.Filenames;
 import stirling.software.SPDF.utils.ProcessExecutor.ProcessExecutorResult;
 
 public class PDFToFile {
+    private static final Logger logger = LoggerFactory.getLogger(PDFToFile.class);
 
     public ResponseEntity<byte[]> processPdfToHtml(MultipartFile inputFile)
             throws IOException, InterruptedException {
@@ -34,7 +36,10 @@ public class PDFToFile {
 
         // Get the original PDF file name without the extension
         String originalPdfFileName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
-        String pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
+        String pdfBaseName = originalPdfFileName;
+        if (originalPdfFileName.contains(".")) {
+            pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
+        }
 
         Path tempInputFile = null;
         Path tempOutputDir = null;
@@ -44,8 +49,7 @@ public class PDFToFile {
         try {
             // Save the uploaded file to a temporary location
             tempInputFile = Files.createTempFile("input_", ".pdf");
-            Files.copy(
+            inputFile.transferTo(tempInputFile);
-                    inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
 
             // Prepare the output directory
             tempOutputDir = Files.createTempDirectory("output_");
@@ -66,23 +70,25 @@ public class PDFToFile {
             // Return output files in a ZIP archive
             fileName = pdfBaseName + "ToHtml.zip";
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-            ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream);
+            try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) {
-
+                for (File outputFile : outputFiles) {
-            for (File outputFile : outputFiles) {
+                    ZipEntry entry = new ZipEntry(outputFile.getName());
-                ZipEntry entry = new ZipEntry(outputFile.getName());
+                    zipOutputStream.putNextEntry(entry);
-                zipOutputStream.putNextEntry(entry);
+                    try (FileInputStream fis = new FileInputStream(outputFile)) {
-                FileInputStream fis = new FileInputStream(outputFile);
+                        IOUtils.copy(fis, zipOutputStream);
-                IOUtils.copy(fis, zipOutputStream);
+                    } catch (IOException e) {
-                fis.close();
+                        logger.error("Exception writing zip entry", e);
-                zipOutputStream.closeEntry();
+                    }
+                    zipOutputStream.closeEntry();
+                }
+            } catch (IOException e) {
+                logger.error("Exception writing zip", e);
             }
-
-            zipOutputStream.close();
             fileBytes = byteArrayOutputStream.toByteArray();
 
         } finally {
             // Clean up the temporary files
-            if (tempInputFile != null) Files.delete(tempInputFile);
+            if (tempInputFile != null) Files.deleteIfExists(tempInputFile);
             if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
 
@@ -100,8 +106,15 @@ public class PDFToFile {
 
         // Get the original PDF file name without the extension
         String originalPdfFileName = Filenames.toSimpleFileName(inputFile.getOriginalFilename());
-        String pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
 
+        if (originalPdfFileName == null || "".equals(originalPdfFileName.trim())) {
+            originalPdfFileName = "output.pdf";
+        }
+        // Assume file is pdf if no extension
+        String pdfBaseName = originalPdfFileName;
+        if (originalPdfFileName.contains(".")) {
+            pdfBaseName = originalPdfFileName.substring(0, originalPdfFileName.lastIndexOf('.'));
+        }
         // Validate output format
         List<String> allowedFormats =
                 Arrays.asList("doc", "docx", "odt", "ppt", "pptx", "odp", "rtf", "xml", "txt:Text");
@@ -117,8 +130,7 @@ public class PDFToFile {
         try {
             // Save the uploaded file to a temporary location
             tempInputFile = Files.createTempFile("input_", ".pdf");
-            Files.copy(
+            inputFile.transferTo(tempInputFile);
-                    inputFile.getInputStream(), tempInputFile, StandardCopyOption.REPLACE_EXISTING);
 
             // Prepare the output directory
             tempOutputDir = Files.createTempDirectory("output_");
@@ -153,26 +165,31 @@ public class PDFToFile {
                 // Return output files in a ZIP archive
                 fileName = pdfBaseName + "To" + outputFormat + ".zip";
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-                ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream);
+                try (ZipOutputStream zipOutputStream = new ZipOutputStream(byteArrayOutputStream)) {
+                    for (File outputFile : outputFiles) {
+                        ZipEntry entry = new ZipEntry(outputFile.getName());
+                        zipOutputStream.putNextEntry(entry);
+                        try (FileInputStream fis = new FileInputStream(outputFile)) {
+                            IOUtils.copy(fis, zipOutputStream);
+                        } catch (IOException e) {
+                            logger.error("Exception writing zip entry", e);
+                        }
 
-                for (File outputFile : outputFiles) {
+                        zipOutputStream.closeEntry();
-                    ZipEntry entry = new ZipEntry(outputFile.getName());
+                    }
-                    zipOutputStream.putNextEntry(entry);
+                } catch (IOException e) {
-                    FileInputStream fis = new FileInputStream(outputFile);
+                    logger.error("Exception writing zip", e);
-                    IOUtils.copy(fis, zipOutputStream);
-                    fis.close();
-                    zipOutputStream.closeEntry();
                 }
 
-                zipOutputStream.close();
                 fileBytes = byteArrayOutputStream.toByteArray();
             }
 
         } finally {
             // Clean up the temporary files
-            if (tempInputFile != null) Files.delete(tempInputFile);
+            Files.deleteIfExists(tempInputFile);
             if (tempOutputDir != null) FileUtils.deleteDirectory(tempOutputDir.toFile());
         }
+        System.out.println("fileBytes=" + fileBytes.length);
         return WebResponseUtils.bytesToWebResponse(
                 fileBytes, fileName, MediaType.APPLICATION_OCTET_STREAM);
     }

src/main/java/stirling/software/SPDF/utils/ProcessExecutor.java

@@ -125,7 +125,7 @@ public class ProcessExecutor {
                                     logger.warn(
                                             "Error reader thread was interrupted due to timeout.");
                                 } catch (IOException e) {
-                                    e.printStackTrace();
+                                    logger.error("exception", e);
                                 }
                             });
 
@@ -149,7 +149,7 @@ public class ProcessExecutor {
                                     logger.warn(
                                             "Error reader thread was interrupted due to timeout.");
                                 } catch (IOException e) {
-                                    e.printStackTrace();
+                                    logger.error("exception", e);
                                 }
                             });
 

src/main/java/stirling/software/SPDF/utils/RequestUriUtils.java

@@ -5,6 +5,7 @@ public class RequestUriUtils {
     public static boolean isStaticResource(String requestURI) {
 
         return requestURI.startsWith("/css/")
+                || requestURI.startsWith("/fonts/")
                 || requestURI.startsWith("/js/")
                 || requestURI.startsWith("/images/")
                 || requestURI.startsWith("/public/")

src/main/java/stirling/software/SPDF/utils/UrlUtils.java

@@ -0,0 +1,15 @@
+package stirling.software.SPDF.utils;
+
+import jakarta.servlet.http.HttpServletRequest;
+
+public class UrlUtils {
+
+    public static String getOrigin(HttpServletRequest request) {
+        String scheme = request.getScheme(); // http or https
+        String serverName = request.getServerName(); // localhost
+        int serverPort = request.getServerPort(); // 8080
+        String contextPath = request.getContextPath(); // /myapp
+
+        return scheme + "://" + serverName + ":" + serverPort + contextPath;
+    }
+}

src/main/resources/messages_ar_AR.properties

@@ -332,6 +332,10 @@ home.certSign.title=Sign with Certificate
 home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
 certSign.tags=authenticate,PEM,P12,official,encrypt
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Multi-Page Layout
 home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
 pageLayout.tags=merge,composite,single-view,organize
@@ -452,6 +456,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=تسجيل الدخول عبر تسجيل الدخول الأحادي
 login.oauth2AutoCreateDisabled=تم تعطيل مستخدم الإنشاء التلقائي لـ OAuth2
+login.oauth2RequestNotFound=Authorization request not found
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
+login.oauth2invalidRequest=Invalid Request
+login.oauth2AccessDenied=Access Denied
+login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Download
 
 #crop
 crop.title=Crop
-crop.header=Crop Image
+crop.header=Crop PDF
 crop.submit=Submit
 
 
@@ -649,6 +659,13 @@ certSign.name=الاسم
 certSign.submit=تسجيل PDF
 
 
+#removeCertSign
+removeCertSign.title=Remove Certificate Signature
+removeCertSign.header=Remove the digital certificate from the PDF
+removeCertSign.selectPDF=Select a PDF file:
+removeCertSign.submit=Remove Signature
+
+
 #removeBlanks
 removeBlanks.title=إزالة الفراغات
 removeBlanks.header=إزالة الصفحات الفارغة
@@ -959,6 +976,7 @@ pdfToPDFA.credit=تستخدم هذه الخدمة OCRmyPDF لتحويل PDF / A.
 pdfToPDFA.submit=تحويل
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord

src/main/resources/messages_bg_BG.properties

@@ -59,8 +59,8 @@ deleteCurrentUserMessage=Не може да се изтрие вписания
 deleteUsernameExistsMessage=Потребителското име не съществува и не може да бъде изтрито.
 downgradeCurrentUserMessage=Не може да се понижи ролята на текущия потребител
 downgradeCurrentUserLongMessage=Не може да се понижи ролята на текущия потребител. Следователно текущият потребител няма да бъде показан.
-userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsOAuthMessage=Потребителят вече съществува като OAuth2 потребител.
-userAlreadyExistsWebMessage=The user already exists as an web user.
+userAlreadyExistsWebMessage=Потребителят вече съществува като уеб-потребител.
 error=Грешка
 oops=Опаа!
 help=Помощ
@@ -105,18 +105,18 @@ pipelineOptions.validateButton=Валидирай
 #############
 #  NAVBAR   #
 #############
-navbar.favorite=Favorites
+navbar.favorite=Любими
 navbar.darkmode=Тъмна тема
-navbar.language=Languages
+navbar.language=Езици
 navbar.settings=Настройки
-navbar.allTools=Tools
+navbar.allTools=Инструменти
-navbar.multiTool=Multi Tools
+navbar.multiTool=Мулти инструменти
-navbar.sections.organize=Organize
+navbar.sections.organize=Организирайте
-navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertTo=Преобразуване в PDF
-navbar.sections.convertFrom=Convert from PDF
+navbar.sections.convertFrom=Преобразуване от PDF
-navbar.sections.security=Sign & Security
+navbar.sections.security=Подписване и сигурност
-navbar.sections.advance=Advanced
+navbar.sections.advance=Разширено
-navbar.sections.edit=View & Edit
+navbar.sections.edit=Преглед и редактиране
 
 #############
 #  SETTINGS #
@@ -185,7 +185,7 @@ adminUserSettings.internalApiUser=Вътрешен API потребител
 adminUserSettings.forceChange=Принудете потребителя да промени потребителското име/парола при влизане
 adminUserSettings.submit=Съхранете потребителя
 adminUserSettings.changeUserRole=Промяна на ролята на потребителя
-adminUserSettings.authenticated=Authenticated
+adminUserSettings.authenticated=Удостоверен
 
 #############
 # HOME-PAGE #
@@ -267,7 +267,7 @@ home.fileToPDF.desc=Преобразуване почти всеки файл к
 fileToPDF.tags=трансформация,формат,документ,изображение,слайд,текст,преобразуване,офис,документи,word,excel,powerpoint
 
 home.ocr.title=OCR / Почистващи сканирания
-home.ocr.desc=Почистване, сканира и открива текст от изображения към PDF и го добавя отново като текст.
+home.ocr.desc=Почиства, сканира и открива текст от изображения в PDF и го добавя отново като текст.
 ocr.tags=разпознаване,текст,изображение,сканиране,четене,идентифициране,откриване,редактиране
 
 
@@ -313,7 +313,7 @@ home.flatten.desc=Премахнете всички интерактивни е
 flatten.tags=статичен,деактивиран,неинтерактивен,рационализиран
 
 home.repair.title=Поправи
-home.repair.desc=Опитва се да поправи повреден/счупен PDF
+home.repair.desc=Опитва се да поправи повреден PDF
 repair.tags=поправка,възстановяване,корекция,възстановяване
 
 home.removeBlanks.title=Премахване на празни страници
@@ -332,6 +332,10 @@ home.certSign.title=Подпишете със сертификат
 home.certSign.desc=Подписва PDF със сертификат/ключ (PEM/P12)
 certSign.tags=удостоверяване,PEM,P12,официален,шифроване
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Оформление с няколко страници
 home.pageLayout.desc=Слейте няколко страници от PDF документ в една страница
 pageLayout.tags=сливане,комбиниран,единичен изглед,организиране
@@ -364,7 +368,7 @@ home.autoSplitPDF.title=Автоматично разделяне на стра
 home.autoSplitPDF.desc=Автоматично разделяне на сканиран PDF файл с QR код за разделяне на физически сканирани страници
 autoSplitPDF.tags=QR-базиран,отделен,сканиране-сегмент,организиране
 
-home.sanitizePdf.title=Дезинфенкцирам
+home.sanitizePdf.title=Обеззаразяване
 home.sanitizePdf.desc=Премахване на скриптове и други елементи от PDF файлове
 sanitizePdf.tags=чисти,сигурни,безопасни,премахване-заплахи
 
@@ -382,8 +386,8 @@ home.MarkdownToPDF.desc=Преобразува всеки Markdown файл къ
 MarkdownToPDF.tags=маркиране,уеб-съдържание,трансформация,преобразуване
 
 
-home.getPdfInfo.title=Вземете ЦЯЛАТА информация към PDF
+home.getPdfInfo.title=Вземете ЦЯЛАТА информация от PDF
-home.getPdfInfo.desc=Взема всяка възможна информация от PDF файлове
+home.getPdfInfo.desc=Взима всяка възможна информация от PDF файлове
 getPdfInfo.tags=информация,данни,статистики,статистика
 
 
@@ -405,7 +409,7 @@ home.autoRedact.title=Автоматично редактиране
 home.autoRedact.desc=Автоматично редактира (зачернява) текст в PDF въз основа на въведен текст
 autoRedact.tags=Редактиране,Скриване,затъмняване,черен,маркер,скрит
 
-home.tableExtraxt.title=PDF to CSV
+home.tableExtraxt.title=PDF в CSV
 home.tableExtraxt.desc=Извлича таблици от PDF, като ги конвертира в CSV
 tableExtraxt.tags=CSV,извличане на таблица,извличане,конвертиране
 
@@ -452,6 +456,12 @@ login.locked=Вашият акаунт е заключен.
 login.signinTitle=Моля впишете се
 login.ssoSignIn=Влизане чрез еднократно влизане
 login.oauth2AutoCreateDisabled=OAUTH2 Автоматично създаване на потребител е деактивирано
+login.oauth2RequestNotFound=Заявката за оторизация не е намерена
+login.oauth2InvalidUserInfoResponse=Невалидна информация за потребителя
+login.oauth2invalidRequest=Невалидна заявка
+login.oauth2AccessDenied=Отказан достъп
+login.oauth2InvalidTokenResponse=Невалиден отговор на токена
+login.oauth2InvalidIdToken=Невалиден токен за идентификатор
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Изтегли
 
 #crop
 crop.title=Изрязване
-crop.header=Изрязване на изображение
+crop.header=Изрязване на PDF
 crop.submit=Подайте
 
 
@@ -632,7 +642,7 @@ scalePages.submit=Подайте
 
 
 #certSign
-certSign.title=Подписване на сертификат
+certSign.title=Подписване със сертификат
 certSign.header=Подпишете PDF с вашия сертификат (В процес на работа)
 certSign.selectPDF=Изберете PDF файл за подписване:
 certSign.jksNote=Забележка: Ако вашият тип сертификат не е в списъка по-долу, моля, конвертирайте го във файл на Java Keystore (.jks) с помощта на инструмента за команден ред keytool. След това изберете опцията за .jks файл по-долу.
@@ -649,6 +659,13 @@ certSign.name=Име
 certSign.submit=Подпишете PDF
 
 
+#removeCertSign
+removeCertSign.title=Remove Certificate Signature
+removeCertSign.header=Remove the digital certificate from the PDF
+removeCertSign.selectPDF=Select a PDF file:
+removeCertSign.submit=Remove Signature
+
+
 #removeBlanks
 removeBlanks.title=Премахване на празни места
 removeBlanks.header=Премахване на празни страници
@@ -752,7 +769,7 @@ extractImages.submit=Извличане
 fileToPDF.title=Файл към PDF
 fileToPDF.header=Конвертирайте всеки файл към PDF
 fileToPDF.credit=Тази услуга използва LibreOffice и Unoconv за преобразуване на файлове.
-fileToPDF.supportedFileTypesInfo=Supported File types
+fileToPDF.supportedFileTypesInfo=Поддържание файлови типове
 fileToPDF.supportedFileTypes=Поддържаните типове файлове трябва да включват по-долу, но за пълен актуализиран списък на поддържаните формати, моля, вижте документацията на LibreOffice
 fileToPDF.submit=Преобразуване към PDF
 
@@ -761,10 +778,10 @@ fileToPDF.submit=Преобразуване към PDF
 compress.title=Компресиране
 compress.header=Компресиране на PDF
 compress.credit=Тази услуга използва Ghostscript за PDF компресиране/оптимизиране.
-compress.selectText.1=Ръчен режим - От 1 до 4
+compress.selectText.1=Ръчен режим - от 1 до 4
 compress.selectText.2=Ниво на оптимизация:
 compress.selectText.3=4 (Ужасно за текстови изображения)
-compress.selectText.4=Автоматичен режим - Автоматично настройва качеството, за да получи PDF точен размер
+compress.selectText.4=Автоматичен режим - Автоматично настройва качеството, за да получи PDF с точен размер
 compress.selectText.5=Очакван PDF размер (напр. 25МБ, 10.8МБ, 25КБ)
 compress.submit=Компресиране
 
@@ -805,7 +822,7 @@ pdfOrganiser.placeholder=(напр. 1,3,2 или 4-8,2,10-12 или 2n-1)
 #multiTool
 multiTool.title=PDF Мулти инструмент
 multiTool.header=PDF Мулти инструмент
-multiTool.uploadPrompts=File Name
+multiTool.uploadPrompts=Име на файл
 
 #view pdf
 viewPdf.title=Преглед на PDF
@@ -904,8 +921,8 @@ watermark.selectText.7=Непрозрачност (0% - 100%):
 watermark.selectText.8=Тип воден знак:
 watermark.selectText.9=Изображение за воден знак:
 watermark.submit=Добавяне на воден знак
-watermark.type.1=Text
+watermark.type.1=Текст
-watermark.type.2=Image
+watermark.type.2=Изображение
 
 
 #Change permissions
@@ -959,6 +976,7 @@ pdfToPDFA.credit=Тази услуга използва OCRmyPDF за PDF/A пр
 pdfToPDFA.submit=Преобразуване
 pdfToPDFA.tip=В момента не работи за няколко входа наведнъж
 pdfToPDFA.outputFormat=Изходен формат
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord

src/main/resources/messages_ca_CA.properties

@@ -332,6 +332,10 @@ home.certSign.title=Signa amb Certificat
 home.certSign.desc=Sign PDF amb Certificate/Clau (PEM/P12)
 certSign.tags=authentica,PEM,P12,official,encripta
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Multi-Page Layout
 home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
 pageLayout.tags=merge,composite,single-view,organize
@@ -452,6 +456,12 @@ login.locked=Compte bloquejat
 login.signinTitle=Autenticat
 login.ssoSignIn=Inicia sessió mitjançant l'inici de sessió ún
 login.oauth2AutoCreateDisabled=L'usuari de creació automàtica OAUTH2 està desactivat
+login.oauth2RequestNotFound=Authorization request not found
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
+login.oauth2invalidRequest=Invalid Request
+login.oauth2AccessDenied=Access Denied
+login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Download
 
 #crop
 crop.title=Talla
-crop.header=Talla Imatge
+crop.header=Talla PDF
 crop.submit=Submit
 
 
@@ -649,6 +659,13 @@ certSign.name=Nom
 certSign.submit=Firma PDF
 
 
+#removeCertSign
+removeCertSign.title=Remove Certificate Signature
+removeCertSign.header=Remove the digital certificate from the PDF
+removeCertSign.selectPDF=Select a PDF file:
+removeCertSign.submit=Remove Signature
+
+
 #removeBlanks
 removeBlanks.title=Elimina els espais en blanc
 removeBlanks.header=Elimina les pàgines en blanc
@@ -959,6 +976,7 @@ pdfToPDFA.credit=Utilitza OCRmyPDF per la conversió a PDF/A
 pdfToPDFA.submit=Converteix
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord

src/main/resources/messages_de_DE.properties

@@ -59,8 +59,8 @@ deleteCurrentUserMessage=Der aktuell angemeldete Benutzer kann nicht gelöscht w
 deleteUsernameExistsMessage=Der Benutzername existiert nicht und kann nicht gelöscht werden.
 downgradeCurrentUserMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden
 downgradeCurrentUserLongMessage=Die Rolle des aktuellen Benutzers kann nicht herabgestuft werden. Daher wird der aktuelle Benutzer nicht angezeigt.
-userAlreadyExistsOAuthMessage=The user already exists as an OAuth2 user.
+userAlreadyExistsOAuthMessage=Der Benutzer ist bereits als OAuth2-Benutzer vorhanden.
-userAlreadyExistsWebMessage=The user already exists as an web user.
+userAlreadyExistsWebMessage=Der Benutzer ist bereits als Webbenutzer vorhanden.
 error=Fehler
 oops=Hoppla!
 help=Hilfe
@@ -71,7 +71,7 @@ visitGithub=GitHub-Repository besuchen
 donate=Spenden
 color=Farbe
 sponsor=Sponsor
-info=Info
+info=Informationen
 
 
 
@@ -105,18 +105,18 @@ pipelineOptions.validateButton=Validieren
 #############
 #  NAVBAR   #
 #############
-navbar.favorite=Favorites
+navbar.favorite=Favoriten
 navbar.darkmode=Dunkler Modus
-navbar.language=Languages
+navbar.language=Sprachen
 navbar.settings=Einstellungen
-navbar.allTools=Tools
+navbar.allTools=Werkzeuge
-navbar.multiTool=Multi Tools
+navbar.multiTool=Multitools
-navbar.sections.organize=Organize
+navbar.sections.organize=Organisieren
-navbar.sections.convertTo=Convert to PDF
+navbar.sections.convertTo=In PDF konvertieren
-navbar.sections.convertFrom=Convert from PDF
+navbar.sections.convertFrom=Konvertieren von PDF
-navbar.sections.security=Sign & Security
+navbar.sections.security=Zeichen und Sicherheit
-navbar.sections.advance=Advanced
+navbar.sections.advance=Fortschrittlich
-navbar.sections.edit=View & Edit
+navbar.sections.edit=Anzeigen und Bearbeiten
 
 #############
 #  SETTINGS #
@@ -185,7 +185,7 @@ adminUserSettings.internalApiUser=Interner API-Benutzer
 adminUserSettings.forceChange=Benutzer dazu zwingen, Benutzernamen/Passwort bei der Anmeldung zu ändern
 adminUserSettings.submit=Benutzer speichern
 adminUserSettings.changeUserRole=Benutzerrolle ändern
-adminUserSettings.authenticated=Authenticated
+adminUserSettings.authenticated=Authentifiziert
 
 #############
 # HOME-PAGE #
@@ -332,6 +332,10 @@ home.certSign.title=Mit Zertifikat signieren
 home.certSign.desc=Ein PDF mit einem Zertifikat/Schlüssel (PEM/P12) signieren
 certSign.tags=authentifizieren,pem,p12,offiziell,verschlüsseln
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Mehrseitiges Layout
 home.pageLayout.desc=Mehrere Seiten eines PDF zu einer Seite zusammenführen
 pageLayout.tags=zusammenführen,zusammensetzen,einzelansicht,organisieren
@@ -452,6 +456,12 @@ login.locked=Ihr Konto wurde gesperrt.
 login.signinTitle=Bitte melden Sie sich an.
 login.ssoSignIn=Anmeldung per Single Sign-On
 login.oauth2AutoCreateDisabled=OAUTH2 Benutzer automatisch erstellen deaktiviert
+login.oauth2RequestNotFound=Autorisierungsanfrage nicht gefunden
+login.oauth2InvalidUserInfoResponse=Ungültige Benutzerinformationsantwort
+login.oauth2invalidRequest=ungültige Anfrage
+login.oauth2AccessDenied=Zugriff abgelehnt
+login.oauth2InvalidTokenResponse=Ungültige Token-Antwort
+login.oauth2InvalidIdToken=Ungültiges ID-Token
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Herunterladen
 
 #crop
 crop.title=Zuschneiden
-crop.header=Bild zuschneiden
+crop.header=PDF zuschneiden
 crop.submit=Abschicken
 
 
@@ -649,6 +659,13 @@ certSign.name=Name
 certSign.submit=PDF signieren
 
 
+#removeCertSign
+removeCertSign.title=Zertifikatsignatur entfernen
+removeCertSign.header=Digitales Zertifikat aus dem PDF entfernen
+removeCertSign.selectPDF=PDF-Datei auswählen:
+removeCertSign.submit=Signatur entfernen
+
+
 #removeBlanks
 removeBlanks.title=Leere Seiten entfernen
 removeBlanks.header=Leere Seiten entfernen
@@ -704,7 +721,7 @@ repair.submit=Reparieren
 #flatten
 flatten.title=Abflachen
 flatten.header=PDFs reduzieren
-flatten.flattenOnlyForms=Flatten only forms
+flatten.flattenOnlyForms=Nur Formulare abflachen
 flatten.submit=Abflachen
 
 
@@ -752,7 +769,7 @@ extractImages.submit=Extrahieren
 fileToPDF.title=Datei in PDF
 fileToPDF.header=Beliebige Dateien in PDF konvertieren
 fileToPDF.credit=Dieser Dienst verwendet LibreOffice und Unoconv für die Dateikonvertierung.
-fileToPDF.supportedFileTypesInfo=Supported File types
+fileToPDF.supportedFileTypesInfo=Unterstützte Dateitypen
 fileToPDF.supportedFileTypes=Unterstützte Dateitypen sollten die folgenden enthalten, eine vollständige aktualisierte Liste der unterstützten Formate finden Sie jedoch in der LibreOffice-Dokumentation
 fileToPDF.submit=In PDF konvertieren
 
@@ -805,7 +822,7 @@ pdfOrganiser.placeholder=(z.B. 1,3,2 oder 4-8,2,10-12 oder 2n-1)
 #multiTool
 multiTool.title=PDF-Multitool
 multiTool.header=PDF-Multitool
-multiTool.uploadPrompts=File Name
+multiTool.uploadPrompts=Dateiname
 
 #view pdf
 viewPdf.title=PDF anzeigen
@@ -959,6 +976,7 @@ pdfToPDFA.credit=Dieser Dienst verwendet OCRmyPDF für die PDF/A-Konvertierung
 pdfToPDFA.submit=Konvertieren
 pdfToPDFA.tip=Dieser Dienst kann nur einzelne Eingangsdateien verarbeiten.
 pdfToPDFA.outputFormat=Ausgabeformat
+pdfToPDFA.pdfWithDigitalSignature=Das PDF enthält eine digitale Signatur. Sie wird im nächsten Schritt entfernt.
 
 
 #PDFToWord

src/main/resources/messages_el_GR.properties

@@ -332,6 +332,10 @@ home.certSign.title=Υπογραφή με Πιστοποιητικό
 home.certSign.desc=Υπογραφή ενός PDF αρχείου με ένα Πιστοποιητικό/Κλειδί (PEM/P12)
 certSign.tags=authenticate,PEM,P12,official,encrypt
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Διάταξη πολλών σελίδων
 home.pageLayout.desc=Συγχώνευση πολλαπλών σελίδων ενός εγγράφου PDF σε μία μόνο σελίδα
 pageLayout.tags=merge,composite,single-view,organize
@@ -452,6 +456,12 @@ login.locked=Ο λογαριασμός σας έχει κλειδωθεί.
 login.signinTitle=Παρακαλώ, συνδεθείτε
 login.ssoSignIn=Σύνδεση μέσω μοναδικής σύνδεσης
 login.oauth2AutoCreateDisabled=Απενεργοποιήθηκε ο χρήστης αυτόματης δημιουργίας OAUTH2
+login.oauth2RequestNotFound=Authorization request not found
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
+login.oauth2invalidRequest=Invalid Request
+login.oauth2AccessDenied=Access Denied
+login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Λήψη
 
 #crop
 crop.title=Κοπή
-crop.header=Κοπή Εικόνας
+crop.header=Περικοπή PDF
 crop.submit=Υποβολή
 
 
@@ -649,6 +659,13 @@ certSign.name=Όνομα
 certSign.submit=Υπογραφή PDF
 
 
+#removeCertSign
+removeCertSign.title=Remove Certificate Signature
+removeCertSign.header=Remove the digital certificate from the PDF
+removeCertSign.selectPDF=Select a PDF file:
+removeCertSign.submit=Remove Signature
+
+
 #removeBlanks
 removeBlanks.title=Αφαίρεση Κενών
 removeBlanks.header=Αφαίρεση Κενών Σελίδων
@@ -959,6 +976,7 @@ pdfToPDFA.credit=Αυτή η υπηρεσία χρησιμοποιεί OCRmyPDF
 pdfToPDFA.submit=Μετατροπή
 pdfToPDFA.tip=Προς το παρόν δεν λειτουργεί για πολλαπλές εισόδους ταυτόχρονα
 pdfToPDFA.outputFormat=Output format
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord

src/main/resources/messages_en_GB.properties

@@ -332,6 +332,10 @@ home.certSign.title=Sign with Certificate
 home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
 certSign.tags=authenticate,PEM,P12,official,encrypt
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Multi-Page Layout
 home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
 pageLayout.tags=merge,composite,single-view,organize
@@ -452,6 +456,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Login via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
+login.oauth2RequestNotFound=Authorization request not found
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
+login.oauth2invalidRequest=Invalid Request
+login.oauth2AccessDenied=Access Denied
+login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Download
 
 #crop
 crop.title=Crop
-crop.header=Crop Image
+crop.header=Crop PDF
 crop.submit=Submit
 
 
@@ -649,6 +659,13 @@ certSign.name=Name
 certSign.submit=Sign PDF
 
 
+#removeCertSign
+removeCertSign.title=Remove Certificate Signature
+removeCertSign.header=Remove the digital certificate from the PDF
+removeCertSign.selectPDF=Select a PDF file:
+removeCertSign.submit=Remove Signature
+
+
 #removeBlanks
 removeBlanks.title=Remove Blanks
 removeBlanks.header=Remove Blank Pages
@@ -959,6 +976,7 @@ pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord

src/main/resources/messages_en_US.properties

@@ -332,6 +332,10 @@ home.certSign.title=Sign with Certificate
 home.certSign.desc=Signs a PDF with a Certificate/Key (PEM/P12)
 certSign.tags=authenticate,PEM,P12,official,encrypt
 
+home.removeCertSign.title=Remove Certificate Sign
+home.removeCertSign.desc=Remove certificate signature from PDF
+removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+
 home.pageLayout.title=Multi-Page Layout
 home.pageLayout.desc=Merge multiple pages of a PDF document into a single page
 pageLayout.tags=merge,composite,single-view,organize
@@ -452,6 +456,12 @@ login.locked=Your account has been locked.
 login.signinTitle=Please sign in
 login.ssoSignIn=Login via Single Sign-on
 login.oauth2AutoCreateDisabled=OAUTH2 Auto-Create User Disabled
+login.oauth2RequestNotFound=Authorization request not found
+login.oauth2InvalidUserInfoResponse=Invalid User Info Response
+login.oauth2invalidRequest=Invalid Request
+login.oauth2AccessDenied=Access Denied
+login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact
@@ -592,7 +602,7 @@ adjustContrast.download=Download
 
 #crop
 crop.title=Crop
-crop.header=Crop Image
+crop.header=Crop PDF
 crop.submit=Submit
 
 
@@ -649,6 +659,13 @@ certSign.name=Name
 certSign.submit=Sign PDF
 
 
+#removeCertSign
+removeCertSign.title=Remove Certificate Signature
+removeCertSign.header=Remove the digital certificate from the PDF
+removeCertSign.selectPDF=Select a PDF file:
+removeCertSign.submit=Remove Signature
+
+
 #removeBlanks
 removeBlanks.title=Remove Blanks
 removeBlanks.header=Remove Blank Pages
@@ -959,6 +976,7 @@ pdfToPDFA.credit=This service uses OCRmyPDF for PDF/A conversion
 pdfToPDFA.submit=Convert
 pdfToPDFA.tip=Currently does not work for multiple inputs at once
 pdfToPDFA.outputFormat=Output format
+pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
 
 
 #PDFToWord