From 5e1aac0b84da4f7a834d79a2800c5eb7ed024bfe Mon Sep 17 00:00:00 2001 From: Ludy Date: Sun, 17 Nov 2024 15:08:41 +0100 Subject: [PATCH] Read login data from application.properties (#2263) Co-authored-by: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> --- .../security/database/DatabaseBackupHelper.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java index 6ccd0ac3..85cef66f 100644 --- a/src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java +++ b/src/main/java/stirling/software/SPDF/config/security/database/DatabaseBackupHelper.java @@ -34,6 +34,12 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface { @Value("${spring.datasource.url}") private String url; + @Value("${spring.datasource.username}") + private String databaseUsername; + + @Value("${spring.datasource.password}") + private String databasePassword; + private Path backupPath = Paths.get("configs/db/backup/"); @Override @@ -134,7 +140,8 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface { this.getBackupFilePath("backup_" + dateNow.format(myFormatObj) + ".sql"); String query = "SCRIPT SIMPLE COLUMNS DROP to ?;"; - try (Connection conn = DriverManager.getConnection(url, "sa", ""); + try (Connection conn = + DriverManager.getConnection(url, databaseUsername, databasePassword); PreparedStatement stmt = conn.prepareStatement(query)) { stmt.setString(1, insertOutputFilePath.toString()); stmt.execute(); @@ -147,7 +154,8 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface { // Retrieves the H2 database version. public String getH2Version() { String version = "Unknown"; - try (Connection conn = DriverManager.getConnection(url, "sa", "")) { + try (Connection conn = + DriverManager.getConnection(url, databaseUsername, databasePassword)) { try (Statement stmt = conn.createStatement(); ResultSet rs = stmt.executeQuery("SELECT H2VERSION() AS version")) { if (rs.next()) { @@ -189,7 +197,8 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface { private boolean executeDatabaseScript(Path scriptPath) { String query = "RUNSCRIPT from ?;"; - try (Connection conn = DriverManager.getConnection(url, "sa", ""); + try (Connection conn = + DriverManager.getConnection(url, databaseUsername, databasePassword); PreparedStatement stmt = conn.prepareStatement(query)) { stmt.setString(1, scriptPath.toString()); stmt.execute();