Skip to content

Commit

Permalink
Merge pull request #1029 from ninoseki/v7.2.0
Browse files Browse the repository at this point in the history
V7.2.0
  • Loading branch information
ninoseki authored Jan 14, 2024
2 parents 8f7a2ac + c87ff2b commit 69b49fc
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 95 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ruby:3.2.2-alpine3.19

ARG MIHARI_VERSION=0.0.0

RUN apk --no-cache add build-base ruby-dev libpq-dev && \
RUN apk --no-cache add build-base ruby-dev libpq-dev whois && \
echo 'gem: --no-document' >> /usr/local/etc/gemrc && \
gem install pg && \
gem install mihari -v ${MIHARI_VERSION} && \
Expand Down
4 changes: 2 additions & 2 deletions docs/analyzers/circl.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ tags:

This analyzer uses CIRCL passive DNS API or passive SSL API:

- Use passive DNS API if a query is a domain
- Use passive SSL API if a query is a SHA1 certificate fingerprint
- Use passive DNS API if a query is a domain.
- Use passive SSL API if a query is a SHA1 certificate fingerprint.

```yaml
analyzer: circl
Expand Down
2 changes: 1 addition & 1 deletion docs/enrichers/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ options:
### Timeout
`timeout` (`integer`) is an HTTP timeout in seconds. Optional.
`timeout` (`integer`) is an HTTP or Whois timeout in seconds. Optional.

### Retry Times

Expand Down
28 changes: 28 additions & 0 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,36 @@ If you want to use MySQL or PostgreSQL instead of SQLite3, please install a gem
gem install mysql2
```

!!! note

- Mihari is tested with `mysql2` v0.5+.
- Please check [brianmario/mysql2](https://github.com/brianmario/mysql2) if you have a problem with installing `mysql2`.

**PostgreSQL**

```bash
gem install pg
```

!!! note

- Mihari is tested with `pg` v1.5+.
- Please check [ged/ruby-pg](https://github.com/ged/ruby-pg) if you have a problem with installing `pg`.

## With Bundler

Alternatively you can use [Bundler](https://bundler.io/) to manage dependencies.

**Gemfile**

```ruby
source 'https://rubygems.org'

gem 'mihari'

# Remove mysql2 or pg if you don't use MySQL or PostgreSQL
gem "mysql2", "~> 0.5"
gem "pg", "~> 1.5"
```

`mihari` and `mysql2` or `pg` will be installed by `bundle install`.
168 changes: 84 additions & 84 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 69b49fc

Please sign in to comment.