irrc 0.1.0 → 0.2.0

data/lib/irrc/logging.rb

@@ -9,5 +9,11 @@ module Irrc
     def logger
       @logger ||= Logger.new(STDERR).tap {|l| l.level = Logger::WARN }
     end
+
+    class Logger < ::Logger
+      def add(severity, message = nil, progname = nil, &block)
+        super(severity, message, "(#{Thread.current[:id]}) #{progname}")
+      end
+    end
   end
 end

data/lib/irrc/parameter.rb

@@ -1,11 +1,10 @@
 module Irrc
   module Parameter
-
     # Public: Create a new IRRd / Whoisd client worker.
     #         You can customize the logger by specifying a block.
     #         The default logger is STDERR printer of more severe messages than INFO.
     #
-    # host   - FQDN of IRR / Whois. IRR / Whois name is also accespted.
+    # fqdn   - FQDN of IRR / Whois.
     # queue  - Queue object having query jobs.
     #          IRR / Whois name is also accespted.
     # block  - An optional block that can be used to customize the logger.
@@ -15,18 +14,19 @@ module Irrc
     #   Irrc::Irrd::Client.new('jpirr.nic.ad.jp', queue) {|c|
     #     c.logger = Logger.new('irrc.log')
     #   }
-    def initialize(host, queue, &block)
-      self.host = host
+    def initialize(fqdn, queue, cache, &block)
+      self.fqdn = fqdn
       self.queue = queue
+      @cache = cache
       instance_eval(&block) if block_given?
     end
 
 
     private
 
-    def host=(host)
-      raise ArgumentError, "Missing argument." unless host
-      @host = Irrc::Irr.host(host) || host
+    def fqdn=(fqdn)
+      raise ArgumentError, "Missing argument." unless fqdn
+      @fqdn = fqdn
     end
 
     def queue=(queue)

data/lib/irrc/prefix.rb

@@ -5,7 +5,7 @@ module Irrc
     private
 
     def classify_by_protocol(prefixes)
-      prefixes.each_with_object(Struct.new(:ipv4, :ipv6).new([], [])) {|prefix, result|
+      Array(prefixes).each_with_object(Struct.new(:ipv4, :ipv6).new([], [])) {|prefix, result|
         addr = IPAddr.new(prefix)
         if addr.ipv4?
           result.ipv4 << prefix

data/lib/irrc/query.rb

@@ -40,6 +40,8 @@ module Irrc
     #
     # autnums - aut-num object(s) in String. Array form is also acceptable for multiple objects.
     def add_aut_num_result(autnums)
+      result = root.result
+
       @protocols.each do |protocol|
         result[protocol] ||= {}
 
@@ -56,9 +58,11 @@ module Irrc
     # protocol - Which protocol the route object(s) is for. :ipv4 or :ipv6.
     #            A String or Symbol of protcol name is acceptable.
     def add_prefix_result(prefixes, autnum, protocol)
+      result = root.result
+
       result[protocol] ||= {}
       result[protocol][autnum] ||= []
-      result[protocol][autnum] |= Array(prefixes)
+      result[protocol][autnum].push *Array(prefixes)
     end
 
 

data/lib/irrc/query_status.rb

@@ -9,7 +9,7 @@ module Irrc
     end
 
     def failed?
-      @failed
+      @failed == true
     end
 
     def succeeded?

data/lib/irrc/runner.rb

@@ -1,37 +1,63 @@
 module Irrc
   module Runner
-    def run
+    def run(threads)
       done = []
 
       loop do
-        if queue.empty?
-          close
+        # NOTE: trick to avoid dead lock
+        if last_thread_of?(threads) && @queue.empty?
+          terminate
+          logger.debug "Queue #{threads - 1} guard objects"
+          (threads - 1).times { @queue.push nil }
+          return done
+        end
+
+        query = @queue.pop
+
+        # NOTE: trick to avoid dead lock
+        if query.nil?
+          terminate
           return done
         end
 
-        query = queue.pop
         connect unless established?
 
         begin
-          process query
+          logger.info "Processing #{query.object}"
+          query = process(query)
           query.success
+          logger.debug "Queue new #{query.children.size} queries"
+          query.children.each {|q| @queue << q }
         rescue
-          logger.error $!.message
+          logger.error "#{$!.message} when processing #{query.object} for #{query.root.object}"
           query.fail
         end
 
-        done << query
+        done << query if query.root?
       end
     end
 
 
     private
 
+    def cache(object, sources, &block)
+      @cache["#{object}:#{sources}"] ||= yield
+    end
+
     def execute(command)
       return if command.nil? || command == ''
 
-      logger.debug "Executing: #{command}"
-      connection.cmd(command).tap {|result| logger.debug "Returned: #{result}" }
+      logger.debug %(Executing "#{command}")
+      connection.cmd(command).tap {|result| logger.debug %(Got "#{result}") }
+    end
+
+    def last_thread_of?(threads)
+      Thread.list.reject(&:stop?).size == 1 && Thread.list.size == threads+1
+    end
+
+    def terminate
+      logger.info "No more queries"
+      close
     end
   end
 end

data/lib/irrc/subquery.rb

@@ -4,21 +4,64 @@ module Irrc
     #
     # object  - IRR / Whois object to extract. (eg: as-set, route-set, aut-num object)
     def fork(object)
-      Query.new(object, source: sources, protocol: protocols).tap {|q|
+      Query.new(object, source: @sources, protocol: @protocols).tap {|q|
         q.parent = self
-      }
+      }.tap {|c| self.add_child c }
     end
 
     # Public: Returns the parent (associated) Query object, which is probably as-set.
     def parent
-      @_parent
+      @parent
     end
 
     # Public: Set a parent (associated) Query object, which is probably as-set.
     #
     # parent - Parent Query object.
-    def parent=(parent)
-      @_parent = parent
+    def parent=(query)
+      @parent = query
+    end
+
+    # Public: Returns child Query objects
+    def children
+      @children ||= []
+    end
+
+    # Public: Add a child Query object
+    def add_child(query)
+      children << query
+    end
+
+    # Public: Delete a child Query object
+    def delete_child(query)
+      children.delete(query)
+    end
+
+    # Public: Returns the IRR object to query including those from ancestor query objects.
+    #
+    # Returns: Array of String.
+    def ancestor_objects
+      @_ancestor_objects ||= Array(parent && parent.ancestor_objects) << object
+    end
+
+    # Public: Returns the root IRR object of the nested query
+    #
+    # Returns: String.
+    def root
+      @_root ||= if parent
+                   parent.root
+                 else
+                   self
+                 end
+    end
+
+    # Public: Returns true if the query is root.
+    def root?
+      root == self
+    end
+
+    # Public: Returns true if object is listed in ancestor IRR objects.
+    def ancestor_object?(object)
+      ancestor_objects.include?(object)
     end
   end
 end

data/lib/irrc/version.rb

@@ -1,3 +1,3 @@
 module Irrc
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/irrc/whoisd/client.rb

@@ -20,68 +20,66 @@ module Irrc
       include Irrc::Runner
       include Irrc::Whoisd::Api
 
-      attr_reader :host, :queue
-
 
       private
 
       def process(query)
         case query.object_type
         when 'as-set'
-          query.add_aut_num_result objects_from_set(query, 'as-set')
-          resolve_prefixes_from_aut_nums query
+          expand_set query, 'as-set'
         when 'route-set'
-          resolve_prefixes_from_route_set query
+          expand_set query, 'route-set'
         when 'aut-num'
-          query.add_aut_num_result query.object
-          resolve_prefixes_from_aut_nums query
+          expand_aut_num query
         end
-      end
 
-      def objects_from_set(query, type)
-        command = expand_set_command(query.object, query.sources, type)
-        cache(query.object) {
-          result = execute(command)
-          parse_objects_from_set(result).map {|object|
-            expand_if_necessary(query.fork(object), type)
-          }.flatten.uniq.compact
-        }
-      rescue
-        raise "'#{command}' failed on '#{host}' (#{$!.message})."
+        query
       end
 
-      def expand_if_necessary(query, type)
-        if query.object_type == type
-          objects_from_set(query, type)
-        else
-          query.object
-        end
-      end
+      # Public: Expand an as-set or route-set object into any object.
+      def expand_set(query, type)
+        result = cache(query.object, query.sources) {
+          begin
+            command = expand_set_command(query.object, query.sources, type)
+            execute(command)
+          rescue
+            raise "'#{command}' failed on '#{@fqdn}' (#{$!.message})."
+          end
+        }
 
-      def resolve_prefixes_from_route_set(query)
-        prefixes = classify_by_protocol(objects_from_set(query, 'route-set'))
-        query.protocols.each do |protocol|
-          query.add_prefix_result prefixes[protocol], nil, protocol
-        end
-      end
+        parse_objects_from_set(result).each do |object|
+          next if query.ancestor_object?(object)
 
-      def resolve_prefixes_from_aut_nums(query)
-        unless query.protocols.empty?
-          # ipv4 and ipv6 should have the same result so far
-          (query.result[:ipv4] || query.result[:ipv6]).keys.each do |autnum|
-            command = expand_aut_num_command(autnum, query.sources)
-            result = execute(command)
+          child = query.fork(object)
 
+          case child.object_type
+          when 'aut-num'
+            query.add_aut_num_result object
+          when nil  # it looks prefix which is a member of route-set
+            prefix = classify_by_protocol(object)
             query.protocols.each do |protocol|
-              query.add_prefix_result parse_prefixes_from_aut_num(result, protocol), autnum, protocol
+              query.add_prefix_result prefix[protocol], nil, protocol
             end
           end
         end
       end
 
-      def cache(object, &block)
-        @_cache ||= {}
-        @_cache[object] ||= yield
+      # Public: Expand an aut-num object into routes
+      def expand_aut_num(query)
+        return if query.protocols.empty?
+
+        result = cache(query.object, query.sources) {
+          begin
+            command = expand_aut_num_command(query.object, query.sources)
+            execute(command)
+          rescue
+            raise "'#{command}' failed on '#{@fqdn}' (#{$!.message})."
+          end
+        }
+
+        query.protocols.each do |protocol|
+          query.add_prefix_result parse_prefixes_from_aut_num(result, protocol), query.object, protocol
+        end
       end
     end
   end

metadata

@@ -1,31 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: irrc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-telnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,12 +84,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/irrc
+- bin/console
+- bin/setup
+- exe/irrc
 - irrc.gemspec
 - lib/irrc.rb
-- lib/irrc/cli.rb
-- lib/irrc/cli/client.rb
-- lib/irrc/cli/yaml_printer.rb
 - lib/irrc/client.rb
 - lib/irrc/connecting.rb
 - lib/irrc/irr.rb
@@ -80,13 +107,6 @@ files:
 - lib/irrc/whoisd.rb
 - lib/irrc/whoisd/api.rb
 - lib/irrc/whoisd/client.rb
-- spec/features/irr_as_set_resolution_spec.rb
-- spec/features/irr_invalid_object_resolution_spec.rb
-- spec/features/whois_as_set_resolution_spec.rb
-- spec/features/whois_invalid_object_resolution_spec.rb
-- spec/spec_helper.rb
-- spec/support/contexts.rb
-- spec/support/query.rb
 homepage: https://github.com/codeout/irrc
 licenses:
 - MIT
@@ -99,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -107,17 +127,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: IRR / Whois client to expand as-set and route-set into a list of origin ASs
   and prefixes
-test_files:
-- spec/features/irr_as_set_resolution_spec.rb
-- spec/features/irr_invalid_object_resolution_spec.rb
-- spec/features/whois_as_set_resolution_spec.rb
-- spec/features/whois_invalid_object_resolution_spec.rb
-- spec/spec_helper.rb
-- spec/support/contexts.rb
-- spec/support/query.rb
-has_rdoc: 
+test_files: []