Repository: nifi Updated Branches: refs/heads/master 234ddb0fe -> fdbcf3428
NIFI-5747 fix NPE when redirecting from HTTPS to HTTP for InvokeHTTP Signed-off-by: Koji Kawamura <ijokaruma...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fdbcf342 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fdbcf342 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fdbcf342 Branch: refs/heads/master Commit: fdbcf34281bf6ee71f4f5ba6b9445254bc874752 Parents: 234ddb0 Author: juliansniff <julian.snif...@gmail.com> Authored: Wed Oct 24 19:47:40 2018 -0400 Committer: Koji Kawamura <ijokaruma...@apache.org> Committed: Fri Oct 26 17:08:17 2018 +0900 ---------------------------------------------------------------------- .../org/apache/nifi/processors/standard/InvokeHTTP.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/fdbcf342/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java index 7d04698..8926ba2 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java @@ -21,6 +21,7 @@ import com.burgstaller.okhttp.CachingAuthenticatorDecorator; import com.burgstaller.okhttp.digest.CachingAuthenticator; import com.burgstaller.okhttp.digest.DigestAuthenticator; import com.google.common.io.Files; +import java.security.Principal; import okhttp3.Cache; import okhttp3.Credentials; import okhttp3.MediaType; @@ -132,7 +133,6 @@ import static org.apache.commons.lang3.StringUtils.trimToEmpty; description = "Send request header with a key matching the Dynamic Property Key and a value created by evaluating " + "the Attribute Expression Language set in the value of the Dynamic Property.") public final class InvokeHTTP extends AbstractProcessor { - // flowfile attribute keys returned after reading the response public final static String STATUS_CODE = "invokehttp.status.code"; public final static String STATUS_MESSAGE = "invokehttp.status.message"; @@ -1182,8 +1182,12 @@ public final class InvokeHTTP extends AbstractProcessor { map.put(key, value); }); - if ("HTTPS".equals(url.getProtocol().toUpperCase())) { - map.put(REMOTE_DN, responseHttp.handshake().peerPrincipal().getName()); + if (responseHttp.request().isHttps()) { + Principal principal = responseHttp.handshake().peerPrincipal(); + + if (principal != null) { + map.put(REMOTE_DN, principal.getName()); + } } return map;
