sharkit 1.0.0.dev3__tar.gz → 1.0.0.dev5__tar.gz

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sharkit
-Version: 1.0.0.dev3
+Version: 1.0.0.dev5
 Summary: OSINT / HUMINT / GEOINT research framework
 Project-URL: Homepage, https://github.com/sshsrv/sharkit
 Project-URL: Repository, https://github.com/sshsrv/sharkit

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sharkit"
-version = "1.0.0.dev3"
+version = "1.0.0.dev5"
 description = "OSINT / HUMINT / GEOINT research framework"
 readme = "README.md"
 license = "MIT"
@@ -89,6 +89,10 @@ no_implicit_optional = true
 warn_redundant_casts = true
 warn_unused_ignores = true
 
+[[tool.mypy.overrides]]
+module = "exifread"
+ignore_missing_imports = true
+
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 pythonpath = ["src"]

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/src/sharkit/commands/builtins.py

@@ -312,7 +312,7 @@ class ShowCommand(Command):
         if not all_tools:
             return "No tools available."
 
-        def matches_category(tool_path: str, tool_cls: type) -> bool:
+        def matches_category(tool_path: str, tool_cls: type[Tool]) -> bool:
             if category is None:
                 return True
 
@@ -320,8 +320,7 @@ class ShowCommand(Command):
             tool_category = (tool_cls.metadata.category or "").lower()
             first_segment = tool_category.split(".")[0]
             return (
-                normalized_category == tool_category
-                or normalized_category == first_segment
+                normalized_category in (tool_category, first_segment)
                 or normalized_category in tool_category
                 or tool_path.lower().startswith(f"{normalized_category}/")
             )

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/src/sharkit/tools/base.py

@@ -38,7 +38,7 @@ def parse_bool(value: str | None) -> bool:
 
 @dataclass(frozen=True)
 class ToolInstallSpec:
-    git_url: str
+    git_url: str | None
     requirements_file: str | None = None
     pip_args: list[str] = field(default_factory=list)
     entry: str | None = None

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/src/sharkit/tools/osint/analytics/images/exif_reader.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from typing import Any
 
 from sharkit.tools.base import (
     ExecutionContext,
@@ -45,10 +46,12 @@ TIMESTAMP_TAGS = {
 ALL_TAGS = GPS_TAGS | CAMERA_TAGS | TIMESTAMP_TAGS
 
 
-def _dms_to_decimal(dms_tag: object, ref_tag: object) -> float | None:
+def _dms_to_decimal(dms_tag: Any, ref_tag: Any) -> float | None:
     """Convert EXIF DMS (degrees/minutes/seconds) to decimal degrees."""
     try:
-        values = dms_tag.values
+        values = getattr(dms_tag, "values", ())
+        if not values or len(values) < 3:
+            return None
         d = float(values[0].num) / float(values[0].den)
         m = float(values[1].num) / float(values[1].den)
         s = float(values[2].num) / float(values[2].den)

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/src/sharkit/tools/osint/recon/domains/dns_lookup.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import json
+from typing import Any
 
 from sharkit.network.client import HttpClient
 from sharkit.tools.base import (
@@ -93,13 +94,13 @@ class DNSLookupTool(Tool):
 
     def _query(
         self, client: HttpClient, base_url: str, domain: str, rtype: str
-    ) -> tuple[int, list[dict]]:
+    ) -> tuple[int, list[dict[str, Any]]]:
         """Query DNS and return (status, answers)."""
         url = f"{base_url}?name={domain}&type={rtype}"
         resp = client.get(url, timeout=30)
-        data = json.loads(resp.content)
-        status = data.get("Status", 0)
-        answers = data.get("Answer") or []
+        data: dict[str, Any] = json.loads(resp.content)
+        status = int(data.get("Status", 0))
+        answers: list[dict[str, Any]] = data.get("Answer") or []
         return status, answers
 
     def execute(self, context: ExecutionContext) -> Result:
@@ -115,7 +116,7 @@ class DNSLookupTool(Tool):
         client = HttpClient(headers=headers)
 
         try:
-            all_answers: list[dict] = []
+            all_answers: list[dict[str, Any]] = []
             worst_status = 0
 
             if record_type == "ALL" and provider == "cloudflare":
@@ -158,8 +159,8 @@ class DNSLookupTool(Tool):
             )
 
         # Deduplicate answers (Cloudflare ALL queries may overlap)
-        seen: set[tuple] = set()
-        unique: list[dict] = []
+        seen: set[tuple[Any, Any, Any]] = set()
+        unique: list[dict[str, Any]] = []
         for ans in all_answers:
             key = (ans.get("name"), ans.get("type"), ans.get("data"))
             if key not in seen:

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/src/sharkit/tools/osint/recon/network/port_scanner.py

@@ -114,7 +114,7 @@ class PortScannerTool(Tool):
         if not ports:
             return Result(success=False, error="No valid ports specified.")
 
-        open_ports: list[dict[str, object]] = []
+        open_ports: list[dict[str, int | str]] = []
         for port in ports:
             try:
                 sock = socket.create_connection((host, port), timeout=timeout)
@@ -132,8 +132,8 @@ class PortScannerTool(Tool):
 
         lines: list[str] = [f"Open ports on {host}:"]
         for entry in open_ports:
-            port = entry["port"]
-            service = entry["service"]
+            port = int(entry["port"])
+            service = str(entry["service"])
             lines.append(f"  {port:<6} {service}")
 
         lines.append(f"\n{len(open_ports)} open port(s) found.")

{sharkit-1.0.0.dev3 → sharkit-1.0.0.dev5}/src/sharkit/tools/osint/recon/network/ssl_check.py

@@ -65,32 +65,44 @@ class SSLCheckTool(Tool):
         except Exception as exc:
             return Result(success=False, error=f"SSL connection failed: {exc}")
 
+        if cert is None:
+            return Result(success=False, error=f"No certificate available for {host}:{port}.")
+
+        def _flatten_name_entries(value: object) -> dict[str, str]:
+            result: dict[str, str] = {}
+            items = value if isinstance(value, (list, tuple)) else ()
+            for item in items:
+                if not isinstance(item, (list, tuple)):
+                    continue
+                for pair in item:
+                    if not isinstance(pair, (list, tuple)) or len(pair) != 2:
+                        continue
+                    key, val = pair
+                    if isinstance(key, str) and isinstance(val, str):
+                        result[key] = val
+            return result
+
         lines: list[str] = [f"SSL Certificate for {host}:{port}:"]
         lines.append("")
 
-        # Subject
-        subject = dict(x[0] for x in cert.get("subject", ()))
+        subject = _flatten_name_entries(cert.get("subject"))
         subject_str = ", ".join(f"{k}={v}" for k, v in subject.items())
         lines.append(f"  Subject:          {subject_str}")
 
-        # Issuer
-        issuer = dict(x[0] for x in cert.get("issuer", ()))
+        issuer = _flatten_name_entries(cert.get("issuer"))
         issuer_str = ", ".join(f"{k}={v}" for k, v in issuer.items())
         lines.append(f"  Issuer:           {issuer_str}")
 
-        # Serial number
-        serial = cert.get("serialNumber", "?")
+        serial = str(cert.get("serialNumber", "?"))
         lines.append(f"  Serial Number:    {serial}")
 
-        # Validity
-        not_before = cert.get("notBefore", "?")
-        not_after = cert.get("notAfter", "?")
+        not_before = str(cert.get("notBefore", "?"))
+        not_after = str(cert.get("notAfter", "?"))
         lines.append(f"  Valid From:       {not_before}")
         lines.append(f"  Valid Until:      {not_after}")
 
-        # Check expiry
         try:
-            expire_dt = datetime.datetime.strptime(not_after, "%b %d %H:%M:%S %Y %Z")
+            expire_dt = datetime.datetime.strptime(str(not_after), "%b %d %H:%M:%S %Y %Z")
             now = datetime.datetime.now(datetime.UTC)
             if expire_dt.replace(tzinfo=datetime.UTC) < now:
                 lines.append("  Status:           *** EXPIRED ***")
@@ -100,15 +112,21 @@ class SSLCheckTool(Tool):
         except ValueError:
             pass
 
-        # SAN
         san_ext = cert.get("subjectAltName", ())
-        if san_ext:
-            sans = [f"{tag}={value}" for tag, value in san_ext[:10]]
-            lines.append(f"  SAN:              {', '.join(sans)}")
-            if len(san_ext) > 10:
-                lines.append(f"                    ... and {len(san_ext) - 10} more")
+        if isinstance(san_ext, (list, tuple)):
+            show_san = san_ext[:10]
+            sans = [
+                f"{tag}={value}"
+                for entry in show_san
+                if isinstance(entry, (list, tuple)) and len(entry) == 2
+                for tag, value in [(entry[0], entry[1])]
+                if isinstance(tag, str) and isinstance(value, str)
+            ]
+            if sans:
+                lines.append(f"  SAN:              {', '.join(sans)}")
+                if len(san_ext) > 10:
+                    lines.append(f"                    ... and {len(san_ext) - 10} more")
 
-        # TLS version and cipher
         lines.append(f"  TLS Version:      {version}")
         if cipher:
             lines.append(f"  Cipher:           {cipher[0]} ({cipher[1]} bits)")