logstash-filter-accesswatch 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91290d2f1fbd7c8f4f52499b87d9aa9dda4f6e473904c1ab5e305742648d8e30
-  data.tar.gz: e6aad19608b4f00dc30abd124e0804073fe92798cabdc6676e49ba9c58c7025c
+  metadata.gz: cedc5dc69f6d2193285d7e153ef22ce7f3cb8c3aff03bbb5079f37c08d016b71
+  data.tar.gz: ee8a7a72f282a9de6ad1a141749f42c7fe9c25c80109e0c052440b08f89d0e32
 SHA512:
-  metadata.gz: 2c2c9e00fb7719212fa59c8a0e6944914156fc2db616c304350a591a0f7f0ef9f4d76d45161f4a07b88c4faedcec1a4eea3ef99047a1f382e2c833efd35b4681
-  data.tar.gz: 84e8bdb3ad11aa79423598f943ce7bded37a75ce75c87aa2509b7174cb2f81836d55d2b35410a85810723aeacccce4114af10ad22d32444903126cd12634d255
+  metadata.gz: f5f0d92cf045ff741810168fafd6753077e47d3ce5399a986fd46521625338b94ddc123109d7377df208beb0377e115de29008ce609307c31f0f6beebe73b8c2
+  data.tar.gz: 962d33aab0a947a1f6a1b08a9489f8d7324d17cd595d7c3b809c572210a989415d6c01c1e41596696c9233e69abad4d947aec43a505693abaa754bb7efcdb289

data/lib/logstash/filters/accesswatch.rb

@@ -39,8 +39,12 @@ class LogStash::Filters::Accesswatch < LogStash::Filters::Base
   # The destination field for reputation data
   config :reputation_destination, :validate => :string
 
+  # The destination field for identity data
+  config :identity_destination, :validate => :string
+
   @@address_keys = ["value", "hostname", "country_code", "flags"]
   @@robot_keys = ["id", "name", "url"]
+  @@identity_keys = ["type"]
 
   public
   def register
@@ -49,17 +53,13 @@ class LogStash::Filters::Accesswatch < LogStash::Filters::Base
     end
   end
 
-  def handle_response(response)
-    data = JSON.parse(response.body)
-    if response.code == 200
-      {:status => :success,
-       :data   => data}
-    else
-      @logger.error("Access Watch (#{data["code"]}): #{data["message"]}")
-      {:status  => :error,
-       :code    => data["code"],
-       :message => data["message"]}
+  def submit(&block)
+    http_response = block.call
+    data = JSON.parse(http_response.body)
+    if http_response.code != 200
+      raise "Access Watch (#{data["code"]}): #{data["message"]}"
     end
+    data
   end
 
   def url(path)
@@ -67,21 +67,23 @@ class LogStash::Filters::Accesswatch < LogStash::Filters::Base
   end
 
   def get_json(path)
-    response = self.client.get(self.url(path),
-                               headers: {"Api-Key"    => @api_key,
-                                         "Accept"     => "application/json",
-                                         "User-Agent" => "Access Watch Logstash Plugin/0.2.0"})
-    self.handle_response(response)
+    self.submit {
+      self.client.get(self.url(path),
+                      headers: {"Api-Key"    => @api_key,
+                                "Accept"     => "application/json",
+                                "User-Agent" => "Access Watch Logstash Plugin/0.2.0"})
+    }
   end
 
   def post_json(path, data)
-    response = self.client.post(self.url(path),
-                                headers: {"Api-Key"      => @api_key,
-                                          "Accept"       => "application/json",
-                                          "Content-Type" => "application/json",
-                                          "User-Agent"   => "Access Watch Logstash Plugin/0.2.0"},
-                                body: JSON.generate(data))
-    self.handle_response(response)
+    self.submit {
+      self.client.post(self.url(path),
+                       headers: {"Api-Key"      => @api_key,
+                                 "Accept"       => "application/json",
+                                 "Content-Type" => "application/json",
+                                 "User-Agent"   => "Access Watch Logstash Plugin/0.2.0"},
+                       body: JSON.generate(data))
+    }
   end
 
   def with_cache(id, &block)
@@ -123,26 +125,24 @@ class LogStash::Filters::Accesswatch < LogStash::Filters::Base
 
   public
   def filter(event)
-    ip = event.get(@ip_source)
-    user_agent = event.get(@user_agent_source)
-    if @ip_source and @user_agent_source
-      response = self.fetch_identity(ip, user_agent)
-      if response[:status] == :success
-        data = response[:data]
+    begin
+      ip = event.get(@ip_source)
+      user_agent = event.get(@user_agent_source)
+      if @ip_source and @user_agent_source
+        data = self.fetch_identity(ip, user_agent)
         self.augment(event, @address_destination, data["address"], @@address_keys)
         self.augment(event, @robot_destination, data["robot"], @@robot_keys)
         self.augment(event, @reputation_destination, data["reputation"])
+        self.augment(event, @identity_destination, data, @@identity_keys)
+      elsif @ip_source
+        data = self.fetch_address(ip)
+        self.augment(event, @address_destination, data, @@address_keys)
+      else
+        data = self.fetch_user_agent(user_agent)
+        self.augment(event, @user_agent_destination, data)
       end
-    elsif @ip_source
-      response = self.fetch_address(ip)
-      if response[:status] == :success
-        self.augment(event, @address_destination, response[:data], @@address_keys)
-      end
-    else
-      response = self.fetch_user_agent(user_agent)
-      if response[:status] == :success
-        self.augment(event, @user_agent_destination, response[:data])
-      end
+    rescue => e
+      @logger.error("Error augmenting the data.", error: e)
     end
     filter_matched(event)
   end

data/logstash-filter-accesswatch.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |s|
   s.name          = 'logstash-filter-accesswatch'
-  s.version       = '0.2.2'
+  s.version       = '0.2.3'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'The Logstash filter plugin for Access Watch (http://access.watch).'
   s.description   = 'The Access Watch filter adds information about robots visiting your website based on data from our robot database.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-accesswatch
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Benoît Fleury
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement