sonar-client 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15839192f17588137b628922b797277e51fe1a4a
-  data.tar.gz: 952a6e55b998608df85d565e5d6bda643e09b2dd
+  metadata.gz: 28d19291140201d88ac436b2d42ab047c477acde
+  data.tar.gz: 3f3115c49a108f3d175f0ea670348ec89835e37e
 SHA512:
-  metadata.gz: 367276131352b48040143cd3b7d5894475fda23c2020fd28efa56452a92af79e89b8f84830ae9132d44ca1ea26c3d2f3d3eb6d7f9bec91f6e28d80faebcc41c5
-  data.tar.gz: aaf7ac557f0f5622ee9a5c3e46db451b63e3470fd1279b712da2669fea2af75fcab91ac892c43855ad416a86728e1a5e870c2935e50cfed06932c657858c71d1
+  metadata.gz: 25251c5d02b60a2afaad1af4ddac7cdf1e85e13fee30b4e89def0f95f1d5aee0de867bbcf6a1665128a6a44c81b75e6e5f5f1a1c5ffa98800921e95974179bfa
+  data.tar.gz: b6cb3e46073c83cd24de84c9abf9a27d4b348e28a8d889309d1f0640a77d2785504be243d8b9ecf88f9640c375d6a779f5c31f5f2fe43b958a3d02eb2b41719d

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sonar-client.gemspec
 gemspec
+
+group :development do
+      gem 'pry'
+end

data/lib/sonar.rb

@@ -3,6 +3,7 @@ require "faraday_middleware"
 require "sonar/cli/cli"
 require "sonar/client"
 require "sonar/version"
+require "sonar/registration"
 
 module Sonar
   class << self

data/lib/sonar/client.rb

@@ -1,10 +1,13 @@
 # encoding: utf-8
+require 'faraday'
+require 'faraday_middleware'
 require 'forwardable'
 require 'sonar/request'
 require 'sonar/certificate'
 require 'sonar/search'
 require 'sonar/user'
 require 'sonar/cli/cli'
+require 'sonar/registration'
 
 module Sonar
   class Client
@@ -14,6 +17,7 @@ module Sonar
     include Certificate
     include Search
     include User
+    include Registration
 
     attr_accessor :api_url, :api_version, :access_token, :email
 
@@ -22,10 +26,10 @@ module Sonar
     #
     # @params options[Hash]
     def initialize(options = {})
-      @api_url        = options[:api_url]       || Sonar.api_url       || "https://sonar.labs.rapid7.com"
-      @api_version    = options[:api_version]   || Sonar.api_version   || "v2"
-      @access_token   = options[:access_token]  || Sonar.access_token
-      @email          = options[:email]         || Sonar.email
+      @api_url        = options.fetch(:api_url, default_api_url)
+      @api_version    = options.fetch(:api_version, default_api_version )
+      @access_token   = options.fetch(:access_token, default_access_token)
+      @email          = options.fetch(:email, default_email)
     end
 
     ##
@@ -72,6 +76,52 @@ module Sonar
 
     private
 
+    # Returns the default value for the api url
+    #
+    # @return [String] the URL for the Sonar API
+    def default_api_url
+      begin
+        Sonar.api_url
+      rescue NoMethodError
+        'https://sonar.labs.rapid7.com'
+      end
+    end
+
+    # Returns the default value for the api version
+    #
+    # @return [String] the Sonar API version to use
+    def default_api_version
+      begin
+        Sonar.api_version
+      rescue NoMethodError
+        'v2'
+      end
+    end
+
+    # Returns the default value for the access token
+    #
+    # @return [String] if {Sonar} has a value configured
+    # @return [nil]
+    def default_access_token
+      begin
+        Sonar.access_token
+      rescue NoMethodError
+        ''
+      end
+    end
+
+    # Returns the default value for the email address
+    #
+    # @return [String] if {Sonar} has a value configured
+    # @return [nil]
+    def default_email
+      begin
+        Sonar.email
+      rescue NoMethodError
+        ''
+      end
+    end
+
     def default_headers
       {
         accept: 'application/json',

data/lib/sonar/registration.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+module Sonar
+  module Registration
+
+    # Takes a Metasploit Product Key and attempts
+    # to register a Sonar account with it.
+    def register_metasploit(product_key)
+      post_params = { product_key: product_key.dup }
+      post_to_sonar('metasploit_verify', post_params)
+    end
+  end
+end

data/lib/sonar/version.rb

@@ -1,3 +1,3 @@
 module Sonar
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/sonar/cli_spec.rb

@@ -67,8 +67,8 @@ describe Sonar::CLI do
         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')
+          expect(JSON.parse(output)['collection'].size).to be >= 1
+          expect(JSON.parse(output)['collection'].any? { |c| c['name'] == '208.118.227.20' }).to be(true)
         end
       end
       context 'client that returns fdns for rapid7 IP' do

data/spec/sonar/registration_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Sonar::Registration do
+  let(:client) { Sonar::Client.new }
+
+  context 'POSTing a valid product key' do
+    let (:resp) { client.register_metasploit("1e80c24b97c928bb1db7d4d3c05475a6a40a1186") }
+
+    xit 'responds that the license is valid' do
+      expect(resp).to have_key('valid')
+      expect(resp['valid']).to be(true)
+    end
+    xit 'responds with a user email' do
+      expect(resp).to have_key('email')
+      expect(resp['email']).to match(/@/)
+    end
+    xit 'responds with an api_key' do
+      expect(resp).to have_key('api_key')
+      expect(resp['api_key']).to match(/KEY/)
+    end
+  end
+
+  context 'POSTing an invalid product key' do
+    let (:resp) { client.register_metasploit("DDXXXX") }
+
+    xit 'responds that the license is invalid' do
+      expect(resp).to have_key('valid')
+      expect(resp['valid']).to be(false)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -66,6 +66,6 @@ def fixtures_path
 end
 
 def reset_sonar_config
-  Sonar.api_version = nil
-  Sonar.api_url = nil
+  Sonar.remove_class_variable(:@@api_url) if Sonar.class_variable_defined?(:@@api_url)
+  Sonar.remove_class_variable(:@@api_version) if Sonar.class_variable_defined?(:@@api_version)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonar-client
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Paul Deardorff & HD Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -242,6 +242,7 @@ files:
 - lib/sonar/cli/cli.rb
 - lib/sonar/cli/rcfile.rb
 - lib/sonar/client.rb
+- lib/sonar/registration.rb
 - lib/sonar/request.rb
 - lib/sonar/search.rb
 - lib/sonar/user.rb
@@ -252,6 +253,7 @@ files:
 - spec/sonar/certificate_spec.rb
 - spec/sonar/cli_spec.rb
 - spec/sonar/client_spec.rb
+- spec/sonar/registration_spec.rb
 - spec/sonar/search_spec.rb
 - spec/sonar/user_spec.rb
 - spec/sonar_spec.rb
@@ -286,6 +288,7 @@ test_files:
 - spec/sonar/certificate_spec.rb
 - spec/sonar/cli_spec.rb
 - spec/sonar/client_spec.rb
+- spec/sonar/registration_spec.rb
 - spec/sonar/search_spec.rb
 - spec/sonar/user_spec.rb
 - spec/sonar_spec.rb