mihari 7.1.0 → 7.1.2

data/lib/mihari/schemas/analyzer.rb

@@ -10,12 +10,12 @@ module Mihari
 
       # Analyzer with API key and pagination
       [
-        Mihari::Analyzers::BinaryEdge.class_keys,
-        Mihari::Analyzers::GreyNoise.class_keys,
-        Mihari::Analyzers::Onyphe.class_keys,
-        Mihari::Analyzers::Shodan.class_keys,
-        Mihari::Analyzers::Urlscan.class_keys,
-        Mihari::Analyzers::VirusTotalIntelligence.class_keys
+        Mihari::Analyzers::BinaryEdge.keys,
+        Mihari::Analyzers::GreyNoise.keys,
+        Mihari::Analyzers::Onyphe.keys,
+        Mihari::Analyzers::Shodan.keys,
+        Mihari::Analyzers::Urlscan.keys,
+        Mihari::Analyzers::VirusTotalIntelligence.keys
       ].each do |keys|
         key = keys.first
         const_set(key.upcase, Dry::Schema.Params do
@@ -28,10 +28,10 @@ module Mihari
 
       # Analyzer with API key
       [
-        Mihari::Analyzers::OTX.class_keys,
-        Mihari::Analyzers::Pulsedive.class_keys,
-        Mihari::Analyzers::VirusTotal.class_keys,
-        Mihari::Analyzers::SecurityTrails.class_keys
+        Mihari::Analyzers::OTX.keys,
+        Mihari::Analyzers::Pulsedive.keys,
+        Mihari::Analyzers::VirusTotal.keys,
+        Mihari::Analyzers::SecurityTrails.keys
       ].each do |keys|
         key = keys.first
         const_set(key.upcase, Dry::Schema.Params do
@@ -43,13 +43,13 @@ module Mihari
       end
 
       DNSTwister = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::DNSTwister.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::DNSTwister.keys))
         required(:query).value(:string)
         optional(:options).hash(AnalyzerOptions)
       end
 
       Censys = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Censys.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Censys.keys))
         required(:query).value(:string)
         optional(:id).value(:string)
         optional(:secret).value(:string)
@@ -57,7 +57,7 @@ module Mihari
       end
 
       CIRCL = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::CIRCL.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::CIRCL.keys))
         required(:query).value(:string)
         optional(:username).value(:string)
         optional(:password).value(:string)
@@ -65,7 +65,7 @@ module Mihari
       end
 
       Fofa = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Fofa.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Fofa.keys))
         required(:query).value(:string)
         optional(:api_key).value(:string)
         optional(:email).value(:string)
@@ -73,7 +73,7 @@ module Mihari
       end
 
       PassiveTotal = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::PassiveTotal.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::PassiveTotal.keys))
         required(:query).value(:string)
         optional(:username).value(:string)
         optional(:api_key).value(:string)
@@ -81,14 +81,14 @@ module Mihari
       end
 
       ZoomEye = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::ZoomEye.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::ZoomEye.keys))
         required(:query).value(:string)
         required(:type).value(Types::String.enum("host", "web"))
         optional(:options).hash(AnalyzerPaginationOptions)
       end
 
       Crtsh = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Crtsh.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Crtsh.keys))
         required(:query).value(:string)
         optional(:exclude_expired).value(:bool).default(true)
         optional(:match).value(Types::String.enum("=", "ILIKE", "LIKE", "single", "any", "FTS")).default(nil)
@@ -96,7 +96,7 @@ module Mihari
       end
 
       HunterHow = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::HunterHow.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::HunterHow.keys))
         required(:query).value(:string)
         required(:start_time).value(:date)
         required(:end_time).value(:date)
@@ -105,7 +105,7 @@ module Mihari
       end
 
       Feed = Dry::Schema.Params do
-        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Feed.class_keys))
+        required(:analyzer).value(Types::String.enum(*Mihari::Analyzers::Feed.keys))
         required(:query).value(:string)
         required(:selector).value(:string)
         optional(:method).value(Types::HTTPRequestMethods).default("GET")

data/lib/mihari/schemas/emitter.rb

@@ -9,33 +9,33 @@ module Mihari
       extend Concerns::Orrable
 
       Database = Dry::Schema.Params do
-        required(:emitter).value(Types::String.enum(*Mihari::Emitters::Database.class_keys))
+        required(:emitter).value(Types::String.enum(*Mihari::Emitters::Database.keys))
         optional(:options).hash(Options)
       end
 
       MISP = Dry::Schema.Params do
-        required(:emitter).value(Types::String.enum(*Mihari::Emitters::MISP.class_keys))
+        required(:emitter).value(Types::String.enum(*Mihari::Emitters::MISP.keys))
         optional(:url).value(:string)
         optional(:api_key).value(:string)
         optional(:options).hash(Options)
       end
 
       TheHive = Dry::Schema.Params do
-        required(:emitter).value(Types::String.enum(*Mihari::Emitters::TheHive.class_keys))
+        required(:emitter).value(Types::String.enum(*Mihari::Emitters::TheHive.keys))
         optional(:url).value(:string)
         optional(:api_key).value(:string)
         optional(:options).hash(Options)
       end
 
       Slack = Dry::Schema.Params do
-        required(:emitter).value(Types::String.enum(*Mihari::Emitters::Slack.class_keys))
+        required(:emitter).value(Types::String.enum(*Mihari::Emitters::Slack.keys))
         optional(:webhook_url).value(:string)
         optional(:channel).value(:string)
         optional(:options).hash(Options)
       end
 
       Webhook = Dry::Schema.Params do
-        required(:emitter).value(Types::String.enum(*Mihari::Emitters::Webhook.class_keys))
+        required(:emitter).value(Types::String.enum(*Mihari::Emitters::Webhook.keys))
         required(:url).value(:string)
         optional(:method).value(Types::HTTPRequestMethods).default("POST")
         optional(:headers).value(:hash).default({})

data/lib/mihari/schemas/enricher.rb

@@ -9,22 +9,22 @@ module Mihari
       extend Concerns::Orrable
 
       MMDB = Dry::Schema.Params do
-        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::MMDB.class_keys))
+        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::MMDB.keys))
         optional(:options).hash(Options)
       end
 
       Whois = Dry::Schema.Params do
-        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::Whois.class_keys))
+        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::Whois.keys))
         optional(:options).hash(Options)
       end
 
       Shodan = Dry::Schema.Params do
-        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::Shodan.class_keys))
+        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::Shodan.keys))
         optional(:options).hash(Options)
       end
 
       GooglePublicDNS = Dry::Schema.Params do
-        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::GooglePublicDNS.class_keys))
+        required(:enricher).value(Types::String.enum(*Mihari::Enrichers::GooglePublicDNS.keys))
         optional(:options).hash(Options)
       end
     end

data/lib/mihari/structs/config.rb

@@ -68,7 +68,7 @@ module Mihari
           begin
             instance = get_dummy(klass)
             new(
-              name: klass.class_key,
+              name: klass.key,
               items: klass.configuration_items,
               configured: instance.configured?,
               type: type

data/lib/mihari/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mihari
-  VERSION = "7.1.0"
+  VERSION = "7.1.2"
 end