sonar-client 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd483db5d8395939220af92349ac4ee6e769a324
-  data.tar.gz: 5fc1f42beb33dd3301c8372c7426414f310a93b4
+  metadata.gz: bfc392531d73c07dc38bdd9c2064d64ced271455
+  data.tar.gz: c59580c7f121c73586310e04623839cf3e2a0e7a
 SHA512:
-  metadata.gz: 71c312bef170b2d717a02fa7e6e7495fd2c7f63d94f646e88f4a04b63c17f5a4b0381a5247ea09a5f05d14b7741f8f994812748c0e9a0c633672739e0a4736ac
-  data.tar.gz: a883d0cf48e83e9a61b3b61135051a2efe84b1b38335191d80a4de85fc8a424dc47a38e99ccf0273b580c0703000c84dbb7d55f6b45a8a63a696af96837f325e
+  metadata.gz: a793b6cbe98628a1bf4414bdea5ec24c4f06adcf3d4b4a9066be491b241847b5adbcc0f2b37d8408bd1179cbe47b22e78f27315c99879d8e3422391edc717ccb
+  data.tar.gz: 8bb3e13a7914179f2a3ce8558419e782492bf84d9d8fe09e0cde218d034dfbc2d73399808ae4769140353331f48bba65c3b1e10908f3e6716a6ca07dd2cf9b6f

data/lib/sonar/certificate.rb

@@ -8,7 +8,7 @@ module Sonar
     #
     # @return [Hashie::Mash] with response of certificate
     def get_certificate(options = {})
-      response = get("/api/#{Sonar.api_version}/certificates/#{options[:sha1]}", options)
+      response = get_endpoint("certificates/#{options[:sha1]}", options)
       response if response
     end
   end

data/lib/sonar/cli/cli.rb

@@ -28,10 +28,13 @@ module Sonar
 
     desc 'search [QUERY TYPE] [QUERY TERM]', 'Search anything from Sonars'
     method_option 'record_limit', type: :numeric, aliases: '-n', desc: 'Maximum number of records to fetch'
+    method_option 'exact', type: :boolean, aliases: '-e', desc: 'Search for the query string exactly, do not including partial string matches'
+
     def search(type, term)
       @query = {}
       @query[type.to_sym] = term
       @query[:limit] = options['record_limit']
+      @query[:exact] = options['exact']
       resp = @client.search(@query)
 
       if resp.is_a?(Sonar::Request::RequestIterator)
@@ -56,19 +59,20 @@ module Sonar
 
     private
 
-    def print_json(json, format)
+    def print_json(data, format)
       case format
       when 'pretty'
-        ap(json)
+        ap(data)
       when 'lines'
-        if json.has_key?('collection')
-          json['collection'].each { |l| puts l.to_json }
+        if data.has_key?('collection')
+          data['collection'].each { |l| puts l.to_json }
         else
-          puts 'Could not parse the response into lines.'
+          puts 'WARNING: Could not parse the response into lines, there was no collection.'
+          puts data.to_json
         end
       else
         # TODO: use a faster JSON generator?
-        puts(json.to_json)
+        puts(data.to_json)
       end
     end
 

data/lib/sonar/cli/rcfile.rb

@@ -22,7 +22,11 @@ module Sonar
         f.puts 'format: flat'
         f.puts 'record_limit: 10000'
       end
+      warn = "Please set your email and API token in sonar.rc"
+      puts "=" * warn.size
       puts "Config file setup at: #{@path}"
+      puts warn
+      puts "=" * warn.size
     end
 
     def load_file

data/lib/sonar/request.rb

@@ -54,7 +54,7 @@ module Sonar
           params[:connection] = connection
           resp = get(url, params)
           params[:iterator_id] = resp.iterator_id
-          records_rcvd += resp['collection'].size
+          records_rcvd += resp['collection'].size rescue 0
           more = resp['more']
           yield resp
         end

data/lib/sonar/version.rb

@@ -1,3 +1,3 @@
 module Sonar
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/fixtures/sonar-stock.rc

@@ -0,0 +1,3 @@
+email: YOUR_EMAIL
+access_token: SONAR_TOKEN
+api_url: https://sonar.labs.rapid7.com

data/spec/sonar/certificate_spec.rb

@@ -5,9 +5,9 @@ describe Sonar::Search do
   let(:client) { Sonar::Client.new }
 
   context "sha1 #get_certificate" do
-    it "should find the Rapid7 certificate by sha1" do
+    it "should find the link to certificate by sha1" do
       res = client.get_certificate(sha1: "1e80c24b97c928bb1db7d4d3c05475a6a40a1186")
-      expect(res.subject.CN).to eq("www.rapid7.com")
+      expect(res._links.self.href).to match(/certificates/)
     end
   end
 end

data/spec/sonar/cli_spec.rb

@@ -2,6 +2,16 @@
 require 'spec_helper'
 
 describe Sonar::CLI do
+  context 'with an invalid stock sonar.rc profile' do
+    before do
+      Sonar::RCFile.instance.path = "#{fixtures_path}/sonar-stock.rc"
+    end
+    it 'warns user of missing config values when trying to search' do
+      output = run_command('search rdns 8.8.8.8')
+      expect(output).to match(/Could not authenticate/)
+    end
+  end
+
   context "with a valid profile" do
     before do
       Sonar::RCFile.instance.path = "#{fixtures_path}/sonar.rc"
@@ -43,11 +53,36 @@ describe Sonar::CLI do
           Sonar::Client.new.search(processed: '8.8.8.')
         )
       end
-      it 'parses the nested value as a string' do
+      xit 'parses the nested value as a string' do
         output = run_command('search processed 8.8.8.')
         expect(JSON.parse(output)['collection'].first['value']['ip']).to eq('8.8.8.8')
       end
     end
+    describe 'searching with #exact --exact option' do
+      context 'client that returns fdns for rapid7 IP exact' do
+        before do
+          allow_any_instance_of(Sonar::Client).to receive(:search).and_return(
+            Sonar::Client.new.search(fdns: '208.118.227.20', exact: true)
+          )
+        end
+        it 'matches exactly with --exact' do
+          output = run_command('search fdns 208.118.227.20 --exact')
+          expect(JSON.parse(output)['collection'].size).to eq(1)
+          expect(JSON.parse(output)['collection'].first['name']).to eq('208.118.227.20')
+        end
+      end
+      context 'client that returns fdns for rapid7 IP' do
+        before do
+          allow_any_instance_of(Sonar::Client).to receive(:search).and_return(
+            Sonar::Client.new.search(fdns: '208.118.227.20')
+          )
+        end
+        it 'matches exactly without --exact' do
+          output = run_command('search fdns 208.118.227.20')
+          expect(JSON.parse(output)['collection'].size).to be >  1
+        end
+      end
+    end
   end
 
   def run_command(args)

data/spec/sonar/search_spec.rb

@@ -98,7 +98,7 @@ describe Sonar::Search do
       let(:resp) { client.search(fdns: '208.118.227.10') }
 
       it "finds fdnsip rapid7.com at 208.118.227.10" do
-        expect(resp['collection'].any? { |x| x['address'] == 'rapid7.com' }).to be(true)
+        expect(resp['collection'].any? { |x| x['address'] =~ 'rapid7' }).to be(true)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonar-client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paul Deardorff & HD Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -247,6 +247,7 @@ files:
 - lib/sonar/user.rb
 - lib/sonar/version.rb
 - sonar-client.gemspec
+- spec/fixtures/sonar-stock.rc
 - spec/fixtures/sonar.rc
 - spec/sonar/certificate_spec.rb
 - spec/sonar/cli_spec.rb
@@ -280,6 +281,7 @@ signing_key:
 specification_version: 4
 summary: API Wrapper for Sonar
 test_files:
+- spec/fixtures/sonar-stock.rc
 - spec/fixtures/sonar.rc
 - spec/sonar/certificate_spec.rb
 - spec/sonar/cli_spec.rb