fixed linting issues

* pin image version to job

* change docker tag format

* update semver GA

.flake8

@@ -1,5 +1,5 @@
 [flake8]
-ignore = E203, E266, E501, W503, B903, T499
+ignore = E203, E266, E501, W503, B903, T499, B020
 max-line-length = 120
 max-complexity = 18
 select = B,C,E,F,W,B9,T4

.github/workflows/publish.yml

@@ -39,7 +39,7 @@ jobs:
           password: ${{ secrets.ECR_SECRET_ACCESS_KEY }}
       - name: Get version
         id: get_version
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: crazy-max/ghaction-docker-meta@v3
         with:
           images: ${{ env.REP }}
           tag-semver: |
@@ -77,9 +77,10 @@ jobs:
           python-version: '3.9'
 
       - name: Install dependencies
+        shell: bash
         run: |
-          python -m pip install -U pip
-          python -m pip install -r requirements-dev.txt
+          pip install -U pip
+          make deps
 
       - name: Build project
         shell: bash

.github/workflows/release.yml

@@ -10,7 +10,7 @@ name: Release
 jobs:
   build:
     name: Upload Release Asset
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -18,12 +18,14 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.8'
 
       - name: Install dependencies
+        shell: bash
         run: |
-          python -m pip install -U pip
-          python -m pip install -r requirements-dev.txt
+          pip install -U pip
+          pip install pyinstaller
+          make deps
 
       - name: Build project
         shell: bash

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.6", "3.7", "3.8", "3.9"]
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04, ubuntu-18.04]
 
     steps:
       - uses: actions/checkout@v2
@@ -23,10 +23,26 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependencies
+      - name: Get pip cache dir
+        id: pip-cache
         run: |
-          python -m pip install -U pip
-          python -m pip install -e .
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key:
+            ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements-dev.txt') }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.python-version }}-
+
+      - name: Install dependencies
+        shell: bash
+        run: |
+          pip install -U pip
+          make dev-deps
+          make install
 
       - name: Test
         shell: bash

Dockerfile

@@ -26,4 +26,7 @@ RUN apk add --no-cache \
 COPY --from=builder /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
 COPY --from=builder /usr/local/bin/kube-hunter /usr/local/bin/kube-hunter
 
+# Add default plugins: https://github.com/aquasecurity/kube-hunter-plugins 
+RUN pip install kube-hunter-arp-spoof>=0.0.3 kube-hunter-dns-spoof>=0.0.3
+
 ENTRYPOINT ["kube-hunter"]

Makefile

@@ -31,7 +31,7 @@ lint-check:
 
 .PHONY: test
 test:
-	pytest
+	python -m pytest
 
 .PHONY: build
 build:

README.md

@@ -18,7 +18,8 @@ kube-hunter hunts for security weaknesses in Kubernetes clusters. The tool was d
 
 **Run kube-hunter**: kube-hunter is available as a container (aquasec/kube-hunter), and we also offer a web site at [kube-hunter.aquasec.com](https://kube-hunter.aquasec.com) where you can register online to receive a token allowing you to see and share the results online. You can also run the Python code yourself as described below.
 
-**Explore vulnerabilities**: The kube-hunter knowledge base includes articles about discoverable vulnerabilities and issues. When kube-hunter reports an issue, it will show its VID (Vulnerability ID) so you can look it up in the KB at https://aquasecurity.github.io/kube-hunter/
+**Explore vulnerabilities**: The kube-hunter knowledge base includes articles about discoverable vulnerabilities and issues. When kube-hunter reports an issue, it will show its VID (Vulnerability ID) so you can look it up in the KB at https://aquasecurity.github.io/kube-hunter/  
+_If you're interested in kube-hunter's integration with the Kubernetes ATT&CK Matrix [Continue Reading](#kuberentes-attck-matrix)_
 
 **Contribute**: We welcome contributions, especially new hunter modules that perform additional tests. If you would like to develop your modules please read [Guidelines For Developing Your First kube-hunter Module](https://github.com/aquasecurity/kube-hunter/blob/main/CONTRIBUTING.md).
 
@@ -28,6 +29,7 @@ Table of Contents
 =================
 
 - [Table of Contents](#table-of-contents)
+  - [Kubernetes ATT&CK Matrix](#kubernetes-attck-matrix)
   - [Hunting](#hunting)
     - [Where should I run kube-hunter?](#where-should-i-run-kube-hunter)
     - [Scanning options](#scanning-options)
@@ -37,8 +39,9 @@ Table of Contents
     - [Nodes Mapping](#nodes-mapping)
     - [Output](#output)
     - [Dispatching](#dispatching)
-    - [Advanced Usage](#advanced-usage)
-      - [Azure Quick Scanning](#azure-quick-scanning)
+  - [Advanced Usage](#advanced-usage)
+    - [Full Cloud Scan](#full-cloud-scan)
+    - [Custom Hunting](#custom-hunting)
   - [Deployment](#deployment)
     - [On Machine](#on-machine)
       - [Prerequisites](#prerequisites)
@@ -48,9 +51,21 @@ Table of Contents
     - [Pod](#pod)
   - [Contribution](#contribution)
   - [License](#license)
-         
-## Hunting
 
+---
+## Kubernetes ATT&CK Matrix
+
+kube-hunter now supports the new format of the Kubernetes ATT&CK matrix.
+While kube-hunter's vulnerabilities are a collection of creative techniques designed to mimic an attacker in the cluster (or outside it)
+The Mitre's ATT&CK defines a more general standardised categories of techniques to do so.
+
+You can think of kube-hunter vulnerabilities as small steps for an attacker, which follows the track of a more general technique he would aim for.
+Most of kube-hunter's hunters and vulnerabilities can closly fall under those techniques, That's why we moved to follow the Matrix standard.  
+ 
+_Some kube-hunter vulnerabities which we could not map to Mitre technique, are prefixed with the `General` keyword_ 
+![kube-hunter](./MITRE.png)
+
+## Hunting
 ### Where should I run kube-hunter?
 
 There are three different ways to run kube-hunter, each providing a different approach to detecting weaknesses in your cluster:
@@ -61,6 +76,7 @@ You can run kube-hunter directly on a machine in the cluster, and select the opt
 
 You can also run kube-hunter in a pod within the cluster. This indicates how exposed your cluster would be if one of your application pods is compromised (through a software vulnerability, for example). (_`--pod` flag_)
 
+
 ### Scanning options
 
 First check for these **[pre-requisites](#prerequisites)**.
@@ -141,10 +157,47 @@ Available dispatch methods are:
     * KUBEHUNTER_HTTP_DISPATCH_URL (defaults to: https://localhost)
     * KUBEHUNTER_HTTP_DISPATCH_METHOD (defaults to: POST)
 
-### Advanced Usage  
-#### Azure Quick Scanning 
-When running **as a Pod in an Azure or AWS environment**, kube-hunter will fetch subnets from the Instance Metadata Service. Naturally this makes the discovery process take longer.
-To hardlimit subnet scanning to a `/24` CIDR, use the `--quick` option. 
+
+## Advanced Usage
+### Full Cloud Scan 
+When running **as a Pod in an Azure or AWS environment**, kube-hunter will fetch subnets from the Instance Metadata Service. Naturally this will make the discovery process take longer. This is why by default kube-hunter will hardlimit `/24` CIDR. 
+If you wish to remove this limit and scan whatever subnet kube-hunter discover you can use the `--full-cloud-scan` 
+
+### Custom Hunting
+Custom hunting enables advanced users to have control over what hunters gets registered at the start of a hunt. 
+**If you know what you are doing**, this can help if you want to adjust kube-hunter's hunting and discovery process for your needs.
+
+Example: 
+```
+kube-hunter --custom <HunterName1> <HunterName2>
+``` 
+Enabling Custom hunting removes all hunters from the hunting process, except the given whitelisted hunters.
+
+The `--custom` flag reads a list of hunters class names, in order to view all of kube-hunter's class names, you can combine the flag `--raw-hunter-names` with the `--list` flag.  
+
+Example: 
+```
+kube-hunter --active --list --raw-hunter-names
+```
+
+**Notice**: Due to kube-huner's architectural design, the following "Core Hunters/Classes" will always register (even when using custom hunting):
+* HostDiscovery 
+  * _Generates ip addresses for the hunt by given configurations_
+* FromPodHostDiscovery
+  * _Auto discover attack surface ip addresses for the hunt by using Pod based environment techniques_
+  * _Automatically discovers subnets using cloud Metadata APIs_
+* PortDiscovery
+  * _Port scanning given ip addresses for known kubernetes services ports_
+* Collector
+  * _Collects discovered vulnerabilities and open services for future report_
+* StartedInfo 
+  * _Prints the start message_
+* SendFullReport 
+  * _Dispatching the report based on given configurations_
+
+
+
+
 
 ## Deployment
 There are three methods for deploying kube-hunter:
@@ -191,7 +244,7 @@ python3 kube_hunter
 _If you want to use pyinstaller/py2exe you need to first run the install_imports.py script._
 
 ### Container
-Aqua Security maintains a containerized version of kube-hunter at `aquasec/kube-hunter`. This container includes this source code, plus an additional (closed source) reporting plugin for uploading results into a report that can be viewed at [kube-hunter.aquasec.com](https://kube-hunter.aquasec.com). Please note, that running the `aquasec/kube-hunter` container and uploading reports data are subject to additional [terms and conditions](https://kube-hunter.aquasec.com/eula.html).
+Aqua Security maintains a containerized version of kube-hunter at `aquasec/kube-hunter:aqua`. This container includes this source code, plus an additional (closed source) reporting plugin for uploading results into a report that can be viewed at [kube-hunter.aquasec.com](https://kube-hunter.aquasec.com). Please note, that running the `aquasec/kube-hunter` container and uploading reports data are subject to additional [terms and conditions](https://kube-hunter.aquasec.com/eula.html).
 
 The Dockerfile in this repository allows you to build a containerized version without the reporting plugin.
 

docs/_kb/KHV002.md

@@ -2,6 +2,7 @@
 vid: KHV002
 title: Kubernetes version disclosure
 categories: [Information Disclosure]
+severity: low
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV003.md

@@ -2,6 +2,7 @@
 vid: KHV003
 title: Azure Metadata Exposure
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV004.md

@@ -2,6 +2,7 @@
 vid: KHV004
 title: Azure SPN Exposure
 categories: [Identity Theft]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV005.md

@@ -2,6 +2,7 @@
 vid: KHV005
 title: Access to Kubernetes API
 categories: [Information Disclosure, Unauthenticated Access]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV006.md

@@ -2,6 +2,7 @@
 vid: KHV006
 title: Insecure (HTTP) access to Kubernetes API
 categories: [Unauthenticated Access]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV007.md

@@ -2,6 +2,7 @@
 vid: KHV007
 title: Specific Access to Kubernetes API
 categories: [Access Risk]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV020.md

@@ -2,6 +2,7 @@
 vid: KHV020
 title: Possible Arp Spoof
 categories: [IdentityTheft]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV021.md

@@ -2,6 +2,7 @@
 vid: KHV021
 title: Certificate Includes Email Address
 categories: [Information Disclosure]
+severity: low
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV022.md

@@ -2,6 +2,7 @@
 vid: KHV022
 title: Critical Privilege Escalation CVE
 categories: [Privilege Escalation]
+severity: critical
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV023.md

@@ -2,6 +2,7 @@
 vid: KHV023
 title: Denial of Service to Kubernetes API Server
 categories: [Denial Of Service]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV024.md

@@ -2,6 +2,7 @@
 vid: KHV024
 title: Possible Ping Flood Attack
 categories: [Denial Of Service]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV025.md

@@ -2,6 +2,7 @@
 vid: KHV025
 title: Possible Reset Flood Attack
 categories: [Denial Of Service]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV026.md

@@ -2,6 +2,7 @@
 vid: KHV026
 title: Arbitrary Access To Cluster Scoped Resources
 categories: [PrivilegeEscalation]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV027.md

@@ -2,6 +2,7 @@
 vid: KHV027
 title: Kubectl Vulnerable To CVE-2019-11246
 categories: [Remote Code Execution]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV028.md

@@ -2,6 +2,7 @@
 vid: KHV028
 title: Kubectl Vulnerable To CVE-2019-1002101
 categories: [Remote Code Execution]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV029.md

@@ -2,6 +2,7 @@
 vid: KHV029
 title: Dashboard Exposed
 categories: [Remote Code Execution]
+severity: critical
 ---
 
 # {{ page.vid }} - {{ page.title }}
@@ -12,4 +13,5 @@ An open Kubernetes Dashboard was detected. The Kubernetes Dashboard can be used
 
 ## Remediation
 
-Do not leave the Dashboard insecured.
+Do not leave the Dashboard insecured.
+

docs/_kb/KHV030.md

@@ -2,6 +2,7 @@
 vid: KHV030
 title: Possible DNS Spoof
 categories: [Identity Theft]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV031.md

@@ -2,6 +2,7 @@
 vid: KHV031
 title: Etcd Remote Write Access Event
 categories: [Remote Code Execution]
+severity: critical
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV032.md

@@ -2,6 +2,7 @@
 vid: KHV032
 title: Etcd Remote Read Access Event
 categories: [Access Risk]
+severity: critical
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV033.md

@@ -2,6 +2,7 @@
 vid: KHV033
 title: Etcd Remote version disclosure
 categories: [Information Disclosure]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV034.md

@@ -2,6 +2,7 @@
 vid: KHV034
 title: Etcd is accessible using insecure connection (HTTP)
 categories: [Unauthenticated Access]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV036.md

@@ -2,6 +2,7 @@
 vid: KHV036
 title: Anonymous Authentication
 categories: [Remote Code Execution]
+severity: critical
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV037.md

@@ -2,6 +2,7 @@
 vid: KHV037
 title: Exposed Container Logs
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV038.md

@@ -2,6 +2,7 @@
 vid: KHV038
 title: Exposed Running Pods
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV039.md

@@ -2,6 +2,7 @@
 vid: KHV039
 title: Exposed Exec On Container
 categories: [Remote Code Execution]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV040.md

@@ -2,6 +2,7 @@
 vid: KHV040
 title: Exposed Run Inside Container
 categories: [Remote Code Execution]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV041.md

@@ -2,6 +2,7 @@
 vid: KHV041
 title: Exposed Port Forward
 categories: [Remote Code Execution]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV042.md

@@ -2,6 +2,7 @@
 vid: KHV042
 title: Exposed Attaching To Container
 categories: [Remote Code Execution]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV043.md

@@ -2,6 +2,7 @@
 vid: KHV043
 title: Cluster Health Disclosure
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV044.md

@@ -2,6 +2,7 @@
 vid: KHV044
 title: Privileged Container
 categories: [Access Risk]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV045.md

@@ -2,6 +2,7 @@
 vid: KHV045
 title: Exposed System Logs
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV046.md

@@ -2,6 +2,7 @@
 vid: KHV046
 title: Exposed Kubelet Cmdline
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV047.md

@@ -2,6 +2,7 @@
 vid: KHV047
 title: Pod With Mount To /var/log
 categories: [Privilege Escalation]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV049.md

@@ -2,6 +2,7 @@
 vid: KHV049
 title: kubectl proxy Exposed
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV050.md

@@ -2,6 +2,7 @@
 vid: KHV050
 title: Read access to Pod service account token
 categories: [Access Risk]
+severity: medium
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV051.md

@@ -2,6 +2,7 @@
 vid: KHV051
 title: Exposed Existing Privileged Containers Via Secure Kubelet Port
 categories: [Access Risk]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV052.md

@@ -2,6 +2,7 @@
 vid: KHV052
 title: Exposed Pods
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

docs/_kb/KHV053.md

@@ -2,6 +2,7 @@
 vid: KHV053
 title: AWS Metadata Exposure
 categories: [Information Disclosure]
+severity: high
 ---
 
 # {{ page.vid }} - {{ page.title }}

job.yaml

@@ -5,11 +5,13 @@ metadata:
   name: kube-hunter
 spec:
   template:
+    metadata:
+      labels:
+        app: kube-hunter
     spec:
       containers:
         - name: kube-hunter
-          image: aquasec/kube-hunter
+          image: aquasec/kube-hunter:0.6.8
           command: ["kube-hunter"]
           args: ["--pod"]
       restartPolicy: Never
-  backoffLimit: 4

kube-hunter.py

@@ -1 +1 @@
-kube_hunter/__main__.py
+kube_hunter / __main__.py

kube_hunter/README.md

@@ -76,7 +76,7 @@ in order to prevent circular dependency bug.
 Following the above example, let's figure out the imports:  
 ```python  
 from kube_hunter.core.types import Hunter  
-from kube_hunter.core.events import handler  
+from kube_hunter.core.events.event_handler import handler  
   
 from kube_hunter.core.events.types import OpenPortEvent  
   
@@ -206,7 +206,7 @@ __Make sure to return the event from the execute method, or the event will not g
  
 For example, if you don't want to hunt services found on a localhost IP, you can create the following module, in the `kube_hunter/modules/report/`
 ```python
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Service, EventFilterBase
 
 @handler.subscribe(Service)
@@ -222,7 +222,7 @@ That means other Hunters that are subscribed to this Service will not get trigge
 That opens up a wide variety of possible operations, as this not only can __filter out__ events, but you can actually __change event attributes__, for example:
 
 ```python
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.types import InformationDisclosure
 from kube_hunter.core.events.types import Vulnerability, EventFilterBase
 

kube_hunter/__main__.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # flake8: noqa: E402
 
+from functools import partial
 import logging
 import threading
 
@@ -21,13 +22,16 @@ config = Config(
     log_file=args.log_file,
     mapping=args.mapping,
     network_timeout=args.network_timeout,
+    num_worker_threads=args.num_worker_threads,
     pod=args.pod,
-    quick=args.quick,
+    full_cloud_scan=args.full_cloud_scan,
     remote=args.remote,
     statistics=args.statistics,
     k8s_auto_discover_nodes=args.k8s_auto_discover_nodes,
     service_account_token=args.service_account_token,
     kubeconfig=args.kubeconfig,
+    enable_cve_hunting=args.enable_cve_hunting,
+    custom=args.custom,
 )
 setup_logger(args.log, args.log_file)
 set_config(config)
@@ -35,7 +39,7 @@ set_config(config)
 # Running all other registered plugins before execution
 pm.hook.load_plugin(args=args)
 
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import HuntFinished, HuntStarted
 from kube_hunter.modules.discovery.hosts import RunningAsPodEvent, HostScanEvent
 from kube_hunter.modules.report import get_reporter, get_dispatcher
@@ -72,16 +76,20 @@ def interactive_set_config():
     return True
 
 
-def list_hunters():
+def list_hunters(class_names=False):
     print("\nPassive Hunters:\n----------------")
     for hunter, docs in handler.passive_hunters.items():
         name, doc = hunter.parse_docs(docs)
+        if class_names:
+            name = hunter.__name__
         print(f"* {name}\n  {doc}\n")
 
     if config.active:
         print("\n\nActive Hunters:\n---------------")
         for hunter, docs in handler.active_hunters.items():
             name, doc = hunter.parse_docs(docs)
+            if class_names:
+                name = hunter.__name__
             print(f"* {name}\n  {doc}\n")
 
 
@@ -94,7 +102,10 @@ def main():
     scan_options = [config.pod, config.cidr, config.remote, config.interface, config.k8s_auto_discover_nodes]
     try:
         if args.list:
-            list_hunters()
+            if args.raw_hunter_names:
+                list_hunters(class_names=True)
+            else:
+                list_hunters()
             return
 
         if not any(scan_options):

kube_hunter/conf/__init__.py

@@ -1,7 +1,11 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any, Optional
 
 
+def get_default_core_hunters():
+    return ["FromPodHostDiscovery", "HostDiscovery", "PortDiscovery", "SendFullReport", "Collector", "StartedInfo"]
+
+
 @dataclass
 class Config:
     """Config is a configuration container.
@@ -16,11 +20,13 @@ class Config:
     - log_file: Log File path
     - mapping: Report only found components
     - network_timeout: Timeout for network operations
+    - num_worker_threads: Add a flag --threads to change the default 800 thread count of the event handler
     - pod: From pod scanning mode
-    - quick: Quick scanning mode
+    - full_cloud_scan: disables limit for 24 cidr in cloud envs
     - remote: Hosts to scan
     - report: Output format
     - statistics: Include hunters statistics
+    - enable_cve_hunting: enables cve hunting, shows cve results
     """
 
     active: bool = False
@@ -31,14 +37,19 @@ class Config:
     log_file: Optional[str] = None
     mapping: bool = False
     network_timeout: float = 5.0
+    num_worker_threads: int = 800
     pod: bool = False
-    quick: bool = False
+    full_cloud_scan: bool = False
     remote: Optional[str] = None
     reporter: Optional[Any] = None
     statistics: bool = False
     k8s_auto_discover_nodes: bool = False
     service_account_token: Optional[str] = None
     kubeconfig: Optional[str] = None
+    enable_cve_hunting: bool = False
+    custom: Optional[list] = None
+    raw_hunter_names: bool = False
+    core_hunters: list = field(default_factory=get_default_core_hunters)
 
 
 _config: Optional[Config] = None

kube_hunter/conf/logging.py

@@ -4,10 +4,6 @@ DEFAULT_LEVEL = logging.INFO
 DEFAULT_LEVEL_NAME = logging.getLevelName(DEFAULT_LEVEL)
 LOG_FORMAT = "%(asctime)s %(levelname)s %(name)s %(message)s"
 
-# Suppress logging from scapy
-logging.getLogger("scapy.runtime").setLevel(logging.CRITICAL)
-logging.getLogger("scapy.loading").setLevel(logging.CRITICAL)
-
 
 def setup_logger(level_name, logfile):
     # Remove any existing handlers

kube_hunter/conf/parser.py

@@ -18,7 +18,11 @@ def parser_add_arguments(parser):
 
     parser.add_argument("--pod", action="store_true", help="Set hunter as an insider pod")
 
-    parser.add_argument("--quick", action="store_true", help="Prefer quick scan (subnet 24)")
+    parser.add_argument(
+        "--full-cloud-scan",
+        action="store_true",
+        help="Disable hardlimit of '/24' CIDR when scraping Instance Metadata API",
+    )
 
     parser.add_argument(
         "--include-patched-versions",
@@ -46,6 +50,22 @@ def parser_add_arguments(parser):
         help="One or more remote ip/dns to hunt",
     )
 
+    parser.add_argument(
+        "-c",
+        "--custom",
+        nargs="+",
+        metavar="HUNTERS",
+        default=list(),
+        help="Custom hunting. Only given hunter names will register in the hunt."
+        "for a list of options run `--list --raw-hunter-names`",
+    )
+
+    parser.add_argument(
+        "--raw-hunter-names",
+        action="store_true",
+        help="Use in combination with `--list` to display hunter class names to pass for custom hunting flag",
+    )
+
     parser.add_argument(
         "--k8s-auto-discover-nodes",
         action="store_true",
@@ -76,6 +96,12 @@ def parser_add_arguments(parser):
 
     parser.add_argument("--active", action="store_true", help="Enables active hunting")
 
+    parser.add_argument(
+        "--enable-cve-hunting",
+        action="store_true",
+        help="Show cluster CVEs based on discovered version (Depending on different vendors, may result in False Positives)",
+    )
+
     parser.add_argument(
         "--log",
         type=str,
@@ -111,6 +137,14 @@ def parser_add_arguments(parser):
 
     parser.add_argument("--network-timeout", type=float, default=5.0, help="network operations timeout")
 
+    parser.add_argument(
+        "--num-worker-threads",
+        type=int,
+        default=800,
+        help="In some environments the default thread count (800) can cause the process to crash. "
+        "In the case of a crash try lowering the thread count",
+    )
+
 
 def parse_args(add_args_hook):
     """

kube_hunter/core/events/__init__.py

@@ -1,3 +1,2 @@
 # flake8: noqa: E402
-from .handler import EventQueue, handler
 from . import types

kube_hunter/core/events/event_handler.py

@@ -62,7 +62,7 @@ class EventQueue(Queue):
     ######################################################
     """
 
-    def subscribe(self, event, hook=None, predicate=None):
+    def subscribe(self, event, hook=None, predicate=None, is_register=True):
         """
         The Subscribe Decorator - For Regular Registration
         Use this to register for one event only. Your hunter will execute each time this event is published
@@ -74,12 +74,12 @@ class EventQueue(Queue):
         """
 
         def wrapper(hook):
-            self.subscribe_event(event, hook=hook, predicate=predicate)
+            self.subscribe_event(event, hook=hook, predicate=predicate, is_register=is_register)
             return hook
 
         return wrapper
 
-    def subscribe_many(self, events, hook=None, predicates=None):
+    def subscribe_many(self, events, hook=None, predicates=None, is_register=True):
         """
         The Subscribe Many Decorator - For Multiple Registration,
         When your attack needs several prerequisites to exist in the cluster, You need to register for multiple events.
@@ -99,12 +99,12 @@ class EventQueue(Queue):
         """
 
         def wrapper(hook):
-            self.subscribe_events(events, hook=hook, predicates=predicates)
+            self.subscribe_events(events, hook=hook, predicates=predicates, is_register=is_register)
             return hook
 
         return wrapper
 
-    def subscribe_once(self, event, hook=None, predicate=None):
+    def subscribe_once(self, event, hook=None, predicate=None, is_register=True):
         """
         The Subscribe Once Decorator - For Single Trigger Registration,
         Use this when you want your hunter to execute only in your entire program run
@@ -125,7 +125,8 @@ class EventQueue(Queue):
 
             hook.__new__ = __new__unsubscribe_self
 
-            self.subscribe_event(event, hook=hook, predicate=predicate)
+            self.subscribe_event(event, hook=hook, predicate=predicate, is_register=is_register)
+
             return hook
 
         return wrapper
@@ -256,7 +257,33 @@ class EventQueue(Queue):
             self.hooks[event].append((hook, predicate))
             logging.debug("{} subscribed to {}".format(hook, event))
 
-    def subscribe_event(self, event, hook=None, predicate=None):
+    def allowed_for_custom_registration(self, target_hunter):
+        """
+        Check if the partial input list contains the hunter we are about to register for events
+        If hunter is considered a Core hunter as specified in `config.core_hunters` we allow it anyway
+
+        Returns true if:
+         1. partial hunt is disabled
+         2. partial hunt is enabled and hunter is in core hunter class
+         3. partial hunt is enabled and hunter is specified in config.partial
+
+        @param target_hunter: hunter class for registration check
+        """
+        config = get_config()
+        if not config.custom:
+            return True
+
+        hunter_class_name = target_hunter.__name__
+        if hunter_class_name in config.core_hunters or hunter_class_name in config.custom:
+            return True
+
+        return False
+
+    def subscribe_event(self, event, hook=None, predicate=None, is_register=True):
+        if not is_register:
+            return
+        if not self.allowed_for_custom_registration(hook):
+            return
         if not self._register_hunters(hook):
             return
 
@@ -267,9 +294,13 @@ class EventQueue(Queue):
         else:
             self._register_hook(event, hook, predicate)
 
-    def subscribe_events(self, events, hook=None, predicates=None):
+    def subscribe_events(self, events, hook=None, predicates=None, is_register=True):
+        if not is_register:
+            return
+        if not self.allowed_for_custom_registration(hook):
+            return
         if not self._register_hunters(hook):
-            return False
+            return
 
         if predicates is None:
             predicates = [None] * len(events)
@@ -335,4 +366,5 @@ class EventQueue(Queue):
             self.queue.clear()
 
 
-handler = EventQueue(800)
+config = get_config()
+handler = EventQueue(config.num_worker_threads)

kube_hunter/core/events/types.py

@@ -1,6 +1,5 @@
 import logging
 import threading
-import requests
 
 from kube_hunter.conf import get_config
 from kube_hunter.core.types import KubernetesCluster
@@ -180,34 +179,11 @@ class NewHostEvent(Event):
     def __init__(self, host, cloud=None):
         global event_id_count
         self.host = host
-        self.cloud_type = cloud
 
         with event_id_count_lock:
             self.event_id = event_id_count
             event_id_count += 1
 
-    @property
-    def cloud(self):
-        if not self.cloud_type:
-            self.cloud_type = self.get_cloud()
-        return self.cloud_type
-
-    def get_cloud(self):
-        config = get_config()
-        try:
-            logger.debug("Checking whether the cluster is deployed on azure's cloud")
-            # Leverage 3rd tool https://github.com/blrchen/AzureSpeed for Azure cloud ip detection
-            result = requests.get(
-                f"https://api.azurespeed.com/api/region?ipOrUrl={self.host}",
-                timeout=config.network_timeout,
-            ).json()
-            return result["cloud"] or "NoCloud"
-        except requests.ConnectionError:
-            logger.info("Failed to connect cloud type service", exc_info=True)
-        except Exception:
-            logger.warning(f"Unable to check cloud of {self.host}", exc_info=True)
-        return "NoCloud"
-
     def __str__(self):
         return str(self.host)
 

kube_hunter/core/types/components.py

@@ -4,6 +4,10 @@ class KubernetesCluster:
     name = "Kubernetes Cluster"
 
 
+class CloudProvider:
+    name = "Cloud Provider"
+
+
 class KubectlClient:
     """The kubectl client binary is used by the user to interact with the cluster"""
 
@@ -16,13 +20,19 @@ class Kubelet(KubernetesCluster):
     name = "Kubelet"
 
 
-class AWS(KubernetesCluster):
+class BareMetal(CloudProvider):
     """AWS Cluster"""
 
-    name = "AWS"
+    name = "Bare Metal Installation"
 
 
-class Azure(KubernetesCluster):
+class Azure(CloudProvider):
     """Azure Cluster"""
 
-    name = "Azure"
+    name = "AKS Cluster"
+
+
+class AWS(CloudProvider):
+    """Azure Cluster"""
+
+    name = "EKS Cluster"

kube_hunter/core/types/hunters.py

@@ -19,7 +19,7 @@ class HunterBase:
     def publish_event(self, event):
         # Import here to avoid circular import from events package.
         # imports are cached in python so this should not affect runtime
-        from ..events import handler  # noqa
+        from ..events.event_handler import handler  # noqa
 
         handler.publish_event(event, caller=self)
 

kube_hunter/modules/discovery/__init__.py

@@ -9,3 +9,5 @@ from . import (
     ports,
     proxy,
 )
+
+from .cloud import aws, azure

kube_hunter/modules/discovery/apiserver.py

@@ -2,7 +2,7 @@ import logging
 import requests
 
 from kube_hunter.core.types import Discovery
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import OpenPortEvent, Service, Event, EventFilterBase
 
 from kube_hunter.conf import get_config

kube_hunter/modules/discovery/cloud/aws.py

@@ -0,0 +1,177 @@
+import logging
+import requests
+import ipaddress
+
+from kube_hunter.conf import get_config
+from kube_hunter.core.events.event_handler import handler
+
+from kube_hunter.core.types import Discovery, AWS
+
+from kube_hunter.core.events.types import Event, Vulnerability, NewHostEvent
+from kube_hunter.core.types.vulnerabilities import InstanceMetadataApiTechnique
+
+from kube_hunter.modules.discovery.hosts import RunningAsPodEvent
+
+logger = logging.getLogger(__name__)
+
+
+class AWSMetadataApiExposed(Vulnerability, Event):
+    """Access to the AWS Metadata API exposes information about the machines associated with the cluster"""
+
+    def __init__(self, version):
+        Vulnerability.__init__(
+            self,
+            AWS,
+            "AWS Metadata Exposure",
+            category=InstanceMetadataApiTechnique,
+            vid="KHV053",
+        )
+        self.version = version
+
+
+class InstanceMetadataApi:
+    URL = "http://169.254.169.254/latest/meta-data/"
+    GET_MACS_URL = "http://169.254.169.254/latest/meta-data/mac"
+    LIST_CIDR_URL = (
+        "http://169.254.169.254/latest/meta-data/network/interfaces/macs/{mac_address}/subnet-ipv4-cidr-block"
+    )
+
+    V2_REQUEST_TOKEN_URL = "http://169.254.169.254/latest/api/token/"
+    V2_REQUEST_TOKEN_HEADER = {"X-aws-ec2-metatadata-token-ttl-seconds": "21600"}
+    V2_TOKEN_HEADER_NAME = "X-aws-ec2-metatadata-token"
+
+    @classmethod
+    def get_api_token(cls, network_timeout):
+        return requests.put(
+            cls.V2_REQUEST_TOKEN_URL,
+            headers=cls.V2_REQUEST_TOKEN_HEADER,
+            timeout=network_timeout,
+        ).text
+
+    @classmethod
+    def ping_v1(cls, network_timeout):
+        status = requests.get(cls.URL, timeout=network_timeout).status_code
+        return status == requests.codes.OK
+
+    @classmethod
+    def ping_v2(cls, token, network_timeout):
+        status = requests.get(
+            cls.URL,
+            headers={cls.V2_TOKEN_HEADER_NAME: token},
+            timeout=network_timeout,
+        ).status_code
+        return status == requests.codes.OK
+
+
+@handler.subscribe(RunningAsPodEvent)
+class AWSMetadataAPIDiscovery(Discovery):
+    """AWS Metadata API Discovery
+    Pings all metadata api versions and determines if they are accessible from the Pod
+    """
+
+    def __init__(self, event):
+        self.event = event
+
+    def execute(self):
+        config = get_config()
+
+        if self.check_metadata_v1(config.network_timeout):
+            self.publish_event(AWSMetadataApiExposed(version="1"))
+
+        if self.check_metadata_v2(config.network_timeout):
+            self.publish_event(AWSMetadataApiExposed(version="2"))
+
+    def check_metadata_v1(self, network_timeout):
+        """Method checks if the metadata version v1 service is up and accessible from the pod"""
+        try:
+            logger.debug("From pod attempting to access AWS Metadata v1 API")
+            return InstanceMetadataApi.ping_v1(network_timeout)
+        except requests.exceptions.ConnectionError:
+            logger.debug("Failed to connect to AWS metadata server v1")
+        except Exception:
+            logger.debug("Unknown error when trying to connect to AWS metadata v1 API")
+        return False
+
+    def check_metadata_v2(self, network_timeout):
+        """Method checks if the metadata version v2 service is up and accessible from the pod"""
+        try:
+            logger.debug("From pod attempting to access AWS Metadata v2 API")
+            token = InstanceMetadataApi.get_api_token()
+            return InstanceMetadataApi.ping_v2(token, network_timeout)
+        except requests.exceptions.ConnectionError:
+            logger.debug("Failed to connect AWS metadata server v2")
+        except Exception:
+            logger.debug("Unknown error when trying to connect to AWS metadata v2 API")
+        return False
+
+
+@handler.subscribe(AWSMetadataApiExposed)
+class AWSMetadataHostsDiscovery(Discovery):
+    """AWS Metadata Hosts Discovery
+    Scrapes the metadata api for additional accessible network subnets for kube-hunter to scan
+    """
+
+    def __init__(self, event):
+        self.event = event
+
+    def execute(self):
+        config = get_config()
+
+        # Extracting network subnet from metadata api
+        if self.event.version == "1":
+            network = self.extract_network_subnet_v1(config.network_timeout)
+        elif self.event.version == "2":
+            network = self.extract_network_subnet_v2(config.network_timeout)
+
+        # If full scan is enabled we ignore the prefix and only use the network address
+        if network:
+            if not config.full_cloud_scan:
+                # Fallback to 24 default subnet
+                network = ipaddress.IPv4Network(f"{network.network_address}/{24}")
+
+        for ip in network:
+            self.publish_event(NewHostEvent(host=ip))
+
+    def extract_network_subnet_v1(self, network_timeout):
+        """Extract network subnet from aws metadata api v1"""
+        logger.debug("From pod attempting to access aws's metadata v1")
+
+        mac_address = requests.get(InstanceMetadataApi.GET_MACS_URL, timeout=network_timeout).text
+        logger.debug(f"Extracted mac from aws's metadata v1: {mac_address}")
+
+        cidr_get_url = InstanceMetadataApi.LIST_CIDR_URL.format(mac_address=mac_address)
+        cidr = requests.get(cidr_get_url, timeout=network_timeout).text
+        logger.debug(f"Extracted cidr block from aws's metadata v1: {cidr}")
+
+        try:
+            network = ipaddress.IPv4Network(cidr.strip())
+            return network
+        except Exception as x:
+            logger.debug(f"ERROR: could not parse cidr from aws metadata api: {cidr} - {x}")
+        return None
+
+    def extract_network_subnet_v2(self, network_timeout):
+        """Extract network subnet from aws metadata api v1"""
+        logger.debug("From pod attempting to access aws's metadata v2")
+
+        token = InstanceMetadataApi.get_api_token()
+
+        mac_address = requests.get(
+            InstanceMetadataApi.GET_MACS_URL,
+            headers={InstanceMetadataApi.V2_TOKEN_HEADER_NAME: token},
+            timeout=network_timeout,
+        ).text
+
+        cidr_get_url = InstanceMetadataApi.LIST_CIDR_URL.format(mac_address=mac_address)
+        cidr = requests.get(
+            cidr_get_url,
+            headers={InstanceMetadataApi.V2_TOKEN_HEADER_NAME: token},
+            timeout=network_timeout,
+        ).text.split("/")
+
+        try:
+            network = ipaddress.IPv4Network(cidr.strip())
+            return network
+        except Exception as x:
+            logger.debug(f"ERROR: could not parse cidr from aws metadata api: {cidr} - {x}")
+        return None

kube_hunter/modules/discovery/cloud/azure.py

@@ -0,0 +1,130 @@
+import logging
+import requests
+
+from kube_hunter.conf import get_config
+from kube_hunter.core.types import Discovery
+from kube_hunter.core.types.components import Azure
+from kube_hunter.core.events.types import Vulnerability, Event, InstanceMetadataApiTechnique
+from kube_hunter.core.events.event_handler import handler
+from kube_hunter.modules.discovery.hosts import RunningAsPodEvent, NewHostEvent
+
+from ipaddress import IPv4Network
+
+logger = logging.getLogger(__name__)
+
+
+class AzureMetadataApiExposed(Vulnerability, Event):
+    """Access to the Azure Metadata API exposes information about the machines associated with the cluster"""
+
+    def __init__(self, versions_info):
+        Vulnerability.__init__(
+            self,
+            Azure,
+            "Azure Metadata Exposure",
+            category=InstanceMetadataApiTechnique,
+            vid="KHV003",
+        )
+
+        # dict containing all api versions instance api extracted
+        self.versions_info = versions_info
+        self.evidence = f"apiVersions: {','.join(self.versions_info.keys())}"
+
+
+class AzureInstanceMetadataService:
+    ROOT = "http://169.254.169.254/metadata/"
+    VERSIONS_ENDPOINT = "versions"
+    INSTANCE_ENDPOINT = "instance"
+
+    VERSION_PARAMETER = "api-version"
+    REQUEST_TOKEN_HEADER = {"Metadata": "true"}
+
+    @classmethod
+    def get_versions(cls, network_timeout):
+        try:
+            return requests.get(
+                cls.ROOT + cls.VERSIONS_ENDPOINT,
+                headers=cls.REQUEST_TOKEN_HEADER,
+                timeout=network_timeout,
+            ).json()
+        except requests.exceptions.ConnectionError:
+            logger.debug("Failed to connect Azure metadata server")
+        except Exception:
+            logger.debug("Unknown error when trying to connect to Azure metadata server")
+        return False
+
+    @classmethod
+    def get_instance_data(cls, api_version, network_timeout):
+        try:
+            return requests.get(
+                cls.ROOT + cls.INSTANCE_ENDPOINT,
+                params={cls.VERSION_PARAMETER: api_version},
+                headers=cls.REQUEST_TOKEN_HEADER,
+                timeout=network_timeout,
+            ).json()
+        except requests.exceptions.ConnectionError:
+            logger.debug("Failed to connect Azure metadata server")
+        except Exception:
+            logger.debug("Unknown error when trying to connect to Azure metadata server")
+        return False
+
+
+@handler.subscribe(RunningAsPodEvent)
+class AzureInstanceMetadataServiceDiscovery(Discovery):
+    def __init__(self, event):
+        self.event = event
+
+    def execute(self):
+        config = get_config()
+
+        logger.debug("Trying to access IMDS (Azure Metadata Service) from pod")
+        available_versions = AzureInstanceMetadataService.get_versions(network_timeout=config.network_timeout)
+
+        if not available_versions:
+            logger.debug("IMDS not available")
+            return
+
+        versions_info = dict()
+        for version in available_versions["apiVersions"]:
+            instance_data = AzureInstanceMetadataService.get_instance_data(
+                api_version=version, network_timeout=config.network_timeout
+            )
+            if instance_data:
+                logger.debug(f"Successfully extracted IMDS apiVersion {version} instance data")
+                versions_info[version] = instance_data
+
+        self.publish_event(AzureMetadataApiExposed(versions_info=versions_info))
+
+
+@handler.subscribe(AzureMetadataApiExposed)
+class AzureSubnetsDiscovery(Discovery):
+    def __init__(self, event):
+        self.event = event
+
+    def extract_azure_subnet(self):
+        # default to 24 subnet
+        address, prefix = None, "24"
+        config = get_config()
+        for version, info in self.event.versions_info.items():
+            try:
+                address = info["network"]["interface"][0]["ipv4"]["subnet"][0]["address"]
+                tmp_prefix = info["network"]["interface"][0]["ipv4"]["subnet"][0]["prefix"]
+
+                if not config.full_cloud_scan:
+                    logger.debug(
+                        f"Discovered azure subnet {tmp_prefix} but scanning {prefix} due to `full_cloud_scan=False` option "
+                    )
+                else:
+                    prefix = tmp_prefix
+
+                return f"{address}/{prefix}"
+            except Exception as x:
+                logger.debug(f"Skipping azure subnet discovery for version {version}: {x}")
+                continue
+        return False
+
+    def execute(self):
+        subnet = self.extract_azure_subnet()
+        if subnet:
+            logger.debug(f"From pod discovered azure subnet {subnet}")
+            for ip in IPv4Network(f"{subnet}"):
+                self.publish_event(NewHostEvent(str(ip)))

kube_hunter/modules/discovery/dashboard.py

@@ -3,7 +3,7 @@ import logging
 import requests
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Event, OpenPortEvent, Service
 from kube_hunter.core.types import Discovery
 

kube_hunter/modules/discovery/etcd.py

@@ -1,4 +1,4 @@
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Event, OpenPortEvent, Service
 from kube_hunter.core.types import Discovery
 

kube_hunter/modules/discovery/hosts.py

@@ -1,17 +1,16 @@
 import os
 import logging
 import itertools
-import requests
 
 from enum import Enum
-from netaddr import IPNetwork, IPAddress, AddrFormatError
+from netaddr import IPNetwork, AddrFormatError
 from netifaces import AF_INET, ifaddresses, interfaces, gateways
 
 from kube_hunter.conf import get_config
 from kube_hunter.modules.discovery.kubernetes_client import list_all_k8s_cluster_nodes
-from kube_hunter.core.events import handler
-from kube_hunter.core.events.types import Event, NewHostEvent, Vulnerability
-from kube_hunter.core.types import Discovery, AWS, Azure, InstanceMetadataApiTechnique
+from kube_hunter.core.types import Discovery
+from kube_hunter.core.events.event_handler import handler
+from kube_hunter.core.events.types import Event, NewHostEvent
 
 logger = logging.getLogger(__name__)
 
@@ -47,36 +46,6 @@ class RunningAsPodEvent(Event):
             pass
 
 
-class AWSMetadataApi(Vulnerability, Event):
-    """Access to the AWS Metadata API exposes information about the machines associated with the cluster"""
-
-    def __init__(self, cidr):
-        Vulnerability.__init__(
-            self,
-            AWS,
-            "AWS Metadata Exposure",
-            category=InstanceMetadataApiTechnique,
-            vid="KHV053",
-        )
-        self.cidr = cidr
-        self.evidence = f"cidr: {cidr}"
-
-
-class AzureMetadataApi(Vulnerability, Event):
-    """Access to the Azure Metadata API exposes information about the machines associated with the cluster"""
-
-    def __init__(self, cidr):
-        Vulnerability.__init__(
-            self,
-            Azure,
-            "Azure Metadata Exposure",
-            category=InstanceMetadataApiTechnique,
-            vid="KHV003",
-        )
-        self.cidr = cidr
-        self.evidence = f"cidr: {cidr}"
-
-
 class HostScanEvent(Event):
     def __init__(self, pod=False, active=False, predefined_hosts=None):
         # flag to specify whether to get actual data from vulnerabilities
@@ -128,16 +97,7 @@ class FromPodHostDiscovery(Discovery):
         if config.remote or config.cidr:
             self.publish_event(HostScanEvent())
         else:
-            # Discover cluster subnets, we'll scan all these hosts
-            cloud, subnets = None, list()
-            if self.is_azure_pod():
-                subnets, cloud = self.azure_metadata_discovery()
-            elif self.is_aws_pod_v1():
-                subnets, cloud = self.aws_metadata_v1_discovery()
-            elif self.is_aws_pod_v2():
-                subnets, cloud = self.aws_metadata_v2_discovery()
-
-            subnets += self.gateway_discovery()
+            subnets = self.gateway_discovery()
 
             should_scan_apiserver = False
             if self.event.kubeservicehost:
@@ -147,160 +107,15 @@ class FromPodHostDiscovery(Discovery):
                     should_scan_apiserver = False
                 logger.debug(f"From pod scanning subnet {ip}/{mask}")
                 for ip in IPNetwork(f"{ip}/{mask}"):
-                    self.publish_event(NewHostEvent(host=ip, cloud=cloud))
+                    self.publish_event(NewHostEvent(host=ip))
             if should_scan_apiserver:
-                self.publish_event(NewHostEvent(host=IPAddress(self.event.kubeservicehost), cloud=cloud))
-
-    def is_aws_pod_v1(self):
-        config = get_config()
-        try:
-            # Instance Metadata Service v1
-            logger.debug("From pod attempting to access AWS Metadata v1 API")
-            if (
-                requests.get(
-                    "http://169.254.169.254/latest/meta-data/",
-                    timeout=config.network_timeout,
-                ).status_code
-                == 200
-            ):
-                return True
-        except requests.exceptions.ConnectionError:
-            logger.debug("Failed to connect AWS metadata server v1")
-            return False
-
-    def is_aws_pod_v2(self):
-        config = get_config()
-        try:
-            # Instance Metadata Service v2
-            logger.debug("From pod attempting to access AWS Metadata v2 API")
-            token = requests.put(
-                "http://169.254.169.254/latest/api/token/",
-                headers={"X-aws-ec2-metatadata-token-ttl-seconds": "21600"},
-                timeout=config.network_timeout,
-            ).text
-            if (
-                requests.get(
-                    "http://169.254.169.254/latest/meta-data/",
-                    headers={"X-aws-ec2-metatadata-token": token},
-                    timeout=config.network_timeout,
-                ).status_code
-                == 200
-            ):
-                return True
-        except requests.exceptions.ConnectionError:
-            logger.debug("Failed to connect AWS metadata server v2")
-            return False
-
-    def is_azure_pod(self):
-        config = get_config()
-        try:
-            logger.debug("From pod attempting to access Azure Metadata API")
-            if (
-                requests.get(
-                    "http://169.254.169.254/metadata/instance?api-version=2017-08-01",
-                    headers={"Metadata": "true"},
-                    timeout=config.network_timeout,
-                ).status_code
-                == 200
-            ):
-                return True
-        except requests.exceptions.ConnectionError:
-            logger.debug("Failed to connect Azure metadata server")
-            return False
+                self.publish_event(NewHostEvent(host=self.event.kubeservicehost))
 
     # for pod scanning
     def gateway_discovery(self):
         """Retrieving default gateway of pod, which is usually also a contact point with the host"""
         return [[gateways()["default"][AF_INET][0], "24"]]
 
-    # querying AWS's interface metadata api v1 | works only from a pod
-    def aws_metadata_v1_discovery(self):
-        config = get_config()
-        logger.debug("From pod attempting to access aws's metadata v1")
-        mac_address = requests.get(
-            "http://169.254.169.254/latest/meta-data/mac",
-            timeout=config.network_timeout,
-        ).text
-        logger.debug(f"Extracted mac from aws's metadata v1: {mac_address}")
-
-        cidr = requests.get(
-            f"http://169.254.169.254/latest/meta-data/network/interfaces/macs/{mac_address}/subnet-ipv4-cidr-block",
-            timeout=config.network_timeout,
-        ).text
-        logger.debug(f"Trying to extract cidr from aws's metadata v1: {cidr}")
-
-        try:
-            cidr = cidr.split("/")
-            address, subnet = (cidr[0], cidr[1])
-            subnet = subnet if not config.quick else "24"
-            cidr = f"{address}/{subnet}"
-            logger.debug(f"From pod discovered subnet {cidr}")
-
-            self.publish_event(AWSMetadataApi(cidr=cidr))
-            return [(address, subnet)], "AWS"
-        except Exception as x:
-            logger.debug(f"ERROR: could not parse cidr from aws metadata api: {cidr} - {x}")
-
-        return [], "AWS"
-
-    # querying AWS's interface metadata api v2 | works only from a pod
-    def aws_metadata_v2_discovery(self):
-        config = get_config()
-        logger.debug("From pod attempting to access aws's metadata v2")
-        token = requests.get(
-            "http://169.254.169.254/latest/api/token",
-            headers={"X-aws-ec2-metatadata-token-ttl-seconds": "21600"},
-            timeout=config.network_timeout,
-        ).text
-        mac_address = requests.get(
-            "http://169.254.169.254/latest/meta-data/mac",
-            headers={"X-aws-ec2-metatadata-token": token},
-            timeout=config.network_timeout,
-        ).text
-        cidr = requests.get(
-            f"http://169.254.169.254/latest/meta-data/network/interfaces/macs/{mac_address}/subnet-ipv4-cidr-block",
-            headers={"X-aws-ec2-metatadata-token": token},
-            timeout=config.network_timeout,
-        ).text.split("/")
-
-        try:
-            address, subnet = (cidr[0], cidr[1])
-            subnet = subnet if not config.quick else "24"
-            cidr = f"{address}/{subnet}"
-            logger.debug(f"From pod discovered subnet {cidr}")
-
-            self.publish_event(AWSMetadataApi(cidr=cidr))
-
-            return [(address, subnet)], "AWS"
-        except Exception as x:
-            logger.debug(f"ERROR: could not parse cidr from aws metadata api: {cidr} - {x}")
-
-        return [], "AWS"
-
-    # querying azure's interface metadata api | works only from a pod
-    def azure_metadata_discovery(self):
-        config = get_config()
-        logger.debug("From pod attempting to access azure's metadata")
-        machine_metadata = requests.get(
-            "http://169.254.169.254/metadata/instance?api-version=2017-08-01",
-            headers={"Metadata": "true"},
-            timeout=config.network_timeout,
-        ).json()
-        address, subnet = "", ""
-        subnets = list()
-        for interface in machine_metadata["network"]["interface"]:
-            address, subnet = (
-                interface["ipv4"]["subnet"][0]["address"],
-                interface["ipv4"]["subnet"][0]["prefix"],
-            )
-            subnet = subnet if not config.quick else "24"
-            logger.debug(f"From pod discovered subnet {address}/{subnet}")
-            subnets.append([address, subnet if not config.quick else "24"])
-
-            self.publish_event(AzureMetadataApi(cidr=f"{address}/{subnet}"))
-
-        return subnets, "Azure"
-
 
 @handler.subscribe(HostScanEvent)
 class HostDiscovery(Discovery):

kube_hunter/modules/discovery/kubectl.py

@@ -2,7 +2,7 @@ import logging
 import subprocess
 
 from kube_hunter.core.types import Discovery
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import HuntStarted, Event
 
 logger = logging.getLogger(__name__)

kube_hunter/modules/discovery/kubelet.py

@@ -5,7 +5,7 @@ from enum import Enum
 
 from kube_hunter.conf import get_config
 from kube_hunter.core.types import Discovery
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import OpenPortEvent, Event, Service
 
 urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)

kube_hunter/modules/discovery/ports.py

@@ -2,7 +2,7 @@ import logging
 from socket import socket
 
 from kube_hunter.core.types import Discovery
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import NewHostEvent, OpenPortEvent
 
 logger = logging.getLogger(__name__)

kube_hunter/modules/discovery/proxy.py

@@ -3,7 +3,7 @@ import requests
 
 from kube_hunter.conf import get_config
 from kube_hunter.core.types import Discovery
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Service, Event, OpenPortEvent
 
 logger = logging.getLogger(__name__)

kube_hunter/modules/hunting/__init__.py

@@ -2,12 +2,10 @@
 from . import (
     aks,
     apiserver,
-    arp,
     capabilities,
     certificates,
     cves,
     dashboard,
-    dns,
     etcd,
     kubelet,
     mounts,

kube_hunter/modules/hunting/aks.py

@@ -4,11 +4,13 @@ import logging
 import requests
 
 from kube_hunter.conf import get_config
-from kube_hunter.modules.hunting.kubelet import ExposedPodsHandler, SecureKubeletPortHunter
-from kube_hunter.core.events import handler
+from kube_hunter.modules.hunting.kubelet import ExposedPodsHandler, ExposedRunHandler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Event, Vulnerability
 from kube_hunter.core.types import Hunter, ActiveHunter, MountServicePrincipalTechnique, Azure
 
+from kube_hunter.modules.discovery.cloud.azure import AzureMetadataApiExposed
+
 logger = logging.getLogger(__name__)
 
 
@@ -27,14 +29,14 @@ class AzureSpnExposure(Vulnerability, Event):
         self.evidence = evidence
 
 
-@handler.subscribe(ExposedPodsHandler, predicate=lambda x: x.cloud_type == "Azure")
+@handler.subscribe_many([ExposedPodsHandler, AzureMetadataApiExposed])
 class AzureSpnHunter(Hunter):
     """AKS Hunting
     Hunting Azure cluster deployments using specific known configurations
     """
 
     def __init__(self, event):
-        self.event = event
+        self.event = event.get_by_class(ExposedPodsHandler)
         self.base_url = f"https://{self.event.host}:{self.event.port}"
 
     # getting a container that has access to the azure.json file
@@ -68,28 +70,25 @@ class AzureSpnHunter(Hunter):
             self.publish_event(AzureSpnExposure(container=container, evidence=evidence))
 
 
-@handler.subscribe(AzureSpnExposure)
+@handler.subscribe_many([AzureSpnExposure, ExposedRunHandler])
 class ProveAzureSpnExposure(ActiveHunter):
     """Azure SPN Hunter
     Gets the azure subscription file on the host by executing inside a container
     """
 
-    def __init__(self, event):
-        self.event = event
-        self.base_url = f"https://{self.event.host}:{self.event.port}"
+    def __init__(self, events):
+        self.events = events
+        self.exposed_run_event = self.events.get_by_class(ExposedRunHandler)
+        self.spn_exposure_event = self.events.get_by_class(AzureSpnExposure)
 
-    def test_run_capability(self):
-        """
-        Uses SecureKubeletPortHunter to test the /run handler
-        TODO: when multiple event subscription is implemented, use this here to make sure /run is accessible
-        """
-        debug_handlers = SecureKubeletPortHunter.DebugHandlers(path=self.base_url, session=self.event.session, pod=None)
-        return debug_handlers.test_run_container()
+        self.base_url = f"https://{self.event.host}:{self.event.port}"
 
     def run(self, command, container):
         config = get_config()
         run_url = f"{self.base_url}/run/{container['namespace']}/{container['pod']}/{container['name']}"
-        return self.event.session.post(run_url, verify=False, params={"cmd": command}, timeout=config.network_timeout)
+        return self.exposed_run_event.session.post(
+            run_url, verify=False, params={"cmd": command}, timeout=config.network_timeout
+        )
 
     def get_full_path_to_azure_file(self):
         """
@@ -106,10 +105,6 @@ class ProveAzureSpnExposure(ActiveHunter):
         return azure_file_path
 
     def execute(self):
-        if not self.test_run_capability():
-            logger.debug("Not proving AzureSpnExposure because /run debug handler is disabled")
-            return
-
         try:
             azure_file_path = self.get_full_path_to_azure_file()
             logger.debug(f"trying to access the azure.json at the resolved path: {azure_file_path}")
@@ -120,8 +115,8 @@ class ProveAzureSpnExposure(ActiveHunter):
             logger.warning("failed to parse SPN")
         else:
             if "subscriptionId" in subscription:
-                self.event.subscriptionId = subscription["subscriptionId"]
-                self.event.aadClientId = subscription["aadClientId"]
-                self.event.aadClientSecret = subscription["aadClientSecret"]
-                self.event.tenantId = subscription["tenantId"]
-                self.event.evidence = f"subscription: {self.event.subscriptionId}"
+                self.spn_exposure_event.subscriptionId = subscription["subscriptionId"]
+                self.spn_exposure_event.aadClientId = subscription["aadClientId"]
+                self.spn_exposure_event.aadClientSecret = subscription["aadClientSecret"]
+                self.spn_exposure_event.tenantId = subscription["tenantId"]
+                self.spn_exposure_event.evidence = f"subscription: {self.event.subscriptionId}"

kube_hunter/modules/hunting/apiserver.py

@@ -5,7 +5,7 @@ import requests
 
 from kube_hunter.conf import get_config
 from kube_hunter.modules.discovery.apiserver import ApiServer
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Vulnerability, Event, K8sVersionDisclosure
 from kube_hunter.core.types import Hunter, ActiveHunter, KubernetesCluster
 from kube_hunter.core.types.vulnerabilities import (

kube_hunter/modules/hunting/arp.py

@@ -1,71 +0,0 @@
-import logging
-
-from scapy.all import ARP, IP, ICMP, Ether, sr1, srp
-
-from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
-from kube_hunter.core.events.types import Event, Vulnerability
-from kube_hunter.core.types import ActiveHunter, KubernetesCluster, ARPPoisoningTechnique
-from kube_hunter.modules.hunting.capabilities import CapNetRawEnabled
-
-logger = logging.getLogger(__name__)
-
-
-class PossibleArpSpoofing(Vulnerability, Event):
-    """A malicious pod running on the cluster could potentially run an ARP Spoof attack
-    and perform a MITM between pods on the node."""
-
-    def __init__(self):
-        Vulnerability.__init__(
-            self,
-            KubernetesCluster,
-            "Possible Arp Spoof",
-            category=ARPPoisoningTechnique,
-            vid="KHV020",
-        )
-
-
-@handler.subscribe(CapNetRawEnabled)
-class ArpSpoofHunter(ActiveHunter):
-    """Arp Spoof Hunter
-    Checks for the possibility of running an ARP spoof
-    attack from within a pod (results are based on the running node)
-    """
-
-    def __init__(self, event):
-        self.event = event
-
-    def try_getting_mac(self, ip):
-        config = get_config()
-        ans = sr1(ARP(op=1, pdst=ip), timeout=config.network_timeout, verbose=0)
-        return ans[ARP].hwsrc if ans else None
-
-    def detect_l3_on_host(self, arp_responses):
-        """returns True for an existence of an L3 network plugin"""
-        logger.debug("Attempting to detect L3 network plugin using ARP")
-        unique_macs = list({response[ARP].hwsrc for _, response in arp_responses})
-
-        # if LAN addresses not unique
-        if len(unique_macs) == 1:
-            # if an ip outside the subnets gets a mac address
-            outside_mac = self.try_getting_mac("1.1.1.1")
-            # outside mac is the same as lan macs
-            if outside_mac == unique_macs[0]:
-                return True
-        # only one mac address for whole LAN and outside
-        return False
-
-    def execute(self):
-        config = get_config()
-        self_ip = sr1(IP(dst="1.1.1.1", ttl=1) / ICMP(), verbose=0, timeout=config.network_timeout)[IP].dst
-        arp_responses, _ = srp(
-            Ether(dst="ff:ff:ff:ff:ff:ff") / ARP(op=1, pdst=f"{self_ip}/24"),
-            timeout=config.network_timeout,
-            verbose=0,
-        )
-
-        # arp enabled on cluster and more than one pod on node
-        if len(arp_responses) > 1:
-            # L3 plugin not installed
-            if not self.detect_l3_on_host(arp_responses):
-                self.publish_event(PossibleArpSpoofing())

kube_hunter/modules/hunting/capabilities.py

@@ -2,7 +2,7 @@ import socket
 import logging
 
 from kube_hunter.modules.discovery.hosts import RunningAsPodEvent
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Event, Vulnerability
 from kube_hunter.core.types import Hunter, ARPPoisoningTechnique, KubernetesCluster
 

kube_hunter/modules/hunting/certificates.py

@@ -4,7 +4,7 @@ import base64
 import re
 
 from kube_hunter.core.types import Hunter, KubernetesCluster, GeneralSensitiveInformationTechnique
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Vulnerability, Event, Service
 
 logger = logging.getLogger(__name__)

kube_hunter/modules/hunting/cves.py

@@ -2,8 +2,9 @@ import logging
 from packaging import version
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
-from kube_hunter.core.events.types import Vulnerability, Event, K8sVersionDisclosure
+from kube_hunter.core.events.event_handler import handler
+
+from kube_hunter.core.events.types import K8sVersionDisclosure, Vulnerability, Event
 from kube_hunter.core.types import (
     Hunter,
     KubectlClient,
@@ -15,6 +16,7 @@ from kube_hunter.core.types import (
 from kube_hunter.modules.discovery.kubectl import KubectlClientEvent
 
 logger = logging.getLogger(__name__)
+config = get_config()
 
 
 class ServerApiVersionEndPointAccessPE(Vulnerability, Event):
@@ -199,7 +201,7 @@ class CveUtils:
         return vulnerable
 
 
-@handler.subscribe_once(K8sVersionDisclosure)
+@handler.subscribe_once(K8sVersionDisclosure, is_register=config.enable_cve_hunting)
 class K8sClusterCveHunter(Hunter):
     """K8s CVE Hunter
     Checks if Node is running a Kubernetes version vulnerable to
@@ -224,6 +226,7 @@ class K8sClusterCveHunter(Hunter):
                 self.publish_event(vulnerability(self.event.version))
 
 
+# Removed due to incomplete implementation for multiple vendors revisions of kubernetes
 @handler.subscribe(KubectlClientEvent)
 class KubectlCVEHunter(Hunter):
     """Kubectl CVE Hunter

kube_hunter/modules/hunting/dashboard.py

@@ -4,7 +4,7 @@ import requests
 
 from kube_hunter.conf import get_config
 from kube_hunter.core.types import Hunter, AccessK8sDashboardTechnique, KubernetesCluster
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Vulnerability, Event
 from kube_hunter.modules.discovery.dashboard import KubeDashboardEvent
 

kube_hunter/modules/hunting/dns.py

@@ -1,90 +0,0 @@
-import re
-import logging
-
-from scapy.all import IP, ICMP, UDP, DNS, DNSQR, ARP, Ether, sr1, srp1, srp
-
-from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
-from kube_hunter.core.events.types import Event, Vulnerability
-from kube_hunter.core.types import ActiveHunter, KubernetesCluster, CoreDNSPoisoningTechnique
-from kube_hunter.modules.hunting.arp import PossibleArpSpoofing
-
-logger = logging.getLogger(__name__)
-
-
-class PossibleDnsSpoofing(Vulnerability, Event):
-    """A malicious pod running on the cluster could potentially run a DNS Spoof attack
-    and perform a MITM attack on applications running in the cluster."""
-
-    def __init__(self, kubedns_pod_ip):
-        Vulnerability.__init__(
-            self,
-            KubernetesCluster,
-            "Possible DNS Spoof",
-            category=CoreDNSPoisoningTechnique,
-            vid="KHV030",
-        )
-        self.kubedns_pod_ip = kubedns_pod_ip
-        self.evidence = f"kube-dns at: {self.kubedns_pod_ip}"
-
-
-# Only triggered with RunningAsPod base event
-@handler.subscribe(PossibleArpSpoofing)
-class DnsSpoofHunter(ActiveHunter):
-    """DNS Spoof Hunter
-    Checks for the possibility for a malicious pod to compromise DNS requests of the cluster
-    (results are based on the running node)
-    """
-
-    def __init__(self, event):
-        self.event = event
-
-    def get_cbr0_ip_mac(self):
-        config = get_config()
-        res = srp1(Ether() / IP(dst="1.1.1.1", ttl=1) / ICMP(), verbose=0, timeout=config.network_timeout)
-        return res[IP].src, res.src
-
-    def extract_nameserver_ip(self):
-        with open("/etc/resolv.conf") as f:
-            # finds first nameserver in /etc/resolv.conf
-            match = re.search(r"nameserver (\d+.\d+.\d+.\d+)", f.read())
-            if match:
-                return match.group(1)
-
-    def get_kube_dns_ip_mac(self):
-        config = get_config()
-        kubedns_svc_ip = self.extract_nameserver_ip()
-
-        # getting actual pod ip of kube-dns service, by comparing the src mac of a dns response and arp scanning.
-        dns_info_res = srp1(
-            Ether() / IP(dst=kubedns_svc_ip) / UDP(dport=53) / DNS(rd=1, qd=DNSQR()),
-            verbose=0,
-            timeout=config.network_timeout,
-        )
-        kubedns_pod_mac = dns_info_res.src
-        self_ip = dns_info_res[IP].dst
-
-        arp_responses, _ = srp(
-            Ether(dst="ff:ff:ff:ff:ff:ff") / ARP(op=1, pdst=f"{self_ip}/24"),
-            timeout=config.network_timeout,
-            verbose=0,
-        )
-        for _, response in arp_responses:
-            if response[Ether].src == kubedns_pod_mac:
-                return response[ARP].psrc, response.src
-
-    def execute(self):
-        config = get_config()
-        logger.debug("Attempting to get kube-dns pod ip")
-        self_ip = sr1(IP(dst="1.1.1.1", ttl=1) / ICMP(), verbose=0, timeout=config.network_timeout)[IP].dst
-        cbr0_ip, cbr0_mac = self.get_cbr0_ip_mac()
-
-        kubedns = self.get_kube_dns_ip_mac()
-        if kubedns:
-            kubedns_ip, kubedns_mac = kubedns
-            logger.debug(f"ip={self_ip} kubednsip={kubedns_ip} cbr0ip={cbr0_ip}")
-            if kubedns_mac != cbr0_mac:
-                # if self pod in the same subnet as kube-dns pod
-                self.publish_event(PossibleDnsSpoofing(kubedns_pod_ip=kubedns_ip))
-        else:
-            logger.debug("Could not get kubedns identity")

kube_hunter/modules/hunting/etcd.py

@@ -2,7 +2,7 @@ import logging
 import requests
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Vulnerability, Event, OpenPortEvent
 from kube_hunter.core.types import (
     ActiveHunter,

kube_hunter/modules/hunting/kubelet.py

@@ -9,7 +9,7 @@ import urllib3
 import uuid
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Vulnerability, Event, K8sVersionDisclosure
 from kube_hunter.core.types import (
     Hunter,

kube_hunter/modules/hunting/mounts.py

@@ -3,7 +3,7 @@ import re
 import uuid
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Event, Vulnerability
 from kube_hunter.core.types import ActiveHunter, Hunter, KubernetesCluster, HostPathMountPrivilegeEscalationTechnique
 from kube_hunter.modules.hunting.kubelet import (

kube_hunter/modules/hunting/proxy.py

@@ -4,7 +4,7 @@ import requests
 from enum import Enum
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Event, Vulnerability, K8sVersionDisclosure
 from kube_hunter.core.types import (
     ActiveHunter,

kube_hunter/modules/hunting/secrets.py

@@ -1,7 +1,7 @@
 import logging
 import os
 
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import Vulnerability, Event
 from kube_hunter.core.types import Hunter, KubernetesCluster, AccessContainerServiceAccountTechnique
 from kube_hunter.modules.discovery.hosts import RunningAsPodEvent

kube_hunter/modules/report/collector.py

@@ -2,7 +2,7 @@ import logging
 import threading
 
 from kube_hunter.conf import get_config
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import (
     Event,
     Service,

kube_hunter/modules/report/dispatchers.py

@@ -12,10 +12,7 @@ class HTTPDispatcher:
         dispatch_url = os.environ.get("KUBEHUNTER_HTTP_DISPATCH_URL", "https://localhost/")
         try:
             r = requests.request(
-                dispatch_method,
-                dispatch_url,
-                json=report,
-                headers={"Content-Type": "application/json"},
+                dispatch_method, dispatch_url, json=report, headers={"Content-Type": "application/json"}, verify=False
             )
             r.raise_for_status()
             logger.info(f"Report was dispatched to: {dispatch_url}")

requirements-dev.txt

@@ -1,5 +1,3 @@
--r requirements.txt
-
 flake8
 pytest >= 2.9.1
 requests-mock >= 1.8

setup.cfg

@@ -32,7 +32,6 @@ packages = find:
 install_requires =
     netaddr
     netifaces
-    scapy>=2.4.3
     requests
     PrettyTable
     urllib3>=1.24.3

tests/core/test_cloud.py

@@ -1,27 +0,0 @@
-import requests_mock
-import json
-
-from kube_hunter.conf import Config, set_config
-from kube_hunter.core.events.types import NewHostEvent
-
-set_config(Config())
-
-
-def test_presetcloud():
-    """Testing if it doesn't try to run get_cloud if the cloud type is already set.
-    get_cloud(1.2.3.4) will result with an error
-    """
-    expcted = "AWS"
-    hostEvent = NewHostEvent(host="1.2.3.4", cloud=expcted)
-    assert expcted == hostEvent.cloud
-
-
-def test_getcloud():
-    fake_host = "1.2.3.4"
-    expected_cloud = "Azure"
-    result = {"cloud": expected_cloud}
-
-    with requests_mock.mock() as m:
-        m.get(f"https://api.azurespeed.com/api/region?ipOrUrl={fake_host}", text=json.dumps(result))
-        hostEvent = NewHostEvent(host=fake_host)
-        assert hostEvent.cloud == expected_cloud

tests/core/test_handler.py

@@ -1,10 +1,10 @@
 # flake8: noqa: E402
 
-from kube_hunter.conf import Config, set_config
+from kube_hunter.conf import Config, set_config, get_config
 
 set_config(Config(active=True))
 
-from kube_hunter.core.events.handler import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.modules.discovery.apiserver import ApiServiceDiscovery
 from kube_hunter.modules.discovery.dashboard import KubeDashboard as KubeDashboardDiscovery
 from kube_hunter.modules.discovery.etcd import EtcdRemoteAccess as EtcdRemoteAccessDiscovery
@@ -13,6 +13,8 @@ from kube_hunter.modules.discovery.kubectl import KubectlClientDiscovery
 from kube_hunter.modules.discovery.kubelet import KubeletDiscovery
 from kube_hunter.modules.discovery.ports import PortDiscovery
 from kube_hunter.modules.discovery.proxy import KubeProxy as KubeProxyDiscovery
+from kube_hunter.modules.discovery.cloud.azure import AzureInstanceMetadataServiceDiscovery, AzureSubnetsDiscovery
+from kube_hunter.modules.discovery.cloud.aws import AWSMetadataAPIDiscovery, AWSMetadataHostsDiscovery
 from kube_hunter.modules.hunting.aks import AzureSpnHunter, ProveAzureSpnExposure
 from kube_hunter.modules.hunting.apiserver import (
     AccessApiServer,
@@ -20,12 +22,12 @@ from kube_hunter.modules.hunting.apiserver import (
     AccessApiServerActive,
     AccessApiServerWithToken,
 )
-from kube_hunter.modules.hunting.arp import ArpSpoofHunter
 from kube_hunter.modules.hunting.capabilities import PodCapabilitiesHunter
 from kube_hunter.modules.hunting.certificates import CertificateDiscovery
-from kube_hunter.modules.hunting.cves import K8sClusterCveHunter, KubectlCVEHunter
+
+from kube_hunter.modules.hunting.cves import K8sClusterCveHunter
+from kube_hunter.modules.hunting.cves import KubectlCVEHunter
 from kube_hunter.modules.hunting.dashboard import KubeDashboard
-from kube_hunter.modules.hunting.dns import DnsSpoofHunter
 from kube_hunter.modules.hunting.etcd import EtcdRemoteAccess, EtcdRemoteAccessActive
 from kube_hunter.modules.hunting.kubelet import (
     ProveAnonymousAuth,
@@ -40,6 +42,8 @@ from kube_hunter.modules.hunting.mounts import VarLogMountHunter, ProveVarLogMou
 from kube_hunter.modules.hunting.proxy import KubeProxy, ProveProxyExposed, K8sVersionDisclosureProve
 from kube_hunter.modules.hunting.secrets import AccessSecrets
 
+config = get_config()
+
 PASSIVE_HUNTERS = {
     ApiServiceDiscovery,
     KubeDashboardDiscovery,
@@ -56,7 +60,6 @@ PASSIVE_HUNTERS = {
     ApiVersionHunter,
     PodCapabilitiesHunter,
     CertificateDiscovery,
-    K8sClusterCveHunter,
     KubectlCVEHunter,
     KubeDashboard,
     EtcdRemoteAccess,
@@ -65,13 +68,18 @@ PASSIVE_HUNTERS = {
     VarLogMountHunter,
     KubeProxy,
     AccessSecrets,
+    AzureInstanceMetadataServiceDiscovery,
+    AzureSubnetsDiscovery,
+    AWSMetadataAPIDiscovery,
+    AWSMetadataHostsDiscovery,
 }
 
+# if config.enable_cve_hunting:
+#     PASSIVE_HUNTERS.append(K8sClusterCveHunter)
+
 ACTIVE_HUNTERS = {
     ProveAzureSpnExposure,
     AccessApiServerActive,
-    ArpSpoofHunter,
-    DnsSpoofHunter,
     EtcdRemoteAccessActive,
     ProveRunHandler,
     ProveContainerLogsHandler,

tests/core/test_subscribe.py

@@ -3,7 +3,7 @@ import time
 from kube_hunter.conf import Config, set_config
 from kube_hunter.core.types import Hunter
 from kube_hunter.core.events.types import Event, Service
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 
 counter = 0
 first_run = True

tests/discovery/test_apiserver.py

@@ -8,7 +8,7 @@ set_config(Config())
 
 from kube_hunter.modules.discovery.apiserver import ApiServer, ApiServiceDiscovery
 from kube_hunter.core.events.types import Event
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 
 counter = 0
 
@@ -125,7 +125,6 @@ def test_InsecureApiServer():
 @handler.subscribe(ApiServer)
 class testApiServer:
     def __init__(self, event):
-        print("Event")
         assert event.host == "mockKubernetes"
         global counter
         counter += 1

tests/discovery/test_aws.py

@@ -0,0 +1,111 @@
+# import requests_mock
+
+# class TestAwsMetadataApiDiscovery:
+#     @staticmethod
+#     def _make_aws_response(*data: List[str]) -> str:
+#         return "\n".join(data)
+
+
+#     def test_is_aws_pod_v1_success(self):
+#         f = FromPodHostDiscovery(RunningAsPodEvent())
+
+#         with requests_mock.Mocker() as m:
+#             m.get(
+#                 "http://169.254.169.254/latest/meta-data/",
+#                 text=TestFromPodHostDiscovery._make_aws_response(
+#                     "\n".join(
+#                         (
+#                             "ami-id",
+#                             "ami-launch-index",
+#                             "ami-manifest-path",
+#                             "block-device-mapping/",
+#                             "events/",
+#                             "hostname",
+#                             "iam/",
+#                             "instance-action",
+#                             "instance-id",
+#                             "instance-type",
+#                             "local-hostname",
+#                             "local-ipv4",
+#                             "mac",
+#                             "metrics/",
+#                             "network/",
+#                             "placement/",
+#                             "profile",
+#                             "public-hostname",
+#                             "public-ipv4",
+#                             "public-keys/",
+#                             "reservation-id",
+#                             "security-groups",
+#                             "services/",
+#                         )
+#                     ),
+#                 ),
+#             )
+#             result = f.is_aws_pod_v1()
+
+#         assert result
+
+#     def test_is_aws_pod_v2_request_fail(self):
+#         f = FromPodHostDiscovery(RunningAsPodEvent())
+
+#         with requests_mock.Mocker() as m:
+#             m.put(
+#                 "http://169.254.169.254/latest/api/token/",
+#                 headers={"X-aws-ec2-metatadata-token-ttl-seconds": "21600"},
+#                 status_code=404,
+#             )
+#             m.get(
+#                 "http://169.254.169.254/latest/meta-data/",
+#                 headers={"X-aws-ec2-metatadata-token": "token"},
+#                 status_code=404,
+#             )
+#             result = f.is_aws_pod_v2()
+
+#         assert not result
+
+#     def test_is_aws_pod_v2_success(self):
+#         f = FromPodHostDiscovery(RunningAsPodEvent())
+
+#         with requests_mock.Mocker() as m:
+#             m.put(
+#                 "http://169.254.169.254/latest/api/token/",
+#                 headers={"X-aws-ec2-metatadata-token-ttl-seconds": "21600"},
+#                 text=TestFromPodHostDiscovery._make_aws_response("token"),
+#             )
+#             m.get(
+#                 "http://169.254.169.254/latest/meta-data/",
+#                 headers={"X-aws-ec2-metatadata-token": "token"},
+#                 text=TestFromPodHostDiscovery._make_aws_response(
+#                     "\n".join(
+#                         (
+#                             "ami-id",
+#                             "ami-launch-index",
+#                             "ami-manifest-path",
+#                             "block-device-mapping/",
+#                             "events/",
+#                             "hostname",
+#                             "iam/",
+#                             "instance-action",
+#                             "instance-id",
+#                             "instance-type",
+#                             "local-hostname",
+#                             "local-ipv4",
+#                             "mac",
+#                             "metrics/",
+#                             "network/",
+#                             "placement/",
+#                             "profile",
+#                             "public-hostname",
+#                             "public-ipv4",
+#                             "public-keys/",
+#                             "reservation-id",
+#                             "security-groups",
+#                             "services/",
+#                         )
+#                     ),
+#                 ),
+#             )
+#             result = f.is_aws_pod_v2()
+
+#         assert result

tests/discovery/test_azure.py

@@ -0,0 +1,79 @@
+import json
+import time
+import requests_mock
+
+from kube_hunter.core.events.event_handler import handler
+from kube_hunter.modules.discovery.hosts import RunningAsPodEvent
+from kube_hunter.modules.discovery.cloud.azure import (
+    AzureInstanceMetadataServiceDiscovery,
+    AzureMetadataApiExposed,
+    AzureSubnetsDiscovery,
+)
+
+event_counter = 0
+
+
+def test_TestAzureMetadataApi():
+    global event_counter
+
+    f = AzureInstanceMetadataServiceDiscovery(RunningAsPodEvent())
+
+    with requests_mock.Mocker() as m:
+        m.get("http://169.254.169.254/metadata/versions", status_code=404)
+        f.execute()
+
+    # We expect 0 triggers.because versions returned 404
+    time.sleep(0.01)
+    assert event_counter == 0
+    event_counter = 0
+
+    with requests_mock.Mocker() as m:
+        m.get("http://169.254.169.254/metadata/versions", text=AzureApiResponses.make_versions_response())
+        m.get(
+            "http://169.254.169.254/metadata/instance?api-version=2017-08-01",
+            text=AzureApiResponses.make_instance_response([("192.168.1.0", "24")]),
+        )
+        f.execute()
+
+    # Expect 1 trigger
+    time.sleep(0.01)
+    assert event_counter == 1
+    event_counter = 0
+
+    # Test subnet extraction:
+    versions_info = {"2017-08-01": AzureApiResponses.make_instance_response([("192.168.0.0", "24")], raw=False)}
+    asd = AzureSubnetsDiscovery(AzureMetadataApiExposed(versions_info))
+    assert asd.extract_azure_subnet() == "192.168.0.0/24"
+
+
+class AzureApiResponses:
+    @staticmethod
+    def make_instance_response(subnets, raw=True):
+        response = {
+            "network": {
+                "interface": [
+                    {"ipv4": {"subnet": [{"address": address, "prefix": prefix} for address, prefix in subnets]}}
+                ]
+            }
+        }
+
+        if raw:
+            response = json.dumps(response)
+        return response
+
+    @staticmethod
+    def make_versions_response():
+        return json.dumps(
+            {
+                "apiVersions": [
+                    "2017-08-01",
+                ]
+            }
+        )
+
+
+@handler.subscribe(AzureMetadataApiExposed)
+class TestAzureMetadataApiExposed:
+    def __init__(self, event):
+        global event_counter
+        event_counter += 1

tests/discovery/test_hosts.py

@@ -6,7 +6,7 @@ from kube_hunter.modules.discovery.hosts import (
     HostDiscoveryHelpers,
 )
 from kube_hunter.core.types import Hunter
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 import json
 import requests_mock
 import pytest
@@ -19,156 +19,6 @@ set_config(Config())
 
 
 class TestFromPodHostDiscovery:
-    @staticmethod
-    def _make_azure_response(*subnets: List[tuple]) -> str:
-        return json.dumps(
-            {
-                "network": {
-                    "interface": [
-                        {"ipv4": {"subnet": [{"address": address, "prefix": prefix} for address, prefix in subnets]}}
-                    ]
-                }
-            }
-        )
-
-    @staticmethod
-    def _make_aws_response(*data: List[str]) -> str:
-        return "\n".join(data)
-
-    def test_is_azure_pod_request_fail(self):
-        f = FromPodHostDiscovery(RunningAsPodEvent())
-
-        with requests_mock.Mocker() as m:
-            m.get("http://169.254.169.254/metadata/instance?api-version=2017-08-01", status_code=404)
-            result = f.is_azure_pod()
-
-        assert not result
-
-    def test_is_azure_pod_success(self):
-        f = FromPodHostDiscovery(RunningAsPodEvent())
-
-        with requests_mock.Mocker() as m:
-            m.get(
-                "http://169.254.169.254/metadata/instance?api-version=2017-08-01",
-                text=TestFromPodHostDiscovery._make_azure_response(("3.4.5.6", "255.255.255.252")),
-            )
-            result = f.is_azure_pod()
-
-        assert result
-
-    def test_is_aws_pod_v1_request_fail(self):
-        f = FromPodHostDiscovery(RunningAsPodEvent())
-
-        with requests_mock.Mocker() as m:
-            m.get("http://169.254.169.254/latest/meta-data/", status_code=404)
-            result = f.is_aws_pod_v1()
-
-        assert not result
-
-    def test_is_aws_pod_v1_success(self):
-        f = FromPodHostDiscovery(RunningAsPodEvent())
-
-        with requests_mock.Mocker() as m:
-            m.get(
-                "http://169.254.169.254/latest/meta-data/",
-                text=TestFromPodHostDiscovery._make_aws_response(
-                    "\n".join(
-                        (
-                            "ami-id",
-                            "ami-launch-index",
-                            "ami-manifest-path",
-                            "block-device-mapping/",
-                            "events/",
-                            "hostname",
-                            "iam/",
-                            "instance-action",
-                            "instance-id",
-                            "instance-type",
-                            "local-hostname",
-                            "local-ipv4",
-                            "mac",
-                            "metrics/",
-                            "network/",
-                            "placement/",
-                            "profile",
-                            "public-hostname",
-                            "public-ipv4",
-                            "public-keys/",
-                            "reservation-id",
-                            "security-groups",
-                            "services/",
-                        )
-                    ),
-                ),
-            )
-            result = f.is_aws_pod_v1()
-
-        assert result
-
-    def test_is_aws_pod_v2_request_fail(self):
-        f = FromPodHostDiscovery(RunningAsPodEvent())
-
-        with requests_mock.Mocker() as m:
-            m.put(
-                "http://169.254.169.254/latest/api/token/",
-                headers={"X-aws-ec2-metatadata-token-ttl-seconds": "21600"},
-                status_code=404,
-            )
-            m.get(
-                "http://169.254.169.254/latest/meta-data/",
-                headers={"X-aws-ec2-metatadata-token": "token"},
-                status_code=404,
-            )
-            result = f.is_aws_pod_v2()
-
-        assert not result
-
-    def test_is_aws_pod_v2_success(self):
-        f = FromPodHostDiscovery(RunningAsPodEvent())
-
-        with requests_mock.Mocker() as m:
-            m.put(
-                "http://169.254.169.254/latest/api/token/",
-                headers={"X-aws-ec2-metatadata-token-ttl-seconds": "21600"},
-                text=TestFromPodHostDiscovery._make_aws_response("token"),
-            )
-            m.get(
-                "http://169.254.169.254/latest/meta-data/",
-                headers={"X-aws-ec2-metatadata-token": "token"},
-                text=TestFromPodHostDiscovery._make_aws_response(
-                    "\n".join(
-                        (
-                            "ami-id",
-                            "ami-launch-index",
-                            "ami-manifest-path",
-                            "block-device-mapping/",
-                            "events/",
-                            "hostname",
-                            "iam/",
-                            "instance-action",
-                            "instance-id",
-                            "instance-type",
-                            "local-hostname",
-                            "local-ipv4",
-                            "mac",
-                            "metrics/",
-                            "network/",
-                            "placement/",
-                            "profile",
-                            "public-hostname",
-                            "public-ipv4",
-                            "public-keys/",
-                            "reservation-id",
-                            "security-groups",
-                            "services/",
-                        )
-                    ),
-                ),
-            )
-            result = f.is_aws_pod_v2()
-
-        assert result
-
     def test_execute_scan_cidr(self):
         set_config(Config(cidr="1.2.3.4/30"))
         f = FromPodHostDiscovery(RunningAsPodEvent())

tests/hunting/test_aks.py

@@ -8,42 +8,64 @@ import json
 set_config(Config())
 
 from kube_hunter.modules.hunting.kubelet import ExposedPodsHandler
+
+from kube_hunter.modules.discovery.cloud.azure import AzureMetadataApiExposed
 from kube_hunter.modules.hunting.aks import AzureSpnHunter
+from kube_hunter.core.events.types import MultipleEventsContainer
 
 
 def test_AzureSpnHunter():
-    e = ExposedPodsHandler(pods=[])
+    exposed_pods = ExposedPodsHandler(pods=[])
+    azure_metadata = AzureMetadataApiExposed(
+        versions_info={
+            "2017-08-01": {
+                "network": {
+                    "interface": [
+                        {
+                            "ipv4": {
+                                "subnet": [
+                                    {"address": address, "prefix": prefix}
+                                    for address, prefix in [("192.168.1.0", "24")]
+                                ]
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    )
+
     pod_template = '{{"items":[ {{"apiVersion":"v1","kind":"Pod","metadata":{{"name":"etc","namespace":"default"}},"spec":{{"containers":[{{"command":["sleep","99999"],"image":"ubuntu","name":"test","volumeMounts":[{{"mountPath":"/mp","name":"v"}}]}}],"volumes":[{{"hostPath":{{"path":"{}"}},"name":"v"}}]}}}} ]}}'
 
     bad_paths = ["/", "/etc", "/etc/", "/etc/kubernetes", "/etc/kubernetes/azure.json"]
     good_paths = ["/yo", "/etc/yo", "/etc/kubernetes/yo.json"]
 
     for p in bad_paths:
-        e.pods = json.loads(pod_template.format(p))["items"]
-        h = AzureSpnHunter(e)
+        exposed_pods.pods = json.loads(pod_template.format(p))["items"]
+        h = AzureSpnHunter(MultipleEventsContainer([azure_metadata, exposed_pods]))
         c = h.get_key_container()
         assert c
 
     for p in good_paths:
-        e.pods = json.loads(pod_template.format(p))["items"]
-        h = AzureSpnHunter(e)
+        exposed_pods.pods = json.loads(pod_template.format(p))["items"]
+        h = AzureSpnHunter(MultipleEventsContainer([azure_metadata, exposed_pods]))
         c = h.get_key_container()
         assert c == None
 
     pod_no_volume_mounts = '{"items":[ {"apiVersion":"v1","kind":"Pod","metadata":{"name":"etc","namespace":"default"},"spec":{"containers":[{"command":["sleep","99999"],"image":"ubuntu","name":"test"}],"volumes":[{"hostPath":{"path":"/whatever"},"name":"v"}]}} ]}'
-    e.pods = json.loads(pod_no_volume_mounts)["items"]
-    h = AzureSpnHunter(e)
+    exposed_pods.pods = json.loads(pod_no_volume_mounts)["items"]
+    h = AzureSpnHunter(MultipleEventsContainer([azure_metadata, exposed_pods]))
     c = h.get_key_container()
     assert c == None
 
     pod_no_volumes = '{"items":[ {"apiVersion":"v1","kind":"Pod","metadata":{"name":"etc","namespace":"default"},"spec":{"containers":[{"command":["sleep","99999"],"image":"ubuntu","name":"test"}]}} ]}'
-    e.pods = json.loads(pod_no_volumes)["items"]
-    h = AzureSpnHunter(e)
+    exposed_pods.pods = json.loads(pod_no_volumes)["items"]
+    h = AzureSpnHunter(MultipleEventsContainer([azure_metadata, exposed_pods]))
     c = h.get_key_container()
     assert c == None
 
     pod_other_volume = '{"items":[ {"apiVersion":"v1","kind":"Pod","metadata":{"name":"etc","namespace":"default"},"spec":{"containers":[{"command":["sleep","99999"],"image":"ubuntu","name":"test","volumeMounts":[{"mountPath":"/mp","name":"v"}]}],"volumes":[{"emptyDir":{},"name":"v"}]}} ]}'
-    e.pods = json.loads(pod_other_volume)["items"]
-    h = AzureSpnHunter(e)
+    exposed_pods.pods = json.loads(pod_other_volume)["items"]
+    h = AzureSpnHunter(MultipleEventsContainer([azure_metadata, exposed_pods]))
     c = h.get_key_container()
     assert c == None

tests/hunting/test_apiserver_hunter.py

@@ -23,7 +23,7 @@ from kube_hunter.modules.hunting.apiserver import ApiServerPassiveHunterFinished
 from kube_hunter.modules.hunting.apiserver import CreateANamespace, DeleteANamespace
 from kube_hunter.modules.discovery.apiserver import ApiServer
 from kube_hunter.core.types import ExposedSensitiveInterfacesTechnique, AccessK8sApiServerTechnique
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 
 counter = 0
 
@@ -125,7 +125,6 @@ def test_AccessApiServer():
 @handler.subscribe(ListNamespaces)
 class test_ListNamespaces:
     def __init__(self, event):
-        print("ListNamespaces")
         assert event.evidence == ["hello"]
         if event.host == "mocktoken":
             assert event.auth_token == "so-secret"
@@ -138,7 +137,6 @@ class test_ListNamespaces:
 @handler.subscribe(ListPodsAndNamespaces)
 class test_ListPodsAndNamespaces:
     def __init__(self, event):
-        print("ListPodsAndNamespaces")
         assert len(event.evidence) == 2
         for pod in event.evidence:
             if pod["name"] == "podA":
@@ -161,7 +159,6 @@ class test_ListPodsAndNamespaces:
 @handler.subscribe(ListRoles)
 class test_ListRoles:
     def __init__(self, event):
-        print("ListRoles")
         assert 0
         global counter
         counter += 1
@@ -172,7 +169,6 @@ class test_ListRoles:
 @handler.subscribe(ListClusterRoles)
 class test_ListClusterRoles:
     def __init__(self, event):
-        print("ListClusterRoles")
         assert event.auth_token == "so-secret"
         global counter
         counter += 1
@@ -181,7 +177,6 @@ class test_ListClusterRoles:
 @handler.subscribe(ServerApiAccess)
 class test_ServerApiAccess:
     def __init__(self, event):
-        print("ServerApiAccess")
         if event.category == ExposedSensitiveInterfacesTechnique:
             assert event.auth_token is None
         else:
@@ -194,7 +189,6 @@ class test_ServerApiAccess:
 @handler.subscribe(ApiServerPassiveHunterFinished)
 class test_PassiveHunterFinished:
     def __init__(self, event):
-        print("PassiveHunterFinished")
         assert event.namespaces == ["hello"]
         global counter
         counter += 1

tests/hunting/test_certificates.py

@@ -5,7 +5,7 @@ set_config(Config())
 
 from kube_hunter.core.events.types import Event
 from kube_hunter.modules.hunting.certificates import CertificateDiscovery, CertificateEmail
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 
 
 def test_CertificateDiscovery():

tests/hunting/test_cvehunting.py

@@ -5,7 +5,7 @@ from kube_hunter.conf import Config, set_config
 
 set_config(Config())
 
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.core.events.types import K8sVersionDisclosure
 from kube_hunter.modules.hunting.cves import (
     K8sClusterCveHunter,

tests/hunting/test_kubelet.py

@@ -3,7 +3,7 @@ import requests_mock
 import urllib.parse
 import uuid
 
-from kube_hunter.core.events import handler
+from kube_hunter.core.events.event_handler import handler
 from kube_hunter.modules.hunting.kubelet import (
     AnonymousAuthEnabled,
     ExposedExistingPrivilegedContainersViaSecureKubeletPort,