NIFI-4750 Ensuring preDestruction is called on authorizer and appropr…

…iate policy/user-group providers. This closes apache#2387
brandonJY · Jan 8, 2018 · 4196140 · 4196140
1 parent 8f635f1
commit 4196140
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 2 deletions.
diff --git a/...rk/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java b/...rk/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java
@@ -479,7 +479,37 @@ public boolean isSingleton() {
     @Override
     public void destroy() throws Exception {
         if (authorizer != null) {
-            authorizer.preDestruction();
+            Exception error = null;
+
+            try {
+                authorizer.preDestruction();
+            } catch (final Exception e) {
+                error = e;
+            }
+
+            if (authorizer instanceof ManagedAuthorizer) {
+                final AccessPolicyProvider accessPolicyProvider = ((ManagedAuthorizer) authorizer).getAccessPolicyProvider();
+                if (accessPolicyProvider != null) {
+                    try {
+                        accessPolicyProvider.preDestruction();
+                    } catch (final Exception e) {
+                        error = e;
+                    }
+
+                    final UserGroupProvider userGroupProvider = accessPolicyProvider.getUserGroupProvider();
+                    if (userGroupProvider != null) {
+                        try {
+                            userGroupProvider.preDestruction();
+                        } catch (final Exception e) {
+                            error = e;
+                        }
+                    }
+                }
+            }
+
+            if (error != null) {
+                throw error;
+            }
         }
     }
 

diff --git a/...n/src/main/java/org/apache/nifi/authorization/CompositeConfigurableUserGroupProvider.java b/...n/src/main/java/org/apache/nifi/authorization/CompositeConfigurableUserGroupProvider.java
@@ -210,6 +210,10 @@ public UserAndGroups getUserAndGroups(String identity) throws AuthorizationAcces
 
     @Override
     public void preDestruction() throws AuthorizerDestructionException {
-        super.preDestruction();
+        try {
+            configurableUserGroupProvider.preDestruction();
+        } finally {
+            super.preDestruction();
+        }
     }
 }
diff --git a/...authorization/src/main/java/org/apache/nifi/authorization/CompositeUserGroupProvider.java b/...authorization/src/main/java/org/apache/nifi/authorization/CompositeUserGroupProvider.java
@@ -199,5 +199,18 @@ public UserAndGroups getUserAndGroups(String identity) throws AuthorizationAcces
 
     @Override
     public void preDestruction() throws AuthorizerDestructionException {
+        Exception error = null;
+        for (final UserGroupProvider userGroupProvider : userGroupProviders) {
+            try {
+                userGroupProvider.preDestruction();
+            } catch (Exception e) {
+                error = e;
+                logger.error("Error pre-destructing: " + e);
+            }
+        }
+
+        if (error != null) {
+            throw new AuthorizerDestructionException(error);
+        }
     }
 }