From ce39b315e4b62133720b89cf102d61e56b6111e2 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:51:51 +0200 Subject: [PATCH 1/2] chore(nifi): update versions for 24.11 --- CHANGELOG.md | 2 + .../1.21.0/001-patch-cyclonedx-plugin.patch | 29 ---------- nifi/stackable/patches/1.21.0/README | 4 -- .../001-NIFI-no-zip-assembly-1.25.0.patch | 12 ---- ...002-NIFI-no-host-header-check-1.25.0.patch | 58 ------------------- .../1.25.0/003-patch-cyclonedx-plugin.patch | 29 ---------- nifi/versions.py | 10 ---- 7 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 nifi/stackable/patches/1.21.0/001-patch-cyclonedx-plugin.patch delete mode 100644 nifi/stackable/patches/1.21.0/README delete mode 100644 nifi/stackable/patches/1.25.0/001-NIFI-no-zip-assembly-1.25.0.patch delete mode 100644 nifi/stackable/patches/1.25.0/002-NIFI-no-host-header-check-1.25.0.patch delete mode 100644 nifi/stackable/patches/1.25.0/003-patch-cyclonedx-plugin.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 1006394ff..eb188f950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ All notable changes to this project will be documented in this file. - omid: Remove 1.1.0 and 1.1.1 ([#846]). - spark: Remove 3.4.2 and 3.4.3 ([#848]). - zookeeper: Remove 3.8.4 ([#851]). +- nifi: Remove 1.21.0 and 1.25.0 ([#868]). ### Fixed @@ -54,6 +55,7 @@ All notable changes to this project will be documented in this file. [#848]: https://github.com/stackabletech/docker-images/pull/848 [#851]: https://github.com/stackabletech/docker-images/pull/851 [#852]: https://github.com/stackabletech/docker-images/pull/852 +[#868]: https://github.com/stackabletech/docker-images/pull/868 ## [24.7.0] - 2024-07-24 diff --git a/nifi/stackable/patches/1.21.0/001-patch-cyclonedx-plugin.patch b/nifi/stackable/patches/1.21.0/001-patch-cyclonedx-plugin.patch deleted file mode 100644 index f4b42ccc9..000000000 --- a/nifi/stackable/patches/1.21.0/001-patch-cyclonedx-plugin.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 1f739a2..36f4567 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -1034,6 +1034,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ false -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ - - - diff --git a/nifi/stackable/patches/1.21.0/README b/nifi/stackable/patches/1.21.0/README deleted file mode 100644 index cbfbc39c9..000000000 --- a/nifi/stackable/patches/1.21.0/README +++ /dev/null @@ -1,4 +0,0 @@ -This folder is unused, as NiFi version 1.21.0 is not currently being built from source. - -We are keeping the folder in place because it would crash the build process if not present -and we ever start looking at building from source. diff --git a/nifi/stackable/patches/1.25.0/001-NIFI-no-zip-assembly-1.25.0.patch b/nifi/stackable/patches/1.25.0/001-NIFI-no-zip-assembly-1.25.0.patch deleted file mode 100644 index 84202d2d5..000000000 --- a/nifi/stackable/patches/1.25.0/001-NIFI-no-zip-assembly-1.25.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml -index f2d236cd56..fdb3879c9f 100644 ---- a/nifi-assembly/pom.xml -+++ b/nifi-assembly/pom.xml -@@ -66,7 +66,6 @@ language governing permissions and limitations under the License. --> - posix - - dir -- zip - - - diff --git a/nifi/stackable/patches/1.25.0/002-NIFI-no-host-header-check-1.25.0.patch b/nifi/stackable/patches/1.25.0/002-NIFI-no-host-header-check-1.25.0.patch deleted file mode 100644 index 6f950c70c..000000000 --- a/nifi/stackable/patches/1.25.0/002-NIFI-no-host-header-check-1.25.0.patch +++ /dev/null @@ -1,58 +0,0 @@ -Subject: [PATCH] Allow bypassing check for host header. -NiFi has the configuration option 'nifi.web.proxy.host' which controls allowed -values for the host header field in any incoming request for the web ui. - -This frequently causes issues when trying to expose the NiFi UI via for example -an ingress, loadbalancer or any similar type of mechanism. - -NiFi does not allow to disable this behavior, so at the moment the nifi operator -simply hardcodes all even remotely possible values into this field. -But in order to allow putting for example in ingress in front of NiFi this means -using config overrides to change the value of this option, copy all the values -the operator put in there and add the extra value you need. - -This is less than ideal, the proper solution would probably be -https://github.com/stackabletech/nifi-operator/issues/604 - -But until that is merged this is a simple workaround that allows overriding the list of allowed -hostnames by just setting it to "*" and this will effectively bypass the hostname check entirely if set. - -This allows us to keep the default behavior in place for those users where it works and not remove -security features, but also enables users to disable this check if they know what they are doing. ---- -Index: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java ---- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java (revision 6ecc398d3f92425447e43242af4992757e25b3c5) -+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/HostHeaderHandler.java (date 1716453739677) -@@ -47,6 +47,7 @@ - private final String serverName; - private final int serverPort; - private final List validHosts; -+ private boolean allowAllHosts = false; - - /** - * Instantiates a handler with a given server name and port 0. -@@ -107,6 +108,10 @@ - // The value(s) from nifi.web.proxy.host - hosts.addAll(parseCustomHostnames(niFiProperties)); - -+ // Check if the setting for allowed hosts has only the wildcard entry and -+ // if so store this in allowAllHost for later use -+ List configuredHostNames = niFiProperties.getAllowedHostsAsList(); -+ this.allowAllHosts = configuredHostNames.size() == 1 && configuredHostNames.contains("*"); - // empty is ok here - hosts.add(""); - -@@ -205,7 +210,7 @@ - } - - boolean hostHeaderIsValid(String hostHeader) { -- return validHosts.contains(hostHeader.toLowerCase().trim()); -+ return this.allowAllHosts || validHosts.contains(hostHeader.toLowerCase().trim()); - } - - @Override diff --git a/nifi/stackable/patches/1.25.0/003-patch-cyclonedx-plugin.patch b/nifi/stackable/patches/1.25.0/003-patch-cyclonedx-plugin.patch deleted file mode 100644 index 910472410..000000000 --- a/nifi/stackable/patches/1.25.0/003-patch-cyclonedx-plugin.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 0e92b46..4094f96 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -1080,6 +1080,24 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ false -+ -+ -+ -+ package -+ -+ makeBom -+ -+ -+ -+ - - - diff --git a/nifi/versions.py b/nifi/versions.py index fbc40126a..b1fc007e6 100644 --- a/nifi/versions.py +++ b/nifi/versions.py @@ -1,14 +1,4 @@ versions = [ - { - "product": "1.21.0", - "java-base": "11", - "java-devel": "11", - }, - { - "product": "1.25.0", - "java-base": "21", - "java-devel": "11", # There is an error when trying to use java-devel 21 (for nifi 1.25.0): - }, { "product": "1.27.0", "java-base": "11", From 70f0f13e4626328c69ade45b4ce40ffc71126b46 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Thu, 19 Sep 2024 05:45:57 -0400 Subject: [PATCH 2/2] Update versions.py --- nifi/versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi/versions.py b/nifi/versions.py index b1fc007e6..df2a23414 100644 --- a/nifi/versions.py +++ b/nifi/versions.py @@ -2,7 +2,7 @@ { "product": "1.27.0", "java-base": "11", - "java-devel": "11", # There is an error when trying to use java-devel 21 (for nifi 1.26.0): + "java-devel": "11", # There is an error when trying to use the jdk 21 (since nifi 1.26.0) }, { "product": "2.0.0-M4",