You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2023/07/21 22:22:25 UTC
[nifi] 01/02: NIFI-11807 Reverted inadvertent changes to HandleHttpRequest
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 8d5a6ce8d2d53b1d3e26cf0745eca1ec237f7d84
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Jul 21 17:21:08 2023 -0500
NIFI-11807 Reverted inadvertent changes to HandleHttpRequest
Signed-off-by: David Handermann <ex...@apache.org>
---
.../processors/standard/HandleHttpRequest.java | 35 ----------------------
1 file changed, 35 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
index e3dda03afe..39e598f880 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
@@ -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);