Merge branch 'main' into testCleanups

.github/ISSUE_TEMPLATE/1-bug.yml

@@ -22,6 +22,8 @@ body:
         - Docker ultra lite
         - Docker fat
         - Local Installation
+      validations:
+        required: true
 
   - type: textarea
     id: problem

README.md

@@ -237,7 +237,7 @@ The Current list of settings is
 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; when using e.g. Fail2Ban you can deactivate the function with -1
+  loginAttemptCount: 5 # lock user account after 5 tries
   loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
   loginMethod: all # 'all' (Login Username/Password and OAuth2[must be enabled and configured]), 'normal'(only Login with Username/Password) or 'oauth2'(only Login with OAuth2)
   initialLogin:

build.gradle

@@ -22,7 +22,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.28.3"
+version = "0.28.2"
 
 java {
     // 17 is lowest but we support and recommend 21
@@ -142,25 +142,24 @@ dependencies {
     testImplementation "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 
     // Batik
-    implementation "org.apache.xmlgraphics:batik-all:1.17"
-    
+
     // TwelveMonkeys
     runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion"
     runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-iff:$imageioVersion"
     runtimeOnly "com.twelvemonkeys.imageio:imageio-jpeg:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-pcx:$imageioVersion@
+    // implementation "com.twelvemonkeys.imageio:imageio-pict:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-pnm:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-psd:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-sgi:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-tga:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-thumbsdb:$imageioVersion"
     runtimeOnly "com.twelvemonkeys.imageio:imageio-tiff:$imageioVersion"
     runtimeOnly "com.twelvemonkeys.imageio:imageio-webp:$imageioVersion"
-    // runtimeOnly "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
+    // implementation "com.twelvemonkeys.imageio:imageio-xwd:$imageioVersion"
 
     implementation "commons-io:commons-io:2.16.1"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0"

chart/stirling-pdf/Chart.yaml

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

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

@@ -126,12 +126,13 @@ public class AppConfig {
     }
 
     @Bean(name = "directoryFilter")
-    public Predicate<Path> processOnlyFiles() {
+    public Predicate<Path> processPDFOnlyFilter() {
         return path -> {
             if (Files.isDirectory(path)) {
                 return !path.toString().contains("processing");
             } else {
-                return true;
+                String fileName = path.getFileName().toString();
+                return fileName.endsWith(".pdf");
             }
         };
     }

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

@@ -7,28 +7,21 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 import stirling.software.SPDF.model.AttemptCounter;
 
 @Service
-@Slf4j
 public class LoginAttemptService {
 
-    @Autowired private ApplicationProperties applicationProperties;
+    @Autowired ApplicationProperties applicationProperties;
 
     private int MAX_ATTEMPT;
     private long ATTEMPT_INCREMENT_TIME;
     private ConcurrentHashMap<String, AttemptCounter> attemptsCache;
-    private boolean isBlockedEnabled = true;
 
     @PostConstruct
     public void init() {
         MAX_ATTEMPT = applicationProperties.getSecurity().getLoginAttemptCount();
-        if (MAX_ATTEMPT == -1) {
-            isBlockedEnabled = false;
-            log.info("Login attempt tracking is disabled.");
-        }
         ATTEMPT_INCREMENT_TIME =
                 TimeUnit.MINUTES.toMillis(
                         applicationProperties.getSecurity().getLoginResetTimeMinutes());
@@ -36,16 +29,14 @@ public class LoginAttemptService {
     }
 
     public void loginSucceeded(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
+        if (key == null || key.trim().isEmpty()) {
             return;
         }
         attemptsCache.remove(key.toLowerCase());
     }
 
     public void loginFailed(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
-            return;
-        }
+        if (key == null || key.trim().isEmpty()) return;
 
         AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
         if (attemptCounter == null) {
@@ -60,9 +51,7 @@ public class LoginAttemptService {
     }
 
     public boolean isBlocked(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
-            return false;
-        }
+        if (key == null || key.trim().isEmpty()) return false;
         AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
         if (attemptCounter == null) {
             return false;
@@ -72,9 +61,7 @@ public class LoginAttemptService {
     }
 
     public int getRemainingAttempts(String key) {
-        if (!isBlockedEnabled || key == null || key.trim().isEmpty()) {
-            return Integer.MAX_VALUE; // Arbitrarily high number if tracking is disabled
-        }
+        if (key == null || key.trim().isEmpty()) return MAX_ATTEMPT;
 
         AttemptCounter attemptCounter = attemptsCache.get(key.toLowerCase());
         if (attemptCounter == null) {

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

@@ -1,5 +1,13 @@
 package stirling.software.SPDF.config.security;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -13,6 +21,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
+
 import stirling.software.SPDF.config.DatabaseBackupInterface;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
 import stirling.software.SPDF.controller.api.pipeline.UserServiceInterface;
@@ -23,10 +32,6 @@ import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.repository.AuthorityRepository;
 import stirling.software.SPDF.repository.UserRepository;
 
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
 @Service
 public class UserService implements UserServiceInterface {
 
@@ -216,7 +221,7 @@ public class UserService implements UserServiceInterface {
 
     public void updateUserSettings(String username, Map<String, String> updates)
             throws IOException {
-        Optional<User> userOpt = findByUsernameIgnoreCaseWithSettings(username);
+        Optional<User> userOpt = findByUsernameIgnoreCase(username);
         if (userOpt.isPresent()) {
             User user = userOpt.get();
             Map<String, String> settingsMap = user.getSettings();
@@ -241,10 +246,6 @@ public class UserService implements UserServiceInterface {
         return userRepository.findByUsernameIgnoreCase(username);
     }
 
-    public Optional<User> findByUsernameIgnoreCaseWithSettings(String username) {
-        return userRepository.findByUsernameIgnoreCaseWithSettings(username);
-    }
-
     public Authority findRole(User user) {
         return authorityRepository.findByUserId(user.getId());
     }

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

@@ -33,7 +33,7 @@ public class AutoRenameController {
     private static final Logger logger = LoggerFactory.getLogger(AutoRenameController.class);
 
     private static final float TITLE_FONT_SIZE_THRESHOLD = 20.0f;
-    private static final int LINE_LIMIT = 200;
+    private static final int LINE_LIMIT = 11;
 
     @PostMapping(consumes = "multipart/form-data", value = "/auto-rename")
     @Operation(

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

@@ -1,10 +1,15 @@
 package stirling.software.SPDF.controller.web;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
@@ -13,20 +18,27 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
-import stirling.software.SPDF.model.*;
+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.Authority;
+import stirling.software.SPDF.model.Role;
+import stirling.software.SPDF.model.SessionEntity;
+import stirling.software.SPDF.model.User;
 import stirling.software.SPDF.model.provider.GithubProvider;
 import stirling.software.SPDF.model.provider.GoogleProvider;
 import stirling.software.SPDF.model.provider.KeycloakProvider;
 import stirling.software.SPDF.repository.UserRepository;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import java.util.stream.Collectors;
-
 @Controller
 @Slf4j
 @Tag(name = "Account Security", description = "Account Security APIs")
@@ -349,7 +361,7 @@ public class AccountWebController {
             if (username != null) {
                 // Fetch user details from the database
                 Optional<User> user =
-                        userRepository.findByUsernameIgnoreCaseWithSettings(
+                        userRepository.findByUsernameIgnoreCase(
                                 username); // Assuming findByUsername method exists
                 if (!user.isPresent()) {
                     return "redirect:/error";

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

@@ -1,7 +1,5 @@
 package stirling.software.SPDF.model;
 
-import jakarta.persistence.*;
-
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9,6 +7,21 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
 @Entity
 @Table(name = "users")
 public class User implements Serializable {

src/main/java/stirling/software/SPDF/repository/UserRepository.java

@@ -1,19 +1,16 @@
 package stirling.software.SPDF.repository;
 
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import stirling.software.SPDF.model.User;
-
 import java.util.Optional;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import stirling.software.SPDF.model.User;
+
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsernameIgnoreCase(String username);
 
-    @Query("FROM User u LEFT JOIN FETCH u.settings where upper(u.username) = upper(:username)")
-    Optional<User> findByUsernameIgnoreCaseWithSettings(String username);
-
     Optional<User> findByUsername(String username);
 
     Optional<User> findByApiKey(String apiKey);

src/main/resources/messages_ar_AR.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=تغيير البيانات الوصفية
 home.changeMetadata.desc=تغيير / إزالة / إضافة بيانات أولية من مستند PDF
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=تحويل الملف إلى PDF
 home.fileToPDF.desc=تحويل أي ملف تقريبا إلى PDF (DOCX وPNG وXLS وPPT وTXT والمزيد)

src/main/resources/messages_ca_CA.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Canvia Metadades
 home.changeMetadata.desc=Canvia/Treu/Afegeix matadades al document PDF.
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Converteix arxiu a PDF
 home.fileToPDF.desc=Converteix qualsevol arxiu a PDF (DOCX, PNG, XLS, PPT, TXT i més)

src/main/resources/messages_cs_CZ.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=rozmáčknout,malý,drobný
 
 home.changeMetadata.title=Změnit Metadata
 home.changeMetadata.desc=Změnit/Odebrat/Přidat metadata z PDF dokumentu
-changeMetadata.tags=Název,autor,datum,tvorba,čas,vydavatel,výrobce,statistiky
+changeMetadata.tags==Název,autor,datum,tvorba,čas,vydavatel,výrobce,statistiky
 
 home.fileToPDF.title=Převést soubor do PDF
 home.fileToPDF.desc=Převést téměř jakýkoli soubor do PDF (DOCX, PNG, XLS, PPT, TXT a více)

src/main/resources/messages_da_DK.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Change Metadata
 home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Convert file to PDF
 home.fileToPDF.desc=Convert nearly any file to PDF (DOCX, PNG, XLS, PPT, TXT and more)

src/main/resources/messages_de_DE.properties

@@ -4,7 +4,7 @@
 # the direction that the language is written (ltr=left to right, rtl = right to left)
 language.direction=ltr
 
-pdfPrompwt=PDF auswählen
+pdfPrompt=PDF auswählen
 multiPdfPrompt=PDFs auswählen(2+)
 multiPdfDropPrompt=Wählen Sie alle gewünschten PDFs aus (oder ziehen Sie sie per Drag & Drop hierhin)
 imgPrompt=Wählen Sie ein Bild
@@ -291,7 +291,7 @@ compressPdfs.tags=komprimieren,verkleinern,minimieren
 
 home.changeMetadata.title=Metadaten ändern
 home.changeMetadata.desc=Ändern/Entfernen/Hinzufügen von Metadaten aus einem PDF-Dokument
-changeMetadata.tags=titel,autor,datum,erstellung,uhrzeit,herausgeber,produzent,statistiken
+changeMetadata.tags==titel,autor,datum,erstellung,uhrzeit,herausgeber,produzent,statistiken
 
 home.fileToPDF.title=Datei in PDF konvertieren
 home.fileToPDF.desc=Konvertieren Sie nahezu jede Datei in PDF (DOCX, PNG, XLS, PPT, TXT und mehr)

src/main/resources/messages_el_GR.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Αλλαγή Μεταδεδομένων
 home.changeMetadata.desc=Αλλαγή/Κατάργηση/Προσθήκη μεταδεδομένων από ένα έγγραφο PDF.
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Μετατροπή ενός αρχείου σε PDF
 home.fileToPDF.desc=Μετατροπή σχεδόν οποιουδήποτε αρχείου σε PDF (DOCX, PNG, XLS, PPT, TXT and more)

src/main/resources/messages_en_GB.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Change Metadata
 home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Convert file to PDF
 home.fileToPDF.desc=Convert nearly any file to PDF (DOCX, PNG, XLS, PPT, TXT and more)

src/main/resources/messages_en_US.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Change Metadata
 home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Convert file to PDF
 home.fileToPDF.desc=Convert nearly any file to PDF (DOCX, PNG, XLS, PPT, TXT and more)

src/main/resources/messages_eu_ES.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Aldatu metadatuak
 home.changeMetadata.desc=Aldatu/Ezabatu/Gehitu metadatuak PDF dokumentuari
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Fitxategia PDF bihurtu
 home.fileToPDF.desc=PDF bihurtu ia edozein fitxategi (DOCX, PNG, XLS, PPT, TXT eta gehiago)

src/main/resources/messages_ga_IE.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish, beag, beag bídeach
 
 home.changeMetadata.title=Athraigh Meiteashonraí
 home.changeMetadata.desc=Athraigh/Bain/Cuir meiteashonraí ó dhoiciméad PDF
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Comhad a thiontú go PDF
 home.fileToPDF.desc=Tiontaigh beagnach aon chomhad go PDF (DOCX, PNG, XLS, PPT, TXT agus go leor eile)

src/main/resources/messages_id_ID.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish, kecil, kecil
 
 home.changeMetadata.title=Ubah Metadata
 home.changeMetadata.desc=Mengubah/Menghapus/Menambahkan metadata dari dokumen PDF
-changeMetadata.tags=Judul,penulis,tanggal,pembuatan,waktu,penerbit,produser,statistik
+changeMetadata.tags==Judul,penulis,tanggal,pembuatan,waktu,penerbit,produser,statistik
 
 home.fileToPDF.title=Mengonversi berkas ke PDF
 home.fileToPDF.desc=Mengonversi hampir semua berkas ke PDF (DOCX, PNG, XLS, PPT, TXT dan lain-lain)

src/main/resources/messages_it_IT.properties

@@ -60,7 +60,7 @@ confirmPasswordErrorMessage=La nuova password e la conferma della nuova password
 deleteCurrentUserMessage=Impossibile eliminare l'utente attualmente connesso.
 deleteUsernameExistsMessage=Il nome utente non esiste e non può essere eliminato.
 downgradeCurrentUserMessage=Impossibile declassare il ruolo dell'utente corrente
-disabledCurrentUserMessage=L'utente corrente non può essere disabilitato
+disabledCurrentUserMessage=The current user cannot be disabled
 downgradeCurrentUserLongMessage=Impossibile declassare il ruolo dell'utente corrente. Pertanto, l'utente corrente non verrà visualizzato.
 userAlreadyExistsOAuthMessage=L'utente esiste già come utente OAuth2.
 userAlreadyExistsWebMessage=L'utente esiste già come utente web.
@@ -291,7 +291,7 @@ compressPdfs.tags=comprimere,piccolo,minuscolo
 
 home.changeMetadata.title=Modifica Proprietà
 home.changeMetadata.desc=Modifica/Aggiungi/Rimuovi le proprietà di un documento PDF.
-changeMetadata.tags=Titolo,autore,data,creazione,ora,editore,produttore,statistiche
+changeMetadata.tags==Titolo,autore,data,creazione,ora,editore,produttore,statistiche
 
 home.fileToPDF.title=Converti file in PDF
 home.fileToPDF.desc=Converti quasi ogni file in PDF (DOCX, PNG, XLS, PPT, TXT e altro)

src/main/resources/messages_ja_JP.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=メタデータの変更
 home.changeMetadata.desc=PDFのメタデータを変更/削除/追加します。
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=ファイルをPDFに変換
 home.fileToPDF.desc=ほぼすべてのファイルをPDFに変換します。 (DOCX, PNG, XLS, PPT, TXTなど)

src/main/resources/messages_ko_KR.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=메타데이터 변경
 home.changeMetadata.desc=PDF 문서의 메타데이터를 수정/제거/추가합니다.
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=파일을 PDF로 변환
 home.fileToPDF.desc=거의 모든 파일을 PDF로 변환합니다(DOCX, PNG, XLS, PPT, TXT 등)

src/main/resources/messages_ro_RO.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Schimbă Metadatele
 home.changeMetadata.desc=Schimbă/Elimină/Adaugă metadate într-un document PDF.
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Convertește fișierul în PDF
 home.fileToPDF.desc=Convertește aproape orice fișier în format PDF (DOCX, PNG, XLS, PPT, TXT și altele).

src/main/resources/messages_ru_RU.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Изменить метаданные
 home.changeMetadata.desc=Изменить/удалить/добавить метаданные из документа PDF
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Конвертировать файл в PDF
 home.fileToPDF.desc=Конвертируйте практически любой файл в PDF (DOCX, PNG, XLS, PPT, TXT и другие)

src/main/resources/messages_sv_SE.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=squish,small,tiny
 
 home.changeMetadata.title=Ändra metadata
 home.changeMetadata.desc=Ändra/ta bort/lägg till metadata från ett PDF-dokument
-changeMetadata.tags=Title,author,date,creation,time,publisher,producer,stats
+changeMetadata.tags==Title,author,date,creation,time,publisher,producer,stats
 
 home.fileToPDF.title=Konvertera fil till PDF
 home.fileToPDF.desc=Konvertera nästan vilken fil som helst till PDF (DOCX, PNG, XLS, PPT, TXT och mer)

src/main/resources/messages_zh_TW.properties

@@ -291,7 +291,7 @@ compressPdfs.tags=壓縮,小,微小
 
 home.changeMetadata.title=變更中繼資料
 home.changeMetadata.desc=從 PDF 檔案中變更/移除/新增中繼資料
-changeMetadata.tags=標題,作者,日期,建立,時間,出版商,製作人,統計
+changeMetadata.tags==標題,作者,日期,建立,時間,出版商,製作人,統計
 
 home.fileToPDF.title=檔案轉 PDF
 home.fileToPDF.desc=將幾乎所有格式轉換為 PDF（DOCX、PNG、XLS、PPT、TXT 等等）

src/main/resources/settings.yml.template

@@ -14,7 +14,7 @@
 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; when using e.g. Fail2Ban you can deactivate the function with -1
+  loginAttemptCount: 5 # lock user account after 5 tries
   loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
   loginMethod: all # 'all' (Login Username/Password and OAuth2[must be enabled and configured]), 'normal'(only Login with Username/Password) or 'oauth2'(only Login with OAuth2)
   initialLogin:

src/main/resources/static/3rdPartyLicenses.json

@@ -3,14 +3,14 @@
         {
             "moduleName": "ch.qos.logback:logback-classic",
             "moduleUrl": "http://www.qos.ch",
-            "moduleVersion": "1.5.6",
+            "moduleVersion": "1.5.7",
             "moduleLicense": "GNU Lesser General Public License",
             "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
         },
         {
             "moduleName": "ch.qos.logback:logback-core",
             "moduleUrl": "http://www.qos.ch",
-            "moduleVersion": "1.5.6",
+            "moduleVersion": "1.5.7",
             "moduleLicense": "GNU Lesser General Public License",
             "moduleLicenseUrl": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
         },

test.sh

@@ -73,8 +73,8 @@ main() {
 
 
     # Building Docker images
-    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile .
-    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
+    docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile .
+    docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
 	
     # Test each configuration
     run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml"
@@ -105,9 +105,9 @@ main() {
 
 
     # Building Docker images with security enabled
-    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile .
-    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
-    docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-fat -f ./Dockerfile-fat .
+    docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile .
+    docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite .
+    docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-fat -f ./Dockerfile-fat .
     
     
     # Test each configuration with security