onyphe 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be6ceccc9070b0ff3e837f9df144bd8b1871f369559b735cbc24c3928de33e5
-  data.tar.gz: f21a7895f4c10fb3290f81a807912cfcc70477d53ecf0ba82800f736b3b6e9cb
+  metadata.gz: fad6434144492c274cbaffb947b51a0e3e4fa1a1fa4bc1faad177a15a01aafff
+  data.tar.gz: a832efbcdab7040004013bbb31e4dddda3c858fd8ad09f8488d6ea3c6dc55d68
 SHA512:
-  metadata.gz: 6c15b5f8728f4f5f67e620bc4b3fea7fa6e322c2bf139bbccdad9ace88abaa90b0f89c37b362534f8c2e4af986d43985b13795acc2917ee2e9a7cc9bc0805a03
-  data.tar.gz: 2f4b24073d4c4e9f7ffee038343814a46260846f1fbfad9d490277acd3c15e87133f5576576e5784648106fc619a1bc90969e47aa0517e31956ca4d0332a80ee
+  metadata.gz: 6f85af0c0040f8eea8f6060e7b42faa233005b07be869427cbc5996a847575cb7e8df9316e3cd2d6fd1a5c3c6c2f505b2dfae058e50162339536d4d5c518449d
+  data.tar.gz: e556b7a8bf25ac787b92bf7b5c91e3bca1e3c68e704b8e77ed1d909b5afe4aad78af7cb5080fe385fbbcc253e0b1943f56cd39e1bb01f0e2a22617c9f4ff236e

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6
+  - 2.7
 before_install: gem install bundler -v 2.1

data/README.md

@@ -1,11 +1,11 @@
 # Onyphe-rb
 
 [![Gem Version](https://badge.fury.io/rb/onyphe.svg)](https://badge.fury.io/rb/onyphe)
-[![Build Status](https://travis-ci.org/ninoseki/onyphe-rb.svg?branch=master)](https://travis-ci.org/ninoseki/onyphe-rb)
+[![Build Status](https://travis-ci.com/ninoseki/onyphe-rb.svg?branch=master)](https://travis-ci.com/ninoseki/onyphe-rb)
 [![Coverage Status](https://coveralls.io/repos/github/ninoseki/onyphe-rb/badge.svg?branch=master)](https://coveralls.io/github/ninoseki/onyphe-rb?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/c4afca9e0ff94d11a53332c0598b868f)](https://www.codacy.com/app/ninoseki/onyphe-rb)
 
-[Onyphe](https://www.onyphe.io) API wrapper for Ruby.
+[Onyphe](https://www.onyphe.io) v2 API wrapper for Ruby.
 
 ## Installation
 
@@ -35,39 +35,14 @@ api = Onyphe::API.new
 # or you can pass your API key as an argument
 api = Onyphe::API.new(YOUR_API_KEY)
 
-api.ctl("github.com")
-api.datascan("1.1.1.1")
-api.forward("1.1.1.1")
-api.geoloc("1.1.1.1")
-api.inetnum("1.1.1.1")
-api.ip("1.1.1.1")
-api.md5("44d88612fea8a8f36de82e1278abb02f")
-api.onionscan("3fyb44wdhnd2ghhl.onion")
-api.pastries("1.1.1.1")
-api.reverse("1.1.1.1")
-api.sniffer("1.1.1.1")
-api.synscan("1.1.1.1")
-api.threatlist("1.1.1.1")
-
-api.search.datascan(
-  os: "Windows",
-  port: 443,
-  product: "HTTP Server",
-  tls: true
-)
-api.search.synscan(
-  country: "FR",
-  port: 23,
-  tag: "mirai"
-)
-
-api.search.inetnum(organization: "OVH SAS")
-api.search.threatlist(country: "RU")
-api.search.pastries(content: "hacked")
-api.search.resolver(ip: "124.108.0.0/16")
-api.search.sniffer(ip: "14.164.0.0/14")
-api.search.ctl(host: "vpn")
-api.search.onionscan("app.http.keywords": "dump")
+api.summary.ip("1.1.1.1")
+api.summary.domain("example.com")
+api.summary.hostname("example.com")
+
+api.simple.geoloc("1.1.1.1")
+api.simple.ctl("example.com")
+
+api.search("category:datascan product:Nginx protocol:http os:Windows tls:true")
 
 api.alert.list
 api.alert.add(name: "foo", query:"bar", email: "foo@bar.com")
@@ -81,43 +56,15 @@ Enumerable style pagination is not supported at the present time.
 You can specify page index by passing `page` argument to the method.
 
 ```rb
-res = api.search.threatlist(country: "RU", page: 1)
-page = res.page
-max_page = res.max_page
+res = api.simple.threatlist(country: "RU", page: 1)
+page = res.dig("page")
+max_page = res.dig("max_page")
 
-((page + 1)..max_page).each do |page_index|
-  res = api.search.threatlist({ country: "RU" }, page = page_index)
+((page + 1)..max_page).each do |index|
+  res = api.simple.threatlist({ country: "RU" }, page = index)
 end
 ```
 
-### As a CLI tool
-
-Note: make sure that your API key is set as an environment variable `ONYPHE_API_KEY` before using the CLI tool.
-
-```sh
-$ onyphe
-Commands:
-  onyphe ctl DOMAIN          # It will return information for the given domain name X509 certificate information from CTLs with history of changes
-  onyphe datascan IP/STRING  # It will return datascan information for the given IPv{4,6} address or string with history of changes
-  onyphe forward IP          # It will return forward DNS lookup information for the given IPv{4,6} address with history of changes
-  onyphe geoloc IP           # It will return geolocation information for the given IPv{4,6} address
-  onyphe help [COMMAND]      # Describe available commands or one specific command
-  onyphe inetnum IP          # It will return inetnum information for the given IPv{4,6} address with history of changes
-  onyphe ip IP               # It will return a summary of all information for the given IPv{4,6} address
-  onyphe md5 MD5             # It will return information for the given datamd5 filter from datascan information category with history of changes
-  onyphe onionscan ONION     # It will return information for the given onion domain with history of changes
-  onyphe pastries IP         # It will return pastries information for the given IPv{4,6} address with history of changes
-  onyphe reverse IP          # It will return reverse DNS lookup information for the given IPv{4,6} address with history of changes
-  onyphe sniffer IP          # It will return information for the given IP address with history of changes
-  onyphe synscan IP          # It will return synscan information for the given IPv{4,6} address with history of changes.
-  onyphe threattlist IP      # It will return threatlist information for the given IPv{4,6} address with history of change
-```
-
-```sh
-$ onyphe geoloc 1.1.1.1
-{"count":1,"error":0,"myip":"x.x.x.x","results":[{"@category":"geoloc","@timestamp":"2018-11-18T00:15:50.000Z","@type":"doc","asn":"AS13335","city":"","country":"AU","ip":"1.1.1.1","ipv6":"false","latitude":"-33.4940","location":"-33.4940,143.2104","longitude":"143.2104","organization":"Cloudflare, Inc.","subnet":"1.1.1.0/24"}],"status":"ok","took":"0.000","total":1}
-```
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/nioseki/onyphe.

data/lib/onyphe.rb

@@ -2,26 +2,13 @@
 
 require "onyphe/api"
 
-require "onyphe/validator"
-
 require "onyphe/client"
+
 require "onyphe/clients/alert"
-require "onyphe/clients/ctl"
-require "onyphe/clients/datascan"
-require "onyphe/clients/forward"
-require "onyphe/clients/geoloc"
-require "onyphe/clients/inetnum"
-require "onyphe/clients/ip"
-require "onyphe/clients/md5"
-require "onyphe/clients/onionscan"
-require "onyphe/clients/pastries"
-require "onyphe/clients/reverse"
-require "onyphe/clients/sniffer"
-require "onyphe/clients/synscan"
-require "onyphe/clients/threatlist"
+require "onyphe/clients/resolver"
 require "onyphe/clients/search"
-
-require "onyphe/cli"
+require "onyphe/clients/simple"
+require "onyphe/clients/summary"
 
 require "onyphe/version"
 

data/lib/onyphe/api.rb

@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-require "forwardable"
-
 module Onyphe
   class API
-    extend Forwardable
-
-    attr_reader :api_key
-
     #
     # API client initialization
     #
@@ -15,83 +9,29 @@ module Onyphe
     #
     def initialize(api_key = ENV["ONYPHE_API_KEY"])
       @api_key = api_key
-      raise ArgumentError, "'api_key' argument is required" unless api_key
-    end
-
-    def search
-      @search ||= Clients::Search.new(api_key)
-    end
-
-    def alert
-      @alert ||= Clients::Alert.new(api_key)
-    end
-
-    private
-
-    def _ctl
-      @_ctl ||= Clients::Ctl.new(api_key)
-    end
-
-    def _datascan
-      @_datascan ||= Clients::Datascan.new(api_key)
+      raise ArgumentError, "'api_key' argument is required" unless @api_key
     end
 
-    def _forward
-      @_forward ||= Clients::Forward.new(api_key)
+    def summary
+      @summary ||= Clients::Summary.new(@api_key)
     end
 
-    def _geoloc
-      @_geoloc ||= Clients::Geoloc.new(api_key)
+    def simple
+      @simple ||= Clients::Simple.new(@api_key)
     end
 
-    def _inetnum
-      @_inetnum ||= Clients::Inetnum.new(api_key)
-    end
-
-    def _ip
-      @_ip ||= Clients::IP.new(api_key)
-    end
-
-    def _md5
-      @_md5 ||= Clients::MD5.new(api_key)
-    end
-
-    def _onionscan
-      @_onionscan ||= Clients::Onionscan.new(api_key)
-    end
-
-    def _pastries
-      @_pastries ||= Clients::Pastries.new(api_key)
-    end
-
-    def _reverse
-      @_reverse ||= Clients::Reverse.new(api_key)
+    def alert
+      @alert ||= Clients::Alert.new(@api_key)
     end
 
-    def _sniffer
-      @_sniffer ||= Clients::Sniffer.new(api_key)
+    def search(oql)
+      _search.search(oql)
     end
 
-    def _synscan
-      @_synscan ||= Clients::Synscan.new(api_key)
-    end
+    private
 
-    def _threatlist
-      @_threatlist ||= Clients::Threatlist.new(api_key)
+    def _search
+      @_search ||= Clients::Search.new(@api_key)
     end
-
-    def_delegator :_ctl, :get_by_domain, :ctl
-    def_delegator :_datascan, :get_by_query, :datascan
-    def_delegator :_forward, :get_by_ip, :forward
-    def_delegator :_geoloc, :get_by_ip, :geoloc
-    def_delegator :_inetnum, :get_by_ip, :inetnum
-    def_delegator :_ip, :get_by_ip, :ip
-    def_delegator :_md5, :get_by_md5, :md5
-    def_delegator :_onionscan, :get_by_onion, :onionscan
-    def_delegator :_pastries, :get_by_ip, :pastries
-    def_delegator :_reverse, :get_by_ip, :reverse
-    def_delegator :_sniffer, :get_by_ip, :sniffer
-    def_delegator :_synscan, :get_by_ip, :synscan
-    def_delegator :_threatlist, :get_by_ip, :threatlist
   end
 end

data/lib/onyphe/client.rb

@@ -7,7 +7,8 @@ require "uri"
 module Onyphe
   class Client
     HOST = "www.onyphe.io"
-    URL = "https://#{HOST}/api"
+    VERSION = "v2"
+    URL = "https://#{HOST}/api/#{VERSION}"
 
     def initialize(api_key)
       @api_key = api_key

data/lib/onyphe/clients/alert.rb

@@ -4,7 +4,7 @@ module Onyphe
   module Clients
     class Alert < Client
       def list
-        get("/v2/alert/list") { |json| json }
+        get("/alert/list") { |json| json }
       end
 
       def add(name:, query:, email:)
@@ -13,11 +13,11 @@ module Onyphe
           query: query,
           email: email
         }
-        post("/v2/alert/add", params) { |json| json }
+        post("/alert/add", params) { |json| json }
       end
 
       def delete(id)
-        post("/v2/alert/del/#{id}") { |json| json }
+        post("/alert/del/#{id}") { |json| json }
       end
     end
   end

data/lib/onyphe/clients/resolver.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Onyphe
+  module Clients
+    class Resolver < Client
+      def forward(ip, page: 1)
+        get("/simple/resolver/forward/#{ip}", page: page) { |json| json }
+      end
+
+      def reverse(ip, page: 1)
+        get("/simple/resolver/reverse/#{ip}", page: page) { |json| json }
+      end
+    end
+  end
+end

data/lib/onyphe/clients/search.rb

@@ -5,55 +5,9 @@ require "addressable/uri"
 module Onyphe
   module Clients
     class Search < Client
-      def datascan(params, page: 1)
-        search("datascan", params, page)
-      end
-
-      def synscan(params, page: 1)
-        search("synscan", params, page)
-      end
-
-      def inetnum(params, page: 1)
-        search("inetnum", params, page)
-      end
-
-      def threatlist(params, page: 1)
-        search("threatlist", params, page)
-      end
-
-      def pastries(params, page: 1)
-        search("pastries", params, page)
-      end
-
-      def resolver(params, page: 1)
-        search("resolver", params, page)
-      end
-
-      def sniffer(params, page: 1)
-        search("sniffer", params, page)
-      end
-
-      def ctl(params, page: 1)
-        search("ctl", params, page)
-      end
-
-      def onionscan(params, page: 1)
-        search("onionscan", params, page)
-      end
-
-      private
-
-      def search(type, params, page)
-        get("/search/#{type}/#{params_to_uri_string(params)}", page: page) { |json| json }
-      end
-
-      def params_to_uri_string(params)
-        s = params.map do |k, v|
-          v = "\"#{v}\"" if v.to_s.include? " "
-          [k, v].join(":")
-        end.join(" ")
-
-        Addressable::URI.encode s
+      def search(oql, page: 1)
+        path = Addressable::URI.encode(oql)
+        get("/search/#{path}", page: page) { |json| json }
       end
     end
   end

data/lib/onyphe/clients/simple.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Onyphe
+  module Clients
+    class Simple < Client
+      def geoloc(ip, page: 1)
+        get("/simple/geoloc/#{ip}", page: page) { |json| json }
+      end
+
+      def inetnum(ip, page: 1)
+        get("/simple/inetnum/#{ip}", page: page) { |json| json }
+      end
+
+      def pastries(ip, page: 1)
+        get("/simple/pastries/#{ip}", page: page) { |json| json }
+      end
+
+      def resolver(ip, page: 1)
+        get("/simple/resolver/#{ip}", page: page) { |json| json }
+      end
+
+      def sniffer(ip, page: 1)
+        get("/simple/sniffer/#{ip}", page: page) { |json| json }
+      end
+
+      def synscan(ip, page: 1)
+        get("/simple/synscan/#{ip}", page: page) { |json| json }
+      end
+
+      def threatlist(ip, page: 1)
+        get("/simple/threatlist/#{ip}", page: page) { |json| json }
+      end
+
+      def topsite(ip, page: 1)
+        get("/simple/topsite/#{ip}", page: page) { |json| json }
+      end
+
+      def vulnscan(ip, page: 1)
+        get("/simple/vulnscan/#{ip}", page: page) { |json| json }
+      end
+
+      def onionshot(ip, page: 1)
+        get("/simple/onionshot/#{ip}", page: page) { |json| json }
+      end
+
+      def datashot(ip, page: 1)
+        get("/simple/datasnot/#{ip}", page: page) { |json| json }
+      end
+
+      def ctl(hostname, page: 1)
+        get("/simple/ctl/#{hostname}", page: page) { |json| json }
+      end
+
+      def onionscan(hostname, page: 1)
+        get("/simple/onionscan/#{hostname}", page: page) { |json| json }
+      end
+
+      def datascan(hostname, page: 1)
+        get("/simple/datascan/#{hostname}", page: page) { |json| json }
+      end
+
+      def datamd5(md5, page: 1)
+        get("/simple/datascan/datamd5/#{md5}", page: page) { |json| json }
+      end
+    end
+  end
+end

data/lib/onyphe/clients/summary.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Onyphe
+  module Clients
+    class Summary < Client
+      def ip(ip)
+        get("/summary/ip/#{ip}") { |json| json }
+      end
+
+      def domain(domain)
+        get("/summary/domain/#{domain}") { |json| json }
+      end
+
+      def hostname(hostname)
+        get("/summary/hostname/#{hostname}") { |json| json }
+      end
+    end
+  end
+end

data/lib/onyphe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onyphe
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/onyphe.gemspec

@@ -24,13 +24,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "addressable", "~> 2.7"
-  spec.add_dependency "thor", "~> 1.0"
-
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "coveralls", "~> 0.8"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
-  spec.add_development_dependency "vcr", "~> 5.0"
-  spec.add_development_dependency "webmock", "~> 3.7"
+  spec.add_development_dependency "vcr", "~> 5.1"
+  spec.add_development_dependency "webmock", "~> 3.8"
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: onyphe
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-19 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,39 +72,37 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 description: ONYPHE API wrapper for Ruby
 email:
 - manabu.niseki@gmail.com
-executables:
-- onyphe
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".solargraph.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -140,27 +110,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- exe/onyphe
 - lib/onyphe.rb
 - lib/onyphe/api.rb
-- lib/onyphe/cli.rb
 - lib/onyphe/client.rb
 - lib/onyphe/clients/alert.rb
-- lib/onyphe/clients/ctl.rb
-- lib/onyphe/clients/datascan.rb
-- lib/onyphe/clients/forward.rb
-- lib/onyphe/clients/geoloc.rb
-- lib/onyphe/clients/inetnum.rb
-- lib/onyphe/clients/ip.rb
-- lib/onyphe/clients/md5.rb
-- lib/onyphe/clients/onionscan.rb
-- lib/onyphe/clients/pastries.rb
-- lib/onyphe/clients/reverse.rb
+- lib/onyphe/clients/resolver.rb
 - lib/onyphe/clients/search.rb
-- lib/onyphe/clients/sniffer.rb
-- lib/onyphe/clients/synscan.rb
-- lib/onyphe/clients/threatlist.rb
-- lib/onyphe/validator.rb
+- lib/onyphe/clients/simple.rb
+- lib/onyphe/clients/summary.rb
 - lib/onyphe/version.rb
 - onyphe.gemspec
 homepage: https://github.com/ninoseki/onyphe-rb
@@ -182,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ONYPHE API wrapper for Ruby

data/.solargraph.yml

@@ -1,11 +0,0 @@
-include:
-  - "**/*.rb"
-exclude:
-  - spec/**/*
-  - test/**/*
-reporters:
-  - rubocop
-  - require_not_found
-  - type_not_defined
-domains: []
-plugins: []

data/exe/onyphe

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-$LOAD_PATH.unshift("#{__dir__}/../lib")
-
-require "onyphe"
-
-Onyphe::CLI.start

data/lib/onyphe/cli.rb

@@ -1,89 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-require "thor"
-
-module Onyphe
-  class CLI < Thor
-    desc "ctl DOMAIN", "It will return information for the given domain name X509 certificate information from CTLs with history of changes"
-    def ctl(domain)
-      with_error_handling { puts api.ctl(domain).to_json }
-    end
-
-    desc "datascan IP/STRING", "It will return datascan information for the given IPv{4,6} address or string with history of changes"
-    def datascan(query)
-      with_error_handling { puts api.datascan(query).to_json }
-    end
-
-    desc "forward IP", "It will return forward DNS lookup information for the given IPv{4,6} address with history of changes"
-    def forward(ip)
-      with_error_handling { puts api.forward(ip).to_json }
-    end
-
-    desc "geoloc IP", "It will return geolocation information for the given IPv{4,6} address"
-    def geoloc(ip)
-      with_error_handling { puts api.geoloc(ip).to_json }
-    end
-
-    desc "inetnum IP", "It will return inetnum information for the given IPv{4,6} address with history of changes"
-    def inetnum(ip)
-      with_error_handling { puts api.inetnum(ip).to_json }
-    end
-
-    desc "ip IP", "It will return a summary of all information for the given IPv{4,6} address"
-    def ip(ip)
-      with_error_handling { puts api.ip(ip).to_json }
-    end
-
-    desc "md5 MD5", "It will return information for the given datamd5 filter from datascan information category with history of changes"
-    def md5(md5)
-      with_error_handling { puts api.md5(md5).to_json }
-    end
-
-    desc "onionscan ONION", "It will return information for the given onion domain with history of changes"
-    def onionscan(onion)
-      with_error_handling { puts api.onionscan(onion).to_json }
-    end
-
-    desc "pastries IP", "It will return pastries information for the given IPv{4,6} address with history of changes"
-    def pastries(ip)
-      with_error_handling { puts api.pastries(ip).to_json }
-    end
-
-    desc "reverse IP", "It will return reverse DNS lookup information for the given IPv{4,6} address with history of changes"
-    def reverse(ip)
-      with_error_handling { puts api.reverse(ip).to_json }
-    end
-
-    desc "sniffer IP", "It will return information for the given IP address with history of changes"
-    def sniffer(ip)
-      with_error_handling { puts api.sniffer(ip).to_json }
-    end
-
-    desc "synscan IP", "It will return synscan information for the given IPv{4,6} address with history of changes."
-    def synscan(ip)
-      with_error_handling { puts api.synscan(ip).to_json }
-    end
-
-    desc "threattlist IP", "It will return threatlist information for the given IPv{4,6} address with history of change"
-    def threatlist(ip)
-      with_error_handling { puts api.threatlist(ip).to_json }
-    end
-
-    no_commands do
-      def with_error_handling
-        yield
-      rescue StandardError => e
-        if e.to_s == "'api_key' argument is required"
-          puts "Please set your API key as an environment variable `ONYPHE_API_KEY`"
-        else
-          puts "Warning: #{e}"
-        end
-      end
-
-      def api
-        @api ||= API.new
-      end
-    end
-  end
-end

data/lib/onyphe/clients/ctl.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Ctl < Client
-      def get_by_domain(domain, page: 1)
-        raise ArgumentError, "Invalid domain: #{domain}" unless Validator.valid_domain?(domain)
-
-        get("/ctl/#{domain}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/datascan.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "addressable/uri"
-
-module Onyphe
-  module Clients
-    class Datascan < Client
-      def get_by_query(query, page: 1)
-        query = Addressable::URI.encode(query)
-        get("/datascan/#{query}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/forward.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Forward < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/forward/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/geoloc.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Geoloc < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/geoloc/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/inetnum.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Inetnum < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/inetnum/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/ip.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class IP < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/ip/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/md5.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class MD5 < Client
-      def get_by_md5(md5, page: 1)
-        raise ArgumentError, "Invalid md5: #{md5}" unless Validator.valid_md5?(md5)
-
-        get("/md5/#{md5}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/onionscan.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Onionscan < Client
-      def get_by_onion(onion, page: 1)
-        raise ArgumentError, "Invalid oninon domain: #{onion}" unless Validator.valid_onion_domain?(onion)
-
-        get("/onionscan/#{onion}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/pastries.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Pastries < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/pastries/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/reverse.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Reverse < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/reverse/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/sniffer.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Sniffer < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/sniffer/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/synscan.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Synscan < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/synscan/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/clients/threatlist.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Onyphe
-  module Clients
-    class Threatlist < Client
-      def get_by_ip(ip, page: 1)
-        raise ArgumentError, "Invalid IP address: #{ip}" unless Validator.valid_ip?(ip)
-
-        get("/threatlist/#{ip}", page: page) { |json| json }
-      end
-    end
-  end
-end

data/lib/onyphe/validator.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require "ipaddr"
-require "uri"
-
-module Onyphe
-  class Validator
-    def self.valid_ip?(ip)
-      IPAddr.new ip
-      true
-    rescue IPAddr::InvalidAddressError => _e
-      false
-    end
-
-    def self.valid_domain?(domain)
-      uri = URI("https://#{domain}")
-      uri.hostname == domain && domain.include?(".") && !valid_ip?(domain)
-    rescue ArgumentError => _e
-      false
-    end
-
-    def self.valid_onion_domain?(domain)
-      uri = URI("https://#{domain}")
-      uri.hostname == domain && domain.end_with?(".onion")
-    rescue ArgumentError => _e
-      false
-    end
-
-    def self.valid_md5?(md5)
-      md5.to_s.match?(/^[a-f0-9]{32}$/)
-    end
-  end
-end