mihari 5.2.3 → 5.3.0

data/lib/mihari.rb

@@ -19,7 +19,6 @@ require "active_support/core_ext/object/deep_dup"
 require "active_record"
 
 # dry-rb
-require "dry/configurable"
 require "dry/files"
 require "dry/initializer"
 require "dry/schema"
@@ -51,6 +50,8 @@ require "dotenv/load"
 require "mihari/version"
 require "mihari/errors"
 
+require "mihari/config"
+
 # Mixins
 require "mihari/mixins/autonomous_system"
 require "mihari/mixins/configurable"
@@ -60,55 +61,6 @@ require "mihari/mixins/refang"
 require "mihari/mixins/retriable"
 
 module Mihari
-  extend Dry::Configurable
-
-  setting :binaryedge_api_key, default: ENV.fetch("BINARYEDGE_API_KEY", nil)
-
-  setting :censys_id, default: ENV.fetch("CENSYS_ID", nil)
-  setting :censys_secret, default: ENV.fetch("CENSYS_SECRET", nil)
-
-  setting :circl_passive_password, default: ENV.fetch("CIRCL_PASSIVE_PASSWORD", nil)
-  setting :circl_passive_username, default: ENV.fetch("CIRCL_PASSIVE_USERNAME", nil)
-
-  setting :database_url, default: URI(ENV.fetch("DATABASE_URL", "sqlite3:///mihari.db"))
-
-  setting :greynoise_api_key, default: ENV.fetch("GREYNOISE_API_KEY", nil)
-
-  setting :ipinfo_api_key, default: ENV.fetch("IPINFO_API_KEY", nil)
-
-  setting :misp_url, default: ENV.fetch("MISP_URL", nil)
-  setting :misp_api_key, default: ENV.fetch("MISP_API_KEY", nil)
-
-  setting :onyphe_api_key, default: ENV.fetch("ONYPHE_API_KEY", nil)
-
-  setting :otx_api_key, default: ENV.fetch("OTX_API_KEY", nil)
-
-  setting :passivetotal_api_key, default: ENV.fetch("PASSIVETOTAL_API_KEY", nil)
-  setting :passivetotal_username, default: ENV.fetch("PASSIVETOTAL_USERNAME", nil)
-
-  setting :pulsedive_api_key, default: ENV.fetch("PULSEDIVE_API_KEY", nil)
-
-  setting :securitytrails_api_key, default: ENV.fetch("SECURITYTRAILS_API_KEY", nil)
-
-  setting :shodan_api_key, default: ENV.fetch("SHODAN_API_KEY", nil)
-
-  setting :slack_channel, default: ENV.fetch("SLACK_CHANNEL", nil)
-  setting :slack_webhook_url, default: ENV.fetch("SLACK_WEBHOOK_URL", nil)
-
-  setting :thehive_url, default: ENV.fetch("THEHIVE_URL", nil)
-  setting :thehive_api_key, default: ENV.fetch("THEHIVE_API_KEY", nil)
-  setting :thehive_api_version, default: ENV.fetch("THEHIVE_API_VERSION", nil)
-
-  setting :urlscan_api_key, default: ENV.fetch("URLSCAN_API_KEY", nil)
-
-  setting :virustotal_api_key, default: ENV.fetch("VIRUSTOTAL_API_KEY", nil)
-
-  setting :zoomeye_api_key, default: ENV.fetch("ZOOMEYE_API_KEY", nil)
-
-  setting :sentry_dsn, default: ENV.fetch("SENTRY_DSN", nil)
-
-  setting :hide_config_values, default: ENV.fetch("HIDE_CONFIG_VALUES", false)
-
   class << self
     include Memist::Memoizable
 
@@ -127,10 +79,8 @@ module Mihari
     end
     memoize :enrichers
 
-    def configs
-      (Mihari.analyzers + Mihari.emitters + Mihari.enrichers).map do |klass|
-        Mihari::Structs::Config.from_class(klass)
-      end.compact
+    def config
+      @config ||= Config.new
     end
 
     def logger
@@ -153,17 +103,17 @@ module Mihari
   end
 end
 
-require "mihari/database"
-require "mihari/type_checker"
-
-require "mihari/http"
-
 # Constants
 require "mihari/constants"
 
 # Types
 require "mihari/types"
 
+# Core classes
+require "mihari/database"
+require "mihari/type_checker"
+require "mihari/http"
+
 # Structs
 require "mihari/structs/censys"
 require "mihari/structs/config"

data/mihari.gemspec

@@ -28,6 +28,9 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|images|docker|.github)/}) }
   end
+  # Include frontend assets in lib/mihari/web/public
+  spec.files += Dir.glob("lib/mihari/web/public/**/*")
+
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
@@ -44,34 +47,31 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rerun", "~> 0.14"
   spec.add_development_dependency "rspec", "~> 3.12"
   spec.add_development_dependency "simplecov-lcov", "~> 0.8.0"
-  spec.add_development_dependency "standard", "~> 1.28"
+  spec.add_development_dependency "standard", "~> 1.29"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6.1"
+  spec.add_development_dependency "vcr", "~> 6.2"
   spec.add_development_dependency "webmock", "~> 3.18"
 
   unless ci_env?
-    spec.add_development_dependency "overcommit", "~> 0.60"
-    spec.add_development_dependency "ruby-lsp", "~> 0.5"
+    spec.add_development_dependency "lefthook", "~> 1.4"
     spec.add_development_dependency "solargraph", "~> 0.49"
     spec.add_development_dependency "steep", "~> 1.4"
   end
 
-  spec.add_dependency "activerecord", "7.0.5"
+  spec.add_dependency "activerecord", "7.0.6"
   spec.add_dependency "addressable", "2.8.4"
   spec.add_dependency "awrence", "2.0.1"
   spec.add_dependency "dotenv", "2.8.1"
-  spec.add_dependency "dry-configurable", "1.0.1"
   spec.add_dependency "dry-container", "0.11.0"
   spec.add_dependency "dry-files", "1.0.1"
-  spec.add_dependency "dry-initializer", "3.1.1"
-  spec.add_dependency "dry-schema", "1.13.1"
+  spec.add_dependency "dry-schema", "1.13.2"
   spec.add_dependency "dry-struct", "1.6.0"
   spec.add_dependency "dry-validation", "1.10.0"
   spec.add_dependency "email_address", "0.2.4"
   spec.add_dependency "grape", "1.7.0"
   spec.add_dependency "grape-entity", "1.0.0"
   spec.add_dependency "grape-swagger", "1.6.1"
-  spec.add_dependency "grape-swagger-entity", "0.5.1"
+  spec.add_dependency "grape-swagger-entity", "0.5.2"
   spec.add_dependency "insensitive_hash", "0.3.3"
   spec.add_dependency "jr-cli", "0.6.0"
   spec.add_dependency "launchy", "2.5.2"
@@ -80,13 +80,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "normalize_country", "0.3.2"
   spec.add_dependency "parallel", "1.23.0"
   spec.add_dependency "plissken", "2.0.1"
-  spec.add_dependency "public_suffix", "5.0.1"
-  spec.add_dependency "puma", "6.2.2"
-  spec.add_dependency "rack", "3.0.7"
+  spec.add_dependency "public_suffix", "5.0.3"
+  spec.add_dependency "puma", "6.3.0"
+  spec.add_dependency "rack", "3.0.8"
   spec.add_dependency "rack-cors", "2.0.1"
   spec.add_dependency "rackup", "2.1.0"
   spec.add_dependency "semantic_logger", "4.13.0"
-  spec.add_dependency "sentry-ruby", "5.9.0"
+  spec.add_dependency "sentry-ruby", "5.10.0"
   spec.add_dependency "slack-notifier", "2.4.0"
   spec.add_dependency "sqlite3", "1.6.3"
   spec.add_dependency "thor", "1.2.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mihari
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 5.3.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.29'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: '1.29'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -235,33 +235,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.18'
 - !ruby/object:Gem::Dependency
-  name: overcommit
+  name: lefthook
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.60'
-- !ruby/object:Gem::Dependency
-  name: ruby-lsp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: solargraph
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +282,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.5
+        version: 7.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.5
+        version: 7.0.6
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -346,20 +332,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.8.1
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -388,34 +360,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: dry-initializer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.13.2
 - !ruby/object:Gem::Dependency
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
@@ -506,14 +464,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: insensitive_hash
   requirement: !ruby/object:Gem::Requirement
@@ -632,42 +590,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.2
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.2
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
@@ -716,14 +674,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.9.0
+        version: 5.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.9.0
+        version: 5.10.0
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
@@ -817,8 +775,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
-- ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".standard.yml"
@@ -832,6 +788,92 @@ files:
 - build_frontend.sh
 - config.ru
 - exe/mihari
+- frontend/.eslintrc.cjs
+- frontend/.gitignore
+- frontend/.prettierrc.json
+- frontend/README.md
+- frontend/env.d.ts
+- frontend/index.html
+- frontend/package-lock.json
+- frontend/package.json
+- frontend/public/favicon.ico
+- frontend/scripts/swagger_doc_to_yaml.rb
+- frontend/src/App.vue
+- frontend/src/api-helper.ts
+- frontend/src/api.ts
+- frontend/src/components/ErrorMessage.vue
+- frontend/src/components/Loading.vue
+- frontend/src/components/Navbar.vue
+- frontend/src/components/Pagination.vue
+- frontend/src/components/alert/Alert.vue
+- frontend/src/components/alert/Alerts.vue
+- frontend/src/components/alert/AlertsWithPagination.vue
+- frontend/src/components/alert/AlertsWrapper.vue
+- frontend/src/components/alert/Form.vue
+- frontend/src/components/artifact/AS.vue
+- frontend/src/components/artifact/Artifact.vue
+- frontend/src/components/artifact/ArtifactTag.vue
+- frontend/src/components/artifact/ArtifactTags.vue
+- frontend/src/components/artifact/ArtifactWrapper.vue
+- frontend/src/components/artifact/CPEs.vue
+- frontend/src/components/artifact/DnsRecords.vue
+- frontend/src/components/artifact/Ports.vue
+- frontend/src/components/artifact/ReverseDnsNames.vue
+- frontend/src/components/artifact/Tags.vue
+- frontend/src/components/artifact/WhoisRecord.vue
+- frontend/src/components/config/Configs.vue
+- frontend/src/components/config/ConfigsWrapper.vue
+- frontend/src/components/link/Link.vue
+- frontend/src/components/link/Links.vue
+- frontend/src/components/rule/EditRule.vue
+- frontend/src/components/rule/EditRuleWrapper.vue
+- frontend/src/components/rule/Form.vue
+- frontend/src/components/rule/InputForm.vue
+- frontend/src/components/rule/NewRule.vue
+- frontend/src/components/rule/Rule.vue
+- frontend/src/components/rule/RuleWrapper.vue
+- frontend/src/components/rule/Rules.vue
+- frontend/src/components/rule/RulesWrapper.vue
+- frontend/src/components/rule/YAML.vue
+- frontend/src/components/tag/Tag.vue
+- frontend/src/components/tag/Tags.vue
+- frontend/src/countries.ts
+- frontend/src/index.ts
+- frontend/src/links/anyrun.ts
+- frontend/src/links/base.ts
+- frontend/src/links/censys.ts
+- frontend/src/links/crtsh.ts
+- frontend/src/links/dnslytics.ts
+- frontend/src/links/greynoise.ts
+- frontend/src/links/index.ts
+- frontend/src/links/intezer.ts
+- frontend/src/links/otx.ts
+- frontend/src/links/securitytrails.ts
+- frontend/src/links/shodan.ts
+- frontend/src/links/urlscan.ts
+- frontend/src/links/virustotal.ts
+- frontend/src/main.ts
+- frontend/src/router/index.ts
+- frontend/src/rule.ts
+- frontend/src/shims-vue.d.ts
+- frontend/src/swagger.yaml
+- frontend/src/types.ts
+- frontend/src/utils.ts
+- frontend/src/views/Alerts.vue
+- frontend/src/views/Artifact.vue
+- frontend/src/views/Configs.vue
+- frontend/src/views/EditRule.vue
+- frontend/src/views/NewRule.vue
+- frontend/src/views/Rule.vue
+- frontend/src/views/Rules.vue
+- frontend/tests/utils.spec.ts
+- frontend/tsconfig.app.json
+- frontend/tsconfig.json
+- frontend/tsconfig.node.json
+- frontend/tsconfig.vitest.json
+- frontend/vite.config.ts
+- frontend/vitest.config.ts
+- lefthook.yml
 - lib/mihari.rb
 - lib/mihari/analyzers/base.rb
 - lib/mihari/analyzers/binaryedge.rb
@@ -879,6 +921,7 @@ files:
 - lib/mihari/commands/search.rb
 - lib/mihari/commands/version.rb
 - lib/mihari/commands/web.rb
+- lib/mihari/config.rb
 - lib/mihari/constants.rb
 - lib/mihari/database.rb
 - lib/mihari/emitters/base.rb
@@ -966,8 +1009,8 @@ files:
 - lib/mihari/web/public/assets/fa-solid-900-7152a693.woff2
 - lib/mihari/web/public/assets/fa-v4compatibility-0515a423.ttf
 - lib/mihari/web/public/assets/fa-v4compatibility-694a17c3.woff2
-- lib/mihari/web/public/assets/index-cbe1734c.js
-- lib/mihari/web/public/assets/index-eed1bcd8.css
+- lib/mihari/web/public/assets/index-2ba8f0a6.css
+- lib/mihari/web/public/assets/index-71285b15.js
 - lib/mihari/web/public/favicon.ico
 - lib/mihari/web/public/index.html
 - lib/mihari/web/public/redoc-static.html

data/.overcommit.yml

@@ -1,12 +0,0 @@
-PreCommit:
-  BundleCheck:
-    enabled: true
-
-  RuboCop:
-    enabled: true
-    required_executable: bundle
-    command: ["bundle", "exec", "standardrb"]
-    on_warn: fail
-
-  YamlSyntax:
-    enabled: true