Merge branch 'main' into pixeebot/drip-2023-10-05-pixee-java/secure-r…

…andom

.gitattributes

@@ -1,5 +1,6 @@
 # Ignore all JavaScript files in a directory
 src/main/resources/static/pdfjs/* linguist-vendored
+src/main/resources/static/pdfjs/** linguist-vendored
 src/main/resources/static/css/bootstrap-icons.css linguist-vendored
 src/main/resources/static/css/bootstrap.min.css linguist-vendored
 src/main/resources/static/css/fonts/* linguist-vendored

.github/pull_request_template.md

@@ -0,0 +1,4 @@
+# License Agreement for Contributions
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under MPL 2.0 (Mozilla Public License Version 2.0) license. 
+
+(This does not change the general open-source nature of Stirling-PDF, simply moving from one license to another license)

.github/workflows/pull_request_template.md

@@ -0,0 +1,3 @@
+# License Agreement for Contributions
+By submitting this pull request, I acknowledge and agree that my contributions will be included in Stirling-PDF and that they can be relicensed in the future under MPL 2.0 (Mozilla Public License Version 2.0) license. 
+(This does not change the open-source nature of Stirling-PDF, simply moving from one license to another license)

.gitignore

@@ -119,4 +119,5 @@ watchedFolders/
 *.db
 /build
 
-/.vscode
+/.vscode
+/.idea

README.md

@@ -19,7 +19,6 @@ Any file which has been downloaded by the user will have already been deleted fr
 
 Feel free to request any features or bug fixes either in github issues or our [Discord](https://discord.gg/Cn8pWhQRxZ)
 
-
 ![stirling-home](images/stirling-home.png)
 
 ## Features
@@ -33,6 +32,7 @@ Feel free to request any features or bug fixes either in github issues or our [D
 ## **PDF Features**
 
 ### **Page Operations**
+- View and modify PDFs - View multi page PDFs with custom viewing sorting and searching. Plus on page edit features like annotate, draw and adding text and images. (Using PDF.js with Joxit and Liberation.Liberation fonts)
 - Full interactive GUI for merging/splitting/rotating/moving PDFs and their pages. 
 - Merge multiple PDFs together into a single resultant file. 
 - Split PDFs into multiple files at specified page numbers or extract all pages as individual files. 
@@ -81,7 +81,7 @@ Feel free to request any features or bug fixes either in github issues or our [D
 - Get all information on a PDF to view or export as JSON. 
 
 
-For a overview of the tasks and the technology each uses please view [groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Groups.md)
+For a overview of the tasks and the technology each uses please view [Endpoint-groups.md](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md)
 Hosted instance/demo of the app can be seen [here](https://pdf.adminforge.de/) hosted by the team at adminforge.de
 
 ## Technologies used
@@ -145,7 +145,7 @@ services:
 Please view https://github.com/Frooodle/Stirling-PDF/blob/main/HowToUseOCR.md
 
 ## Want to add your own language?
-Stirling PDF currently supports 18!
+Stirling PDF currently supports 19!
 - English (English) (en_GB)
 - English (US) (en_US)
 - Arabic (العربية) (ar_AR)
@@ -164,6 +164,7 @@ Stirling PDF currently supports 18!
 - Basque (Euskara) (eu_ES)
 - Japanese (日本語) (ja_JP)
 - Dutch (Nederlands) (nl_NL)
+- Greek (el_GR)
 
 If you want to add your own language to Stirling-PDF please refer
 https://github.com/Frooodle/Stirling-PDF/blob/main/HowToAddNewLanguage.md
@@ -218,7 +219,7 @@ metrics:
   enabled: true # 'true' to enable Info APIs endpoints (view http://localhost:8080/swagger-ui/index.html#/API to learn more), 'false' to disable
 ```
 ### Extra notes
-- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/groups.md) 
+- Endpoints. Currently, the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma separate lists of endpoints and groups to disable as example ENDPOINTS_TO_REMOVE=img-to-pdf,remove-pages would disable both image-to-pdf and remove pages, GROUPS_TO_REMOVE=LibreOffice Would disable all things that use LibreOffice. You can see a list of all endpoints and groups [here](https://github.com/Frooodle/Stirling-PDF/blob/main/Endpoint-groups.md) 
 - customStaticFilePath. Customise static files such as the app logo by placing files in the /customFiles/static/ directory. An example of customising app logo is placing a /customFiles/static/favicon.svg to override current SVG. This can be used to change any images/icons/css/fonts/js etc in Stirling-PDF
 
 ### Environment only parameters
@@ -232,6 +233,7 @@ For those wanting to use Stirling-PDFs backend API to link with their own custom
 
 
 ## Login authentication
+![stirling-login](images/login-light.png)
 ### Prerequisites: 
 - User must have the folder ./configs volumed within docker so that it is retained during updates.
 - Docker uses must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables. 
@@ -257,12 +259,11 @@ For API usage you must provide a header with 'X-API-Key' and the associated API
 - Folder support with auto scanning to perform operations on
 - Redact text (Via UI not just automated way) 
 - Add Forms
-- Annotations
 - Multi page layout (Stich PDF pages together) support x rows y columns and custom page sizing 
 - Fill forms mannual and automatic 
 
 ### Q2: Why is my application downloading .htm files?
 This is a issue caused commonly by your NGINX congifuration. The default file upload size for NGINX is 1MB, you need to add the following in your Nginx sites-available file. ``client_max_body_size SIZE;`` Where "SIZE" is 50M for example for 50MB files.
 
 ### Q3: Why is my download timing out
-NGINX has timeout values by default so if you are running Stirling-PDF behind NGINX you may need to set a timeout value such as adding the config ``proxy_read_timeout 3600;``
+NGINX has timeout values by default so if you are running Stirling-PDF behind NGINX you may need to set a timeout value such as adding the config ``proxy_read_timeout 3600;``

build.gradle

@@ -1,14 +1,14 @@
 plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.1.2'
-	id 'io.spring.dependency-management' version '1.1.2'
+	id 'io.spring.dependency-management' version '1.1.3'
 	id 'org.springdoc.openapi-gradle-plugin' version '1.6.0'
 	id "io.swagger.swaggerhub" version "1.2.0"
-	id 'edu.sc.seis.launch4j' version '3.0.3'
+	id 'edu.sc.seis.launch4j' version '3.0.5'
 }
 
 group = 'stirling.software'
-version = '0.14.4'
+version = '0.15.2'
 sourceCompatibility = '17'
 
 repositories {
@@ -74,15 +74,15 @@ dependencies {
 		implementation "com.h2database:h2"
     }
 
-	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.2'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test:3.1.4'
 
 
 
 	// https://mvnrepository.com/artifact/org.apache.pdfbox/jbig2-imageio
 	implementation group: 'org.apache.pdfbox', name: 'jbig2-imageio', version: '3.0.4'
 	implementation 'commons-io:commons-io:2.13.0'
 
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
 
 	//general PDF
     implementation 'org.apache.pdfbox:pdfbox:2.0.29'
@@ -91,7 +91,7 @@ dependencies {
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.70' 
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-core'
-    implementation group: 'com.google.zxing', name: 'core', version: '3.5.1'
+    implementation group: 'com.google.zxing', name: 'core', version: '3.5.2'
     // https://mvnrepository.com/artifact/org.commonmark/commonmark
 	implementation 'org.commonmark:commonmark:0.21.0'
     // https://mvnrepository.com/artifact/com.github.vladimir-bukhtoyarov/bucket4j-core

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

@@ -1,5 +1,6 @@
 package stirling.software.SPDF.config;
 
+import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,6 +9,7 @@
 @Configuration
 public class AppConfig {
 
+
     @Autowired
     ApplicationProperties applicationProperties;
 

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

@@ -21,6 +21,7 @@
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import stirling.software.SPDF.model.SortTypes;
+import stirling.software.SPDF.model.api.PDFWithPageNums;
 import stirling.software.SPDF.model.api.general.RearrangePagesRequest;
 import stirling.software.SPDF.utils.GeneralUtils;
 import stirling.software.SPDF.utils.WebResponseUtils;
@@ -33,11 +34,12 @@ public class RearrangePagesPDFController {
 
 	@PostMapping(consumes = "multipart/form-data", value = "/remove-pages")
 	@Operation(summary = "Remove pages from a PDF file", description = "This endpoint removes specified pages from a given PDF file. Users can provide a comma-separated list of page numbers or ranges to delete. Input:PDF Output:PDF Type:SISO")
-	public ResponseEntity<byte[]> deletePages(
-			@RequestPart(required = true, value = "fileInput") @Parameter(description = "The input PDF file from which pages will be removed") MultipartFile pdfFile,
-			@RequestParam("pagesToDelete") @Parameter(description = "Comma-separated list of pages or page ranges to delete, e.g., '1,3,5-8'") String pagesToDelete)
+	public ResponseEntity<byte[]> deletePages(@ModelAttribute PDFWithPageNums request )
 			throws IOException {
 
+		MultipartFile pdfFile = request.getFileInput();
+		String pagesToDelete = request.getPageNumbers();
+
 		PDDocument document = PDDocument.load(pdfFile.getBytes());
 
 		// Split the page order string into an array of page numbers or range of numbers

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

@@ -108,4 +108,4 @@ public ResponseEntity<byte[]> splitPdf(@ModelAttribute PDFWithPageNums request)
 
     }
 
-}
+}

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

@@ -1,18 +1,9 @@
 package stirling.software.SPDF.controller.web;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.v3.oas.annotations.Hidden;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -21,11 +12,14 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Controller
 @Tag(name = "General", description = "General APIs")
@@ -80,7 +74,13 @@ public String mergePdfForm(Model model) {
         model.addAttribute("currentPage", "merge-pdfs");
         return "merge-pdfs";
     }
-
+
+    @GetMapping("/view-pdf")
+    @Hidden
+    public String ViewPdfForm2(Model model) {
+        model.addAttribute("currentPage", "view-pdf");
+        return "view-pdf";
+    }
 
     @GetMapping("/multi-tool")
     @Hidden

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

@@ -232,6 +232,8 @@ public static class Ui {
 	    private String appNameNavbar;
 
 	    public String getAppName() {
+	    	if(appName != null && appName.trim().length() == 0)
+	    		return null;
 	        return appName;
 	    }
 
@@ -240,6 +242,8 @@ public void setAppName(String appName) {
 	    }
 
 	    public String getHomeDescription() {
+	    	if(homeDescription != null && homeDescription.trim().length() == 0)
+	    		return null;
 	        return homeDescription;
 	    }
 
@@ -248,6 +252,8 @@ public void setHomeDescription(String homeDescription) {
 	    }
 
 	    public String getAppNameNavbar() {
+	    	if(appNameNavbar != null && appNameNavbar.trim().length() == 0)
+	    		return null;
 	        return appNameNavbar;
 	    }
 

src/main/resources/messages_ar_AR.properties

@@ -126,8 +126,13 @@ adminUserSettings.submit=Save User
 # HOME-PAGE #
 #############
 home.desc=متجرك الشامل المستضاف محليًا لجميع احتياجات PDF الخاصة بك.
+home.searchBar=Search for features...
 
 
+home.viewPdf.title=View PDF
+home.viewPdf.desc=View, annotate, add text or images
+viewPdf.tags=view,read,annotate,text,image
+
 home.multiTool.title=أداة متعددة PDF
 home.multiTool.desc=دمج الصفحات وتدويرها وإعادة ترتيبها وإزالتها
 multiTool.tags=Multi Tool,Multi operation,UI,click drag,front end,client side
@@ -478,9 +483,6 @@ pipeline.title=Pipeline
 pageLayout.title=Multi Page Layout
 pageLayout.header=Multi Page Layout
 pageLayout.pagesPerSheet=Pages per sheet:
-##########################
-###  TODO: Translate   ###
-##########################
 pageLayout.addBorder=Add Borders
 pageLayout.submit=Submit
 
@@ -635,6 +637,9 @@ pdfOrganiser.submit=إعادة ترتيب الصفحات
 multiTool.title=أداة متعددة PDF
 multiTool.header=أداة متعددة PDF
 
+#view pdf
+viewPdf.title=View PDF
+viewPdf.header=View PDF
 
 #pageRemover
 pageRemover.title=مزيل الصفحة