This is an automated email from the ASF dual-hosted git repository.

joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new f70ed77ada NIFI-13294 Deprecated Apache Knox SSO Authentication This 
closes #8875.
f70ed77ada is described below

commit f70ed77adac43c9b173492166645f586378b2497
Author: exceptionfactory <[email protected]>
AuthorDate: Fri May 24 14:23:46 2024 -0500

    NIFI-13294 Deprecated Apache Knox SSO Authentication
    This closes #8875.
    
    Signed-off-by: Joseph Witt <[email protected]>
---
 nifi-docs/src/main/asciidoc/administration-guide.adoc             | 2 ++
 .../nifi-framework/nifi-web/nifi-web-security/pom.xml             | 4 ++++
 .../configuration/KnoxAuthenticationSecurityConfiguration.java    | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc 
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index 754da60156..d09440539f 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -610,6 +610,8 @@ SAML authentication enables the following REST API 
resources for integration wit
 [[apache_knox]]
 === Apache Knox
 
+NOTE: Support for Apache Knox Single Sign-On is deprecated for removal in NiFi 
2.
+
 To enable authentication via Apache Knox the following properties must be 
configured in _nifi.properties_.
 
 [options="header"]
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
index 1a198c4cbf..1a5bd665d8 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
@@ -173,6 +173,10 @@
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-property-protection-loader</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-deprecation-log</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk18on</artifactId>
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/KnoxAuthenticationSecurityConfiguration.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/KnoxAuthenticationSecurityConfiguration.java
index da01fecfab..1ea05c7812 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/KnoxAuthenticationSecurityConfiguration.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/configuration/KnoxAuthenticationSecurityConfiguration.java
@@ -17,6 +17,8 @@
 package org.apache.nifi.web.security.configuration;
 
 import org.apache.nifi.authorization.Authorizer;
+import org.apache.nifi.deprecation.log.DeprecationLogger;
+import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
 import org.apache.nifi.util.NiFiProperties;
 import org.apache.nifi.web.security.knox.KnoxAuthenticationFilter;
 import org.apache.nifi.web.security.knox.KnoxAuthenticationProvider;
@@ -32,6 +34,8 @@ import 
org.springframework.security.authentication.AuthenticationManager;
  */
 @Configuration
 public class KnoxAuthenticationSecurityConfiguration {
+    private static final DeprecationLogger deprecationLogger = 
DeprecationLoggerFactory.getLogger(KnoxAuthenticationSecurityConfiguration.class);
+
     private final NiFiProperties niFiProperties;
 
     private final Authorizer authorizer;
@@ -43,6 +47,10 @@ public class KnoxAuthenticationSecurityConfiguration {
     ) {
         this.niFiProperties = niFiProperties;
         this.authorizer = authorizer;
+
+        if (niFiProperties.isKnoxSsoEnabled()) {
+            deprecationLogger.warn("Support for Apache Knox Single Sign-On 
authentication is deprecated for removal in NiFi 2");
+        }
     }
 
     @Bean

Reply via email to