netgrep 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b110d00b007da2535965b5360e646b914934455
-  data.tar.gz: ad737d4e32ac546034c677911bea3047dcc8527f
+  metadata.gz: 7598247777cb8eb177816550f6c0f45a5e91b1b3
+  data.tar.gz: d765b270e0544047276980b4eba7c8e4adaad331
 SHA512:
-  metadata.gz: 99da0017ff6d5c89235efb601acbef38ef3b2917ad58b73a30fb5dbb06d198d7487adaca0a6b1d57de0a9c72323681adea1eaf2739bfba0ce2fee77972ed4e8e
-  data.tar.gz: 9ef146ae6225c52a04d91eb7e48a41f8ae69133138d74164d0738f3b0d317e7842e651396a99d8d29cf23698a9c751132cf7a5cebeb81a627692b7570695baee
+  metadata.gz: 8a5aae3ccd8ccefa5039714cf19875202c21e29973442d6f19ebbd5fba3cb7bd77bc19f322a86d88c6174eea141f25feb1adbfd84eb5367f8930cb4bc24e0436
+  data.tar.gz: 9da055d3c4866676e1fb6436e7f26703fb7788a977e0bea3d327789b2e6313136cc51cd8cc947276d1178bddbc9f311d39771d519c8102e476556f35c2422682

data/exe/netgrep

@@ -11,11 +11,12 @@ begin
   runner = Netgrep::Runner.new(
       log_file: opts.log_file,
       netblocks_file: opts.netblocks_file,
-      num_workers: opts.num_workers
+      num_workers: opts.num_workers,
+      ignore_ipv6: opts.ignore_ipv6
   )
   runner.run
 rescue Errno::ENOENT => err
   abort "netgrep: #{err.message}"
 rescue OptionParser::InvalidOption, OptionParser::InvalidArgument
-  abort "usage: netgrep [-w NUM_WORKERS] -f [NETBLOCKS_FILE] [LOG_FILE]"
+  abort "usage: netgrep [-w NUM_WORKERS] -f [NETBLOCKS_FILE] [--ignore-ipv6] [LOG_FILE]"
 end

data/lib/netgrep/ip.rb

@@ -46,6 +46,16 @@ module Netgrep
   end
 
   module Ip
-    REGEX = /\b(#{Netgrep::Ipv4::REGEX} | #{Netgrep::Ipv6::REGEX})\b/xi
+    IPV4_REGEX = /\b(#{Netgrep::Ipv4::REGEX})\b/xi
+    IPV6_REGEX = /\b(#{Netgrep::Ipv6::REGEX})\b/xi
+    REGEX = /\b(#{Netgrep::Ipv4::REGEX}|#{Netgrep::Ipv6::REGEX})\b/xi
+
+    def self.regex(ignore_ipv6)
+      if ignore_ipv6
+        IPV4_REGEX
+      else
+        REGEX
+      end
+    end
   end
 end

data/lib/netgrep/netblocks.rb

@@ -6,6 +6,7 @@ module Netgrep
 
     def initialize(file: nil, netblocks: [])
       @netblocks = file ? File.readlines(file) : netblocks
+      @has_ipv6 = false
     end
 
     def include?(ip)
@@ -13,6 +14,10 @@ module Netgrep
       ipv6_addresses.any? { |ipv6| ipv6.include?(ip) }
     end
 
+    def has_ipv6?
+      ipv6_addresses && @has_ipv6
+    end
+
     private
 
     def ipv4_addresses
@@ -32,7 +37,10 @@ module Netgrep
       @ipv6_addresses ||= begin
         @netblocks.each_with_object([]) do |netblock, ips|
           ip_addr = init_ip(netblock)
-          ips.push(ip_addr) if ip_addr.ipv6?
+          if ip_addr.ipv6?
+            ips.push(ip_addr)
+            @has_ipv6 = true
+          end
         end
       end
     end

data/lib/netgrep/options.rb

@@ -6,12 +6,17 @@ module Netgrep
       options.netblocks_file = nil
       options.log_file = nil
       options.num_workers = 1
+      options.ignore_ipv6 = false
 
       parser = OptionParser.new do |opts|
         opts.on("-f NETBLOCKS_FILE", String, "File containing one IP or CIDR per line") do |file_name|
           options.netblocks_file = File.absolute_path(file_name)
         end
 
+        opts.on("--ignore-ipv6", "Don't try to match IPV6 Addresses") do
+          options.ignore_ipv6 = true
+        end
+
         opts.on("-w NUM_WORKERS", Integer, "Number of worker processes to use") do |n|
           options.num_workers = Integer(n)
           raise(OptionParser::InvalidArgument) if options.num_workers < 1

data/lib/netgrep/runner.rb

@@ -5,10 +5,11 @@ module Netgrep
   class Runner
     attr_accessor :matches
 
-    def initialize(log_file:, netblocks_file:, num_workers: 1)
+    def initialize(log_file:, netblocks_file:, num_workers: 1, ignore_ipv6: false)
       @log_file = log_file
       @netblocks_file = netblocks_file
       @num_workers = num_workers
+      @ignore_ipv6 = ignore_ipv6?(ignore_ipv6)
       @matches = []
       @worker_pids = []
       @pipe_reader, @pipe_writer = IO.pipe
@@ -41,6 +42,11 @@ module Netgrep
       @pipe_writer.close
     end
 
+    def ignore_ipv6?(ignore_ipv6)
+      return true if ignore_ipv6
+      netblocks.has_ipv6? ? false : true
+    end
+
     def calc_line_ranges(num_lines, num_ranges)
       ranges = []
       range_length = num_lines / num_ranges
@@ -54,11 +60,10 @@ module Netgrep
     end
 
     def select_data_in_range(fd, first_lineno, last_lineno)
-      lineno = first_lineno
       data = []
-      while lineno <= last_lineno
+      while first_lineno <= last_lineno
         data.push(fd.gets)
-        lineno += 1
+        first_lineno += 1
       end
       data
     end
@@ -85,8 +90,10 @@ module Netgrep
     end
 
     def start_worker(writer, netblocks, data)
+      regex = Netgrep::Ip.regex(@ignore_ipv6)
+
       data.each do |line|
-        line.scan(Netgrep::Ip::REGEX).each do |md|
+        line.scan(regex).each do |md|
           ip = md[0]
           if netblocks.include?(ip)
             writer.write(line)

data/lib/netgrep/version.rb

@@ -1,3 +1,3 @@
 module Netgrep
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netgrep
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Steven Hansen