You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2017/12/14 15:35:07 UTC

nifi-registry git commit: NIFIREG-71 Making JettyServer set wantClientAuth to true when needClientAuth is false

Repository: nifi-registry
Updated Branches:
  refs/heads/master a8786a807 -> 9d221e3a3


NIFIREG-71 Making JettyServer set wantClientAuth to true when needClientAuth is false

This closes #56.

Signed-off-by: Bryan Bende <bb...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/9d221e3a
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/9d221e3a
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/9d221e3a

Branch: refs/heads/master
Commit: 9d221e3a3fcd7ea1477a47ba38c39618c519cd34
Parents: a8786a8
Author: Bryan Bende <bb...@apache.org>
Authored: Wed Dec 13 15:02:30 2017 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Thu Dec 14 10:34:54 2017 -0500

----------------------------------------------------------------------
 .../org/apache/nifi/registry/jetty/JettyServer.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/9d221e3a/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
----------------------------------------------------------------------
diff --git a/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java b/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
index db3129b..459a61b 100644
--- a/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
+++ b/nifi-registry-jetty/src/main/java/org/apache/nifi/registry/jetty/JettyServer.java
@@ -160,10 +160,14 @@ public class JettyServer {
     private SslContextFactory createSslContextFactory() {
         final SslContextFactory contextFactory = new SslContextFactory();
 
-        logger.error("" + properties.getNeedClientAuth());
-
-        // need client auth
-        contextFactory.setNeedClientAuth(properties.getNeedClientAuth());
+        // if needClientAuth is false then set want to true so we can optionally use certs
+        if (properties.getNeedClientAuth()) {
+            logger.info("Setting Jetty's SSLContextFactory needClientAuth to true");
+            contextFactory.setNeedClientAuth(true);
+        } else {
+            logger.info("Setting Jetty's SSLContextFactory wantClientAuth to true");
+            contextFactory.setWantClientAuth(true);
+        }
 
         /* below code sets JSSE system properties when values are provided */
         // keystore properties