Skip to content

Commit 6133732

Browse files
authored
feat: backport NiFi-15567 to NiFi 2.6.0 and 2.7.2 (#1429)
* feat: backport NiFi-15567 to NiFi 2.6.0 and 2.7.2 * chore: changelog
1 parent ff695b7 commit 6133732

5 files changed

Lines changed: 1365 additions & 3 deletions

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ All notable changes to this project will be documented in this file.
4242
Remove all HBase dependencies from the Spark 4 image.
4343
Pull logging dependencies with `mvn` instead of `curl` to remove manual maintenance in Nexus `packages`.
4444
- hbase: Update `hbase-operator-tools` from `1.3.0-fd5a5fb` to `1.3.0` ([#1425]).
45+
- nifi: Backported NiFi-15567 to NiFi 2.6.0 and 2.7.2 to fix CVE CVE-2026-25903 ([#1429]).
4546

4647
### Removed
4748

@@ -104,6 +105,7 @@ All notable changes to this project will be documented in this file.
104105
[#1425]: https://github.com/stackabletech/docker-images/pull/1425
105106
[#1426]: https://github.com/stackabletech/docker-images/pull/1426
106107
[#1428]: https://github.com/stackabletech/docker-images/pull/1428
108+
[#1429]: https://github.com/stackabletech/docker-images/pull/1429
107109

108110
## [25.11.0] - 2025-11-07
109111

nifi/stackable/patches/2.6.0/0004-NIFI-14858-Make-SNI-checking-configurable.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 22fff64167758481f7c66a85bc86df1467928e00 Mon Sep 17 00:00:00 2001
1+
From b1cf1b8747c3d877c2aeca1892be0708355a6676 Mon Sep 17 00:00:00 2001
22
From: Lars Francke <git@lars-francke.de>
33
Date: Wed, 13 Aug 2025 14:16:55 +0200
44
Subject: NIFI-14858: Make SNI checking configurable
@@ -64,7 +64,7 @@ index 26d09706a1..132973cad5 100644
6464
}
6565

6666
diff --git a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
67-
index 9e85c05d22..89d81813f4 100644
67+
index 9e85c05d22..9c26cb7eb3 100644
6868
--- a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
6969
+++ b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
7070
@@ -205,6 +205,8 @@ public class NiFiProperties extends ApplicationProperties {

nifi/stackable/patches/2.6.0/0005-fix-pin-esbuild-to-fix-NiFi-2.6.0-build.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1fe22dcc974b52d83b8288d5279c3aa8c41a1243 Mon Sep 17 00:00:00 2001
1+
From 1b21f7709cf3bfafecd9f75ffadf6b6dc7391055 Mon Sep 17 00:00:00 2001
22
From: dervoeti <lukas.krug@stackable.tech>
33
Date: Wed, 22 Oct 2025 15:27:29 +0200
44
Subject: fix: pin esbuild to fix NiFi 2.6.0 build

0 commit comments

Comments
 (0)