From bcc0bb31a01272ac98ae1731761d81e6d59d6e03 Mon Sep 17 00:00:00 2001 From: Maarten Schmeitz Date: Thu, 26 Sep 2024 11:27:52 +0200 Subject: [PATCH 1/3] Fix code scanning alert - Inclusion of functionality from an untrusted source - jquery --- static/Installation.html | 5 ++++- static/Troubleshooting.html | 5 ++++- static/contact.html | 5 ++++- static/contributing.html | 5 ++++- static/diyorbuy.html | 5 ++++- static/energydashboard.html | 5 ++++- static/index.html | 5 ++++- static/information.html | 5 ++++- static/license.html | 5 ++++- static/navbar.html | 5 ++++- 10 files changed, 40 insertions(+), 10 deletions(-) diff --git a/static/Installation.html b/static/Installation.html index ed9630b..87ba90f 100644 --- a/static/Installation.html +++ b/static/Installation.html @@ -281,7 +281,10 @@

s0tool-standard-flux

- + diff --git a/static/Troubleshooting.html b/static/Troubleshooting.html index 39751ef..effefa4 100644 --- a/static/Troubleshooting.html +++ b/static/Troubleshooting.html @@ -126,7 +126,10 @@

Advanced Users

- + diff --git a/static/contact.html b/static/contact.html index 28062fc..fc84f45 100644 --- a/static/contact.html +++ b/static/contact.html @@ -57,7 +57,10 @@

Contact

- + diff --git a/static/contributing.html b/static/contributing.html index 758ba82..8878262 100644 --- a/static/contributing.html +++ b/static/contributing.html @@ -79,7 +79,10 @@

Contributing


- + diff --git a/static/diyorbuy.html b/static/diyorbuy.html index a6ee379..03e2863 100644 --- a/static/diyorbuy.html +++ b/static/diyorbuy.html @@ -82,7 +82,10 @@

How to order the S0tool 🛒 ?


- + diff --git a/static/energydashboard.html b/static/energydashboard.html index ba1d770..b3d98e6 100644 --- a/static/energydashboard.html +++ b/static/energydashboard.html @@ -71,7 +71,10 @@

Watermeter and s0 port in to energy dashboard.

- + diff --git a/static/index.html b/static/index.html index 29fe8ae..9104452 100644 --- a/static/index.html +++ b/static/index.html @@ -71,7 +71,10 @@ - + diff --git a/static/information.html b/static/information.html index bcaea66..465812f 100644 --- a/static/information.html +++ b/static/information.html @@ -166,7 +166,10 @@

Blueprint for S0tool and Home Assistant

- + diff --git a/static/license.html b/static/license.html index 6664e25..388616d 100644 --- a/static/license.html +++ b/static/license.html @@ -69,7 +69,10 @@

License

- + diff --git a/static/navbar.html b/static/navbar.html index 36763ce..2213062 100644 --- a/static/navbar.html +++ b/static/navbar.html @@ -55,7 +55,10 @@ - + From 93872974240c2cf1f9ad18af176bb44681cf38be Mon Sep 17 00:00:00 2001 From: Maarten Schmeitz Date: Thu, 26 Sep 2024 11:44:49 +0200 Subject: [PATCH 2/3] used the correct JS file --- static/Installation.html | 6 +++--- static/Troubleshooting.html | 6 +++--- static/contact.html | 6 +++--- static/contributing.html | 6 +++--- static/diyorbuy.html | 6 +++--- static/energydashboard.html | 6 +++--- static/index.html | 6 +++--- static/information.html | 6 +++--- static/license.html | 6 +++--- static/navbar.html | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/static/Installation.html b/static/Installation.html index 87ba90f..35b2e82 100644 --- a/static/Installation.html +++ b/static/Installation.html @@ -282,9 +282,9 @@

s0tool-standard-flux

+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/Troubleshooting.html b/static/Troubleshooting.html index effefa4..21d819e 100644 --- a/static/Troubleshooting.html +++ b/static/Troubleshooting.html @@ -127,9 +127,9 @@

Advanced Users

+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/contact.html b/static/contact.html index fc84f45..e8666d8 100644 --- a/static/contact.html +++ b/static/contact.html @@ -58,9 +58,9 @@

Contact

+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/contributing.html b/static/contributing.html index 8878262..d64058b 100644 --- a/static/contributing.html +++ b/static/contributing.html @@ -80,9 +80,9 @@

Contributing


+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/diyorbuy.html b/static/diyorbuy.html index 03e2863..aefef9e 100644 --- a/static/diyorbuy.html +++ b/static/diyorbuy.html @@ -83,9 +83,9 @@

How to order the S0tool 🛒 ?


+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/energydashboard.html b/static/energydashboard.html index b3d98e6..975960f 100644 --- a/static/energydashboard.html +++ b/static/energydashboard.html @@ -72,9 +72,9 @@

Watermeter and s0 port in to energy dashboard.

+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/index.html b/static/index.html index 9104452..4bb42ea 100644 --- a/static/index.html +++ b/static/index.html @@ -70,10 +70,10 @@ - + diff --git a/static/information.html b/static/information.html index 465812f..d644257 100644 --- a/static/information.html +++ b/static/information.html @@ -167,9 +167,9 @@

Blueprint for S0tool and Home Assistant

+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/license.html b/static/license.html index 388616d..434f93e 100644 --- a/static/license.html +++ b/static/license.html @@ -70,9 +70,9 @@

License

+ src="https://code.jquery.com/jquery-3.7.1.slim.min.js" + integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8=" + crossorigin="anonymous"> diff --git a/static/navbar.html b/static/navbar.html index 2213062..97051cb 100644 --- a/static/navbar.html +++ b/static/navbar.html @@ -56,8 +56,8 @@ From 485f0afdf562361a11304e6d381c04331bfe1476 Mon Sep 17 00:00:00 2001 From: Maarten Schmeitz Date: Thu, 26 Sep 2024 11:55:08 +0200 Subject: [PATCH 3/3] add security label fixes to release-drafter.yml --- .github/release-drafter.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 92569b8..8bbf346 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -29,6 +29,9 @@ categories: collapse-after: 5 labels: - "dependencies" + - title: "🚨🚨 Security Fixes 🚨🚨" + labels: + - "security" exclude-labels: - "sync" @@ -52,6 +55,7 @@ version-resolver: - "enhancement" - "performance" - "refactor" + - "security" default: patch no-changes-template: '- No changes' template: |