From ceadd7056f1bf1683db2baf567e7bc82b301b8b8 Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 21:31:14 +0200 Subject: [PATCH 1/9] Updated gitignore --- .gitignore | 2 +- src/main/java/com/example/demo/util/MyCredentials.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/util/MyCredentials.java diff --git a/.gitignore b/.gitignore index 3290ff5..abad717 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,4 @@ build/ *.log ### Credentials ### -MyCredentials.java + diff --git a/src/main/java/com/example/demo/util/MyCredentials.java b/src/main/java/com/example/demo/util/MyCredentials.java new file mode 100644 index 0000000..76d008a --- /dev/null +++ b/src/main/java/com/example/demo/util/MyCredentials.java @@ -0,0 +1,8 @@ +package com.example.demo.util; + +public class MyCredentials { + public static String reCaptchaKey = "placeholder"; + public static String sendGridKey = "placeholder"; + public static String oAuthClientId = "placeholder"; + public static String oAuthClientSecret = "placeholder"; +} From 425a286d11554eb5e3f1d35971f59a45e3e471df Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 21:46:47 +0200 Subject: [PATCH 2/9] Updated codeql.yml --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 390f91c..1ed5953 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ "main" ] + branches: [ "codeql-setup" ] pull_request: # The branches below must be a subset of the branches above - branches: [ "main" ] + branches: [ "codeql-setup" ] schedule: - cron: '43 7 * * 5' From a75ad0bd064788a7da41199997922ec4d369b48f Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 21:56:06 +0200 Subject: [PATCH 3/9] Attempt 1654654 --- .github/workflows/codeql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1ed5953..78475df 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -64,7 +64,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - name: Build with Maven - run: mvn clean install + run: mvn clean install -DskipTests # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun From 661950972115e2115741cd6f1ea891368896ec90 Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 22:15:30 +0200 Subject: [PATCH 4/9] Dependency review --- .github/workflows/dependency-review.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/dependency-review.yml diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml new file mode 100644 index 0000000..95c8acd --- /dev/null +++ b/.github/workflows/dependency-review.yml @@ -0,0 +1,20 @@ +# Dependency Review Action +# +# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging. +# +# Source repository: https://github.com/actions/dependency-review-action +# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement +name: 'Dependency Review' +on: [push] + +permissions: + contents: read + +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: 'Checkout Repository' + uses: actions/checkout@v3 + - name: 'Dependency Review' + uses: actions/dependency-review-action@v2 \ No newline at end of file From a7953f3de4982e363e43662766c637ad30688c77 Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 22:20:02 +0200 Subject: [PATCH 5/9] Boze pomozi --- .github/workflows/dependency-review.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 95c8acd..934284f 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -5,7 +5,10 @@ # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' -on: [push] +on: + push: + branches: + - codeql-setup permissions: contents: read From 6b8891d5164b046e1b6d06c2f1849fcd36f576ae Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 22:21:56 +0200 Subject: [PATCH 6/9] ... --- .github/workflows/dependency-review.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 934284f..149c171 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -6,6 +6,10 @@ # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' on: + pull_request: + types: + - opened + - synchronize push: branches: - codeql-setup From 0e2eafb0949bde066d59555aae54e32252c6d3a2 Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 22:24:54 +0200 Subject: [PATCH 7/9] opet --- .github/workflows/dependency-review.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 149c171..577a347 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -5,14 +5,7 @@ # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' -on: - pull_request: - types: - - opened - - synchronize - push: - branches: - - codeql-setup +on: [pull_request] permissions: contents: read From a3b2035da70b2e690944b8fea6ccc04d21c16122 Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 22:27:06 +0200 Subject: [PATCH 8/9] Fixed minor issues --- .github/workflows/dependency-review.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 577a347..d9a6fbf 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -5,7 +5,15 @@ # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' -on: [pull_request] +on: + push: + branches: [ "codeql-setup" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "codeql-setup" ] + schedule: + - cron: '43 7 * * 5' + permissions: contents: read From 0f978c04c49b5db0920403fb09d9be99288060a6 Mon Sep 17 00:00:00 2001 From: cuturic01 Date: Fri, 16 Jun 2023 22:27:56 +0200 Subject: [PATCH 9/9] Redo --- .github/workflows/dependency-review.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index d9a6fbf..577a347 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -5,15 +5,7 @@ # Source repository: https://github.com/actions/dependency-review-action # Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement name: 'Dependency Review' -on: - push: - branches: [ "codeql-setup" ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ "codeql-setup" ] - schedule: - - cron: '43 7 * * 5' - +on: [pull_request] permissions: contents: read