Update build.yml

Add missing pdflib

.github/workflows/build.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.7"
+          python-version: "3.12"
 
       - name: Pip requirements
         run: |

.github/workflows/multiOSReleases.yml

@@ -74,7 +74,7 @@ jobs:
         shell: bash
         run: |
           if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
+            mv "build/jpackage/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.exe" "Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then
             mv "build/jpackage/Stirling-PDF-${{ steps.versionNumberMac.outputs.versionNumberMac }}.dmg" "Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}"
           else
@@ -85,7 +85,12 @@ jobs:
       - name: Upload Installer Artifact
         uses: actions/upload-artifact@v4
         with:    
-          name: Stirling-PDF-${{ matrix.platform }}-installer.{{ matrix.ext }}
-          path: Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}-${{ matrix.platform }}.${{ matrix.ext }}
+          name: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
+          path: Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}
           retention-days: 1
-          if-no-files-found: error
+          if-no-files-found: error
+
+      - name: Upload binaries to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./Stirling-PDF-${{ matrix.platform }}-installer.${{ matrix.ext }}

.github/workflows/releaseArtifacts.yml

@@ -59,13 +59,13 @@ jobs:
           files: ./build/launch4j/Stirling-PDF-Server${{ matrix.file_suffix }}.exe
 
       - name: Rename jar binaries
-        run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF-Server${{ matrix.file_suffix }}.jar
+        run: cp ./build/libs/Stirling-PDF-${{ steps.versionNumber.outputs.versionNumber }}.jar ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
 
       - name: Upload Assets jar binaries
         uses: actions/upload-artifact@v4
         with:
-          path: ./build/libs/Stirling-PDF-Server${{ matrix.file_suffix }}.jar
-          name: Stirling-PDF-Server${{ matrix.file_suffix }}.jar
+          path: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
+          name: Stirling-PDF${{ matrix.file_suffix }}.jar
           overwrite: true
           retention-days: 1
           if-no-files-found: error
@@ -73,7 +73,7 @@ jobs:
       - name: Upload jar binaries to release
         uses: softprops/action-gh-release@v2
         with:
-          files: ./build/libs/Stirling-PDF-Server${{ matrix.file_suffix }}.jar
+          files: ./build/libs/Stirling-PDF${{ matrix.file_suffix }}.jar
 
 
   push-ui:

build.gradle

@@ -23,11 +23,11 @@ ext {
     lombokVersion = "1.18.36"
     bouncycastleVersion = "1.79"
     springSecuritySamlVersion = "6.4.1"
-    openSamlVersion = "4.3.2"  
+    openSamlVersion = "4.3.2"
 }
 
 group = "stirling.software"
-version = "0.36.1"
+version = "0.36.3"
 
 
 java {
@@ -44,7 +44,7 @@ repositories {
     }
     maven { url "https://build.shibboleth.net/maven/releases" }
     maven { url "https://maven.pkg.github.com/jcefmaven/jcefmaven" }
-    
+
 }
 
 licenseReport {
@@ -68,12 +68,12 @@ sourceSets {
                 exclude "stirling/software/SPDF/model/User.java"
                 exclude "stirling/software/SPDF/repository/**"
             }
-            
+
             if (System.getenv("STIRLING_PDF_DESKTOP_UI") == "false") {
             	exclude "stirling/software/SPDF/UI/impl/**"
             }
-            
-            
+
+
         }
     }
 }
@@ -104,7 +104,7 @@ jpackage {
 
     icon = "src/main/resources/static/favicon.ico"
 
-    
+
 
     // JVM Options
     javaOptions = [
@@ -115,12 +115,12 @@ jpackage {
         "--add-opens", "java.base/java.lang=ALL-UNNAMED",
         "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
         "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED"
-        
+
     ]
 
 
     verbose = true
-    
+
     destination = "${projectDir}/build/jpackage"
 
     // Windows-specific configuration
@@ -150,16 +150,16 @@ jpackage {
         macAppCategory = "public.app-category.productivity"
         macSign = false // Enable signing
         macAppStore = false // Not targeting App Store initially
-        
+
         //installDir = "Applications"
-        
+
         // Add license and other documentation to DMG
         /*macDmgContent = [
             "README.md",
             "LICENSE",
             "CHANGELOG.md"
         ]*/
-        
+
         // Enable Mac-specific entitlements
         //macEntitlements = "entitlements.plist" // You'll need to create this file
     }
@@ -169,7 +169,7 @@ jpackage {
     	appVersion = project.version
         icon = "src/main/resources/static/favicon.png"
         type = "deb" // Can also use "rpm" for Red Hat-based systems
-        
+
         // Debian package configuration
         //linuxPackageName = "stirlingpdf"
         linuxDebMaintainer = "support@stirlingpdf.com"
@@ -177,9 +177,9 @@ jpackage {
         linuxAppCategory = "Office"
         linuxAppRelease = "1"
         linuxPackageDeps = true
-        
+
         installDir = "/opt/Stirling-PDF"
-        
+
         // RPM-specific settings
         //linuxRpmLicenseType = "MIT"
     }
@@ -212,7 +212,7 @@ launch4j {
     icon = "${projectDir}/src/main/resources/static/favicon.ico"
 
     outfile="Stirling-PDF.exe"
-    
+
     if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
     	headerType = "gui"
     } else {
@@ -222,15 +222,15 @@ launch4j {
 
     errTitle="Encountered error, Do you have Java 21?"
     downloadUrl="https://download.oracle.com/java/21/latest/jdk-21_windows-x64_bin.exe"
-    
+
     if(System.getenv("STIRLING_PDF_DESKTOP_UI") == 'true') {
     	variables=["BROWSER_OPEN=true", "STIRLING_PDF_DESKTOP_UI=true"]
     } else {
     	variables=["BROWSER_OPEN=true"]
     }
-    
-    
-    
+
+
+
     jreMinVersion="17"
 
     mutexName="Stirling-PDF"
@@ -276,7 +276,7 @@ dependencies {
 	    implementation "org.openjfx:javafx-controls:21"
 	    implementation "org.openjfx:javafx-swing:21"
     }
-    
+
     //security updates
     implementation "org.springframework:spring-webmvc:6.2.0"
 
@@ -301,7 +301,7 @@ dependencies {
         implementation "org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion"
 
 		implementation "org.springframework.session:spring-session-core:$springBootVersion"
-				
+
 	    implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
         // Don't upgrade h2database
         runtimeOnly "com.h2database:h2:2.3.232"

src/main/resources/static/js/downloader.js

@@ -242,7 +242,7 @@
     let errorMessage = null;
 
     try {
-      const response = await fetch(url, {method: 'POST', body: formData});
+      const response = await window.fetchWithCsrf(url, {method: 'POST', body: formData});
       const contentType = response.headers.get('content-type');
 
       if (!response.ok) {

src/main/resources/static/js/fetch-utils.js

@@ -8,7 +8,6 @@ window.fetchWithCsrf = async function(url, options = {}) {
         if (cookieValue) {
             return cookieValue;
         }
-        
         const csrfElement = document.querySelector('input[name="_csrf"]');
         return csrfElement ? csrfElement.value : null;
     }

src/main/resources/templates/account.html

@@ -196,7 +196,7 @@
                     /*<![CDATA[*/
                     const urlGetApiKey = /*[[@{/api/v1/user/get-api-key}]]*/ "/api/v1/user/get-api-key";
                     /*]]>*/
-                    let response = await fetch(urlGetApiKey, { method: 'POST' });
+                    let response = await window.fetchWithCsrf(urlGetApiKey, { method: 'POST' });
                     if (response.status === 200) {
                       let apiKey = await response.text();
                       manageUIState(apiKey);
@@ -213,7 +213,7 @@
                     /*<![CDATA[*/
                     const urlUpdateApiKey = /*[[@{/api/v1/user/update-api-key}]]*/ "/api/v1/user/update-api-key";
                     /*]]>*/
-                    let response = await fetch(urlUpdateApiKey, { method: 'POST' });
+                    let response = await window.fetchWithCsrf(urlUpdateApiKey, { method: 'POST' });
                     if (response.status === 200) {
                       let apiKey = await response.text();
                       manageUIState(apiKey);

src/main/resources/templates/fragments/common.html

@@ -24,7 +24,7 @@
     <script>
       window.stirlingPDF = window.stirlingPDF || {};
     </script>
-
+	<script th:src="@{'/js/fetch-utils.js'}"></script>
     <!-- jQuery -->
     <script th:src="@{'/js/thirdParty/jquery.min.js'}"></script>
     <script th:src="@{'/js/thirdParty/jquery.validate.min.js'}"></script>

src/main/resources/templates/fragments/navbar.html

@@ -14,6 +14,7 @@
   </script>
   <script th:src="@{'/js/homecard.js'}"></script>
   <script th:src="@{'/js/githubVersion.js'}"></script>
+  <form th:action="@{'/dummyFormToPopulateCSRF'}" method="post" enctype="multipart/form-data"></form>
   <nav class="navbar navbar-expand-xl">
     <div class="container ">
       <a class="navbar-brand" th:href="@{'/'}" style="display: flex;">
@@ -376,7 +377,6 @@
               <span class="go-pro-badge" th:text="#{enterpriseEdition.button}"></span>
             </a>
           </li>
-
           <li class="nav-item">
             <!-- Settings Button -->
             <a href="#" class="nav-link" data-bs-toggle="modal" data-bs-target="#settingsModal" th:title="#{navbar.settings}">

src/main/resources/templates/merge-pdfs.html

@@ -5,6 +5,7 @@
 <head>
   <th:block th:insert="~{fragments/common :: head(title=#{merge.title}, header=#{merge.header})}"></th:block>
   <link rel="stylesheet" th:href="@{'/css/merge.css'}">
+  <script th:src="@{'/js/thirdParty/pdf-lib.min.js'}"></script>
 </head>
 
 <body>

src/main/resources/templates/misc/remove-annotations.html

@@ -38,7 +38,7 @@
 
         const processFile = async (file) => {
           const origFileUrl = URL.createObjectURL(file);
-          const formPdfBytes = await fetch(origFileUrl).then(res => res.arrayBuffer());
+          const formPdfBytes = await window.fetchWithCsrf(origFileUrl).then(res => res.arrayBuffer());
           const pdfDoc = await PDFDocument.load(formPdfBytes, { ignoreEncryption: true });
 
           const pages = pdfDoc.getPages();

src/main/resources/templates/security/validate-signature.html

@@ -102,7 +102,7 @@ document.querySelector('#pdfForm').addEventListener('submit', async (e) => {
             formData.append('certFile', certInput.files[0]);
         }
         try {
-            const response = await fetch(e.target.action, {
+            const response = await window.fetchWithCsrf(e.target.action, {
                 method: 'POST',
                 body: formData
             });