shodanz 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 410e95de412de33cdbe2fb4fd47ed7eda7e9bdbc1dc86f68a09050cf5ec316fc
-  data.tar.gz: 94dc8c3425f95bd0d7294499618e58f2f3e4b88f174f132ced5b2316a52800b1
+  metadata.gz: f4b13cd6886a40478480be6963df243daff8a70bc89386aaf837589a2d8ad301
+  data.tar.gz: 90f764801640b90765c5e2bbf84cc7be70f0dbfbf788f60315bebf3a24f3e8ee
 SHA512:
-  metadata.gz: 29dea01f7e595b0b7eb6700eaa5e04dac0a426606c6bd28882b9ac484c48e48bb9ff35aa26cfd7b60996cde16273ff27d92534dd5e7909997c75c58c94b0d228
-  data.tar.gz: e7c851400c229bd11749d4acafc8c9b784ef29b61c40f1187db7774886f565aa82935086f648178eac2e3f6782f5618572074fa5a468803c670a3ae31d4ed2d6
+  metadata.gz: b2da8666780fe6fd7560155c868a821c0ea353ac5515f7e794429a07b5b600729ee117fbb6d269d3316b1c502afd9a914b656d7cfd0ca2cf8a5a1b410cab1ed4
+  data.tar.gz: 4f44aac093e59b2f38ac942b7c6548abe25189180109f91a78e81b2f0ebbda235edf147625468252632f49cc806c0ad584f517074d6771716485e9d84be306b3

data/lib/shodanz/apis/exploits.rb

@@ -19,13 +19,13 @@ module Shodanz
       attr_accessor :key
 
       # The path to the REST API endpoint.
-      URL = 'https://exploits.shodan.io/api/'
+      URL = 'https://exploits.shodan.io/'
 
       # @param key [String] SHODAN API key, defaulted to
       # the *SHODAN_API_KEY* enviroment variable.
       def initialize(key: ENV['SHODAN_API_KEY'])
         @url      = URL
-        @internet = Async::HTTP::Internet.new
+        @client   = Async::HTTP::Client.new(Async::HTTP::Endpoint.parse(@url))
         self.key  = key
 
         warn 'No key has been found or provided!' unless key?
@@ -50,7 +50,7 @@ module Shodanz
         params = turn_into_query(**params)
         facets = turn_into_facets(**facets)
         params[:page] = page
-        get('search', **params.merge(**facets))
+        get('api/search', **params.merge(**facets))
       end
 
       # This method behaves identical to the "/search" method with
@@ -62,7 +62,7 @@ module Shodanz
         params = turn_into_query(**params)
         facets = turn_into_facets(**facets)
         params[:page] = page
-        get('count', **params.merge(**facets))
+        get('api/count', **params.merge(**facets))
       end
     end
   end

data/lib/shodanz/apis/rest.rb

@@ -22,7 +22,7 @@ module Shodanz
       # @param key [String] SHODAN API key, defaulted to the *SHODAN_API_KEY* enviroment variable.
       def initialize(key: ENV['SHODAN_API_KEY'])
         @url      = URL
-        @internet = Async::HTTP::Internet.new
+        @client   = Async::HTTP::Client.new(Async::HTTP::Endpoint.parse(@url))
         self.key  = key
 
         warn 'No key has been found or provided!' unless key?

data/lib/shodanz/apis/streaming.rb

@@ -28,7 +28,7 @@ module Shodanz
       # @param key [String] SHODAN API key, defaulted to the *SHODAN_API_KEY* enviroment variable.
       def initialize(key: ENV['SHODAN_API_KEY'])
         @url      = URL
-        @internet = Async::HTTP::Internet.new
+        @client   = Async::HTTP::Client.new(Async::HTTP::Endpoint.parse(@url))
         self.key  = key
 
         warn 'No key has been found or provided!' unless key?

data/lib/shodanz/apis/utils.rb

@@ -78,11 +78,11 @@ module Shodanz
         return json
       end
 
-      def getter(path, one_shot=false, **params)
+      def getter(path, **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}"
+        url = "/#{path}?key=#{@key}"
         # special params
         params.each do |param,value|
           next if value.is_a?(String) && value.empty?
@@ -90,38 +90,41 @@ module Shodanz
           url += "&#{param}=#{value}"
         end
 
-        resp = @internet.get(url)
+        resp = @client.get(url)
 
-        # parse all lines in the response body as JSON
-        json = JSON.parse(resp.body.join)
+        if resp.success?
+          # 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)
 
-        handle_any_json_errors(json)
-
-        return json
+          return json
+        else
+          raise "Got response status #{resp.status}"
+        end
       ensure
+        @client.pool.close
         resp&.close
-        @internet = Async::HTTP::Internet.new if one_shot
       end
 
       def poster(path, one_shot=false, **params)
         # param keys should all be strings
         params = params.transform_keys(&:to_s)
         # make POST request to server
-        resp = @internet.post("#{@url}#{path}?key=#{@key}", params)
+        resp = @client.post("/#{path}?key=#{@key}", nil, JSON.dump(params))
 
-        # parse all lines in the response body as JSON
-        json = JSON.parse(resp.body.join)
+        if resp.success?
+          json = JSON.parse(resp.body.join)
 
-        @internet.close if one_shot
+          handle_any_json_errors(json)
 
-        handle_any_json_errors(json)
-
-        return json
+          return json
+        else
+          raise "Got response status #{resp.status}"
+        end
       ensure
+        @client.pool.close
         resp&.close
-        @internet = Async::HTTP::Internet.new if one_shot
       end
 
       def slurper(path, **params)
@@ -132,7 +135,7 @@ module Shodanz
           counter = 0
         end
         # make GET request to server
-        resp = @internet.get("#{@url}#{path}?key=#{@key}", params)
+        resp = @client.get("/#{path}?key=#{@key}", params)
         # read body line-by-line
         until resp.body.nil? || resp.body.empty?
           resp.body.read.each_line do |line|
@@ -151,25 +154,25 @@ module Shodanz
 
       def async_get(path, **params)
         Async::Task.current.async do
-          getter(path, false, **params)
+          getter(path, **params)
         end
       end
 
       def sync_get(path, **params)
         Async do
-          getter(path, true, **params)
+          getter(path, **params)
         end.wait
       end
 
       def async_post(path, **params)
         Async::Task.current.async do
-          poster(path, false, **params)
+          poster(path, **params)
         end
       end
 
       def sync_post(path, **params)
         Async do
-          poster(path, true, **params)
+          poster(path, **params)
         end.wait
       end
 

data/lib/shodanz/errors.rb

@@ -15,7 +15,7 @@ module Shodanz
     end
 
     class NoAPIKey < StandardError
-      def initialize(msg = 'No API key has been found or provided! ( setup your SHODAN_API_KEY environment varialbe )')
+      def initialize(msg = 'No API key has been found or provided! ( setup your SHODAN_API_KEY environment variable )')
         super
       end
     end

data/lib/shodanz/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shodanz
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Kent 'picatz' Gruber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A modern, async Ruby gem for Shodan, the world's first search engine for