shodanz 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32aa0999f1cb087637e0abe8428bd70592f22a3761da87be09bcf1a2bd8c2d37
-  data.tar.gz: a6d8a053446c3163bb3ee7630c5663510e6568469cd0569e6c6d4ad67d1873a3
+  metadata.gz: 410e95de412de33cdbe2fb4fd47ed7eda7e9bdbc1dc86f68a09050cf5ec316fc
+  data.tar.gz: 94dc8c3425f95bd0d7294499618e58f2f3e4b88f174f132ced5b2316a52800b1
 SHA512:
-  metadata.gz: d3c5e27187e510f5b811bee421194b269bcc1092bc4b212c7a172c342f1b6a4c932314e5198e89b16509ce6c1345714e232461e4c3b34de1bf2262797a435bdf
-  data.tar.gz: d66f4fc7e68963a54870b789a1b63ada8ffe3174947f6b641dfa8b43547d77ef37b73fc16ff7c4f8715244be8449037dcc5fa2b7028cf50424b43a6004c4297b
+  metadata.gz: 29dea01f7e595b0b7eb6700eaa5e04dac0a426606c6bd28882b9ac484c48e48bb9ff35aa26cfd7b60996cde16273ff27d92534dd5e7909997c75c58c94b0d228
+  data.tar.gz: e7c851400c229bd11749d4acafc8c9b784ef29b61c40f1187db7774886f565aa82935086f648178eac2e3f6782f5618572074fa5a468803c670a3ae31d4ed2d6

data/README.md

@@ -289,10 +289,10 @@ The Exploits API provides access to several exploit/ vulnerability data sources.
 Search across a variety of data sources for exploits and use facets to get summary information.
 
 ```ruby
-client.search("python")             # Search for Snek vulns.
-client.search(post: 22)             # Port number for the affected service if the exploit is remote.
-client.search(type: "shellcode")    # A category of exploit to search for.
-client.search(osvdb: "100007")      # Open Source Vulnerability Database ID for the exploit.
+client.exploits_api.search("python")             # Search for python vulns.
+client.exploits_api.search(port: 22)             # Port number for the affected service if the exploit is remote.
+client.exploits_api.search(type: "shellcode")    # A category of exploit to search for.
+client.exploits_api.search(osvdb: "100007")      # Open Source Vulnerability Database ID for the exploit.
 ```
 
 #### Count
@@ -300,10 +300,10 @@ client.search(osvdb: "100007")      # Open Source Vulnerability Database ID for
 This method behaves identical to the Exploits API `search` method with the difference that it doesn't return any results.
 
 ```ruby
-client.count("python")             # Count Snek vulns.
-client.count(port: 22)             # Port number for the affected service if the exploit is remote.
-client.count(type: "shellcode")    # A category of exploit to search for.
-client.count(osvdb: "100007")      # Open Source Vulnerability Database ID for the exploit.
+client.exploits_api.count("python")             # Count python vulns.
+client.exploits_api.count(port: 22)             # Port number for the affected service if the exploit is remote.
+client.exploits_api.count(type: "shellcode")    # A category of exploit to search for.
+client.exploits_api.count(osvdb: "100007")      # Open Source Vulnerability Database ID for the exploit.
 ```
 
 ## License

data/lib/shodanz/apis/utils.rb

@@ -61,40 +61,51 @@ module Shodanz
 
       private
 
-      RATELIMIT = 'rate limit reached'
-      NOINFO    = 'no information available'
-      NOQUERY   = 'empty search query'
+      RATELIMIT    = 'rate limit reached'
+      NOINFO       = 'no information available'
+      NOQUERY      = 'empty search query'
+      ACCESSDENIED = 'access denied'
+      INVALIDKEY   = 'invalid API key'
 
       def handle_any_json_errors(json)
-        return json unless json.is_a?(Hash) && json.key?('error')
-
-        raise Shodanz::Errors::RateLimited if json['error'].casecmp(RATELIMIT) >= 0
-        raise Shodanz::Errors::NoInformation if json['error'].casecmp(NOINFO) >= 0
-        raise Shodanz::Errors::NoQuery if json['error'].casecmp(NOQUERY) >= 0
-
-        json
+        if json.is_a?(Hash) && json.key?('error')
+          raise Shodanz::Errors::RateLimited if json['error'].casecmp(RATELIMIT) >= 0
+          raise Shodanz::Errors::NoInformation if json['error'].casecmp(NOINFO) >= 0
+          raise Shodanz::Errors::NoQuery if json['error'].casecmp(NOQUERY) >= 0
+          raise Shodanz::Errors::AccessDenied if json['error'].casecmp(ACCESSDENIED) >= 0
+          raise Shodanz::Errors::InvalidKey if json['error'].casecmp(INVALIDKEY) >= 0
+        end
+        return json
       end
 
-      def getter(path, **params)
+      def getter(path, one_shot=false, **params)
         # param keys should all be strings
         params = params.transform_keys(&:to_s)
         # build up url string based on special params
         url = "#{@url}#{path}?key=#{@key}"
         # special params
         params.each do |param,value|
-          url += "&#{param}=#{value}" unless value.is_a?(String) && value.empty?
+          next if value.is_a?(String) && value.empty?
+          value = URI.encode_www_form_component("#{value}")
+          url += "&#{param}=#{value}"
         end
+
         resp = @internet.get(url)
 
         # parse all lines in the response body as JSON
         json = JSON.parse(resp.body.join)
 
+        @internet.close if one_shot
+
         handle_any_json_errors(json)
+
+        return json
       ensure
         resp&.close
+        @internet = Async::HTTP::Internet.new if one_shot
       end
 
-      def poster(path, **params)
+      def poster(path, one_shot=false, **params)
         # param keys should all be strings
         params = params.transform_keys(&:to_s)
         # make POST request to server
@@ -103,9 +114,14 @@ module Shodanz
         # parse all lines in the response body as JSON
         json = JSON.parse(resp.body.join)
 
+        @internet.close if one_shot
+
         handle_any_json_errors(json)
+
+        return json
       ensure
         resp&.close
+        @internet = Async::HTTP::Internet.new if one_shot
       end
 
       def slurper(path, **params)
@@ -135,25 +151,25 @@ module Shodanz
 
       def async_get(path, **params)
         Async::Task.current.async do
-          getter(path, **params)
+          getter(path, false, **params)
         end
       end
 
       def sync_get(path, **params)
         Async do
-          getter(path, **params)
+          getter(path, true, **params)
         end.wait
       end
 
       def async_post(path, **params)
         Async::Task.current.async do
-          poster(path, **params)
+          poster(path, false, **params)
         end
       end
 
       def sync_post(path, **params)
         Async do
-          poster(path, **params)
+          poster(path, true, **params)
         end.wait
       end
 

data/lib/shodanz/errors.rb

@@ -25,5 +25,17 @@ module Shodanz
         super
       end
     end
+
+    class AccessDenied < StandardError
+      def initialize(msg = 'Shodan subscription doesn\'t support action, check API permissions!')
+        super
+      end
+    end
+
+    class InvalidKey < StandardError
+      def initialize(msg = 'Invalid API key used, or none given!')
+        super
+      end
+    end
   end
 end

data/lib/shodanz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shodanz
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shodanz
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Kent 'picatz' Gruber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http