Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-5747 fix NPE when redirecting from HTTPS to HTTP for InvokeHTTP 

Signed-off-by: Koji Kawamura <ijokarumawak@apache.org>
This commit is contained in:
juliansniff 2018-10-24 19:47:40 -04:00 committed by Koji Kawamura
parent 234ddb0fe1
commit fdbcf34281
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
View File

@ -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;