ronin 2.0.0.beta1 → 2.0.0.beta2

data/lib/ronin/cli/commands/hexdump.rb

@@ -275,8 +275,14 @@ module Ronin
           @highlight_chars   = {}
         end
 
+        #
+        # Runs the `ronin hexdump` command.
+        #
+        # @param [Array<String>] files
+        #   Additional files to hexdump.
+        #
         def run(*files)
-          @hexdump = ::Hexdump::Hexdump.new(**hexdump_options)
+          @hexdump = ::Hexdump::Hexdump.new(**hexdump_kwargs)
 
           super(*files)
         end
@@ -432,7 +438,7 @@ module Ronin
         #
         # @return [Hash{Symbol => Object}]
         #
-        def hexdump_options
+        def hexdump_kwargs
           kwargs = {}
 
           HEXDUMP_OPTIONS.each do |key|

data/lib/ronin/cli/commands/host.rb

@@ -17,6 +17,7 @@
 #
 
 require 'ronin/cli/value_processor_command'
+require 'ronin/cli/dns'
 require 'ronin/support/network/host'
 
 require 'wordlist/file'
@@ -60,6 +61,8 @@ module Ronin
       #
       class Host < ValueProcessorCommand
 
+        include DNS
+
         usage '[options] [HOST ...]'
 
         option :subdomain, value: {
@@ -99,15 +102,6 @@ module Ronin
                                  },
                                  desc: 'Enumerates over every subdomain in the wordlist'
 
-        option :nameserver, short: '-N',
-                            value: {
-                              type: String,
-                              usage: 'HOST|IP'
-                            },
-                            desc: 'Send DNS queries to the nameserver' do |ip|
-                              @nameservers << ip
-                            end
-
         option :ips, short: '-I',
                      desc:  "Converts the hostname to it's IP addresses"
 
@@ -155,21 +149,6 @@ module Ronin
 
         man_page 'ronin-host.1'
 
-        #
-        # Initializes the `ronin dns` command.
-        #
-        def initialize(**kwargs)
-          super(**kwargs)
-
-          @nameservers = []
-        end
-
-        def dns_options
-          kwargs = {}
-          kwargs[:nameservers] = @nameservers unless @nameservers.empty?
-          kwargs
-        end
-
         #
         # Queries the given host.
         #
@@ -228,7 +207,9 @@ module Ronin
           elsif options[:has_addresses]
             puts host if host.has_addresses?
           elsif options[:has_records]
-            puts host unless host.get_records(options[:has_records]).empty?
+            records = host.get_records(options[:has_records])
+
+            puts host unless records.empty?
           elsif options[:query]
             print_records(query_records(host))
           else
@@ -236,69 +217,6 @@ module Ronin
           end
         end
 
-        #
-        # Queries the records for the given host name.
-        #
-        # @param [String] host
-        #   The host name to query.
-        #
-        # @return [Array<Resolv::DNS::Resource>]
-        #   The returned DNS resource records.
-        #
-        def query_records(host)
-          if options[:type]
-            resolver.get_records(host,options[:type].downcase)
-          else
-            resolver.get_a_records(host) + resolver.get_aaaa_records(host)
-          end
-        end
-
-        #
-        # Prints multiple DNS records.
-        #
-        # @param [Array<Resolv::DNS::Resource>] records
-        #   The DNS resource records to print.
-        #
-        def print_records(records)
-          records.each do |record|
-            print_record(record)
-          end
-        end
-
-        #
-        # Prints a DNS record.
-        #
-        # @param [Resolv::DNS::Resource] record
-        #   The DNS resource record to print.
-        #
-        def print_record(record)
-          case record
-          when Resolv::DNS::Resource::IN::A,
-               Resolv::DNS::Resource::IN::AAAA
-            puts record.address
-          when Resolv::DNS::Resource::IN::NS,
-               Resolv::DNS::Resource::IN::CNAME,
-               Resolv::DNS::Resource::IN::PTR
-            puts record.name
-          when Resolv::DNS::Resource::IN::MX
-            puts record.exchange
-          when Resolv::DNS::Resource::IN::TXT
-            puts record.strings.join
-          when Resolv::DNS::Resource::IN::HINFO
-            puts "#{record.cpu} #{record.os}"
-          when Resolv::DNS::Resource::IN::LOC
-            puts "#{record.latitude} #{record.longitude}"
-          when Resolv::DNS::Resource::IN::MINFO
-            puts "#{record.emailbx}@#{record.rmailbx}"
-          when Resolv::DNS::Resource::IN::SOA
-            puts "#{record.mname} #{record.rname} #{record.serial} #{record.refresh} #{record.retry} #{record.expire} #{record.ttl}"
-          when Resolv::DNS::Resource::IN::SRV
-            puts "#{record.port} #{record.priority} #{record.weight} #{record.target}"
-          when Resolv::DNS::Resource::IN::WKS
-            puts "#{record.address} #{record.protocol}"
-          end
-        end
-
       end
     end
   end

data/lib/ronin/cli/commands/http.rb

@@ -319,17 +319,17 @@ module Ronin
         def process_value(url)
           url = URI(url)
 
-          Support::Network::HTTP.connect_uri(url, proxy:      @proxy,
-                                                  user_agent: @user_agent) do |http|
-            http.request(
-              @http_method, url.request_uri, user:         url.user,
-                                             password:     url.password,
-                                             query_params: @query_params,
-                                             headers:      @headers,
-                                             body:         @body,
-                                             form_data:    @form_data,
-                                             &method(:print_response))
-          end
+          Support::Network::HTTP.request(
+            @http_method, url, proxy:        @proxy,
+                               user_agent:   @user_agent,
+                               user:         url.user,
+                               password:     url.password,
+                               query_params: @query_params,
+                               headers:      @headers,
+                               body:         @body,
+                               form_data:    @form_data,
+                               &method(:print_response)
+          )
         end
 
         #

data/lib/ronin/cli/commands/public_suffix_list.rb

@@ -69,8 +69,11 @@ module Ronin
 
         man_page 'ronin-public-suffix-list.1'
 
-        def run(*args)
-          if !File.file?(options[:path])
+        #
+        # Runs the `ronin public-suffix-list` command.
+        #
+        def run
+          if !downloaded?
             download
           elsif options[:update] || stale?
             update
@@ -83,9 +86,20 @@ module Ronin
           end
         end
 
+        #
+        # Determines if the public suffix list file has been downloaded yet.
+        #
+        # @return [Boolean]
+        #
+        def downloaded?
+          List.downloaded?(options[:path])
+        end
+
         #
         # Determines if the public suffix list file is stale.
         #
+        # @return [Boolean]
+        #
         def stale?
           List.stale?(options[:path])
         end

data/lib/ronin/cli/commands/tld_list.rb

@@ -69,8 +69,11 @@ module Ronin
 
         man_page 'ronin-tld-list.1'
 
-        def run(*args)
-          if !File.file?(options[:path])
+        #
+        # Runs the `ronin tld-list` command.
+        #
+        def run
+          if !downloaded?
             download
           elsif options[:update] || stale?
             update
@@ -83,9 +86,20 @@ module Ronin
           end
         end
 
+        #
+        # Determines if the TLD list file has been downloaded already.
+        #
+        # @return [Boolean]
+        #
+        def downloaded?
+          List.downloaded?(options[:path])
+        end
+
         #
         # Determines if the TLD list file is stale.
         #
+        # @return [Boolean]
+        #
         def stale?
           List.stale?(options[:path])
         end

data/lib/ronin/cli/dns.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+#
+# Copyright (c) 2006-2023 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# Ronin is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ronin is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ronin.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+require 'ronin/support/network/dns'
+
+module Ronin
+  class CLI
+    module DNS
+      #
+      # Adds the `-N,--nameserver HOST|IP` option to the command which is
+      # including {DNS}.
+      #
+      # @param [Class<Command>] command
+      #   The command which is including {DNS}.
+      #
+      def self.included(command)
+        command.option :nameserver, short: '-N',
+                                    value: {
+                                      type: String,
+                                      usage: 'HOST|IP'
+                                    },
+                                    desc: 'Send DNS queries to the nameserver' do |ip|
+                                      @nameservers << ip
+                                    end
+      end
+
+      # The configured nameservers to query.
+      #
+      # @return [Array<String>]
+      attr_reader :nameservers
+
+      #
+      # Initializes the command.
+      #
+      def initialize(**kwargs)
+        super(**kwargs)
+
+        @nameservers = []
+      end
+
+      #
+      # The resolver to use.
+      #
+      # @return [Ronin::Network::DNS::Resolver]
+      #   The DNS resolver.
+      #
+      def resolver
+        @resolver ||= unless @nameservers.empty?
+                        Support::Network::DNS.resolver(
+                          nameservers: @nameservers
+                        )
+                      else
+                        Support::Network::DNS.resolver
+                      end
+      end
+
+      #
+      # Queries the records for the given host name.
+      #
+      # @param [String] host
+      #   The host name to query.
+      #
+      # @return [Array<Resolv::DNS::Resource>]
+      #   The returned DNS resource records.
+      #
+      def query_records(host)
+        if options[:type]
+          resolver.get_records(host,options[:type].downcase)
+        else
+          resolver.get_a_records(host) + resolver.get_aaaa_records(host)
+        end
+      end
+
+      #
+      # Prints multiple DNS records.
+      #
+      # @param [Array<Resolv::DNS::Resource>] records
+      #   The DNS resource records to print.
+      #
+      def print_records(records)
+        records.each do |record|
+          print_record(record)
+        end
+      end
+
+      #
+      # Prints a DNS record.
+      #
+      # @param [Resolv::DNS::Resource] record
+      #   The DNS resource record to print.
+      #
+      def print_record(record)
+        case record
+        when Resolv::DNS::Resource::IN::A,
+          Resolv::DNS::Resource::IN::AAAA
+          puts record.address
+        when Resolv::DNS::Resource::IN::NS,
+          Resolv::DNS::Resource::IN::CNAME,
+          Resolv::DNS::Resource::IN::PTR
+          puts record.name
+        when Resolv::DNS::Resource::IN::MX
+          puts record.exchange
+        when Resolv::DNS::Resource::IN::TXT
+          puts record.strings.join
+        when Resolv::DNS::Resource::IN::HINFO
+          puts "#{record.cpu} #{record.os}"
+        when Resolv::DNS::Resource::IN::LOC
+          puts "#{record.latitude} #{record.longitude}"
+        when Resolv::DNS::Resource::IN::MINFO
+          puts "#{record.emailbx}@#{record.rmailbx}"
+        when Resolv::DNS::Resource::IN::SOA
+          puts "#{record.mname} #{record.rname} #{record.serial} #{record.refresh} #{record.retry} #{record.expire} #{record.ttl}"
+        when Resolv::DNS::Resource::IN::SRV
+          puts "#{record.port} #{record.priority} #{record.weight} #{record.target}"
+        when Resolv::DNS::Resource::IN::WKS
+          puts "#{record.address} #{record.protocol}"
+        end
+      end
+    end
+  end
+end