From 6c6dc9301e6289577aac9f219826a0c30a5ea582 Mon Sep 17 00:00:00 2001 From: Andre F de Miranda Date: Sun, 18 Oct 2015 21:53:39 +1100 Subject: [PATCH 1/2] Adds restlistener.remote.source.ip attribute (representing the source IP of the original http request to dataflow Closes NIFI-1042 --- .../nifi/processors/standard/servlets/ListenHTTPServlet.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java index 6a8f32fc5cc3..1ec228ae0c88 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java @@ -266,6 +266,7 @@ public void process(final OutputStream rawOut) throws IOException { flowFile = session.putAllAttributes(flowFile, attributes); session.getProvenanceReporter().receive(flowFile, request.getRequestURL().toString(), sourceSystemFlowFileIdentifier, "Remote DN=" + foundSubject, transferMillis); + flowFile = session.putAttribute(flowFile, "restlistener.remote.source.ip", request.getRemoteHost() ); flowFile = session.putAttribute(flowFile, "restlistener.remote.user.dn", foundSubject); flowFileSet.add(flowFile); From b68c86a4cd34498ab7dd01a2d8c47ace4db7e645 Mon Sep 17 00:00:00 2001 From: Andre F de Miranda Date: Sun, 18 Oct 2015 22:18:46 +1100 Subject: [PATCH 2/2] Rename attribute as RemoteHost may contain hostnames --- .../nifi/processors/standard/servlets/ListenHTTPServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java index 1ec228ae0c88..8b3cc00bac92 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java @@ -266,7 +266,7 @@ public void process(final OutputStream rawOut) throws IOException { flowFile = session.putAllAttributes(flowFile, attributes); session.getProvenanceReporter().receive(flowFile, request.getRequestURL().toString(), sourceSystemFlowFileIdentifier, "Remote DN=" + foundSubject, transferMillis); - flowFile = session.putAttribute(flowFile, "restlistener.remote.source.ip", request.getRemoteHost() ); + flowFile = session.putAttribute(flowFile, "restlistener.remote.source.host", request.getRemoteHost() ); flowFile = session.putAttribute(flowFile, "restlistener.remote.user.dn", foundSubject); flowFileSet.add(flowFile);