logstash-filter-cidr 3.1.2-java → 3.1.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4204d30726e8c53f727afa65dcd9ef920a51972fdcec978859b71ed7cedfbf
-  data.tar.gz: 6ffc644e74c4d045d0f853f159993db7c493d404b3bf7c925906de086e746184
+  metadata.gz: 3af9ea6ead9d2e16e392a8d5288a738884b83668d5536250172d69e87ee1d6a0
+  data.tar.gz: 41f7dca503104b5d7a3d9fae086b31c721de0f5d350c81e54435d34760a1052d
 SHA512:
-  metadata.gz: ad1e973711f313c554ef4adf8d4395bb4b70af60151c5198d59e15d52fc0c32df2f579536d08469bc858ff4799b6e0930fe15339ec7d30ba6a6ad15784aeb646
-  data.tar.gz: ad159d13977302043626352ee483b37ab62da944291df3f6451dcc1d40cc16369a9e5ec1246cd689f3591e9b45b200a8c6f0c27524b2ca1a7b5f26576b95f6b0
+  metadata.gz: 12c49c20c3a36734536d74191d69540d667d4d8a6c7dae93d35563d099be10d4865af4b6271f020ae95111331e01458104a61d8e1ab7acf77fd6bbf91c7ccf5c
+  data.tar.gz: 6d4a84645515f0b7964a0f3563898a65cfcd1ec86a4f9584cd97f3a481a38103464d94a76ed21ce7b815a98568c3be3e21f8572745f71f06253a42fb41a12947

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.3
+  - Support string arrays in network setting
+
 ## 3.1.2
   - Update gemspec summary
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012-2018 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/lib/logstash/filters/cidr.rb

@@ -125,7 +125,7 @@ class LogStash::Filters::CIDR < LogStash::Filters::Base
       begin
         IPAddr.new(event.sprintf(a))
       rescue ArgumentError => e
-        @logger.warn("Invalid IP address, skipping", :address => a, :event => event)
+        @logger.warn("Invalid IP address, skipping", :address => a, :event => event.to_hash)
         nil
       end
     end
@@ -147,18 +147,18 @@ class LogStash::Filters::CIDR < LogStash::Filters::Base
             IPAddr.new(n)
           end
         rescue ArgumentError => e
-          @logger.warn("Invalid IP network, skipping", :network => n, :event => event)
+          @logger.warn("Invalid IP network, skipping", :network => n, :event => event.to_hash)
           nil
         end
       end
 
     else #networks come from array in config file
 
-      network = @network.collect do |n|
+      network = @network.map {|nw| event.sprintf(nw) }.map {|nw| nw.split(",") }.flatten.collect do |n|
         begin
-          IPAddr.new(event.sprintf(n))
+          IPAddr.new(n.strip)
         rescue ArgumentError => e
-          @logger.warn("Invalid IP network, skipping", :network => n, :event => event)
+          @logger.warn("Invalid IP network, skipping", :network => n, :event => event.to_hash)
           nil
         end
       end

data/logstash-filter-cidr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-cidr'
-  s.version         = '3.1.2'
+  s.version         = '3.1.3'
   s.platform        = 'java'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Checks IP addresses against a list of network blocks"

data/spec/filters/cidr_spec.rb

@@ -70,6 +70,37 @@ describe LogStash::Filters::CIDR do
     end
 
   end
+  describe "IPV4 match, passing a string with a list to network" do
+   config <<-CONFIG
+       filter {
+        cidr {
+          address => [ "%{clientip}"]
+          network => [ "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"]
+          add_tag => [ "matched" ]
+        }
+      }
+    CONFIG
+
+    sample("clientip" => "192.168.0.30") do
+      insist { subject.get("tags") }.include?("matched")
+    end
+
+    context "when network list comes in a field reference" do
+      config <<-CONFIG
+          filter {
+           cidr {
+             address => [ "%{clientip}"]
+             network => [ "%{whitelist}"]
+             add_tag => [ "matched" ]
+           }
+         }
+      CONFIG
+      sample("whitelist" => [ "10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"], "clientip" => "192.168.0.30") do
+        insist { subject.get("tags") }.include?("matched")
+      end
+    end
+  end
+
 
   # IPV6
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-cidr
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2019-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Checks IP addresses against a list of network blocks