From commits-return-3654-archive-asf-public=cust-asf.ponee.io@metron.apache.org Fri Aug 31 21:20:09 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4973618077F for ; Fri, 31 Aug 2018 21:20:08 +0200 (CEST) Received: (qmail 51648 invoked by uid 500); 31 Aug 2018 19:19:59 -0000 Mailing-List: contact commits-help@metron.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@metron.apache.org Delivered-To: mailing list commits@metron.apache.org Received: (qmail 51041 invoked by uid 99); 31 Aug 2018 19:19:58 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Aug 2018 19:19:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AEFB0E11C3; Fri, 31 Aug 2018 19:19:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nickallen@apache.org To: commits@metron.apache.org Date: Fri, 31 Aug 2018 19:20:30 -0000 Message-Id: <43d50fca0db14209bb373f87837c5b06@git.apache.org> In-Reply-To: <5c0bd5a5ccb04b2d9c067031d7b43fe7@git.apache.org> References: <5c0bd5a5ccb04b2d9c067031d7b43fe7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] [abbrv] metron git commit: METRON-1734 Src and Dst port filters are incorrect after changing to empty (merrimanr) closes apache/metron#1159 METRON-1734 Src and Dst port filters are incorrect after changing to empty (merrimanr) closes apache/metron#1159 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/ba0a6092 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/ba0a6092 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/ba0a6092 Branch: refs/remotes/apache/feature/METRON-1699-create-batch-profiler Commit: ba0a6092c97d23c118c2b5780c2559c2f849a220 Parents: 7a8c246 Author: merrimanr Authored: Mon Aug 13 15:42:29 2018 -0500 Committer: rmerriman Committed: Mon Aug 13 15:42:29 2018 -0500 ---------------------------------------------------------------------- .../pcap/pcap-filters/pcap-filters.component.spec.ts | 13 +++++++++++++ .../app/pcap/pcap-filters/pcap-filters.component.ts | 4 ++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/ba0a6092/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.spec.ts ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.spec.ts b/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.spec.ts index c1d8664..3f1ab07 100644 --- a/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.spec.ts +++ b/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.spec.ts @@ -179,6 +179,19 @@ describe('PcapFiltersComponent', () => { component.onSubmit(); }); + it('Port fields should be removed from request when set to empty', () => { + component.model.ipSrcPort = 44; + component.model.ipDstPort = 44; + component.ipSrcPort = ''; + component.ipDstPort = ''; + + component.search.emit = (model: PcapRequest) => { + expect(model.ipSrcPort).toBeFalsy(); + expect(model.ipDstPort).toBeFalsy(); + }; + component.onSubmit(); + }); + it('Filter should have an output called search', () => { component.search.subscribe((filterModel) => { expect(filterModel).toBeDefined(); http://git-wip-us.apache.org/repos/asf/metron/blob/ba0a6092/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.ts ---------------------------------------------------------------------- diff --git a/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.ts b/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.ts index 20a8c2b..df91ae3 100644 --- a/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.ts +++ b/metron-interface/metron-alerts/src/app/pcap/pcap-filters/pcap-filters.component.ts @@ -63,9 +63,13 @@ export class PcapFiltersComponent implements OnInit, OnChanges { this.model.endTimeMs = new Date(this.endTimeStr).getTime(); if (this.ipSrcPort !== '') { this.model.ipSrcPort = +this.ipSrcPort; + } else { + delete this.model.ipSrcPort; } if (this.ipDstPort !== '') { this.model.ipDstPort = +this.ipDstPort; + } else { + delete this.model.ipDstPort; } this.search.emit(this.model);