onesnooper-server 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddde539b87f2e399138adb90fb527f961c7f93e6
-  data.tar.gz: 56056665bb72f2947b9c8bead3d03a897fed3a68
+  metadata.gz: f37b299a996de04590e37698e8653e38524621da
+  data.tar.gz: 2111589b7f09581c5f91f3873d0ca561f2553ebc
 SHA512:
-  metadata.gz: 9f9454da3a5245bd293ca38dfe284716b36de2640e98c276ddcafb6ef18945d7731c93a6ca08a2181fad4049dfc5ffcc1e8020d3ca3fcbc5d20a118597d27f06
-  data.tar.gz: 76d09bd95c7dcedfa7abd081ba560f66974eaea1f2ee5a73aecf9804a34559da02fe0746c38e2c5fc6b2286fa403e510108b08eb94b1c3c9872297eced542529
+  metadata.gz: 2dd3a98270426888068976d57e84fe6bbc40c0936bb48bac922ba1cd87414dc4d7ab3be36df85a0695228b52dd4d7f33fec0b369876e59a4db0380ef60a5181e
+  data.tar.gz: 6e5add9f0fad2db2030bebf00fbc672c2632e437f6222bf20654906762738fb9d2d833a212fc59bba52e4d6be985a3e94cfe407646368d28a7dc395da325dd0f

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true
+
+branches:
+  only:
+    - master

data/lib/onesnooper-server.rb

@@ -5,6 +5,7 @@ module OnesnooperServer; end
 # internal ruby dependencies
 require 'date'
 require 'ipaddr'
+require 'resolv'
 require 'base64'
 
 # active support stuff

data/lib/onesnooper_server/request_handler.rb

@@ -32,7 +32,7 @@ class OnesnooperServer::RequestHandler
   # @param source_port [String] port number of the client
   def self.parse(monitoring_datagram, source_ip, source_port)
     unless valid_data?(monitoring_datagram)
-      ::OnesnooperServer::Log.fatal "[#{self.name}] Dropping invalid monitoring data #{monitoring_datagram.inspect}"
+      ::OnesnooperServer::Log.error "[#{self.name}] Dropping invalid monitoring data #{monitoring_datagram.inspect}"
       return DATAGRAMS.default.new
     end
 
@@ -68,7 +68,21 @@ private
   # @param source_ip [String] IP address to match
   # @return [Boolean] result
   def self.valid_peer?(source_ip)
-    ::OnesnooperServer::Settings.allowed_sources.include? source_ip
+    begin
+      source_ip = ::IPAddr.new(::Resolv.getaddress(source_ip))
+      ::OnesnooperServer::Log.debug "[#{self.name}] Resolved source IP" \
+                                    " address to #{source_ip.inspect}"
+    rescue => ex
+      ::OnesnooperServer::Log.error "[#{self.name}] Invalid source IP" \
+                                    " address #{source_ip.inspect}, dropping"
+      return false
+    end
+
+    ::OnesnooperServer::Settings.allowed_sources.each do |allowed_source|
+      return true if ::IPAddr.new(allowed_source).include?(source_ip)
+    end
+
+    false
   end
 
   # Retrieves a list of instances for allowed store backends.

data/lib/onesnooper_server/settings.rb

@@ -8,5 +8,5 @@ class OnesnooperServer::Settings < ::Settingslogic
   source "/etc/onesnooper-server/onesnooper-server.yml" if File.readable?("/etc/onesnooper-server/onesnooper-server.yml")
   source "#{gem_root}/config/onesnooper-server.yml"
 
-  namespace ENV['RAILS_ENV'] ? ENV['RAILS_ENV'] : 'production'
+  namespace ENV['RAILS_ENV'].blank? ? 'production' : ENV['RAILS_ENV']
 end

data/lib/onesnooper_server/version.rb

@@ -1,4 +1,4 @@
 module OnesnooperServer
   # Static version information
-  VERSION = "0.0.1" unless defined?(::OnesnooperServer::VERSION)
+  VERSION = "0.0.2" unless defined?(::OnesnooperServer::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onesnooper-server
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md