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

NIFI-11807 Reverted inadvertent changes to HandleHttpRequest 

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
exceptionfactory 2023-07-21 17:21:08 -05:00
parent 902f4145fd
commit 8d5a6ce8d2
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,11 +69,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URLDecoder;
import java.security.Principal;
import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@ -772,38 +769,6 @@ public class HandleHttpRequest extends AbstractProcessor {
return session.putAllAttributes(flowFile, attributes);
}
private void putCertificateAttributes(final X509Certificate certificate, final Map<String, String> attributes) {
putAttribute(attributes, "http.subject.dn", certificate.getSubjectX500Principal().getName());
putAttribute(attributes, "http.issuer.dn", certificate.getIssuerX500Principal().getName());
try {
final Collection<List<?>> subjectAlternativeNames = certificate.getSubjectAlternativeNames();
if (subjectAlternativeNames != null) {
int subjectAlternativeNameIndex = 0;
for (final List<?> subjectAlternativeTypeName : subjectAlternativeNames) {
final String nameTypeAttributeKey = String.format("http.client.certificate.sans.%d.nameType", subjectAlternativeNameIndex);
final String nameType = subjectAlternativeTypeName.get(0).toString();
putAttribute(attributes, nameTypeAttributeKey, nameType);
final String nameAttributeKey = String.format("http.client.certificate.sans.%d.name", subjectAlternativeNameIndex);
final Object name = subjectAlternativeTypeName.get(1);
final String serializedName;
if (name instanceof byte[]) {
final byte[] encodedName = (byte[]) name;
serializedName = Base64.getEncoder().encodeToString(encodedName);
} else {
serializedName = name.toString();
}
putAttribute(attributes, nameTypeAttributeKey, serializedName);
}
}
} catch (final CertificateParsingException e) {
getLogger().info("Read X.509 Client Certificate Subject Alternative Names failed", e);
}
}
private void forwardFlowFile(final ProcessSession session, final long start, final HttpServletRequest request, final FlowFile flowFile) {
final long receiveMillis = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
final String subjectDn = flowFile.getAttribute(HTTPUtils.HTTP_SSL_CERT);