[7.12] Fix typo in validation for destination port of community ID pr…

…ocessor (#70883) (#71530)
elastic · Apr 12, 2021 · ad55975 · ad55975
1 parent 5b60678
commit ad55975
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/x-pack/plugin/ingest/src/main/java/org/elasticsearch/xpack/ingest/CommunityIdProcessor.java b/x-pack/plugin/ingest/src/main/java/org/elasticsearch/xpack/ingest/CommunityIdProcessor.java
@@ -177,7 +177,7 @@ private Flow buildFlow(IngestDocument d) {
 
                 Object destinationPortValue = d.getFieldValue(destinationPortField, Object.class, ignoreMissing);
                 flow.destinationPort = parseIntFromObjectOrString(destinationPortValue, "destination port");
-                if (flow.destinationPort < 1 || flow.sourcePort > 65535) {
+                if (flow.destinationPort < 1 || flow.destinationPort > 65535) {
                     throw new IllegalArgumentException("invalid destination port [" + destinationPortValue + "]");
                 }
                 break;

diff --git a/...plugin/ingest/src/test/java/org/elasticsearch/xpack/ingest/CommunityIdProcessorTests.java b/...plugin/ingest/src/test/java/org/elasticsearch/xpack/ingest/CommunityIdProcessorTests.java
@@ -299,6 +299,20 @@ public void testInvalidPort() throws Exception {
         source2.put("port", 65536);
         e = expectThrows(IllegalArgumentException.class, () -> testCommunityIdProcessor(event, null));
         assertThat(e.getMessage(), containsString("invalid source port [65536]"));
+
+        event = buildEvent();
+        @SuppressWarnings("unchecked")
+        Map<String, Object> source3 = (Map<String, Object>) event.get("destination");
+        source3.put("port", 0);
+        e = expectThrows(IllegalArgumentException.class, () -> testCommunityIdProcessor(event, null));
+        assertThat(e.getMessage(), containsString("invalid destination port [0]"));
+
+        event = buildEvent();
+        @SuppressWarnings("unchecked")
+        Map<String, Object> source4 = (Map<String, Object>) event.get("destination");
+        source4.put("port", 65536);
+        e = expectThrows(IllegalArgumentException.class, () -> testCommunityIdProcessor(event, null));
+        assertThat(e.getMessage(), containsString("invalid destination port [65536]"));
     }
 
     public void testIgnoreMissing() throws Exception {