mihari 5.2.4 → 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"]
@@ -46,24 +49,21 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov-lcov", "~> 0.8.0"
   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 "lefthook", "~> 1.4"
-    spec.add_development_dependency "ruby-lsp", "~> 0.5"
     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.2"
   spec.add_dependency "dry-struct", "1.6.0"
   spec.add_dependency "dry-validation", "1.10.0"
@@ -71,7 +71,7 @@ Gem::Specification.new do |spec|
   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 "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.4
+  version: 5.3.0
 platform: ruby
 authors:
 - Manabu Niseki
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -248,20 +248,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: ruby-lsp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 - !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,20 +360,6 @@ 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
@@ -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,14 +590,14 @@ 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
@@ -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
@@ -830,13 +788,12 @@ files:
 - build_frontend.sh
 - config.ru
 - exe/mihari
-- frontend/.browserslistrc
-- frontend/.eslintrc.js
+- frontend/.eslintrc.cjs
 - frontend/.gitignore
+- frontend/.prettierrc.json
 - frontend/README.md
-- frontend/babel.config.js
+- frontend/env.d.ts
 - frontend/index.html
-- frontend/jest.config.js
 - frontend/package-lock.json
 - frontend/package.json
 - frontend/public/favicon.ico
@@ -909,9 +866,13 @@ files:
 - frontend/src/views/NewRule.vue
 - frontend/src/views/Rule.vue
 - frontend/src/views/Rules.vue
-- frontend/tests/unit/utils.spec.ts
+- frontend/tests/utils.spec.ts
+- frontend/tsconfig.app.json
 - frontend/tsconfig.json
-- frontend/vite.config.js
+- 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
@@ -960,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
@@ -1047,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-ac4e5ffa.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/frontend/.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not dead

data/frontend/.eslintrc.js

@@ -1,33 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-  },
-  plugins: ["simple-import-sort"],
-  extends: [
-    "plugin:vue/vue3-essential",
-    "eslint:recommended",
-    "@vue/typescript/recommended",
-    "plugin:prettier/recommended",
-  ],
-  parserOptions: {
-    ecmaVersion: 2020,
-  },
-  rules: {
-    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "simple-import-sort/imports": "error",
-    "simple-import-sort/exports": "error",
-  },
-  overrides: [
-    {
-      files: [
-        "**/__tests__/*.{j,t}s?(x)",
-        "**/tests/unit/**/*.spec.{j,t}s?(x)",
-      ],
-      env: {
-        jest: true,
-      },
-    },
-  ],
-};

data/frontend/babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-};

data/frontend/jest.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-  moduleNameMapper: {
-    "^@/(.*)$": "<rootDir>/src/$1",
-  },
-  transform: {
-    "^.+\\.vue$": "@vue/vue3-jest",
-    "^.+\\.ts$": "ts-jest",
-  },
-};

data/frontend/tests/unit/utils.spec.ts

@@ -1,7 +0,0 @@
-import { getHumanizedRelativeTime } from "@/utils";
-
-describe("getHumanizedRelativeTime", () => {
-  it("returns a relative time in humanized format", () => {
-    expect(getHumanizedRelativeTime("1970-01-01 00:00:00")).toContain("years");
-  });
-});

data/frontend/vite.config.js

@@ -1,24 +0,0 @@
-import vue from "@vitejs/plugin-vue";
-import path from "path";
-import { defineConfig, loadEnv } from "vite";
-
-export default defineConfig(({ _, mode }) => {
-  const env = loadEnv(mode, process.cwd(), "");
-  const target = env.BACKEND_URL || "http://localhost:9292/";
-  const port = env.port || 8080;
-
-  return {
-    plugins: [vue()],
-    server: {
-      port,
-      proxy: {
-        "/api": target,
-      },
-    },
-    resolve: {
-      alias: {
-        "@": path.resolve(__dirname, "./src"),
-      },
-    },
-  };
-});