[ENV-360] Ensure returned token provider is valid (#236)

cloudera-labs · Nov 15, 2018 · 0c13657 · 0c13657
1 parent 5aced81
commit 0c13657
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/core/src/main/java/com/cloudera/labs/envelope/run/Runner.java b/core/src/main/java/com/cloudera/labs/envelope/run/Runner.java
@@ -25,6 +25,7 @@
 import com.cloudera.labs.envelope.input.InputFactory;
 import com.cloudera.labs.envelope.input.StreamInput;
 import com.cloudera.labs.envelope.security.SecurityUtils;
+import com.cloudera.labs.envelope.security.TokenProvider;
 import com.cloudera.labs.envelope.security.TokenStoreManager;
 import com.cloudera.labs.envelope.security.UsesDelegationTokens;
 import com.cloudera.labs.envelope.spark.AccumulatorRequest;
@@ -488,7 +489,10 @@ private static void initializeSecurity(Config config, Set<Step> steps) throws Ex
 
     // Get all token providers
     for (InstantiatedComponent secureComponent : secureComponents) {
-      tokenStoreManager.addTokenProvider(((UsesDelegationTokens)secureComponent.getComponent()).getTokenProvider());
+      TokenProvider tokenProvider = ((UsesDelegationTokens)secureComponent.getComponent()).getTokenProvider();
+      if (tokenProvider != null) {
+        tokenStoreManager.addTokenProvider(tokenProvider);
+      }
     }
 
     LOG.debug("Starting TokenStoreManager thread");