secator 0.6.0__tar.gz → 0.8.0__tar.gz

secator-0.8.0/.docker/Dockerfile.alpine

@@ -0,0 +1,36 @@
+FROM alpine:latest
+
+ENV PATH="${PATH}:/root/.local/bin"
+ENV GOBIN="/root/.local/bin"
+ENV TERM="dumb"
+RUN apk add --no-cache \
+	bash \
+	build-base \
+	chromium \
+	curl \
+	gcc \
+	git \
+	go \
+	linux-headers \
+    openssl \
+	pipx \
+	proxychains-ng \
+	python3 \
+	python3-dev \
+	py3-pip \
+	ruby \
+	ruby-dev \
+	sudo \
+	unzip
+COPY . /code
+WORKDIR /code
+RUN pipx install . && \
+	secator install addons worker && \
+	secator install addons gdrive && \
+	secator install addons gcs && \
+	secator install addons mongodb && \
+	secator install addons redis && \
+	secator install addons dev
+RUN secator config set security.force_source_install true
+RUN secator install tools
+ENTRYPOINT ["secator"]

secator-0.8.0/.docker/Dockerfile.arch

@@ -0,0 +1,38 @@
+FROM archlinux:latest
+
+ENV PATH="${PATH}:/root/.local/bin"
+ENV GOBIN="/root/.local/bin"
+RUN pacman -Syu --noconfirm && \
+    pacman -S --noconfirm \
+	base-devel \
+	bash \
+	chromium \
+	curl \
+	gcc \
+	git \
+	go \
+    jq \
+    make \
+    openssl \
+	proxychains \
+	proxychains-ng \
+	python \
+	python-pip \
+	python-pipx \
+	ruby \
+	rubygems \
+	unzip \
+	vim \
+    wget
+COPY . /code
+WORKDIR /code
+RUN pipx install . && \
+	secator install addons worker && \
+	secator install addons gdrive && \
+	secator install addons gcs && \
+	secator install addons mongodb && \
+	secator install addons redis && \
+	secator install addons dev
+RUN secator config set security.force_source_install true
+RUN secator install tools
+ENTRYPOINT ["secator"]

secator-0.8.0/.docker/Dockerfile.debian

@@ -0,0 +1,41 @@
+FROM debian:latest
+
+ENV PATH="${PATH}:/root/.local/bin"
+ENV GOBIN="/root/.local/bin"
+RUN apt update -y && \
+    apt install -y \
+	bash \
+	build-essential \
+	chromium \
+	curl \
+	gcc \
+	git \
+	golang-go \
+    jq \
+    make \
+    openssl \
+	pipx \
+	python3 \
+	python3-pip \
+	python3-venv \
+	ruby-full \
+	rubygems \
+	proxychains \
+	proxychains-ng \
+	sudo \
+	unzip \
+	vim \
+    wget
+COPY . /code
+WORKDIR /code
+RUN pipx install . && \
+	secator install addons worker && \
+	secator install addons gdrive && \
+	secator install addons gcs && \
+	secator install addons mongodb && \
+	secator install addons redis && \
+	secator install addons dev
+RUN secator install langs go
+RUN secator config set security.force_source_install true
+RUN secator install tools
+ENTRYPOINT ["secator"]

secator-0.8.0/.docker/Dockerfile.kali

@@ -0,0 +1,40 @@
+FROM kalilinux/kali-rolling:latest
+
+ENV PATH="${PATH}:/root/.local/bin"
+ENV GOBIN="/root/.local/bin"
+RUN apt update -y && \
+    apt install -y \
+	bash \
+	build-essential \
+	chromium \
+	curl \
+	gcc \
+	git \
+	golang-go \
+    jq \
+    make \
+    openssl \
+	pipx \
+	python3 \
+	python3-pip \
+	python3-venv \
+	ruby-full \
+	rubygems \
+	sudo \
+	proxychains \
+	proxychains-ng \
+	unzip \
+	vim \
+    wget
+COPY . /code
+WORKDIR /code
+RUN pipx install . && \
+	secator install addons worker && \
+	secator install addons gdrive && \
+	secator install addons gcs && \
+	secator install addons mongodb && \
+	secator install addons redis && \
+	secator install addons dev
+RUN secator config set security.force_source_install true
+RUN secator install tools
+ENTRYPOINT ["secator"]

secator-0.8.0/.docker/Dockerfile.osx

@@ -0,0 +1,42 @@
+FROM sickcodes/docker-osx:latest
+
+ENV PATH="${PATH}:/home/arch/.local/bin"
+ENV GOBIN="/home/arch/.local/bin"
+RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+RUN echo >> /home/arch/.bashrc
+RUN echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"' >> /home/arch/.bashrc
+RUN sudo pacman -Syu --noconfirm && \
+    sudo pacman -S --noconfirm -y \
+	base-devel \
+	bash \
+	chromium \
+	curl \
+	gcc \
+	git \
+	go \
+    jq \
+    make \
+    openssl \
+	proxychains \
+	proxychains-ng \
+	python \
+	python-pip \
+	python-pipx \
+	ruby \
+	rubygems \
+	unzip \
+	vim \
+    wget
+COPY . /code
+WORKDIR /code
+USER arch
+RUN pipx install . && \
+	secator install addons worker && \
+	secator install addons gdrive && \
+	secator install addons gcs && \
+	secator install addons mongodb && \
+	secator install addons redis && \
+	secator install addons dev
+RUN secator config set security.force_source_install true
+RUN secator install tools
+ENTRYPOINT ["secator"]

secator-0.8.0/.docker/Dockerfile.ubuntu

@@ -0,0 +1,40 @@
+FROM ubuntu:latest
+
+ENV PATH="${PATH}:/root/.local/bin"
+ENV GOBIN="/root/.local/bin"
+RUN apt update -y && \
+    apt install -y \
+	bash \
+	build-essential \
+	chromium \
+	curl \
+	gcc \
+	git \
+	golang-go \
+    jq \
+    make \
+    openssl \
+	pipx \
+	python3 \
+	python3-pip \
+	python3-venv \
+	ruby-full \
+	rubygems \
+	proxychains \
+	proxychains-ng \
+	sudo \
+	unzip \
+	vim \
+    wget
+COPY . /code
+WORKDIR /code
+RUN pipx install . && \
+	secator install addons worker && \
+	secator install addons gdrive && \
+	secator install addons gcs && \
+	secator install addons mongodb && \
+	secator install addons redis && \
+	secator install addons dev
+RUN secator config set security.force_source_install true
+RUN secator install tools
+ENTRYPOINT ["secator"]

secator-0.8.0/.docker/build_all.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Define an array of distributions
+DISTROS=("alpine" "arch" "debian" "kali" "osx" "ubuntu")
+
+# Function to build an image
+build_image() {
+    local DISTRO=$1
+    local DOCKERFILE=".docker/Dockerfile.${DISTRO}"
+    local IMAGE_NAME="secator-${DISTRO}"
+
+    if [ -f "$DOCKERFILE" ]; then
+        echo "🚀 Building $IMAGE_NAME using $DOCKERFILE..."
+        docker build -t "$IMAGE_NAME" -f "$DOCKERFILE" . && \
+        echo "✅ Successfully built $IMAGE_NAME" || \
+        echo "❌ Failed to build $IMAGE_NAME"
+    else
+        echo "⚠️ Dockerfile $DOCKERFILE not found, skipping..."
+    fi
+}
+
+# Iterate through the distributions and build in parallel
+for DISTRO in "${DISTROS[@]}"; do
+    build_image "$DISTRO" &
+done
+
+# Wait for all background jobs to finish
+wait
+
+echo "🎉 All parallel builds completed!"

secator-0.8.0/.dockerignore

@@ -0,0 +1 @@
+.gitignore

{secator-0.6.0 → secator-0.8.0}/CHANGELOG.md

@@ -1,5 +1,81 @@
 # Changelog
 
+## [0.8.0](https://github.com/freelabz/secator/compare/v0.7.0...v0.8.0) (2025-02-06)
+
+
+### Features
+
+* add alpine to msfinstall script ([cf921fd](https://github.com/freelabz/secator/commit/cf921fd7e7f31f6e37c14e5831f5e4d3aa087f44))
+* add install support for multiple distribs ([#514](https://github.com/freelabz/secator/issues/514)) ([19d1317](https://github.com/freelabz/secator/commit/19d131760221cf6c92a6f60e29ceb236eb7e0640))
+* **config:** load wordlists from URLs and config values ([#498](https://github.com/freelabz/secator/issues/498)) ([d537952](https://github.com/freelabz/secator/commit/d537952cc0065de2053479ab75927321b8032e41))
+* **nmap:** lookup and correlate exploits with CVE ids ([#489](https://github.com/freelabz/secator/issues/489)) ([988edcb](https://github.com/freelabz/secator/commit/988edcbb1f5855f64a96dd5b1cc16c0c10256cc6))
+* **runner:** add previous results to runner results ([#503](https://github.com/freelabz/secator/issues/503)) ([2c490fb](https://github.com/freelabz/secator/commit/2c490fb2d5d358785c22849716f78f158c975766))
+
+
+### Bug Fixes
+
+* **cli:** various fixes to report commands ([#507](https://github.com/freelabz/secator/issues/507)) ([ee715dd](https://github.com/freelabz/secator/commit/ee715dd9cba75a1e1a3ff12ec98ccbdae8c48675))
+* **docs:** update docker-compose.yml ([#462](https://github.com/freelabz/secator/issues/462)) ([3140ee2](https://github.com/freelabz/secator/commit/3140ee25dd69aa387e3b100719a67609c099219b))
+* **install:** strict healthcheck, better version parsing, install fixes ([#496](https://github.com/freelabz/secator/issues/496)) ([7d6e071](https://github.com/freelabz/secator/commit/7d6e0719dc3a83fb6ae47b2898bb63d43c03f685))
+* misc bug fixes ([#511](https://github.com/freelabz/secator/issues/511)) ([16b50c4](https://github.com/freelabz/secator/commit/16b50c481da5be9b62cbb93effd9464a581e57a6))
+* **msfconsole:** bug fixes ([#488](https://github.com/freelabz/secator/issues/488)) ([a54077d](https://github.com/freelabz/secator/commit/a54077d5cbcf5518f73300edf4db9a2000017ec5))
+* msfinstall script ([171f868](https://github.com/freelabz/secator/commit/171f868d07c4c29444fca7487b7ea9d25148b295))
+* **naabu:** change localhost to 127.0.0.1 before run ([#501](https://github.com/freelabz/secator/issues/501)) ([d0938ba](https://github.com/freelabz/secator/commit/d0938bac31de3d820e6dee53b61f9458fcd1a424))
+* **naabu:** convert localhost to 127.0.0.1 and back ([#502](https://github.com/freelabz/secator/issues/502)) ([935ee65](https://github.com/freelabz/secator/commit/935ee65c13db90e8e6479d189947b48302fb5db1))
+* **runner:** duplicate prints in runner due to processing of existing results ([#509](https://github.com/freelabz/secator/issues/509)) ([602cdf0](https://github.com/freelabz/secator/commit/602cdf0445a5ece0c1d50ae04ff1266705cff71b))
+* syntax warnings ([#508](https://github.com/freelabz/secator/issues/508)) ([54fb8cd](https://github.com/freelabz/secator/commit/54fb8cdb3f8f8cd3a42a28ce5f8d5f45e9c50295))
+* **template:** bugfix for compound group keys ([#487](https://github.com/freelabz/secator/issues/487)) ([b3e7327](https://github.com/freelabz/secator/commit/b3e73274426f09a5e940f5932ae09e7eb1f592d7))
+* **tests:** update wpscan integration test ([#490](https://github.com/freelabz/secator/issues/490)) ([1493063](https://github.com/freelabz/secator/commit/1493063f236f33f6ed1ec37a1359e859f51ecd53))
+* update cve circl search ([#506](https://github.com/freelabz/secator/issues/506)) ([6e10e4a](https://github.com/freelabz/secator/commit/6e10e4aa2f7013dce4941688d98bda0253588bfc))
+* various fixes ([#515](https://github.com/freelabz/secator/issues/515)) ([a88c5a7](https://github.com/freelabz/secator/commit/a88c5a7e9a0ec01f4824e427474a7bd115008b5d))
+
+## [0.7.0](https://github.com/freelabz/secator/compare/v0.6.0...v0.7.0) (2024-11-13)
+
+
+### Features
+
+* **`bup`:** add proxy option and progress indicator ([#444](https://github.com/freelabz/secator/issues/444)) ([d5c63c8](https://github.com/freelabz/secator/commit/d5c63c81c6465a142ce70e4800effc02d526a243))
+* **`dnsx`:** add IP output type on dnsx A record  ([#426](https://github.com/freelabz/secator/issues/426)) ([629439e](https://github.com/freelabz/secator/commit/629439e459a6eefd5cbe68e9fc3a317371ba7987))
+* **`naabu`/`nmap`:** help for defaults and change workflow opts ([#438](https://github.com/freelabz/secator/issues/438)) ([4dd0055](https://github.com/freelabz/secator/commit/4dd00556648e691a093887d294325b00409ac04a))
+* **`nmap`:** add udp scan (`-sU`) and change default scan opts ([#418](https://github.com/freelabz/secator/issues/418)) ([36c6ff3](https://github.com/freelabz/secator/commit/36c6ff3766f88ac311c1bfea86a1b5e8686dd94e))
+* add url_bypass workflow based on bup ([e96b1bc](https://github.com/freelabz/secator/commit/e96b1bc9906cd2f9aa3eb5b3770594811f242abd))
+* chunk dalfox input by 1 ([#443](https://github.com/freelabz/secator/issues/443)) ([26c38d7](https://github.com/freelabz/secator/commit/26c38d79e89be3d35f464e89c6973b7beadb6ac4))
+* **cli:** misc bug fixes and features ([#445](https://github.com/freelabz/secator/issues/445)) ([fccfdb8](https://github.com/freelabz/secator/commit/fccfdb8ca38dcd3a2c559429a7d58d46ecac49a6))
+* **hooks:** explicit output type yield in static hooks ([#439](https://github.com/freelabz/secator/issues/439)) ([2d1f8e6](https://github.com/freelabz/secator/commit/2d1f8e6b7b77210028efe2c2c56866efbd6b0152))
+* **katana:** add form_fill option ([#419](https://github.com/freelabz/secator/issues/419)) ([bebddb1](https://github.com/freelabz/secator/commit/bebddb1e2fae460403adda2d84b9ae515ca977aa))
+* **refactor:** improve performance, add on_interval hook, rework CLI opts ([#473](https://github.com/freelabz/secator/issues/473)) ([4a22a70](https://github.com/freelabz/secator/commit/4a22a7082fe1edf50644034cfc54b11653b47aa4))
+* **runner:** add GCS driver and secator threads ([#476](https://github.com/freelabz/secator/issues/476)) ([cae475a](https://github.com/freelabz/secator/commit/cae475a2fe15742ccd80d40c28ad41aa1ffc5348))
+* **runner:** add skip_if_no_inputs to workflows ([#482](https://github.com/freelabz/secator/issues/482)) ([5546b82](https://github.com/freelabz/secator/commit/5546b82756d6aad0d227072d5a3b1149c44306e8))
+* **runner:** on serialized hooks ([#424](https://github.com/freelabz/secator/issues/424)) ([fde6cd7](https://github.com/freelabz/secator/commit/fde6cd7f6cba015b08b370bfd14b0aca3f4a4018))
+* **runner:** rework Celery core and mix fixes ([#450](https://github.com/freelabz/secator/issues/450)) ([b72f152](https://github.com/freelabz/secator/commit/b72f15286bb29ae60568309907d4dad41d4fbacb))
+* sudo prompt check test ([#432](https://github.com/freelabz/secator/issues/432)) ([f45b123](https://github.com/freelabz/secator/commit/f45b1230fd6313342ebdda5a359c1285f2d80aa8))
+* sudo prompts in non-tty mode ([#431](https://github.com/freelabz/secator/issues/431)) ([0e26b55](https://github.com/freelabz/secator/commit/0e26b55c168bfd69c212bc7667ef1b97e89e6bd5))
+* **tasks:** bbot integration ([#375](https://github.com/freelabz/secator/issues/375)) ([2f0dea4](https://github.com/freelabz/secator/commit/2f0dea4f4cac3370129d0adf0000c8d0efa54361))
+* **tasks:** bup integration ([#398](https://github.com/freelabz/secator/issues/398)) ([ed636aa](https://github.com/freelabz/secator/commit/ed636aad7d90baa7b3b73baebc8f5be002dd796a))
+
+
+### Bug Fixes
+
+* **cli:** proper opts override for workflows ([#436](https://github.com/freelabz/secator/issues/436)) ([1d1eaa3](https://github.com/freelabz/secator/commit/1d1eaa3283b3d5e9650b452e3865476e6a60a086))
+* **dalfox:** restore input_chunk_size to default ([8f0a3b4](https://github.com/freelabz/secator/commit/8f0a3b4976e20afc2fb708483c7f8885b2b9f3d9))
+* dnsx parsing output loading error ([#422](https://github.com/freelabz/secator/issues/422)) ([b9e98da](https://github.com/freelabz/secator/commit/b9e98da2b5378957076e1d8f0afd3948d5bcb5f6))
+* empty CVE should pass ([#478](https://github.com/freelabz/secator/issues/478)) ([0644d68](https://github.com/freelabz/secator/commit/0644d68ccb92a4c38e8210e39f14f0850d84348d))
+* gcs bug with empty paths ([549ac4c](https://github.com/freelabz/secator/commit/549ac4c8e7391a829cf1a6c5a43ad291bec1b34a))
+* gcs bug with empty paths ([2d57e1a](https://github.com/freelabz/secator/commit/2d57e1ad4669587cf0abb0a59b0918cf72107d72))
+* get_opt_value default value and reorg hooks ([#429](https://github.com/freelabz/secator/issues/429)) ([a44a36d](https://github.com/freelabz/secator/commit/a44a36d37f888787927ec6dfc891e86dab071aa4))
+* mix bugfixes for stable release ([b743925](https://github.com/freelabz/secator/commit/b7439258c9cdadc7bd14a0a0b49e2db2d0f5b537))
+* nmap defaults ([396f68a](https://github.com/freelabz/secator/commit/396f68a325a5a8f1a9379d314979dbf85a9c95c7))
+* **nmap:** undefined service name ([#437](https://github.com/freelabz/secator/issues/437)) ([596f1af](https://github.com/freelabz/secator/commit/596f1aff53e9add73e1587497aee82465d212300))
+* runner opts processing ([#477](https://github.com/freelabz/secator/issues/477)) ([d788e9d](https://github.com/freelabz/secator/commit/d788e9d3e508a849119d418bcc5ce371c6c53c6c))
+* runner toDict() errors ([#475](https://github.com/freelabz/secator/issues/475)) ([b43c866](https://github.com/freelabz/secator/commit/b43c8669808651368536fa121be2ce79de7556aa))
+* **runner:** bug with no inputs ([#483](https://github.com/freelabz/secator/issues/483)) ([4db7b46](https://github.com/freelabz/secator/commit/4db7b460a949e6b74b5837f0f1e3b5ca51b39094))
+* **url_vuln:** repair bad condition ([214c8ab](https://github.com/freelabz/secator/commit/214c8abf7cad4916c8301ff056d894cc0bc26b28))
+
+
+### Documentation
+
+* add package json ([#415](https://github.com/freelabz/secator/issues/415)) ([f9a7c2f](https://github.com/freelabz/secator/commit/f9a7c2fc5df11506cce0d81babf1f7790b80465a))
+
 ## [0.6.0](https://github.com/freelabz/secator/compare/v0.5.2...v0.6.0) (2024-07-25)
 
 

secator-0.8.0/Dockerfile

@@ -0,0 +1 @@
+.docker/Dockerfile.alpine

{secator-0.6.0 → secator-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: secator
-Version: 0.6.0
+Version: 0.8.0
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues
@@ -22,19 +22,24 @@ Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4<=5
 Requires-Dist: celery<6
 Requires-Dist: cpe<2
+Requires-Dist: distro<2
 Requires-Dist: dotmap<2
 Requires-Dist: free-proxy<2
 Requires-Dist: furl<3
+Requires-Dist: greenlet<4
 Requires-Dist: humanize<5
 Requires-Dist: ifaddr<1
 Requires-Dist: jinja2<4
 Requires-Dist: packaging<25
+Requires-Dist: psutil<7
 Requires-Dist: pydantic<3
 Requires-Dist: python-dotenv<2
 Requires-Dist: pyyaml<7
 Requires-Dist: requests<3
+Requires-Dist: retry<1
 Requires-Dist: rich-click<1.7
 Requires-Dist: rich<14
+Requires-Dist: tldextract<6
 Requires-Dist: typing-extensions<5
 Requires-Dist: validators<1
 Requires-Dist: xmltodict<1
@@ -44,10 +49,13 @@ Provides-Extra: dev
 Requires-Dist: asciinema-automation<1; extra == 'dev'
 Requires-Dist: coverage<8; extra == 'dev'
 Requires-Dist: flake8<8; extra == 'dev'
+Requires-Dist: pytest<9; extra == 'dev'
 Requires-Dist: watchdog<3; extra == 'dev'
-Provides-Extra: google
-Requires-Dist: google-api-python-client<3; extra == 'google'
-Requires-Dist: gspread<7; extra == 'google'
+Provides-Extra: gcs
+Requires-Dist: google-cloud-storage<3; extra == 'gcs'
+Provides-Extra: gdrive
+Requires-Dist: google-api-python-client<3; extra == 'gdrive'
+Requires-Dist: gspread<7; extra == 'gdrive'
 Provides-Extra: mongodb
 Requires-Dist: pymongo<5; extra == 'mongodb'
 Provides-Extra: redis
@@ -62,7 +70,7 @@ Requires-Dist: gevent<25; extra == 'worker'
 Description-Content-Type: text/markdown
 
 <h1 align="center">
-	<img src="https://github.com/freelabz/secator/assets/9629314/ee203af4-e853-439a-af01-edeabfc4bf07/" width="400">
+    <img src="https://github.com/freelabz/secator/assets/9629314/ee203af4-e853-439a-af01-edeabfc4bf07/" width="400">
 </h1>
 
 <h4 align="center">The pentester's swiss knife.</h4>
@@ -113,32 +121,35 @@ and it is designed to improve productivity for pentesters and security researche
 
 `secator` integrates the following tools:
 
-| Name                                                          | Description                                                                    | Category       |
-|---------------------------------------------------------------|--------------------------------------------------------------------------------|----------------|
-| [httpx](https://github.com/projectdiscovery/httpx)            | Fast HTTP prober.                                                              | `http`         |
-| [cariddi](https://github.com/edoardottt/cariddi)              | Fast crawler and endpoint secrets / api keys / tokens matcher.                 | `http/crawler` |
-| [gau](https://github.com/lc/gau)                              | Offline URL crawler (Alien Vault, The Wayback Machine, Common Crawl, URLScan). | `http/crawler` |
-| [gospider](https://github.com/jaeles-project/gospider)        | Fast web spider written in Go.                                                 | `http/crawler` |
-| [katana](https://github.com/projectdiscovery/katana)          | Next-generation crawling and spidering framework.                              | `http/crawler` |
-| [dirsearch](https://github.com/maurosoria/dirsearch)          | Web path discovery.                                                            | `http/fuzzer`  |
-| [feroxbuster](https://github.com/epi052/feroxbuster)          | Simple, fast, recursive content discovery tool written in Rust.                | `http/fuzzer`  |
-| [ffuf](https://github.com/ffuf/ffuf)                          | Fast web fuzzer written in Go.                                                 | `http/fuzzer`  |
-| [h8mail](https://github.com/khast3x/h8mail)                   | Email OSINT and breach hunting tool.                                           | `osint`        |
-| [dnsx](https://github.com/projectdiscovery/dnsx)              | Fast and multi-purpose DNS toolkit designed for running DNS queries.           | `recon/dns`    |
-| [dnsxbrute](https://github.com/projectdiscovery/dnsx)              | Fast and multi-purpose DNS toolkit designed for running DNS queries (bruteforce mode).           | `recon/dns`    |
-| [subfinder](https://github.com/projectdiscovery/subfinder)    | Fast subdomain finder.                                                         | `recon/dns`    |
-| [fping](https://fping.org/)                                   | Find alive hosts on local networks.                                            | `recon/ip`     |
-| [mapcidr](https://github.com/projectdiscovery/mapcidr)        | Expand CIDR ranges into IPs.                                                   | `recon/ip`     |
-| [naabu](https://github.com/projectdiscovery/naabu)            | Fast port discovery tool.                                                      | `recon/port`   |
-| [maigret](https://github.com/soxoj/maigret)                   | Hunt for user accounts across many websites.                                   | `recon/user`   |
-| [gf](https://github.com/tomnomnom/gf)                         | A wrapper around grep to avoid typing common patterns.                         | `tagger`       |
-| [grype](https://github.com/anchore/grype)                     | A vulnerability scanner for container images and filesystems.                  | `vuln/code`    |
-| [dalfox](https://github.com/hahwul/dalfox)                    | Powerful XSS scanning tool and parameter analyzer.                             | `vuln/http`    |
-| [msfconsole](https://docs.rapid7.com/metasploit/msf-overview) | CLI to access and work with the Metasploit Framework.                          | `vuln/http`    |
-| [wpscan](https://github.com/wpscanteam/wpscan)                | WordPress Security Scanner                                                     | `vuln/multi`   |
-| [nmap](https://github.com/nmap/nmap)                          | Vulnerability scanner using NSE scripts.                                       | `vuln/multi`   |
-| [nuclei](https://github.com/projectdiscovery/nuclei)          | Fast and customisable vulnerability scanner based on simple YAML based DSL.    | `vuln/multi`   |
-| [searchsploit](https://gitlab.com/exploit-database/exploitdb) | Exploit searcher. | `exploit/search`    |
+| Name                                                          | Description                                                                    | Category        |
+|---------------------------------------------------------------|--------------------------------------------------------------------------------|-----------------|
+| [httpx](https://github.com/projectdiscovery/httpx)            | Fast HTTP prober.                                                              | `http`          |
+| [cariddi](https://github.com/edoardottt/cariddi)              | Fast crawler and endpoint secrets / api keys / tokens matcher.                 | `http/crawler`  |
+| [gau](https://github.com/lc/gau)                              | Offline URL crawler (Alien Vault, The Wayback Machine, Common Crawl, URLScan). | `http/crawler`  |
+| [gospider](https://github.com/jaeles-project/gospider)        | Fast web spider written in Go.                                                 | `http/crawler`  |
+| [katana](https://github.com/projectdiscovery/katana)          | Next-generation crawling and spidering framework.                              | `http/crawler`  |
+| [dirsearch](https://github.com/maurosoria/dirsearch)          | Web path discovery.                                                            | `http/fuzzer`   |
+| [feroxbuster](https://github.com/epi052/feroxbuster)          | Simple, fast, recursive content discovery tool written in Rust.                | `http/fuzzer`   |
+| [ffuf](https://github.com/ffuf/ffuf)                          | Fast web fuzzer written in Go.                                                 | `http/fuzzer`   |
+| [h8mail](https://github.com/khast3x/h8mail)                   | Email OSINT and breach hunting tool.                                           | `osint`         |
+| [dnsx](https://github.com/projectdiscovery/dnsx)              | Fast and multi-purpose DNS toolkit.                                            | `recon/dns`     |
+| [dnsxbrute](https://github.com/projectdiscovery/dnsx)         | Fast and multi-purpose DNS toolkit (bruteforce mode).                          | `recon/dns`     |
+| [subfinder](https://github.com/projectdiscovery/subfinder)    | Fast subdomain finder.                                                         | `recon/dns`     |
+| [fping](https://fping.org/)                                   | Find alive hosts on local networks.                                            | `recon/ip`      |
+| [mapcidr](https://github.com/projectdiscovery/mapcidr)        | Expand CIDR ranges into IPs.                                                   | `recon/ip`      |
+| [naabu](https://github.com/projectdiscovery/naabu)            | Fast port discovery tool.                                                      | `recon/port`    |
+| [maigret](https://github.com/soxoj/maigret)                   | Hunt for user accounts across many websites.                                   | `recon/user`    |
+| [gf](https://github.com/tomnomnom/gf)                         | A wrapper around grep to avoid typing common patterns.                         | `tagger`        |
+| [grype](https://github.com/anchore/grype)                     | A vulnerability scanner for container images and filesystems.                  | `vuln/code`     |
+| [dalfox](https://github.com/hahwul/dalfox)                    | Powerful XSS scanning tool and parameter analyzer.                             | `vuln/http`     |
+| [msfconsole](https://docs.rapid7.com/metasploit/msf-overview) | CLI to access and work with the Metasploit Framework.                          | `vuln/http`     |
+| [wpscan](https://github.com/wpscanteam/wpscan)                | WordPress Security Scanner                                                     | `vuln/multi`    |
+| [nmap](https://github.com/nmap/nmap)                          | Vulnerability scanner using NSE scripts.                                       | `vuln/multi`    |
+| [nuclei](https://github.com/projectdiscovery/nuclei)          | Fast and customisable vulnerability scanner based on simple YAML based DSL.    | `vuln/multi`    |
+| [bbot](https://github.com/blacklanternsecurity/bbot)          | Multipurpose scanner.                                                          | `multi`         |
+| [searchsploit](https://gitlab.com/exploit-database/exploitdb) | Exploit searcher based on ExploitDB.                                           | `exploit/search`|
+| [bup](https://github.com/laluka/bypass-url-parser)            | 40X bypasser.                                                                  | `http`          |
+
 
 Feel free to request new tools to be added by opening an issue, but please 
 check that the tool complies with our selection criterias before doing so. If it doesn't but you still want to integrate it into `secator`, you can plug it in (see the [dev guide](https://docs.freelabz.com/for-developers/writing-custom-tasks)).
@@ -149,7 +160,7 @@ check that the tool complies with our selection criterias before doing so. If it
 ### Installing secator
 
 <details>
-	<summary>Pipx</summary>
+    <summary>Pipx</summary>
 
 ```sh
 pipx install secator
@@ -158,7 +169,7 @@ pipx install secator
 </details>
 
 <details>
-	<summary>Pip</summary>
+    <summary>Pip</summary>
 
 ```sh
 pip install secator
@@ -176,7 +187,7 @@ wget -O - https://raw.githubusercontent.com/freelabz/secator/main/scripts/instal
 </details>
 
 <details>
-	<summary>Docker</summary>
+    <summary>Docker</summary>
 
 ```sh
 docker run -it --rm --net=host -v ~/.secator:/root/.secator freelabz/secator --help
@@ -197,13 +208,13 @@ secator --help
 </details>
 
 <details>
-	<summary>Docker Compose</summary>
+    <summary>Docker Compose</summary>
 
 ```sh
 git clone https://github.com/freelabz/secator
 cd secator
 docker-compose up -d
-docker-compose exec secator secator --help
+docker-compose exec secator-client secator --help
 ```
 
 </details>
@@ -217,7 +228,7 @@ docker-compose exec secator secator --help
 We provide utilities to install required languages if you don't manage them externally:
 
 <details>
-	<summary>Go</summary>
+    <summary>Go</summary>
 
 ```sh
 secator install langs go
@@ -226,7 +237,7 @@ secator install langs go
 </details>
 
 <details>
-	<summary>Ruby</summary>
+    <summary>Ruby</summary>
 
 ```sh
 secator install langs ruby
@@ -241,7 +252,7 @@ secator install langs ruby
 We provide utilities to install or update each supported tool which should work on all systems supporting `apt`:
 
 <details>
-	<summary>All tools</summary>
+    <summary>All tools</summary>
 
 ```sh
 secator install tools
@@ -250,7 +261,7 @@ secator install tools
 </details>
 
 <details>
-	<summary>Specific tools</summary>
+    <summary>Specific tools</summary>
 
 ```sh
 secator install tools <TOOL_NAME>
@@ -273,7 +284,7 @@ Please make sure you are using the latest available versions for each tool befor
 There are several addons available for `secator`:
 
 <details>
-	<summary>worker</summary>
+    <summary>worker</summary>
 
 Add support for Celery workers (see [Distributed runs with Celery](https://docs.freelabz.com/in-depth/distributed-runs-with-celery)).
 ```sh
@@ -284,7 +295,7 @@ secator install addons worker
 
 
 <details>
-	<summary>google</summary>
+    <summary>google</summary>
 
 Add support for Google Drive exporter (`-o gdrive`).
 
@@ -295,7 +306,7 @@ secator install addons google
 </details>
 
 <details>
-	<summary>mongodb</summary>
+    <summary>mongodb</summary>
 
 Add support for MongoDB driver (`-driver mongodb`).
 ```sh
@@ -305,7 +316,7 @@ secator install addons mongodb
 </details>
 
 <details>
-	<summary>redis</summary>
+    <summary>redis</summary>
 
 Add support for Redis backend (Celery).
 
@@ -316,7 +327,7 @@ secator install addons redis
 </details>
 
 <details>
-	<summary>dev</summary>
+    <summary>dev</summary>
 
 Add development tools like `coverage` and `flake8` required for running tests.
 
@@ -327,7 +338,7 @@ secator install addons dev
 </details>
 
 <details>
-	<summary>trace</summary>
+    <summary>trace</summary>
 
 Add tracing tools like `memray` and `pyinstrument` required for tracing functions.
 
@@ -338,7 +349,7 @@ secator install addons trace
 </details>
 
 <details>
-	<summary>build</summary>
+    <summary>build</summary>
 
 Add `hatch` for building and publishing the PyPI package.