From 1a00aa2e5d821ac57c4bf70b81229e8a98a0a6f3 Mon Sep 17 00:00:00 2001 From: dotasek Date: Mon, 7 Oct 2024 15:27:02 -0400 Subject: [PATCH 1/3] Bump checkout action to v4 + codeql actions to v3 --- .github/workflows/codeql.yml | 8 ++++---- .github/workflows/dependency-submit.yml | 2 +- .github/workflows/owasp.yml | 4 ++-- .github/workflows/trivy.yml | 4 ++-- gradle.properties | 2 +- src/test/java/org/hl7/fhir/XMLUtilTest.java | 16 ++++++++++++++++ 6 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 src/test/java/org/hl7/fhir/XMLUtilTest.java diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ab4dde53..c8cf230c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,11 +40,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -58,7 +58,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ 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 @@ -71,6 +71,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/dependency-submit.yml b/.github/workflows/dependency-submit.yml index 3daa0101..22db3e98 100644 --- a/.github/workflows/dependency-submit.yml +++ b/.github/workflows/dependency-submit.yml @@ -12,7 +12,7 @@ jobs: contents: write steps: - name: 'Checkout Repository' - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run snapshot action uses: mikepenz/gradle-dependency-submission@v0.8.6 diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml index e09ade45..bcb81927 100644 --- a/.github/workflows/owasp.yml +++ b/.github/workflows/owasp.yml @@ -15,13 +15,13 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - run: | ./gradlew dependencyCheckAnalyze - name: Upload SARIF file - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: # Path to SARIF file relative to the root of the repository sarif_file: build/reports/dependency-check-report.sarif diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 0a872fcb..075fb1bb 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run static analysis uses: aquasecurity/trivy-action@master @@ -29,7 +29,7 @@ jobs: - name: Upload Trivy scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: 'trivy-results.sarif' category: 'code' diff --git a/gradle.properties b/gradle.properties index 15c9d961..dac1d5f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -fhirCoreVersion = 6.3.29 +fhirCoreVersion = 6.3.30-SNAPSHOT apachePoiVersion = 5.2.1 jacksonVersion = 2.16.0 apacheHttpcomponentsVersion = 4.5.13 diff --git a/src/test/java/org/hl7/fhir/XMLUtilTest.java b/src/test/java/org/hl7/fhir/XMLUtilTest.java new file mode 100644 index 00000000..b3a29383 --- /dev/null +++ b/src/test/java/org/hl7/fhir/XMLUtilTest.java @@ -0,0 +1,16 @@ +package org.hl7.fhir; + +import org.junit.jupiter.api.Test; + +import javax.xml.XMLConstants; +import javax.xml.transform.TransformerFactory; + +public class XMLUtilTest { + @Test + public void test() { + TransformerFactory f = TransformerFactory.newInstance(); + //f.setAttribute("http://javax.xml.XMLConstants/property/accessExternalDTD", ""); + f.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, ""); + + } +} From f2826dc88371688e07bd832bbbbeea589a36dca8 Mon Sep 17 00:00:00 2001 From: dotasek Date: Mon, 7 Oct 2024 17:09:03 -0400 Subject: [PATCH 2/3] Revert accidental core bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index dac1d5f0..15c9d961 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -fhirCoreVersion = 6.3.30-SNAPSHOT +fhirCoreVersion = 6.3.29 apachePoiVersion = 5.2.1 jacksonVersion = 2.16.0 apacheHttpcomponentsVersion = 4.5.13 From 37fda93b4a8794f0210c45f064def3e30cc391b8 Mon Sep 17 00:00:00 2001 From: dotasek Date: Tue, 8 Oct 2024 10:15:12 -0400 Subject: [PATCH 3/3] Create SECURITY.md ***NO_CI*** --- SECURITY.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..6c182091 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,5 @@ +# Security Policy + +## Reporting a Vulnerability + +Please report all potential security vulnerabilities using the [Report a vulnerability](../../security/advisories/new) button in the [Security](../../security) section of this repository.