From 6eb79e65faaf42f575c6bf01aab554fd7026975f Mon Sep 17 00:00:00 2001 From: Ludy Date: Mon, 22 Jul 2024 22:15:10 +0200 Subject: [PATCH] minor changes in the DEV tools and more (#1578) --- .github/labeler-config.yml | 40 ++++++++++++++++--- .github/scripts/check_tabulator.py | 1 + .../{labeler.yml => auto-labeler.yml} | 0 .github/workflows/sync_files.yml | 2 + build.gradle | 1 + .../database/DatabaseBackupHelper.java | 9 +++-- .../SPDF/model/ApplicationProperties.java | 2 + 7 files changed, 45 insertions(+), 10 deletions(-) rename .github/workflows/{labeler.yml => auto-labeler.yml} (100%) diff --git a/.github/labeler-config.yml b/.github/labeler-config.yml index 029aa318..da9e5e3f 100644 --- a/.github/labeler-config.yml +++ b/.github/labeler-config.yml @@ -1,20 +1,48 @@ -translation: +Translation: - changed-files: - any-glob-to-any-file: 'src/main/resources/messages_*_*.properties' Front End: - changed-files: - - any-glob-to-any-file: 'src/main/resources/templates/**' + - any-glob-to-any-file: 'src/main/resources/templates/**/*' + - any-glob-to-any-file: 'src/main/resources/static/**/*' + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/**' -java: +Java: - changed-files: - any-glob-to-any-file: 'src/main/java/**/*.java' -documentation: +Back End: + - changed-files: + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*' + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*' + - any-glob-to-any-file: 'src/main/resources/settings.yml.template' + - any-glob-to-any-file: 'src/main/resources/banner.txt' + +Security: + - changed-files: + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/security/**/*' + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/provider/**/*' + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/config/model/AuthenticationType.java' + +API: + - changed-files: + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/web/MetricsController.java' + - any-glob-to-any-file: 'src/main/java/stirling/software/SPDF/controller/api/**/*' + +Documentation: - changed-files: - any-glob-to-any-file: '**/*.md' + - any-glob-to-any-file: 'scripts/counter_translation.py' + - any-glob-to-any-file: 'scripts/ignore_translation.toml' -docker: +Docker: - changed-files: - any-glob-to-any-file: 'Dockerfile' - - any-glob-to-any-file: 'Dockerfile-*' \ No newline at end of file + - any-glob-to-any-file: 'Dockerfile-*' + - any-glob-to-any-file: 'exampleYmlFiles/*.yml' + +Test: + - changed-files: + - any-glob-to-any-file: 'cucumber/**/*' + - any-glob-to-any-file: 'test*' \ No newline at end of file diff --git a/.github/scripts/check_tabulator.py b/.github/scripts/check_tabulator.py index eb408ad6..dea57092 100644 --- a/.github/scripts/check_tabulator.py +++ b/.github/scripts/check_tabulator.py @@ -1,4 +1,5 @@ """check_tabulator.py""" + import argparse import sys diff --git a/.github/workflows/labeler.yml b/.github/workflows/auto-labeler.yml similarity index 100% rename from .github/workflows/labeler.yml rename to .github/workflows/auto-labeler.yml diff --git a/.github/workflows/sync_files.yml b/.github/workflows/sync_files.yml index c9365460..018f6e1f 100644 --- a/.github/workflows/sync_files.yml +++ b/.github/workflows/sync_files.yml @@ -51,6 +51,7 @@ jobs: [1]: https://github.com/peter-evans/create-pull-request draft: false delete-branch: true + labels: github-actions sync-readme: runs-on: ubuntu-latest steps: @@ -88,3 +89,4 @@ jobs: [1]: https://github.com/peter-evans/create-pull-request draft: false delete-branch: true + labels: Documentation,Translation,github-actions diff --git a/build.gradle b/build.gradle index eb776343..0dde7af5 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,7 @@ sourceSets { exclude "stirling/software/SPDF/controller/web/AccountWebController.java" exclude "stirling/software/SPDF/controller/web/DatabaseWebController.java" exclude "stirling/software/SPDF/model/ApiKeyAuthenticationToken.java" + exclude "stirling/software/SPDF/model/AttemptCounter.java" exclude "stirling/software/SPDF/model/Authority.java" exclude "stirling/software/SPDF/model/PersistentLogin.java" exclude "stirling/software/SPDF/model/User.java" 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 0cf1e612..3ce4f28a 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 @@ -179,11 +179,12 @@ public class DatabaseBackupHelper implements DatabaseBackupInterface { } private boolean executeDatabaseScript(Path scriptPath) { - try (Connection conn = DriverManager.getConnection(url, "sa", ""); - Statement stmt = conn.createStatement()) { + String query = "RUNSCRIPT from ?;"; - String query = "RUNSCRIPT from '" + scriptPath.toString() + "';"; - stmt.execute(query); + try (Connection conn = DriverManager.getConnection(url, "sa", ""); + PreparedStatement stmt = conn.prepareStatement(query)) { + stmt.setString(1, scriptPath.toString()); + stmt.execute(); log.info("Database import completed: {}", scriptPath); return true; } catch (SQLException e) { diff --git a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java index 99e45776..6bad4a66 100644 --- a/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java +++ b/src/main/java/stirling/software/SPDF/model/ApplicationProperties.java @@ -360,6 +360,8 @@ public class ApplicationProperties { + useAsUsername + ", provider=" + provider + + ", client=" + + client + ", scopes=" + scopes + "]";