2270: Added new dep, implemented functionality to init the DB in postgres, more refactoring

Author: DarioGii

build.gradle

@@ -39,7 +39,7 @@ repositories {
     maven { url "https://jitpack.io" }
     maven { url "https://build.shibboleth.net/nexus/content/repositories/releases/" }
     maven {
-        url 'https://build.shibboleth.net/maven/releases'
+        url "https://build.shibboleth.net/maven/releases"
     }
 }
 
@@ -98,7 +98,7 @@ launch4j {
 
 spotless {
     java {
-        target project.fileTree('src/main/java')
+        target project.fileTree("src/main/java")
 
         googleJavaFormat("1.22.0").aosp().reorderImports(false)
 
@@ -111,7 +111,7 @@ spotless {
 }
 
 //gradleLint {
-//        rules=['unused-dependency']
+//        rules=["unused-dependency"]
 //    }
 tasks.wrapper {
     gradleVersion = "8.7"
@@ -129,15 +129,15 @@ dependencies {
     implementation("io.github.pixee:java-security-toolkit:1.2.0")
 
     // implementation "org.yaml:snakeyaml:2.2"
-    implementation 'com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4'
+    implementation "com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4"
 
     // Exclude Tomcat and include Jetty
     implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
     implementation "org.springframework.boot:spring-boot-starter-jetty:$springBootVersion"
 
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion"
-    implementation 'com.posthog.java:posthog:1.1.1'
-    implementation 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1'
+    implementation "com.posthog.java:posthog:1.1.1"
+    implementation "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20240325.1"
 
 
     if (System.getenv("DOCKER_ENABLE_SECURITY") != "false") {
@@ -147,8 +147,9 @@ 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'
+        implementation "org.springframework:spring-jdbc"
+
+        implementation "com.unboundid.product.scim2:scim2-sdk-client:2.3.5"
         // Don't upgrade h2database
         runtimeOnly "org.postgresql:postgresql:42.7.4"
         constraints {
@@ -157,8 +158,8 @@ dependencies {
             implementation "org.opensaml:opensaml-saml-impl:$openSamlVersion"
         }
         implementation "org.springframework.security:spring-security-saml2-service-provider:$springSecuritySamlVersion"
-//		implementation 'org.springframework.security:spring-security-core:$springSecuritySamlVersion'
-        implementation 'com.coveo:saml-client:5.0.0'
+//		implementation "org.springframework.security:spring-security-core:$springSecuritySamlVersion"
+        implementation "com.coveo:saml-client:5.0.0"
 
 
     }
@@ -207,13 +208,13 @@ dependencies {
     }
 
     // https://mvnrepository.com/artifact/technology.tabula/tabula
-    implementation ('technology.tabula:tabula:1.0.5')  {
+    implementation ("technology.tabula:tabula:1.0.5")  {
         exclude group: "org.slf4j", module: "slf4j-simple"
         exclude group: "org.bouncycastle", module: "bcprov-jdk15on"
         exclude group: "com.google.code.gson", module: "gson"
     }
 
-    implementation 'org.apache.pdfbox:jbig2-imageio:3.0.4'
+    implementation "org.apache.pdfbox:jbig2-imageio:3.0.4"
 
     implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion"
     implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion"
@@ -231,7 +232,7 @@ dependencies {
     compileOnly "org.projectlombok:lombok:$lombokVersion"
     annotationProcessor "org.projectlombok:lombok:$lombokVersion"
 
-    testRuntimeOnly 'org.mockito:mockito-inline:5.2.0'
+    testRuntimeOnly "org.mockito:mockito-inline:5.2.0"
 }
 
 tasks.withType(JavaCompile).configureEach {

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

@@ -5,11 +5,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -72,61 +67,6 @@ private static boolean isPortAvailable(int port) {
         }
     }
 
-    @PostConstruct
-    public void initDB() {
-        Connection connection = null;
-        Statement statement = null;
-        try {
-            logger.debug("Creating database...");
-            ApplicationProperties.Datasource datasource =
-                    applicationProperties.getSystem().getDatasource();
-
-            if (datasource != null) {
-                connection =
-                        DriverManager.getConnection(
-                                datasource.getUrl(),
-                                datasource.getUsername(),
-                                datasource.getPassword());
-                statement = connection.createStatement();
-                statement.executeQuery(
-                        "SELECT count(*) FROM pg_database WHERE datname = 'database_name'");
-                ResultSet resultSet = statement.getResultSet();
-                resultSet.next();
-                int count = resultSet.getInt(1);
-
-                if (count <= 0) {
-                    statement.executeUpdate("CREATE DATABASE stirling-pdf-DB");
-                    statement.executeUpdate(
-                            "CREATE ROLE "
-                                    + datasource.getUsername()
-                                    + " ADMIN WITH PASSWORD '"
-                                    + datasource.getPassword()
-                                    + "'");
-                    statement.executeUpdate("SET ROLE " + datasource.getUsername());
-                    logger.debug("Database created.");
-                } else {
-                    logger.debug("Database already exists.");
-                }
-            }
-
-        } catch (SQLException e) {
-            logger.error(e.toString());
-        } finally {
-            try {
-                if (statement != null) {
-                    statement.close();
-                    logger.debug("Closed Statement.");
-                }
-                if (connection != null) {
-                    logger.debug("Closed Connection.");
-                    connection.close();
-                }
-            } catch (SQLException e) {
-                logger.error(e.toString());
-            }
-        }
-    }
-
     @PostConstruct
     public void init() {
         baseUrlStatic = this.baseUrl;

src/main/java/stirling/software/SPDF/config/interfaces/DatabaseBackupInterface.java

@@ -6,9 +6,11 @@
 import stirling.software.SPDF.utils.FileInfo;
 
 public interface DatabaseBackupInterface {
+    void initDatabase();
+
     void exportDatabase() throws IOException;
 
-    boolean importDatabase();
+    void importDatabase();
 
     boolean hasBackup();
 

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

@@ -20,11 +20,12 @@ public class InitialSecuritySetup {
 
     @Autowired private ApplicationProperties applicationProperties;
 
-    // todo: wip add Postgres here
     @Autowired private DatabaseBackupInterface databaseBackupHelper;
 
     @PostConstruct
     public void init() throws IllegalArgumentException, IOException {
+        databaseBackupHelper.initDatabase();
+
         if (databaseBackupHelper.hasBackup() && !userService.hasUsers()) {
             databaseBackupHelper.importDatabase();
         } else if (!userService.hasUsers()) {