From 0364cf584b55a617c6eded719f0bc5a8baf91c99 Mon Sep 17 00:00:00 2001
From: joewitt <joewitt@apache.org>
Date: Thu, 2 Aug 2018 16:29:23 -0400
Subject: [PATCH 1/2] NIFI-5479 Upgraded Jetty. Moved where we unpack bundled
 deps to so we can avoid a new jetty bug with META-INF loading logic.   WIP
 for testing/eval.  Not ready for merge

---
 .../java/org/apache/nifi/nar/NarClassLoader.java | 16 ++++++++--------
 .../java/org/apache/nifi/nar/NarUnpacker.java    |  5 ++++-
 .../org/apache/nifi/web/server/JettyServer.java  |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml  |  5 +++++
 pom.xml                                          |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
index eb4539ca12f1..776ec28bbd5c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
@@ -176,21 +176,21 @@ public File getWorkingDirectory() {
 
     /**
      * Adds URLs for the resources unpacked from this NAR:
-     * <ul><li>the root: for classes, <tt>META-INF</tt>, etc.</li>
-     * <li><tt>META-INF/dependencies</tt>: for config files, <tt>.so</tt>s,
+     * <ul><li>the root: for classes, <tt>NAR-INF</tt>, etc.</li>
+     * <li><tt>NAR-INF/bundled-dependencies</tt>: for config files, <tt>.so</tt>s,
      * etc.</li>
-     * <li><tt>META-INF/dependencies/*.jar</tt>: for dependent
+     * <li><tt>NAR-INF/bundled-dependencies/*.jar</tt>: for dependent
      * libraries</li></ul>
      *
      * @param root the root directory of the unpacked NAR.
      * @throws IOException if the URL list could not be updated.
      */
     private void updateClasspath(File root) throws IOException {
-        addURL(root.toURI().toURL()); // for compiled classes, META-INF/, etc.
+        addURL(root.toURI().toURL()); // for compiled classes, WEB-INF, NAR-INF/, etc.
 
-        File dependencies = new File(root, "META-INF/bundled-dependencies");
+        File dependencies = new File(root, "NAR-INF/bundled-dependencies");
         if (!dependencies.isDirectory()) {
-            LOGGER.warn(narWorkingDirectory + " does not contain META-INF/bundled-dependencies!");
+            LOGGER.warn(narWorkingDirectory + " does not contain NAR-INF/bundled-dependencies!");
         }
         addURL(dependencies.toURI().toURL());
         if (dependencies.isDirectory()) {
@@ -206,9 +206,9 @@ private void updateClasspath(File root) throws IOException {
 
     @Override
     protected String findLibrary(final String libname) {
-        File dependencies = new File(narWorkingDirectory, "META-INF/bundled-dependencies");
+        File dependencies = new File(narWorkingDirectory, "NAR-INF/bundled-dependencies");
         if (!dependencies.isDirectory()) {
-            LOGGER.warn(narWorkingDirectory + " does not contain META-INF/bundled-dependencies!");
+            LOGGER.warn(narWorkingDirectory + " does not contain NAR-INF/bundled-dependencies!");
         }
 
         final File nativeDir = new File(dependencies, "native");
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
index d476883e610d..afd021e91d55 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarUnpacker.java
@@ -195,7 +195,7 @@ private static void mapExtensions(final Map<File, BundleCoordinate> unpackedNars
             final File unpackedNar = entry.getKey();
             final BundleCoordinate bundleCoordinate = entry.getValue();
 
-            final File bundledDependencies = new File(unpackedNar, "META-INF/bundled-dependencies");
+            final File bundledDependencies = new File(unpackedNar, "NAR-INF/bundled-dependencies");
 
             unpackBundleDocs(docsDirectory, mapping, bundleCoordinate, bundledDependencies);
         }
@@ -261,6 +261,9 @@ private static void unpack(final File nar, final File workingDirectory, final by
             while (jarEntries.hasMoreElements()) {
                 JarEntry jarEntry = jarEntries.nextElement();
                 String name = jarEntry.getName();
+                if(name.contains("META-INF/bundled-dependencies")){
+                    name = name.replace("META-INF/bundled-dependencies", "NAR-INF/bundled-dependencies");
+                }
                 File f = new File(workingDirectory, name);
                 if (jarEntry.isDirectory()) {
                     FileUtils.ensureDirectoryExistAndCanReadAndWrite(f);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
index 971353b711e9..66ecd451de95 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
@@ -384,7 +384,7 @@ private Map<File, Bundle> findWars(final Set<Bundle> bundles) {
         // consider each nar working directory
         bundles.forEach(bundle -> {
             final BundleDetails details = bundle.getBundleDetails();
-            final File narDependencies = new File(details.getWorkingDirectory(), "META-INF/bundled-dependencies");
+            final File narDependencies = new File(details.getWorkingDirectory(), "NAR-INF/bundled-dependencies");
             if (narDependencies.isDirectory()) {
                 // list the wars from this nar
                 final File[] narDependencyDirs = narDependencies.listFiles(WAR_FILTER);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index abeffa7d2520..a4a217573e20 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -913,6 +913,11 @@
             the application classpath or the maven jetty plugin classpath defined
             above.
         -->
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>apache-jstl</artifactId>
+            <scope>provided</scope>
+        </dependency>        
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/pom.xml b/pom.xml
index b1f52503550f..80662ee60ece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
         <inceptionYear>2014</inceptionYear>
         <org.slf4j.version>1.7.25</org.slf4j.version>
         <ranger.version>1.0.0</ranger.version>
-        <jetty.version>9.4.3.v20170317</jetty.version>
+        <jetty.version>9.4.11.v20180605</jetty.version>
     </properties>
 
     <repositories>

From 57a97c3189c4b66f7ae8870a11e9220a3e92e8b1 Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Thu, 23 Aug 2018 14:21:28 -0400
Subject: [PATCH 2/2] NIFI-5479: - Using the SUN provider when the keystore
 type is JKS.

---
 .../java/org/apache/nifi/security/util/KeyStoreUtils.java    | 4 ++++
 .../java/org/apache/nifi/web/server/JettyServerTest.java     | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeyStoreUtils.java b/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeyStoreUtils.java
index 50ed8c32d947..6b52009792bc 100644
--- a/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeyStoreUtils.java
+++ b/nifi-commons/nifi-security-utils/src/main/java/org/apache/nifi/security/util/KeyStoreUtils.java
@@ -29,6 +29,8 @@
 public class KeyStoreUtils {
     private static final Logger logger = LoggerFactory.getLogger(KeyStoreUtils.class);
 
+    public static final String SUN_PROVIDER_NAME = "SUN";
+
     static {
         Security.addProvider(new BouncyCastleProvider());
     }
@@ -42,6 +44,8 @@ public class KeyStoreUtils {
     public static String getKeyStoreProvider(String keyStoreType) {
         if (KeystoreType.PKCS12.toString().equalsIgnoreCase(keyStoreType)) {
             return BouncyCastleProvider.PROVIDER_NAME;
+        } else if (KeystoreType.JKS.toString().equalsIgnoreCase(keyStoreType)) {
+            return SUN_PROVIDER_NAME;
         }
         return null;
     }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/test/java/org/apache/nifi/web/server/JettyServerTest.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/test/java/org/apache/nifi/web/server/JettyServerTest.java
index 618b2d7f6841..d0b839686e82 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/test/java/org/apache/nifi/web/server/JettyServerTest.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/test/java/org/apache/nifi/web/server/JettyServerTest.java
@@ -37,6 +37,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.apache.nifi.security.util.KeyStoreUtils.SUN_PROVIDER_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -107,7 +108,7 @@ public void testConfigureSslContextFactoryWithJksKeyStore() {
         JettyServer.configureSslContextFactory(contextFactory, nifiProperties);
 
         verify(contextFactory).setKeyStoreType(keyStoreType);
-        verify(contextFactory, never()).setKeyStoreProvider(anyString());
+        verify(contextFactory).setKeyStoreProvider(SUN_PROVIDER_NAME);
     }
 
     @Test
@@ -137,7 +138,7 @@ public void testConfigureSslContextFactoryWithJksTrustStore() {
         JettyServer.configureSslContextFactory(contextFactory, nifiProperties);
 
         verify(contextFactory).setTrustStoreType(trustStoreType);
-        verify(contextFactory, never()).setTrustStoreProvider(anyString());
+        verify(contextFactory).setTrustStoreProvider(SUN_PROVIDER_NAME);
     }
 
     @Test