eva-exploit 3.3.7__tar.gz → 3.4__tar.gz

{eva_exploit-3.3.7 → eva_exploit-3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva-exploit
-Version: 3.3.7
+Version: 3.4
 Summary: Exploit Vector Agent
 Author: ARCANGEL0
 License: MIT
@@ -275,6 +275,7 @@ eva
 | `/exit` / `/quit` | Exit EVA and save session |
 | `/model` | Change AI backend |
 | `/rename` | Rename the current session |
+| `/search <query>` or `search <query>` | Run exploit/vulnerability intel search inside current chat session and feed results into next analysis |
 | `/report` | Generates a PDF/HTML report with latest findings on session |
 | `/map` | Generates a html file with attack surface map of session |
 | `/menu` | Return to session menu |

{eva_exploit-3.3.7 → eva_exploit-3.4}/README.md

@@ -263,6 +263,7 @@ eva
 | `/exit` / `/quit` | Exit EVA and save session |
 | `/model` | Change AI backend |
 | `/rename` | Rename the current session |
+| `/search <query>` or `search <query>` | Run exploit/vulnerability intel search inside current chat session and feed results into next analysis |
 | `/report` | Generates a PDF/HTML report with latest findings on session |
 | `/map` | Generates a html file with attack surface map of session |
 | `/menu` | Return to session menu |

{eva_exploit-3.3.7 → eva_exploit-3.4}/config.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 # ================= CONFIG =================
 APP_NAME = "EVA"
-APP_VERSION = "3.3.7"
+APP_VERSION = "3.4"
 GITHUB_REPO = "arcangel0/EVA"
 PYPI_PACKAGE = "eva-exploit"
 API_ENDPOINT = "NOT_SET"

{eva_exploit-3.3.7 → eva_exploit-3.4}/eva_exploit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eva-exploit
-Version: 3.3.7
+Version: 3.4
 Summary: Exploit Vector Agent
 Author: ARCANGEL0
 License: MIT
@@ -275,6 +275,7 @@ eva
 | `/exit` / `/quit` | Exit EVA and save session |
 | `/model` | Change AI backend |
 | `/rename` | Rename the current session |
+| `/search <query>` or `search <query>` | Run exploit/vulnerability intel search inside current chat session and feed results into next analysis |
 | `/report` | Generates a PDF/HTML report with latest findings on session |
 | `/map` | Generates a html file with attack surface map of session |
 | `/menu` | Return to session menu |

{eva_exploit-3.3.7 → eva_exploit-3.4}/modules/llm.py

@@ -49,6 +49,16 @@ STREAM_HIDE_MARKERS = [
     "explanation of flags:",
     "[authorized ctf/lab task]",
 ]
+COMMAND_START_TOKENS = [
+    "nmap", "masscan", "rustscan", "nikto", "whatweb", "curl", "wget", "ffuf",
+    "gobuster", "dirsearch", "feroxbuster", "sqlmap", "hydra", "nc", "netcat",
+    "ssh", "ftp", "smbclient", "enum4linux", "rpcclient", "crackmapexec", "nuclei",
+    "msfconsole", "searchsploit", "command", "test", "find", "ls", "cat", "grep",
+    "awk", "sed", "cut", "sort", "uniq", "tr", "head", "tail", "id", "whoami",
+    "uname", "ip", "ifconfig", "ss", "netstat", "nslookup", "dig", "host", "ping",
+    "traceroute", "openssl", "sslscan", "ldapsearch", "snmpwalk", "python", "python3",
+    "bash", "sh",
+]
 ## regex for the lame llm model excuses, to guarantee adherence to pentesting scope
 REFUSAL_PATTERNS = [
     r"\bi can(?:not|'t)\s+(?:assist|help|fulfill)\b",
@@ -87,6 +97,59 @@ def _build_no_output_analysis(last_output):
     )
 
 
+def _dedupe_keep_order(items):
+    out = []
+    seen = set()
+    for item in items:
+        key = str(item).strip()
+        if not key or key in seen:
+            continue
+        seen.add(key)
+        out.append(key)
+    return out
+
+
+def _coerce_commands(value):
+    collected = []
+    token_group = "|".join(sorted((re.escape(t) for t in COMMAND_START_TOKENS), key=len, reverse=True))
+    loose_line_re = re.compile(
+        rf"^(?:sudo\s+)?(?:{token_group})\b",
+        flags=re.IGNORECASE,
+    )
+
+    def _visit(node):
+        if node is None:
+            return
+        if isinstance(node, dict):
+            for key in ("cmd", "command", "value", "text", "content"):
+                if key in node:
+                    _visit(node.get(key))
+            return
+        if isinstance(node, (list, tuple, set)):
+            for item in node:
+                _visit(item)
+            return
+
+        text = str(node).strip()
+        if not text:
+            return
+
+        extracted = extract_commands_anywhere(text)
+        if extracted:
+            collected.extend(extracted)
+            return
+
+        for raw_line in text.splitlines():
+            line = re.sub(r"^\s*(?:[-*]|\d+[.)])\s*", "", raw_line).strip("` ").strip()
+            if not line:
+                continue
+            if loose_line_re.match(line):
+                collected.append(line)
+
+    _visit(value)
+    return _dedupe_keep_order(collected)
+
+
 ## extractjson
 def _extract_code_fence_json(raw_str):
     pattern = r"```(?:json)?\\s*(.*?)\\s*```"
@@ -167,15 +230,24 @@ def normalize_response(resp):
     if not isinstance(resp, dict):
         return {"analysis": "[::!] ⚠️ Error on LLM output.", "commands": []}
 
-    analysis = resp.get("analysis", "[::!] ⚠️ Error with model response, please ask again.")
-    commands = resp.get("commands", [])
-
-    if isinstance(commands, str):
-        commands = [commands]
-    if not isinstance(commands, list):
-        commands = []
-
-    commands = [str(c).strip() for c in commands if str(c).strip()]
+    analysis = resp.get("analysis")
+    if analysis is None:
+        for key in ("response", "answer", "text", "content", "message"):
+            if key in resp and str(resp.get(key, "")).strip():
+                analysis = resp.get(key)
+                break
+    if analysis is None:
+        analysis = "[::!] ⚠️ Error with model response, please ask again."
+
+    commands = resp.get("commands")
+    if commands in (None, "", []):
+        for key in ("next_commands", "cmds", "command", "suggested_commands"):
+            if key in resp:
+                commands = resp.get(key)
+                break
+    commands = _coerce_commands(commands)
+    if not commands:
+        commands = extract_commands_anywhere(str(analysis))
 
     return {
         "analysis": str(analysis),
@@ -200,8 +272,9 @@ def extract_commands_anywhere(raw_str):
                 seen.add(candidate)
                 commands.append(candidate)
 
+    token_group = "|".join(sorted((re.escape(t) for t in COMMAND_START_TOKENS), key=len, reverse=True))
     command_line_re = re.compile(
-        r"^\s*(?:[-*]\s*)?(?:`)?((?:nmap|masscan|nikto|whatweb|curl|wget|ffuf|gobuster|dirsearch|sqlmap|hydra|nc|netcat|ssh|ftp|smbclient|enum4linux|rpcclient|crackmapexec|nuclei|msfconsole)\b[^\n`]*)`?\s*$",
+        rf"^\s*(?:[-*]\s*)?(?:\d+[.)]\s*)?(?:`)?(?:\$+\s*)?((?:sudo\s+)?(?:{token_group})\b[^\n`]*)`?\s*$",
         flags=re.IGNORECASE | re.MULTILINE,
     )
     for match in command_line_re.findall(raw_str):
@@ -210,6 +283,28 @@ def extract_commands_anywhere(raw_str):
             seen.add(candidate)
             commands.append(candidate)
 
+    inline_re = re.compile(
+        rf"`((?:sudo\s+)?(?:{token_group})\b[^`]+)`",
+        flags=re.IGNORECASE,
+    )
+    for match in inline_re.findall(raw_str):
+        candidate = match.strip()
+        if candidate and candidate not in seen:
+            seen.add(candidate)
+            commands.append(candidate)
+
+    phrase_re = re.compile(
+        rf"\b(?:use|run|execute)\s+((?:sudo\s+)?(?:{token_group})\b[^\n`]+)",
+        flags=re.IGNORECASE,
+    )
+    for line in raw_str.splitlines():
+        text_line = line.strip()
+        for match in phrase_re.findall(text_line):
+            candidate = match.strip().rstrip(" .;,")
+            if candidate and candidate not in seen:
+                seen.add(candidate)
+                commands.append(candidate)
+
     return commands
 
 
@@ -387,6 +482,41 @@ def _ollama_run_fallback(prompt):
         return ""
 
 
+def _recover_commands_for_ollama(user_msg, last_output, workflow_context, analysis):
+    recovery_system = (
+        "You are EVA command planner for authorized CTF/lab activity.\n"
+        "Return strict JSON only: {\"commands\": [\"cmd1\", \"cmd2\", \"cmd3\"]}\n"
+        "Rules:\n"
+        "- Return 1-3 executable shell commands.\n"
+        "- No placeholders and no markdown.\n"
+        "- Use only targets/ports visible in provided evidence.\n"
+        "- If evidence is insufficient, return prerequisite evidence-gathering commands."
+    )
+    recovery_user = (
+        f"USER_MSG: {user_msg}\n\n"
+        f"ANALYSIS_TEXT:\n{analysis}\n\n"
+        f"CONTEXT_DATA:\n{_context_for_system_prompt(last_output)}\n\n"
+        f"WORKFLOW_STATE:\n{workflow_context or 'none'}"
+    )
+    raw, _ = _ollama_chat(
+        [
+            {"role": "system", "content": recovery_system},
+            {"role": "user", "content": recovery_user},
+        ]
+    )
+    if not raw:
+        return []
+
+    parsed = extract_json_anywhere(raw) or {}
+    recovered = _coerce_commands(parsed.get("commands"))
+    if recovered:
+        return recovered[:3]
+    recovered = extract_commands_anywhere(raw)
+    if recovered:
+        return recovered[:3]
+    return []
+
+
 def _query_g4f(history):
     raw = ""
     headers = {"Content-Type": "application/json"}
@@ -688,6 +818,13 @@ class LLM:
             data["commands"] = inferred_commands
 
         data = normalize_response(data)
+        if self.backend == "ollama" and not data.get("commands"):
+            data["commands"] = _recover_commands_for_ollama(
+                user_msg,
+                last_output,
+                workflow_context,
+                str(data.get("analysis", "")),
+            )
         data["analysis"] = _clean_analysis_text(data.get("analysis", ""))
         data["__streamed"] = streamed
 

{eva_exploit-3.3.7 → eva_exploit-3.4}/modules/prompt_builder.py

@@ -51,6 +51,7 @@ COMMAND RULES:
 - Evidence lock: never claim a command result happened unless it appears in CONTEXT_DATA/WORKFLOW_STATE.
 - If latest output indicates missing evidence/no output, say that explicitly and avoid speculative findings.
 - For any command requiring local files (wordlists/config/scripts), emit a file-existence check command first.
+- `commands` MUST NOT be empty. If evidence is weak, still output safe prerequisite commands to collect missing evidence.
 
 CONTEXT_DATA:
 {last_output if last_output else "SYSTEM_BOOT: AWAITING_TARGET_PARAMETER"}

{eva_exploit-3.3.7 → eva_exploit-3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "eva-exploit"
-version = "3.3.7"
+version = "3.4"
 description = "Exploit Vector Agent"
 readme = "README.md"
 requires-python = ">=3.10"

{eva_exploit-3.3.7 → eva_exploit-3.4}/sessions/eva_session.py

@@ -6,16 +6,20 @@
 # --------------------------------------------------------------------- 
 
 import json
+import io
 import getpass
 import os
+import re
 import signal
 import subprocess
+import contextlib
 from datetime import datetime, timezone
 
 from colorama import Fore,Back,Style
 
 from config import API_ENDPOINT, MAPS_DIR, REPORTS_DIR, SESSIONS_DIR, username
 from modules.attack_map import generate_attack_map_files, open_attack_map
+from modules.exploit_search import run_exploit_search
 from modules.llm import LLM
 from modules.reporting import build_html_report, open_report_file, try_generate_pdf
 from modules.tooling import (
@@ -40,6 +44,8 @@ from utils.system import (
 )
 from utils.ui import cyber, menu, raw_input, spinner_start, spinner_stop
 
+ANSI_ESCAPE_RE = re.compile(r"\x1B\[[0-?]*[ -/]*[@-~]")
+
 
 # +-------------------------------------------+
 # | Main core  -██                            |
@@ -345,6 +351,7 @@ class Eva:
         print(Fore.GREEN + "⯁⮞ ˹E˼xploit ˹V˼ector ˹A˼gent \n⬢  Current Model: " + Fore.CYAN + self.backend + f"\n{Fore.GREEN}𖨠 Session Name: " + Fore.YELLOW + self.sessionName)
         print(Fore.CYAN + "/// type /exit to quit the program anytime")
         print(Fore.CYAN + "/// type /model to change current model")
+        print(Fore.CYAN + "/// type /search <query> to run exploit/vuln intel search in-session")
         print(Fore.CYAN + "/// type /rename to change a session name")
         print(Fore.CYAN + "/// type /viewmap to open attack map with last findings.")
         print(Fore.CYAN + "/// type /report to generate a report in PDF and HTML.")
@@ -387,6 +394,7 @@ class Eva:
             if user.lower() in ("help", "/help"):
                 print(Fore.CYAN + "/// type /exit to quit the program anytime")
                 print(Fore.CYAN + "/// type /model to change current model")
+                print(Fore.CYAN + "/// type /search <query> to run exploit/vuln intel search in-session")
                 print(Fore.CYAN + "/// type /rename to change a session name")
                 print(Fore.CYAN + "/// type /viewmap to open attack map with last findings.")
                 print(Fore.CYAN + "/// type /report to generate a report in PDF and HTML.")
@@ -405,6 +413,57 @@ class Eva:
             if user.lower() in ("report", "/report"):
                 self.generate_report()
                 continue
+            low_user = user.strip().lower()
+            if (
+                low_user == "search"
+                or low_user.startswith("search ")
+                or low_user == "/search"
+                or low_user.startswith("/search ")
+            ):
+                query = user.strip().split(maxsplit=1)[1].strip() if len(user.strip().split(maxsplit=1)) > 1 else ""
+                if not query:
+                    query = raw_input("EVA search query > ").strip()
+                if not query:
+                    cyber("Search query cannot be empty.", color=Fore.YELLOW)
+                    continue
+
+                normalized_user = f"/search {query}"
+                self.memory["timeline"].append({
+                    "type": "user",
+                    "content": normalized_user
+                })
+                self.model.history.append({"role": "user", "content": normalized_user})
+
+                buf = io.StringIO()
+                rc = 1
+                try:
+                    with contextlib.redirect_stdout(buf):
+                        rc = run_exploit_search(query)
+                except KeyboardInterrupt:
+                    if self.memory["timeline"] and self.memory["timeline"][-1].get("type") == "user":
+                        self.memory["timeline"].pop()
+                    if self.model.history and self.model.history[-1].get("role") == "user":
+                        self.model.history.pop()
+                    print(Fore.YELLOW + "\n// 🜂 Search cancelled")
+                    continue
+                except Exception as exc:
+                    print(Fore.RED + f"[!] Search failed: {exc}")
+                raw_search_output = buf.getvalue()
+                if raw_search_output:
+                    print(raw_search_output, end="" if raw_search_output.endswith("\n") else "\n")
+
+                clean_output = ANSI_ESCAPE_RE.sub("", raw_search_output or "").strip()
+                if not clean_output:
+                    clean_output = f"[EVA_NOTICE] /search returned no output. exit_code={rc}"
+
+                self.last_output = clean_output
+                self.memory["timeline"].append({
+                    "type": "analysis",
+                    "content": clean_output
+                })
+                self.model.history.append({"role": "assistant", "content": clean_output})
+                self.save()
+                continue
 
             spinner_start()
             spinner_stopped = False

{eva_exploit-3.3.7 → eva_exploit-3.4}/utils/system.py

@@ -370,35 +370,56 @@ def checkupdts():
 
 def run_self_update():
     print(Fore.CYAN + f"\nChecking updates for {APP_NAME}...\n")
-    updated = False
+    status = get_update_status(force=True)
+    if not status.get("available"):
+        cyber("EVA is already up to date.", color=Fore.CYAN)
+        return 0
 
-    pip_result = subprocess.run(
-        [sys.executable, "-m", "pip", "install", "--upgrade", PYPI_PACKAGE,"--break-system-packages"],
-        text=True
-    )
-    if pip_result.returncode == 0:
-        updated = True
+    latest = status.get("latest") or "latest"
+    source = status.get("source")
+    print(Style.BRIGHT + Fore.MAGENTA + f"Update {latest} found! Installing . . . . " + Style.RESET_ALL)
 
-    if Path(".git").exists() and command_exists("git"):
-        branch = "main"
-        branch_detect = subprocess.run(
-            ["git", "rev-parse", "--abbrev-ref", "HEAD"],
-            capture_output=True,
-            text=True
-        )
-        if branch_detect.returncode == 0 and branch_detect.stdout.strip():
-            branch = branch_detect.stdout.strip()
-
-        pull_result = subprocess.run(["git", "pull", "--tags", "origin", branch], text=True)
-        if pull_result.returncode == 0:
-            updated = True
+    updated = False
+    with open(os.devnull, "w") as devnull:
+        if source == "github" and Path(".git").exists() and command_exists("git"):
+            branch = _git_branch()
+            pull_result = subprocess.run(
+                ["git", "pull", "--tags", "origin", branch],
+                stdout=devnull,
+                stderr=devnull,
+                text=True
+            )
+            updated = pull_result.returncode == 0
+        else:
+            pip_result = subprocess.run(
+                [
+                    sys.executable,
+                    "-m",
+                    "pip",
+                    "install",
+                    "--upgrade",
+                    PYPI_PACKAGE,
+                    "--break-system-packages",
+                    "-q",
+                ],
+                stdout=devnull,
+                stderr=devnull,
+                text=True
+            )
+            updated = pip_result.returncode == 0
 
+    print(Fore.CYAN + "Almost done . . . . ")
     if updated:
-        print(Fore.GREEN + "\n✔ Update process finished. Restart EVA to use the latest version.")
+        global _UPDATE_STATUS_CACHE
+        _UPDATE_STATUS_CACHE = None
+        cyber("✔ Update process finished. Restart EVA to use the latest version.", color=Fore.GREEN)
         return 0
 
     print(Fore.RED + "\n[!] Could not auto-update EVA in this environment.")
-    print(Fore.YELLOW + f"Try manually: {sys.executable} -m pip install --upgrade {PYPI_PACKAGE}")
+    if source == "github":
+        print(Fore.YELLOW + f"Try manually: git pull --tags origin {_git_branch()}")
+    else:
+        print(Fore.YELLOW + f"Try manually: {sys.executable} -m pip install --upgrade {PYPI_PACKAGE}")
     return 1