fix max size issue

README.md

@@ -82,9 +82,9 @@ Please view https://github.com/Frooodle/Stirling-PDF/blob/main/LocalRunGuide.md
 ### Docker
 https://hub.docker.com/r/frooodle/s-pdf
 
-Stirling PDF has 3 different versions, a Full version, Lite and ultra-Lite. Depending on the types of features you use you may want a smaller image to save on space.
+Stirling PDF has 3 different versions, a Full version, Lite, and ultra-Lite. Depending on the types of features you use you may want a smaller image to save on space.
 To see what the different versions offer please look at our [version mapping](https://github.com/Frooodle/Stirling-PDF/blob/main/Version-groups.md)
-For people that dont mind about space optimisation just use latest tag.
+For people that don't mind about space optimization just use the latest tag.
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest?label=Stirling-PDF%20Full)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-lite?label=Stirling-PDF%20Lite)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/frooodle/s-pdf/latest-ultra-lite?label=Stirling-PDF%20Ultra-Lite)
@@ -94,19 +94,14 @@ Docker Run
 docker run -d \
   -p 8080:8080 \
   -v /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata \
+  -v /location/of/extraConfigs:/configs \
   --name stirling-pdf \
   frooodle/s-pdf:latest
   
   
   Can also add these for customisation but are not required
-  -v /location/of/extraConfigs:/configs \
+  
   -v /location/of/customFiles:/customFiles \
-  -e APP_HOME_NAME="Stirling PDF" \
-  -e APP_HOME_DESCRIPTION="Your locally hosted one-stop-shop for all your PDF needs." \
-  -e APP_NAVBAR_NAME="Stirling PDF" \
-  -e ALLOW_GOOGLE_VISIBILITY="true" \
-  -e APP_ROOT_PATH="/" \
-  -e APP_LOCALE="en_GB" \
 ```
 Docker Compose
 ```
@@ -118,15 +113,8 @@ services:
       - '8080:8080'
     volumes:
       - /location/of/trainingData:/usr/share/tesseract-ocr/4.00/tessdata #Required for extra OCR languages
-#      - /location/of/extraConfigs:/configs
+      - /location/of/extraConfigs:/configs
 #      - /location/of/customFiles:/customFiles/
-#    environment:
-#      APP_LOCALE: en_GB
-#      APP_HOME_NAME: Stirling PDF
-#      APP_HOME_DESCRIPTION: Your locally hosted one-stop-shop for all your PDF needs.
-#      APP_NAVBAR_NAME: Stirling PDF
-#      APP_ROOT_PATH: /
-#      ALLOW_GOOGLE_VISIBILITY: true
 
 ```
 
@@ -158,46 +146,77 @@ https://github.com/Frooodle/Stirling-PDF/blob/main/HowToAddNewLanguage.md
 
 And please create a PR to merge it back in so others can use it! 
 
-Also please note as i add new features i will google translate existing languages so that they dont lose support. This could mean that new features need grammer corrections as added.
-
 ## How to View
 1. Open a web browser and navigate to `http://localhost:8080/`
 2. Use the application by following the instructions on the website.
 
 
-## Customize App
-Stirling PDF allows easy customization of the visible application name.
-Simply use environment variables APP_HOME_NAME, APP_HOME_DESCRIPTION and APP_NAVBAR_NAME with Docker or Java. 
-If running Java directly, you can also pass these as properties using -D arguments.
+## Customisation
+Stirling PDF allows easy customization of the app.
+Includes things like
+- Custom application name
+- Custom slogans, icons, images, and even custom HTML (via file overrides)
 
-Using the same method you can also change 
 
-- The default language by providing APP_LOCALE with values like de-DE fr-FR or ar-AR (Note the - character not _ ) to select your default language (Will always default to English on invalid locale) Current accepted locales can be seen above in the Want to add your own language section
-- Enable/Disable search engine visiblility with ALLOW_GOOGLE_VISIBILITY with true / false values. Default disable visiblility.
-- Change root URI for Stirling-PDF ie change server.com/ to server.com/pdf-app by running APP_ROOT_PATH as pdf-app
-- Disable and remove endpoints and functionality from Stirling-PDF. Currently the endpoints ENDPOINTS_TO_REMOVE and GROUPS_TO_REMOVE can include comma seperated 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) 
-- Change the max file size allowed through the server with the environment variable MAX_FILE_SIZE. default  2000MB
-- Customise static files such as app logo by placing files in the /customFiles/static/ directory. Example to customise 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
-- Enable/Disable metric api endpoints with ENABLE_API_METRICS. Default enabled
+There are two options for this, either using the generated settings file ``settings.yml``
+This file is located in the ``/configs`` directory and follows standard YAML formatting
+
+Environment variables are also supported and would override the settings file
+For example in the settings.yml you have
+```
+system:
+  defaultLocale: 'en-US'
+```
+
+To have this via an environment variable you would have ``SYSTEM_DEFAULTLOCALE``
+
+The Current list of settings is
+```
+security:
+  enableLogin: true # set to 'true' to enable login
+  csrfDisabled: true #enables/disables csrf protection 
+
+system:
+  defaultLocale: 'en-US' # Set the default language (e.g. 'de-DE', 'fr-FR', etc)
+  googlevisibility: false # 'true' to allow Google visibility, 'false' to disallow
+  rootPath: / # Set the application's root URI (e.g. pdf-app for  http://localhost/pdf-app)
+  customstaticFilePath: '/customFiles/static/' # Directory path for custom static files
+
+ui:
+  homeName:  # Application's visible name
+  homeDescription:  # Short description or tagline.
+  navbarName:  # Name displayed on the navigation bar
+
+endpoints:
+  toRemove: [] # List individual endpoints to disable (e.g. ['img-to-pdf', 'remove-pages'])
+  groupsToRemove: [] # List groups of endpoints to disable (e.g. ['LibreOffice']) view groups.md for more info
+
+metrics:
+  enabled: true 
+```
+### 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) 
+- 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
+
 
 ## API
 For those wanting to use Stirling-PDFs backend API to link with their own custom scripting to edit PDFs you can view all existing API documentation
 [here](https://app.swaggerhub.com/apis-docs/Frooodle/Stirling-PDF/) or navigate to /swagger-ui/index.html of your stirling-pdf instance for your versions documentation (Or by following the API button in your settings of Stirling-PDF)
 
 
-## Login authentication (CURRENTLY ALPHA TAG ONLY)
+## Login authentication
 ### Prerequisites: 
 - User must have the folder ./configs volumed within docker so that it is retained during updates.
-- The environment variable 'login.enabled' must be set to true
-- The environment variables "INITIAL_USERNAME" and "INITIAL_PASSWORD" must also be populated (only required on first boot to create initial user, ignored after.)
+- Docker uses must download the security jar version by setting ``DOCKER_ENABLE_SECURITY`` to ``true`` in environment variables. 
+- Now the initial user must be generated. Navigate to your settings.yaml and configure your security settings along with the username and password (only required on the first boot to create the initial user, ignored after.). Alternatively, you can set these via the environment variables ``SECURITY_ENABLELOGIN : true`` ``SECURITY_INITIALLOGIN_USERNAME: username`` ``SECURITY_INITIALLOGIN_PASSWORD: password``
 
-Once the above has been done, on restart a new stirling-pdf-DB.mv.db will show if everything worked.
+Once the above has been done, on restart, a new stirling-pdf-DB.mv.db will show if everything worked.
 
 When you login to Stirling PDF you will be redirected to /login page to login with those credentials. After login everything should function as normal
 
-To access your account settings go to Account settings in the settings cog menu (top right in navbar) this Account settings menu is also where you find your API key.
+To access your account settings go to Account settings in the settings cog menu (top right in navbar) This Account settings menu is also where you find your API key.
 
-To add new users go to bottom of Account settings and hit 'Admin Settings', here you can add new users. The different roles mentioned within this are for rate limiting. This is a Work in progress which will be expanding on more in future
+To add new users go to the bottom of Account settings and hit 'Admin Settings', here you can add new users. The different roles mentioned within this are for rate limiting. This is a Work in progress which will be expanding on more in future
 
 For API usage you must provide a header with 'X-API-Key' and the associated API key for that user.
 

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'stirling.software'
-version = '0.13.0'
+version = '0.13.1'
 sourceCompatibility = '17'
 
 repositories {

scripts/init.sh

@@ -18,11 +18,20 @@ fi
 
 # Check for DOCKER_ENABLE_SECURITY and download the appropriate JAR if required
 if [ "$DOCKER_ENABLE_SECURITY" = "true" ] && [ "$VERSION_TAG" != "alpha" ]; then
-	echo "Downloading from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
-    curl -L -o new-app.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
-    if [ $? -eq 0 ]; then  # checks if curl was successful
-        rm -f app.jar
-        mv new-app.jar app.jar
+    if [ ! -f app-security.jar ]; then
+    	echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar"
+        curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/v$VERSION_TAG/Stirling-PDF-with-login.jar
+       
+        # If the first download attempt failed, try with the 'v' prefix
+        if [ $? -ne 0 ]; then
+            echo "Trying to download from: https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar"
+        	curl -L -o app-security.jar https://github.com/Frooodle/Stirling-PDF/releases/download/$VERSION_TAG/Stirling-PDF-with-login.jar
+        fi
+
+        if [ $? -eq 0 ]; then  # checks if curl was successful
+            rm -f app.jar
+            ln -s app-security.jar app.jar
+        fi
     fi
 fi
 

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

@@ -51,7 +51,7 @@ public class SPdfApplication {
     	SpringApplication app = new SpringApplication(SPdfApplication.class);
     	app.addInitializers(new ConfigInitializer());
     	if (Files.exists(Paths.get("configs/settings.yml"))) {
-            app.setDefaultProperties(Collections.singletonMap("spring.config.location", "file:configs/settings.yml"));
+            app.setDefaultProperties(Collections.singletonMap("spring.config.additional-location", "file:configs/settings.yml"));
         } else {
             System.out.println("External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -121,8 +122,17 @@ public class UserController {
 
     
     @PreAuthorize("hasRole('ROLE_ADMIN')")
-    @GetMapping("/admin/deleteUser/{username}")
-    public String deleteUser(@PathVariable String username) {
+    @PostMapping("/admin/deleteUser/{username}")
+    public String deleteUser(@PathVariable String username,  Authentication authentication) {
+    	
+    	// Get the currently authenticated username
+        String currentUsername = authentication.getName();
+
+        // Check if the provided username matches the current session's username
+        if (currentUsername.equals(username)) {
+            throw new IllegalArgumentException("Cannot delete currently logined in user.");
+        }
+        
     	userService.deleteUser(username); 
         return "redirect:/addUsers";
     }

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

@@ -1,6 +1,7 @@
 package stirling.software.SPDF.controller.api.security;
 
 import java.io.IOException;
+import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -331,8 +332,21 @@ public class GetInfoOnPDF {
                 PDEncryption pdfEncryption = pdfBoxDoc.getEncryption();
                 encryption.put("EncryptionAlgorithm", pdfEncryption.getFilter());
                 encryption.put("KeyLength", pdfEncryption.getLength());
-                encryption.put("Permissions", pdfBoxDoc.getCurrentAccessPermission().toString());
-                
+                AccessPermission ap = pdfBoxDoc.getCurrentAccessPermission();
+                if (ap != null) {
+                    ObjectNode permissionsNode = objectMapper.createObjectNode();
+                    
+                    permissionsNode.put("CanAssembleDocument", ap.canAssembleDocument());
+                    permissionsNode.put("CanExtractContent", ap.canExtractContent());
+                    permissionsNode.put("CanExtractForAccessibility", ap.canExtractForAccessibility());
+                    permissionsNode.put("CanFillInForm", ap.canFillInForm());
+                    permissionsNode.put("CanModify", ap.canModify());
+                    permissionsNode.put("CanModifyAnnotations", ap.canModifyAnnotations());
+                    permissionsNode.put("CanPrint", ap.canPrint());
+                    permissionsNode.put("CanPrintDegraded", ap.canPrintDegraded());
+
+                    encryption.set("Permissions", permissionsNode);  // set the node under "Permissions"
+                } 
                 // Add other encryption-related properties as needed
             } else {
             	encryption.put("IsEncrypted", false);

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

@@ -45,6 +45,7 @@ public class RedactController {
             @Parameter(description = "List of listOfText to redact from the PDF", required = true, schema = @Schema(type = "string")) @RequestParam("listOfText") String listOfTextString,
             @RequestParam(value = "useRegex", required = false) boolean useRegex,
             @RequestParam(value = "wholeWordSearch", required = false) boolean wholeWordSearchBool,
+            @RequestParam(value = "redactColor", required = false, defaultValue = "#000000") String colorString,
             @RequestParam(value = "customPadding", required = false) float customPadding,
             @RequestParam(value = "convertPDFToImage", required = false) boolean convertPDFToImage) throws Exception {
         
@@ -52,12 +53,26 @@ public class RedactController {
     	String[] listOfText = listOfTextString.split("\n");
         byte[] bytes = file.getBytes();
         PDDocument document = PDDocument.load(new ByteArrayInputStream(bytes));
+        
+        Color redactColor;
+        try {
+        	if (!colorString.startsWith("#")) {
+                colorString = "#" + colorString;
+            }
+            redactColor = Color.decode(colorString);
+        } catch (NumberFormatException e) {
+            logger.warn("Invalid color string provided. Using default color BLACK for redaction.");
+            redactColor = Color.BLACK;
+        }
+
+
+        
         for (String text : listOfText) {
         	text = text.trim();
         	System.out.println(text);
         	TextFinder textFinder = new TextFinder(text, useRegex, wholeWordSearchBool);
             List<PDFText> foundTexts = textFinder.getTextLocations(document);
-            redactFoundText(document, foundTexts, customPadding);
+            redactFoundText(document, foundTexts, customPadding,redactColor);
         }
         
         
@@ -88,13 +103,13 @@ public class RedactController {
     }
 
     
-    private void redactFoundText(PDDocument document, List<PDFText> blocks, float customPadding) throws IOException {
+    private void redactFoundText(PDDocument document, List<PDFText> blocks, float customPadding, Color redactColor) throws IOException {
         var allPages = document.getDocumentCatalog().getPages();
 
         for (PDFText block : blocks) {
             var page = allPages.get(block.getPageIndex());
             PDPageContentStream contentStream = new PDPageContentStream(document, page, PDPageContentStream.AppendMode.APPEND, true, true);
-            contentStream.setNonStrokingColor(Color.BLACK);
+            contentStream.setNonStrokingColor(redactColor);
             float padding = (block.getY2() - block.getY1()) * 0.3f + customPadding;
             PDRectangle pageBox = page.getBBox();
             contentStream.addRect(block.getX1(), pageBox.getHeight() - block.getY1() - padding, block.getX2() - block.getX1(), block.getY2() - block.getY1() + 2 * padding);
@@ -103,4 +118,5 @@ public class RedactController {
         }
     }
 
+
 }

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

@@ -58,14 +58,13 @@ public class AccountWebController {
 	@Autowired
 	private UserRepository userRepository;  // Assuming you have a repository for user operations
 
-	@Autowired
-	private UserService userService;  // Assuming you have a repository for user operations
 
 	@PreAuthorize("hasRole('ROLE_ADMIN')")
 	@GetMapping("/addUsers")
-	public String showAddUserForm(Model model) {
+	public String showAddUserForm(Model model,  Authentication authentication) {
 	    List<User> allUsers = userRepository.findAll();
 	    model.addAttribute("users", allUsers);
+	    model.addAttribute("currentUsername", authentication.getName());
 	    return "addUsers";
 	}
 

src/main/resources/application.properties

@@ -1,12 +1,5 @@
-spring.http.multipart.max-file-size=${MAX_FILE_SIZE:2000MB}
-spring.http.multipart.max-request-size=${MAX_FILE_SIZE:2000MB}
-
 multipart.enabled=true
-multipart.max-file-size=${MAX_FILE_SIZE:2000MB}
-multipart.max-request-size=${MAX_FILE_SIZE:2000MB}
 
-spring.servlet.multipart.max-file-size=${MAX_FILE_SIZE:2000MB}
-spring.servlet.multipart.max-request-size=${MAX_FILE_SIZE:2000MB}
 
 server.forward-headers-strategy=NATIVE
 
@@ -20,6 +13,8 @@ server.error.include-message=always
 #logging.level.org.springframework=DEBUG
 #logging.level.org.springframework.security=DEBUG
 
+spring.servlet.multipart.max-file-size=2000MB
+spring.servlet.multipart.max-request-size=2000MB
 
 server.servlet.session.tracking-modes=cookie
 server.servlet.context-path=${SYSTEM_ROOTURIPATH:/}
@@ -36,7 +31,6 @@ spring.resources.static-locations=file:customFiles/static/
 #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/
 #spring.thymeleaf.cache=false
 
-
 spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.username=sa

src/main/resources/messages_ar_AR.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_ca_CA.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_de_DE.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_en_GB.properties

@@ -35,7 +35,17 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -320,6 +330,7 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_en_US.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Color
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_es_ES.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_eu_ES.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_fr_FR.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=afficher,javascript,js
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_it_IT.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_ja_JP.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_ko_KR.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_nl_NL.properties

@@ -35,7 +35,20 @@ delete=Verwijderen
 username=Gebruikersnaam
 password=Wachtwoord
 welcome=Welkom
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_pl_PL.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_pt_BR.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JavaScript
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_ro_RO.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_ru_RU.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_sv_SE.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/messages_zh_CN.properties

@@ -35,7 +35,20 @@ delete=Delete
 username=Username
 password=Password
 welcome=Welcome
-=Property
+##########################
+###  TODO: Translate   ###
+##########################
+property=Property
+black=Black
+white=White
+red=Red
+green=Green
+blue=Blue
+custom=Custom...
+
+
+
+
 
 #############
 #  NAVBAR   #
@@ -309,9 +322,6 @@ showJS.tags=JS
 #                         #
 ###########################
 #login
-##########################
-###  TODO: Translate   ###
-##########################
 login.title=Sign in
 login.signin=Sign in
 login.rememberme=Remember me
@@ -323,6 +333,10 @@ login.signinTitle=Please sign in
 #auto-redact
 autoRedact.title=Auto Redact
 autoRedact.header=Auto Redact
+##########################
+###  TODO: Translate   ###
+##########################
+autoRedact.colorLabel=Colour
 autoRedact.textsToRedactLabel=Text to Redact (line-separated)
 autoRedact.textsToRedactPlaceholder=e.g. \nConfidential  \nTop-Secret
 autoRedact.useRegexLabel=Use Regex

src/main/resources/settings.yml.template

@@ -6,7 +6,7 @@ security:
   enableLogin: false # set to 'true' to enable login
   initialLogin:
     username: 'username' # Specify the initial username for first boot (e.g. 'admin')
-    password: 'password'# Specify the initial password for first boot (e.g. 'password123')
+    password: 'password' # Specify the initial password for first boot (e.g. 'password123')
   csrfDisabled: true
 
 system:
@@ -14,10 +14,7 @@ system:
   googlevisibility: false # 'true' to allow Google visibility, 'false' to disallow
   rootURIPath: / # Set the application's root URI (e.g. /pdf-app)
   customStaticFilePath: '/customFiles/static/' # Directory path for custom static files
-  maxFileSize: 2000 # Set the maximum file size in MB
-  connectionTimeoutMinutes: 5m
-  connectionTimeoutMilliSeconds: 300000
-  
+
 #ui:
 #  appName: exampleAppName # Application's visible name
 #  homeDescription: I am a description # Short description or tagline shown on homepage.

src/main/resources/templates/addUsers.html

@@ -20,23 +20,26 @@
 						
 						
 						<table class="table">
-						    <thead>
-						        <tr>
-						            <th th:text="#{username}">Username</th>
-						            <th th:text="#{adminUserSettings.roles}">Roles</th>
-						            <th th:text="#{adminUserSettings.actions}">Actions</th>
-						        </tr>
-						    </thead>
-						    <tbody>
-						        <tr th:each="user : ${users}">
-						            <td th:text="${user.username}"></td>
-						            <td th:text="${user.getRolesAsString()}"></td>
-						            <td>
-						                <a th:href="@{'/admin/deleteUser/' + ${user.username}}" th:text="#{delete}">Delete</a>
-						            </td>
-						        </tr>
-						    </tbody>
-						</table>
+					    <thead>
+					        <tr>
+					            <th th:text="#{username}">Username</th>
+					            <th th:text="#{adminUserSettings.roles}">Roles</th>
+					            <th th:text="#{adminUserSettings.actions}">Actions</th>
+					        </tr>
+					    </thead>
+					    <tbody>
+					        <tr th:each="user : ${users}">
+					            <td th:text="${user.username}"></td>
+					            <td th:text="${user.getRolesAsString()}"></td>
+					            <td>
+					                <form th:if="${user.username != currentUsername}" th:action="@{'/admin/deleteUser/' + ${user.username}}" method="post">
+					                    <button type="submit" th:text="#{delete}">Delete</button>
+					                </form>
+					            </td>
+					        </tr>
+					    </tbody>
+					</table>
+
 						
 
 						<h2 th:text="#{adminUserSettings.addUser}">Add New User</h2>

src/main/resources/templates/other/change-metadata.html

@@ -87,20 +87,18 @@
                             <script>
   
     const deleteAllCheckbox = document.querySelector("#deleteAll");
-    const inputs = document.querySelectorAll(".form-control");
+    let inputs = document.querySelectorAll("input");
     const customMetadataDiv = document.getElementById('customMetadata');
     const otherMetadataEntriesDiv = document.getElementById('otherMetadataEntries');
     
     deleteAllCheckbox.addEventListener("change", function(event) {
-      if (event.target !== deleteAllCheckbox) {
-        return;
-      }
-
       inputs.forEach(input => {
-        if (input === deleteAllCheckbox) {
-          return;
-        }
-        input.disabled = deleteAllCheckbox.checked;
+          // If it's the deleteAllCheckbox or any file input, skip
+          if (input === deleteAllCheckbox || input.type === "file") {
+              return;
+          }
+          // Disable or enable based on the checkbox state
+          input.disabled = deleteAllCheckbox.checked;
       });
     });
                             

src/main/resources/templates/security/auto-redact.html

@@ -21,6 +21,37 @@
 		            <textarea class="form-control" id="listOfText" name="listOfText" rows="4" required th:placeholder="#{autoRedact.textsToRedactPlaceholder}"></textarea>
 		        </div>
 		        
+		        <div class="mb-3">
+				    <label for="defaultColor" class="form-label" th:text="#{autoRedact.colorLabel}">Color</label>
+				    <select class="form-control" id="defaultColor" name="defaultColor" onchange="handleColorChange(this.value)">
+				        <option value="#000000" th:text="#{black}">Black</option>
+				        <option value="#FFFFFF" th:text="#{white}">White</option>
+				        <option value="#FF0000" th:text="#{red}">Red</option>
+				        <option value="#00FF00" th:text="#{green}">Green</option>
+				        <option value="#0000FF" th:text="#{blue}">Blue</option>
+				        <option value="custom" th:text="#{custom}">Custom...</option>
+				    </select>
+				</div>
+				
+				<!-- Custom Color Input -->
+				<div class="mb-3" id="customColorContainer" style="display: none;">
+				    <label for="customColor" class="form-label" th:text="#{autoRedact.colorLabel}">Custom Color</label>
+				    <input type="text" class="form-control" id="customColor" name="redactColor" placeholder="#FF00FF">
+				</div>
+				
+				<script>
+				    function handleColorChange(selectedValue) {
+				        if (selectedValue === "custom") {
+				            document.getElementById('customColorContainer').style.display = 'block';
+				        } else {
+				            document.getElementById('customColorContainer').style.display = 'none';
+				            document.getElementById('customColor').value = selectedValue; 
+				        }
+				    }
+				</script>
+
+        
+		        
 		        <div class="mb-3 form-check">
 		            <input type="checkbox" class="form-check-input" id="useRegex" name="useRegex">
 		            <label class="form-check-label" for="useRegex" th:text="#{autoRedact.useRegexLabel}"></label>