dronebl.rb 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b176362e9cf954dd9e4bbdd7895c08e726d6732
-  data.tar.gz: 21a9406ef25ae5abb81b2de5f41563f1ce8a1862
+  metadata.gz: 45bc94d05aa14f311e9506834de8bdbe13578842
+  data.tar.gz: fcbe4cead5705d0e89b7d1b8882a386f7dc629d1
 SHA512:
-  metadata.gz: f9b667e129e0f8548e1342420034f174e336002e9a3bc45b68fed428412b6b27e983d45854eeda3f73e73227a87f24004c3a50322f31474bba2fad91475bd981
-  data.tar.gz: 71a0f48745fc83f232b2ecd481cafedf8f6d5d54aaab3319868027d6799b8308ac74afb736c59418d8c8028e6cdda23af2dd096ecdbe882d4907af124147529f
+  metadata.gz: b8bf384847ec9f3cb386be428eb50e1a6eadabee121badf655fb8e034dd0c877e4d896754d4158f973d9c459bc03d60e60dd0023f1f4d3b6b3be8204a4b650aa
+  data.tar.gz: 5e96f22bf7cd87d7acce9d0f48dfd39078a9a9fb415689f8a96c62989d8e3e7bd731f595000208cc22497c3d20a645e6784e15100751c75b083ae22de47b4cef

data/bin/dronebl-add

@@ -6,7 +6,7 @@ require 'resolv'
 require 'optparse'
 class Options
   attr_reader :read_from_stdin, :key_str, :key_file, :type, :comment, :dry_run,
-    :use_key_file, :no_check, :max_ips_per_chunk
+    :use_key_file, :no_check, :max_ips_per_chunk, :show_raw_xml
   attr_accessor :ips
   def initialize
     @key_file = File.expand_path "~/.droneblkey"
@@ -45,6 +45,9 @@ class Options
       opts.on('-u', '--use-key-file', 'Use the default key file located at ~/.droneblkey') do
         @use_key_file = true
       end
+      opts.on('-r', '--show-raw-xml', 'Print the raw response received from the DroneBL server') do
+        @show_raw_xml = true
+      end
       opts.on('-d', '--dry-run', 'Prints the query to be run to STDOUT instead of sending it as a query to the DroneBL RPC service.') do
         @dry_run = true
       end
@@ -101,7 +104,7 @@ if opts.dry_run
   valid.each_slice(opts.max_ips_per_chunk) { |submit| puts DroneBL::gen_add_query(submit, opts.type, opts.comment) }
   puts "#{valid.count} IPs will be added as type #{opts.type}#{" with comment '#{opts.comment if opts.comment}'"}."
 else
-  valid.each_slice(opts.max_ips_per_chunk) { |submit| DroneBL::add(submit, opts.type, opts.comment) }
+  valid.each_slice(opts.max_ips_per_chunk) { |submit| DroneBL::add(submit, opts.type, opts.comment, show_raw=opts.show_raw_xml) }
   puts "#{valid.count} IPs added as type #{opts.type}#{" with comment '#{opts.comment}'" if opts.comment}"
 end
 unless invalid.empty?

data/bin/dronebl-query

@@ -6,11 +6,12 @@ require 'resolv'
 require 'optparse'
 class Options
   attr_reader :read_from_stdin, :key_str, :key_file, :get_archived, :long_types,
-    :dry_run, :time_format, :use_key_file
+    :dry_run, :time_format, :use_key_file, :show_raw_xml
   attr_accessor :ips
   def initialize
     @key_file = File.expand_path "~/.droneblkey"
     @ips = []
+    @show_raw_xml = false
     @opt_parser = OptionParser.new do |opts|
       opts.banner = "Usage: #{$0} [options]"
       opts.separator ""
@@ -40,6 +41,9 @@ class Options
       opts.on('-L', '--long-types', 'Print type definitions instead of numeric types for record matches.') do
         @long_types = true
       end
+      opts.on('-r', '--show-raw-xml', 'Print the raw response received from the DroneBL server') do
+        @show_raw_xml = true
+      end
       opts.on('-d', '--dry-run', 'Prints the query to be run to STDOUT instead of sending it as a query to the DroneBL RPC service.') do
         @dry_run = true
       end
@@ -114,7 +118,7 @@ if @dry_run
   puts DroneBL::gen_lookup_query query, opts.get_archived
   puts "#{query.count} IPs will be looked up."
 else
-  response = DroneBL::lookup(query, opts.get_archived)
+  response = DroneBL::lookup(query, opts.get_archived, show_raw=opts.show_raw_xml)
   print_table response, opts.long_types
   puts "#{query.count} IPs looked up. #{response.map { |r| r['ip'] }.uniq.length} unique IPs found in response."
 end

data/lib/dronebl-client.rb

@@ -26,10 +26,11 @@ module DroneBL
            "255"=>"Uncategorized threat class"}
   class << self
     attr_accessor :key
-    def parse_response xml
+    def parse_response xml, show_raw=false
       # This giant mess of hax is needed because the DroneBL response to queries
       # is encased in CDATA for whatever reason.
       begin
+        puts xml if show_raw
         resp = Nokogiri.parse(xml).at("response")
         if resp['type'].downcase == 'error'
           abort "call failed: '#{resp.css('message').text}' data: '#{resp.css('data').text}'"
@@ -58,14 +59,14 @@ EOF
 </request>"
     end
 
-    def lookup ips, archived=false
+    def lookup ips, archived=false, show_raw=false
       query = gen_lookup_query ips, archived
-      parse_response post('/RPC2', {:body => query }).body
+      parse_response post('/RPC2', {:body => query }).bodya, show_raw=show_raw
     end
 
-    def add ips, type, comment=''
+    def add ips, type, comment='', show_raw=false
       query = gen_add_query ips, type, comment
-      parse_response post('/RPC2', {:body => query }).body
+      parse_response post('/RPC2', {:body => query }).body, show_raw=show_raw
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dronebl.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Rylee Fowler