mihari 4.11.0 → 4.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda042a7f3e0c70bb86a1008d24556b2daf4264142e01936e4bdab3da275ff39
-  data.tar.gz: a5e3711ecb0fb982ce6280fbed12261d753e2224966e3961ac2cfe2b83e0e15d
+  metadata.gz: 16412e44a6aa5eb9fb7022aa531b950249df76f074136e71c6621e5f2d3c7d44
+  data.tar.gz: 403f780911934e891ef072c87a3a6ae48d31f1854c8806d4c9ece884faf9ec62
 SHA512:
-  metadata.gz: f33e198db0d4964eb15372b30ef6733aaf3efe51b31640e62e33da2412089e30f618ea9509cc86d57a6e38ae65eac1dd5c7f3fab9c2dc1d5793d005bdcb95862
-  data.tar.gz: d7824b329d6117c2539e62044374b989538e4d22fd7641eb63b11db3b766ef52943f3559cb6a43be440b60f55609a763e316661e69196d6749486c8027cad5b2
+  metadata.gz: edde8ae3fb93a7e3719788c6727782f7f9a9e2ae53eaa9d804342e545e0ca5e9ec6bb96d633f9c26a33f98e4addaf8693b6da37de8930f8770847a531665baa0
+  data.tar.gz: afda1bef59be058cbb5972d771bf7615820cc4588cae6cc53c2f2d39333e02edce9a3165dee30caf0996195ab09565392316d116040ce5cc93dbdac28b04c239

data/.github/workflows/test.yml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, "3.0", 3.1]
+        ruby: [2.7, "3.0", 3.1, 3.2]
 
     steps:
       - uses: actions/checkout@v3

data/README.md

@@ -5,9 +5,19 @@
 [![Coverage Status](https://coveralls.io/repos/github/ninoseki/mihari/badge.svg?branch=master)](https://coveralls.io/github/ninoseki/mihari?branch=master)
 [![CodeFactor](https://www.codefactor.io/repository/github/ninoseki/mihari/badge)](https://www.codefactor.io/repository/github/ninoseki/mihari)
 
-![img](https://github.com/ninoseki/mihari/raw/master/images/logo.png)
-
-[![](images/tines.png)](https://tines.io?utm_source=github&utm_medium=sponsorship&utm_campaign=ninoseki)
+---
+
+<p align="center">
+  <img src="https://github.com/ninoseki/mihari/raw/master/images/logo.png"/>
+  <br/>
+  <a href="https://tines.io?utm_source=github&utm_medium=sponsorship&utm_campaign=ninoseki">
+    <img src="https://github.com/ninoseki/mihari/raw/master/images/Tines-Full_Logo-Tines_Black.png"/>
+  </a>
+  <br/>
+  Mihari is proudly supported by <a href="https://tines.io?utm_source=github&utm_medium=sponsorship&utm_campaign=ninoseki">Tines</a>
+</p>
+
+---
 
 Mihari is a tool for OSINT based threat hunting.
 

data/build_frontend.sh

@@ -15,8 +15,5 @@ trash -r ${CURRENT_DIR}/lib/mihari/web/public/
 mkdir -p ${CURRENT_DIR}/lib/mihari/web/public/
 cp -r dist/* ${CURRENT_DIR}/lib/mihari/web/public
 
-# replace favicon path
-sed -i "" 's/href="\/favicon.ico"/href="\/static\/favicon.ico"/' ${CURRENT_DIR}/lib/mihari/web/public/index.html
-
 # remove tmp dir
 rm -rf ${CURRENT_DIR}/tmp/mihari-frontend

data/docker/Dockerfile

@@ -1,15 +1,14 @@
-FROM ruby:3.0.3-alpine3.13
-
-RUN apk --no-cache add git build-base ruby-dev sqlite-dev postgresql-dev mysql-client mysql-dev \
-  && gem install pg mysql2 \
-  && cd /tmp/ \
-  && git clone https://github.com/ninoseki/mihari.git \
-  && cd mihari \
-  && gem build mihari.gemspec -o mihari.gem \
-  && gem install mihari.gem \
-  && rm -rf /tmp/mihari \
-  && apk del --purge git build-base ruby-dev
+FROM ruby:3.1.3-alpine3.17
+
+RUN apk --no-cache add git build-base ruby-dev sqlite-dev postgresql-dev mysql-client mysql-dev && \
+  gem install pg mysql2
+
+ARG MIHARI_VERSION=4.11.0
+
+RUN gem install mihari -v ${MIHARI_VERSION}
+
+RUN apk del --purge git build-base ruby-dev
 
 ENTRYPOINT ["mihari"]
 
-CMD ["--help"]
+CMD ["--help"]

data/lib/mihari/commands/web.rb

@@ -8,18 +8,20 @@ module Mihari
           desc "web", "Launch the web app"
           method_option :port, type: :numeric, default: 9292, desc: "Hostname to listen on"
           method_option :host, type: :string, default: "localhost", desc: "Port to listen on"
-          method_option :threads, type: :string, default: "1:1", desc: "min:max threads to use"
+          method_option :threads, type: :string, default: "0:5", desc: "min:max threads to use"
           method_option :verbose, type: :boolean, default: true, desc: "Report each request"
+          method_option :worker_timeout, type: :numeric, default: 60, desc: "Worker timeout value (in seconds)"
           def web
             port = options["port"]
             host = options["host"]
             threads = options["threads"]
             verbose = options["verbose"]
+            worker_timeout = options["worker_timeout"]
 
             # set rack env as production
             ENV["RACK_ENV"] ||= "production"
 
-            Mihari::App.run!(port: port, host: host, threads: threads, verbose: verbose)
+            Mihari::App.run!(port: port, host: host, threads: threads, verbose: verbose, worker_timeout: worker_timeout)
           end
         end
       end

data/lib/mihari/version.rb

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

data/lib/mihari/web/app.rb

@@ -31,7 +31,7 @@ module Mihari
           use Rack::Cors do
             allow do
               origins "*"
-              resource "*", headers: :any, methods: [:get, :post, :put, :delete, :options]
+              resource "*", headers: :any, methods: %i[get post put delete options]
             end
           end
 
@@ -42,7 +42,7 @@ module Mihari
         end.to_app
       end
 
-      def run!(port: 9292, host: "localhost", threads: "1:1", verbose: false)
+      def run!(port: 9292, host: "localhost", threads: "0:5", verbose: false, worker_timeout: 60)
         url = "http://#{host}:#{port}"
 
         # set maximum number of threads to use as PARALLEL_PROCESSOR_COUNT (if it is not set)
@@ -50,8 +50,14 @@ module Mihari
         # TODO: is this the best way?
         _min_thread, max_thread = threads.split(":")
         ENV["PARALLEL_PROCESSOR_COUNT"] = max_thread if ENV["PARALLEL_PROCESSOR_COUNT"].nil?
-
-        Rack::Handler::Puma.run(instance, Port: port, Host: host, Threads: threads, Verbose: verbose) do |_launcher|
+        Rack::Handler::Puma.run(
+          instance,
+          Port: port,
+          Host: host,
+          Threads: threads,
+          Verbose: verbose,
+          worker_timeout: worker_timeout
+        ) do |_launcher|
           Launchy.open(url) if ENV["RACK_ENV"] != "development"
         rescue Launchy::CommandNotFoundError
           # ref. https://github.com/ninoseki/mihari/issues/477