shodan 0.2.0 → 0.3.1

data/README.md

@@ -1,3 +1,7 @@
+Visit the official Shodan API documentation at:
+
+[http://docs.shodanhq.com](http://docs.shodanhq.com)
+
 ## Installation
 
 To install the library use rubygems:
@@ -37,3 +41,7 @@ To properly handle potential errors, you should wrap all requests in a try/excep
 	else
 		puts "Unknown error"
 	end
+
+## Articles
+
+* [Perl, Python and Ruby API libraries](http://www.surtri.com/2010/10/20/perl-python-ruby-api/)

data/lib/shodan/api.rb

@@ -17,11 +17,13 @@ module Shodan
     attr_accessor :api_key
     attr_accessor :base_url
     attr_accessor :exploitdb
+    attr_accessor :msf
     
     def initialize(api_key)
       @api_key = api_key
       @base_url = "http://www.shodanhq.com/api/"
       @exploitdb = ExploitDB.new(self)
+      @msf = Msf.new(self)
     end
     
     # Internal method that sends out the HTTP request.
@@ -68,7 +70,7 @@ module Shodan
     end
   end
   
-  # The ExploitDB class depends shouldn't be used independently,
+  # The ExploitDB class shouldn't be used independently,
   # as it depends on the WebAPI class.
   #
   # Author:: achillean (mailto:jmath at surtri.com)
@@ -124,4 +126,39 @@ module Shodan
     
   end
   
+  # The Msf class shouldn't be used independently,
+  # as it depends on the WebAPI class.
+  #
+  # Author:: achillean (mailto:jmath at surtri.com)
+  #
+  # :title:Shodan::Msf
+  class Msf
+    attr_accessor :api
+    
+    def initialize(api)
+      @api = api
+    end
+
+    # Download a metasploit module given the fullname (id) of it.
+    #
+    # Arguments:
+    # id        -- fullname of the module (ex. auxiliary/admin/backupexec/dump)
+    # 
+    # Returns:
+    # A dictionary with the following fields:
+    # # filename        -- Name of the file
+    # content-type    -- Mimetype
+    # data            -- File content
+    def download(id)
+      return @api.request('msf/download', {:id => "#{id}"})
+    end
+    
+    # Search for a metasploit module
+    def search(query, params={})
+      params[:q] = query
+      return @api.request('msf/search', params)
+    end
+    
+  end
+  
 end

data/lib/shodan/version.rb

@@ -1,3 +1,3 @@
 module Shodan
-  Version = VERSION = '0.2.0'
+  Version = VERSION = '0.3.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shodan
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 17
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 0
-  version: 0.2.0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - John Matherly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 -07:00
+date: 2010-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency