coretrace-python-analyzer 0.5.0__tar.gz → 0.6.0__tar.gz

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.6.0 (2026-09-24)
+
+### Reports
+
+- `--vex PATH` writes an OpenVEX document with one statement per advisory affecting a requirement. A statement is `affected` when the project's code reaches the vulnerability, including findings the policy accepts or a comment suppresses. It is `not_affected` (`vulnerable_code_not_in_execute_path`) only for an advisory with entry points that nothing reaches, in a complete analysis, and when the lock file shows no other package requiring the vulnerable one. Anything else is `under_investigation`, with the reason (#97).
+
+### Dependencies
+
+- An advisory entry point marked `read` is an attribute whose getter runs the affected code, such as `request.form`: reading it is reachable, called or not — a subscript, an iteration or a method called on it reads it — with one finding per function, where it is first read (#111).
+- A lock file records which packages require which. `DependencyGraph.required_by(name)` gives the other packages requiring a package; the project's own packages are not counted. `ProjectAnalysis.accepted` keeps the findings of advisories the policy accepts (#97).
+
+### Detection
+
+- `yaml.load_all`, `yaml.full_load_all` and `yaml.unsafe_load_all` are deserialization sinks like their single-document versions; `yaml.load_all` with a safe loader is not, and `yaml.safe_load_all` stays safe (#123).
+
+### Precision
+
+- A sink call can be made safe by one of its arguments: a `SafeArgument` model names the argument and the values that take kinds off the sink, only when the call gives one explicitly. `yaml.load` with `SafeLoader`, `BaseLoader` or their C versions, under every spelling, is no longer an insecure deserialization; an absent loader, another loader, a variable or unpacked arguments still are (#121).
+
+### Plugins
+
+- The call graph records the symbols each function reads, called or not, where it first reads each: `CallGraph.reads(function)` gives them as `SymbolRead` records, modules served from the cache keep them, and the cache format is bumped (#111).
+
 ## 0.5.0 (2026-09-24)
 
 ### Dependencies

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: coretrace-python-analyzer
-Version: 0.5.0
+Version: 0.6.0
 Summary: Static security analysis infrastructure for Python code
 Project-URL: Homepage, https://github.com/CoreTrace/coretrace-python-analyzer
 Project-URL: Repository, https://github.com/CoreTrace/coretrace-python-analyzer

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/docs/plugins.md

@@ -148,6 +148,7 @@ class BottleModels(ModelPlugin):
 | `NamedParameter(pattern, label, kinds)` | A regular expression on parameter names; matching parameters carry `kinds`, as `password` carries `CREDENTIAL`. |
 | `RouteRegistrar(symbol, argument, label, kinds=ALL, keyword=None)` | A call registering a view at argument `argument` (or `keyword`), such as Django's `path`; the view receives `label` input. |
 | `SuffixSink(suffix, kinds, positions=())` | A sink matched by the end of the symbol, for methods of any class such as `objects.raw`. |
+| `SafeArgument(symbol, argument, values, position=None, kinds=ALL)` | A call to the sink `symbol` whose `argument` (by keyword, or at `position`) denotes one of `values` is not a sink for `kinds`, such as `yaml.load` with `Loader=yaml.SafeLoader`. Values are written as the analyzer records arguments: a symbol by its canonical name, a constant as Python writes it (`True`). Only a value given explicitly makes the call safe. |
 | `Validator(symbol, kinds=ALL, argument=0)` | A callable whose truth proves its argument safe, such as `re.fullmatch`; a flow guarded by it is refuted. |
 | `AuthorizationGuard(symbol, label)` | A decorator or a condition restricting who reaches the code, such as `login_required`; a flow behind it is a hotspot. |
 
@@ -226,8 +227,11 @@ contributed, the policy, the project root, and each module's imports, call graph
 functions. `ctx.functions(module)` gives every function as the call graph names it
 (`Admin.get`, `outer.inner`, `<module>`), with its span, so a finding can be placed in
 one, and the label of the entry point it is (`http` for a route, `argv` for a command)
-when the models make it one. The shipped `vulnerable-dependency`,
-`reachable-vulnerability` and `dependency-policy` plugins are of this kind.
+when the models make it one. `ctx.call_graph(module)` gives each function's call sites
+(`sites(function)`) and the symbols it reads, called or not (`reads(function)`: reading
+`request.form['name']` reads `python.flask.request.form`), each where it first reads it.
+The shipped `vulnerable-dependency`, `reachable-vulnerability` and `dependency-policy`
+plugins are of this kind.
 
 ```python
 from collections.abc import Sequence

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/docs/usage.md

@@ -50,6 +50,7 @@ coretrace-python-analyzer [--check | --emit-ir [--ssa]] [options] [path]
 | `--cache DIR` | Keep per-module results under `DIR` and reuse them for unchanged modules. |
 | `--jobs N` | Analyse independent modules in `N` processes. |
 | `--sbom PATH` | Write a CycloneDX bill of materials of the dependencies to `PATH`. |
+| `--vex PATH` | Write an OpenVEX document to `PATH`: whether each advisory affecting a requirement affects the project. |
 | `--advisories FILE` | Read a local advisory file in addition to `advisories.json` at the root. Repeatable. |
 | `--policy FILE` | Apply this dependency policy instead of `coretrace-policy.toml` at the root. |
 | `--import-advisories SRC OUT` | Convert an OSV dump into the local advisory file `OUT`, then exit. |
@@ -59,7 +60,7 @@ coretrace-python-analyzer [--check | --emit-ir [--ssa]] [options] [path]
 | `--ssa` | With `--emit-ir`, print the static single assignment form. |
 | `--help` | Show the options and exit. |
 
-`--cache`, `--jobs`, `--sbom`, `--advisories` and `--policy` apply to a directory check.
+`--cache`, `--jobs`, `--sbom`, `--vex`, `--advisories` and `--policy` apply to a directory check.
 
 ## What is analysed
 
@@ -109,7 +110,7 @@ a sanitizer for that kind of sink.
 | `path-traversal` | A file system path (`open`, `send_file`, `os.remove`, …). |
 | `ssrf` | The URL of an HTTP client request (Requests, httpx, `urllib`). |
 | `xss` | An HTTP response body built without escaping. |
-| `insecure-deserialization` | `pickle`, `yaml.load` and similar loaders. |
+| `insecure-deserialization` | `pickle`, `marshal`, `dill`, `jsonpickle`, `shelve`, and the YAML loaders (`yaml.load`, `load_all`, `full_load`, `unsafe_load` and their several-document versions); `yaml.load` and `load_all` given a safe loader (`SafeLoader`, `BaseLoader`) are not. |
 | `open-redirect` | An HTTP redirect target. |
 | `plaintext-credential-storage` | A parameter named like a password stored in a database without hashing. Medium confidence, since a name is a hint. |
 | `exploitable-vulnerability` | An API affected by an advisory of a vulnerable requirement, see Dependencies. |
@@ -151,7 +152,7 @@ sources and in configuration files.
 | Rule | Trigger |
 |---|---|
 | `vulnerable-dependency` | A requirement allows a version affected by an advisory, reported at its line. |
-| `reachable-vulnerability` | A call in the project to an API the advisory affects. |
+| `reachable-vulnerability` | A call in the project to an API the advisory affects, or a read of an entry point marked `read`. |
 | `exploitable-vulnerability` | Attacker-controlled data reaches such a call. Critical. |
 | `denied-dependency` | A package the policy denies. |
 | `unpinned-dependency` | A requirement without an exact pin when the policy requires pins. |
@@ -201,7 +202,7 @@ the directory of the checked file; a path outside it is printed as it is.
 ```json
 {
   "schema_version": 1,
-  "tool": {"name": "coretrace-python-analyzer", "version": "0.5.0"},
+  "tool": {"name": "coretrace-python-analyzer", "version": "0.6.0"},
   "root": "/home/me/project",
   "findings": [
     {
@@ -291,6 +292,13 @@ call to either kind of symbol is reachable. `modules` names the top-level module
 package installs, so the analyzer can tell an imported package from a merely required
 one; it defaults to the package name.
 
+An entry point marked `"read": true` is an attribute whose getter runs the affected code,
+such as a request body parsed on first access
+(`{"symbol": "python.flask.request.form", "justification": "…", "read": true}`): reading
+it is reachable, called or not — `request.form['name']`, `for key in request.form`,
+`request.form.get('name')` all read it. A function reading it several times is reported
+once, where it first reads it.
+
 An `argument` condition is decided at each call. It names the argument by keyword and,
 when it may be passed positionally, by `position` (counted from 0, the receiver of a
 method excluded); `values` are what makes the call affected, written as the analyzer
@@ -305,7 +313,8 @@ template's origin — cannot be decided and is always pending review, never drop
 Every dependency finding records the highest level of evidence established in its
 `level` metadata: `declared` (the requirement allows a vulnerable version), `imported`
 (a module of the package is imported somewhere), `reachable` (an entry point or affected
-symbol is called) or `exploitable` (attacker input reaches it). The last two carry
+symbol is called, or an entry point marked `read` is read) or `exploitable` (attacker
+input reaches it). The last two carry
 `entry_point`, `justification`, `conditions`, and which of them the call meets
 (`conditions_met`) or leaves to review (`conditions_pending_review`). A requirement whose
 entry points are only called with arguments that contradict a condition stays
@@ -332,6 +341,24 @@ with its package URL, and the advisories affecting them as vulnerabilities.
 coretrace-python-analyzer --check src/ --sbom sbom.json --policy security/policy.toml
 ```
 
+`--vex PATH` writes an OpenVEX 0.2.0 document with one statement per advisory affecting
+a requirement. In each statement, the required package is a subcomponent of the project,
+identified as `pkg:generic/<directory>`. The status follows from the evidence of the
+check, including findings the policy accepts or a comment suppresses:
+
+| Status | When |
+|---|---|
+| `affected` | The project's code reaches the vulnerable code. The notes give each place and its level, `reachable` or `exploitable`. |
+| `not_affected` | Justified as `vulnerable_code_not_in_execute_path`, only when all of these hold: the advisory names entry points, no code of the project reaches them, every file and function was analysed, and a lock file (`uv.lock` or `poetry.lock`) shows that no other package requires the vulnerable one. The impact statement names the entry points and any calls ruled out by their arguments. |
+| `under_investigation` | Anything else. The notes say which condition failed. |
+
+`not_affected` needs the lock-file check because the analyzer reads the project's code,
+not the code of installed packages. A framework calling the vulnerable function on the
+project's behalf would go unseen. Without a lock file, a package is never
+`not_affected`. The document's `@id` derives from its statements, so two runs with the
+same result share it; its `author` is `Unknown Author`, as OpenVEX tools write when they
+cannot know it.
+
 ## Large projects
 
 `--cache DIR` keeps the results of a directory check on disk, one entry per module,

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "coretrace-python-analyzer"
-version = "0.5.0"
+version = "0.6.0"
 description = "Static security analysis infrastructure for Python code"
 readme = "README.md"
 requires-python = ">=3.11"

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/__init__.py

@@ -1,4 +1,4 @@
 """CoreTrace's Python static analysis frontend."""
 
-__version__ = "0.5.0"
+__version__ = "0.6.0"
 

coretrace_python_analyzer-0.6.0/src/coretrace_python/bundled/dependency/reachable_vulnerability/reachable_vulnerability.py

@@ -0,0 +1,82 @@
+"""Calls, anywhere in the project, to an API affected by a vulnerable requirement, and
+reads of an affected attribute whose getter runs the vulnerable code."""
+
+from __future__ import annotations
+
+from collections.abc import Iterator, Sequence
+from typing import ClassVar
+
+from coretrace_python.analysis import AnyAnalysis
+from coretrace_python.dependency import Advisory, DependencyAnalysis
+from coretrace_python.dependency.correlation import (
+    ConditionCheck,
+    affected_symbols,
+    check_conditions,
+    evidence,
+)
+from coretrace_python.findings import Confidence, Finding
+from coretrace_python.interprocedural import CallGraphAnalysis, ExternalSymbol
+from coretrace_python.plugins import ProjectContext, ProjectPlugin
+from coretrace_python.semantic.symbols import SymbolId
+from coretrace_python.source import SourceSpan
+
+
+class ReachableVulnerabilityPlugin(ProjectPlugin):
+    name: ClassVar[str] = "reachable-vulnerability"
+    requires: ClassVar[frozenset[AnyAnalysis]] = frozenset({DependencyAnalysis, CallGraphAnalysis})
+
+    def analyze_project(self, ctx: ProjectContext) -> Sequence[Finding]:
+        affected = affected_symbols(ctx.dependencies, ctx.advisories)
+        if not affected:
+            return ()
+        findings: list[Finding] = []
+        for module in ctx.modules:
+            graph = ctx.call_graph(module)
+            for function in graph.functions:
+                for site in graph.sites(function):
+                    if not isinstance(site.target, ExternalSymbol):
+                        continue
+                    for advisory in affected.get(site.target.symbol, ()):
+                        entry = advisory.entry_point(site.target.symbol)
+                        if entry is not None and entry.read:
+                            continue  # a call reads its callee first: reported with the reads
+                        check = check_conditions(entry, site.arguments)
+                        if check.contradicted is not None:
+                            continue
+                        findings.append(_reached(advisory, site.target.symbol, site.location, function, check))
+                # Reading ``request.form.get`` reads ``request.form``: one finding per entry
+                # point and function, where the function first reads it.
+                reported: set[tuple[Advisory, SymbolId]] = set()
+                for read in graph.reads(function):
+                    for symbol in _read_through(read.symbol):
+                        for advisory in affected.get(symbol, ()):
+                            entry = advisory.entry_point(symbol)
+                            if entry is None or not entry.read or (advisory, symbol) in reported:
+                                continue
+                            reported.add((advisory, symbol))
+                            check = check_conditions(entry, None)
+                            findings.append(_reached(advisory, symbol, read.location, function, check))
+        return findings
+
+
+def _read_through(symbol: SymbolId) -> Iterator[SymbolId]:
+    """``symbol`` and every symbol it is an attribute of, as reading it reads them all."""
+
+    components = symbol.canonical_name.split(".")
+    for end in range(len(components), 1, -1):
+        yield SymbolId(".".join(components[:end]))
+
+
+def _reached(advisory: Advisory, symbol: SymbolId, span: SourceSpan, function: str, check: ConditionCheck) -> Finding:
+    return Finding(
+        rule_id="reachable-vulnerability",
+        message=(
+            f"{advisory.id}: {symbol} is affected in the required "
+            f"{advisory.package} {advisory.vulnerable}: {advisory.summary}"
+        ),
+        severity=advisory.severity,
+        confidence=Confidence.HIGH,
+        span=span,
+        function=function,
+        metadata=evidence(advisory, symbol, "reachable", check),
+    )

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/bundled/models/python_stdlib/python_stdlib.py

@@ -6,9 +6,28 @@ from typing import ClassVar
 
 from coretrace_python.plugins import ModelPlugin
 from coretrace_python.semantic.symbols import SymbolId
-from coretrace_python.taint import Model, Sanitizer, Sink, Source, TaintKind, Validator
+from coretrace_python.taint import (
+    Model,
+    SafeArgument,
+    Sanitizer,
+    Sink,
+    Source,
+    TaintKind,
+    Validator,
+)
 
 _ENVIRONMENT_KINDS = TaintKind.ALL & ~(TaintKind.COMMAND | TaintKind.PATH)
+# SafeLoader and BaseLoader build plain data only, in Python and in C, under every spelling.
+_SAFE_YAML_LOADERS = (
+    "python.yaml.SafeLoader",
+    "python.yaml.loader.SafeLoader",
+    "python.yaml.BaseLoader",
+    "python.yaml.loader.BaseLoader",
+    "python.yaml.CSafeLoader",
+    "python.yaml.cyaml.CSafeLoader",
+    "python.yaml.CBaseLoader",
+    "python.yaml.cyaml.CBaseLoader",
+)
 _PROCESS_OUTPUT_KINDS = TaintKind.ALL & ~TaintKind.PATH
 
 
@@ -66,6 +85,11 @@ class PythonStdlibModels(ModelPlugin):
         Sink(_sym("dill.loads"), TaintKind.DESERIALIZATION),
         Sink(_sym("jsonpickle.decode"), TaintKind.DESERIALIZATION),
         Sink(_sym("yaml.load"), TaintKind.DESERIALIZATION),
+        Sink(_sym("yaml.load_all"), TaintKind.DESERIALIZATION),
+        Sink(_sym("yaml.full_load_all"), TaintKind.DESERIALIZATION),
+        Sink(_sym("yaml.unsafe_load_all"), TaintKind.DESERIALIZATION),
+        SafeArgument(_sym("yaml.load"), "Loader", _SAFE_YAML_LOADERS, position=1, kinds=TaintKind.DESERIALIZATION),
+        SafeArgument(_sym("yaml.load_all"), "Loader", _SAFE_YAML_LOADERS, position=1, kinds=TaintKind.DESERIALIZATION),
         Sink(_sym("yaml.unsafe_load"), TaintKind.DESERIALIZATION),
         Sink(_sym("yaml.full_load"), TaintKind.DESERIALIZATION),
         Sanitizer(_sym("os.path.basename"), TaintKind.PATH),

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/cache.py

@@ -4,9 +4,10 @@ A module's results are stored under a key derived from everything they depend on
 source text and identity, the engine, schema and plugin API versions, the plugins and
 their code, the security models, the advisories, the dependency graph, and the keys of
 the project modules it imports transitively. A module whose key is unchanged on a later
-run is served from the cache: its summaries seed the project index, its call sites serve
-the project plugins and its findings are reported as they were. Entries are JSON, so a
-tampered or foreign file can never execute anything; an unreadable entry is a miss.
+run is served from the cache: its summaries seed the project index, its call sites and
+symbol reads serve the project plugins and its findings are reported as they were.
+Entries are JSON, so a tampered or foreign file can never execute anything; an
+unreadable entry is a miss.
 """
 
 from __future__ import annotations
@@ -33,13 +34,14 @@ from coretrace_python.interprocedural import (
     Mutation,
     NonlocalWrite,
     SummaryIndex,
+    SymbolRead,
     Target,
     UnknownTarget,
 )
 from coretrace_python.semantic.symbols import SymbolId
 from coretrace_python.source import SourceId, SourceSpan
 
-CACHE_FORMAT = 7
+CACHE_FORMAT = 8
 
 
 @dataclass(frozen=True)
@@ -50,6 +52,7 @@ class CachedModule:
     summaries: Mapping[str, FunctionSummary]
     sites: tuple[CallSite, ...]
     findings: tuple[Finding, ...]
+    reads: tuple[SymbolRead, ...] = ()
 
     def __post_init__(self) -> None:
         object.__setattr__(self, "summaries", MappingProxyType(dict(self.summaries)))
@@ -134,6 +137,7 @@ def encode(module: CachedModule) -> dict[str, Any]:
         "summaries": {name: _encode_summary(s) for name, s in module.summaries.items()},
         "sites": [_encode_site(site) for site in module.sites],
         "findings": [_encode_finding(finding) for finding in module.findings],
+        "reads": [[r.function, _encode_span(r.location), str(r.symbol)] for r in module.reads],
     }
 
 
@@ -145,6 +149,7 @@ def decode(data: Mapping[str, Any]) -> CachedModule:
         {_string(name): _decode_summary(s) for name, s in data["summaries"].items()},
         tuple(_decode_site(site) for site in data["sites"]),
         tuple(_decode_finding(finding) for finding in data["findings"]),
+        tuple(_decode_read(read) for read in data["reads"]),
     )
 
 
@@ -194,6 +199,11 @@ def _decode_function(data: Any) -> ModuleFunction:
     return ModuleFunction(_string(name), _decode_span(span), None if entry_point is None else _string(entry_point))
 
 
+def _decode_read(data: Any) -> SymbolRead:
+    function, span, symbol = data
+    return SymbolRead(_string(function), _decode_span(span), SymbolId(_string(symbol)))
+
+
 def _encode_finding(finding: Finding) -> dict[str, Any]:
     return {
         "rule": finding.rule_id,

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/cli.py

@@ -3,13 +3,20 @@ from __future__ import annotations
 import argparse
 import sys
 import zipfile
+from datetime import UTC, datetime
 from pathlib import Path
 
 from coretrace_python import __version__, engine
 from coretrace_python.analysis import AnalysisError
 from coretrace_python.cache import ProjectCache
 from coretrace_python.cfg import CFGError
-from coretrace_python.dependency import dump_advisories, import_osv, read_osv, render_sbom
+from coretrace_python.dependency import (
+    dump_advisories,
+    import_osv,
+    read_osv,
+    render_sbom,
+    render_vex,
+)
 from coretrace_python.findings import Severity
 from coretrace_python.findings.baseline import Baseline, BaselineError
 from coretrace_python.frontend import HIRBuildError, ParseError, build_hir
@@ -106,6 +113,14 @@ def build_parser() -> argparse.ArgumentParser:
         metavar="PATH",
         help="with --check on a directory, write a CycloneDX bill of materials to PATH",
     )
+    parser.add_argument(
+        "--vex",
+        type=Path,
+        default=None,
+        metavar="PATH",
+        help="with --check on a directory, write to PATH an OpenVEX document saying whether "
+        "each advisory affecting a requirement affects the project",
+    )
     parser.add_argument(
         "--advisories",
         action="append",
@@ -182,6 +197,9 @@ def main(argv: list[str] | None = None) -> int:
     if args.sbom is not None and not (args.check and args.path.is_dir()):
         print("error: --sbom only applies to --check on a directory", file=sys.stderr)
         return EXIT_ERROR
+    if args.vex is not None and not (args.check and args.path.is_dir()):
+        print("error: --vex only applies to --check on a directory", file=sys.stderr)
+        return EXIT_ERROR
     if args.advisories and not (args.check and args.path.is_dir()):
         print("error: --advisories only applies to --check on a directory", file=sys.stderr)
         return EXIT_ERROR
@@ -227,6 +245,20 @@ def main(argv: list[str] | None = None) -> int:
                         render_sbom(analysis.dependencies, analysis.advisories, engine.TOOL_NAME, __version__),
                         encoding="utf-8",
                     )
+                if args.vex is not None:
+                    args.vex.write_text(
+                        render_vex(
+                            analysis.dependencies,
+                            analysis.advisories,
+                            (*analysis.findings, *analysis.suppressed, *analysis.accepted),
+                            analysis.coverage,
+                            args.path,
+                            engine.TOOL_NAME,
+                            __version__,
+                            datetime.now(UTC),
+                        ),
+                        encoding="utf-8",
+                    )
             else:
                 file_analysis = engine.analyze_file(SourceManager().load_file(args.path), plugin_roots)
                 findings, coverage = file_analysis.findings, file_analysis.coverage

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/dependency/__init__.py

@@ -22,6 +22,7 @@ from coretrace_python.dependency.graph import (
 )
 from coretrace_python.dependency.policy import POLICY_FILE, Policy, apply_policy, load_policy
 from coretrace_python.dependency.sbom import render_sbom
+from coretrace_python.dependency.vex import render_vex
 
 __all__ = [
     "ADVISORY_FILE",
@@ -45,4 +46,5 @@ __all__ = [
     "parse_dependencies",
     "read_osv",
     "render_sbom",
+    "render_vex",
 ]

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/dependency/advisories.py

@@ -138,14 +138,7 @@ def dump_advisories(advisories: Iterable[Advisory]) -> str:
                 "severity": a.severity.value,
                 "affected_symbols": [str(s) for s in a.affected_symbols],
                 "aliases": list(a.aliases),
-                "entry_points": [
-                    {
-                        "symbol": str(e.symbol),
-                        "justification": e.justification,
-                        "conditions": [_condition_entry(c) for c in e.conditions],
-                    }
-                    for e in a.entry_points
-                ],
+                "entry_points": [_entry_point_entry(e) for e in a.entry_points],
                 "modules": list(a.modules),
             }
             for a in advisories
@@ -154,6 +147,17 @@ def dump_advisories(advisories: Iterable[Advisory]) -> str:
     return json.dumps(document, indent=2) + "\n"
 
 
+def _entry_point_entry(entry_point: AdvisoryEntryPoint) -> dict[str, Any]:
+    entry: dict[str, Any] = {
+        "symbol": str(entry_point.symbol),
+        "justification": entry_point.justification,
+        "conditions": [_condition_entry(c) for c in entry_point.conditions],
+    }
+    if entry_point.read:
+        entry["read"] = True
+    return entry
+
+
 def _condition_entry(condition: Condition) -> dict[str, Any]:
     entry: dict[str, Any] = {"kind": condition.kind, "text": condition.text}
     if condition.argument is not None:
@@ -194,10 +198,14 @@ def _advisory(entry: Mapping[str, Any]) -> Advisory:
 
 
 def _entry_point(entry: Mapping[str, Any]) -> AdvisoryEntryPoint:
+    read = entry.get("read", False)
+    if not isinstance(read, bool):
+        raise TypeError(f"entry point read must be true or false, got {read!r}")
     return AdvisoryEntryPoint(
         SymbolId(str(entry["symbol"])),
         str(entry["justification"]),
         tuple(_condition(c) for c in entry.get("conditions") or []),
+        read,
     )
 
 

{coretrace_python_analyzer-0.5.0 → coretrace_python_analyzer-0.6.0}/src/coretrace_python/dependency/correlation.py

@@ -69,7 +69,7 @@ def check_conditions(entry: AdvisoryEntryPoint | None, arguments: Arguments | No
     met: list[Condition] = []
     pending: list[Condition] = []
     for condition in entry.conditions:
-        given = _given(condition, arguments) if condition.checkable and arguments is not None else None
+        given = arguments.given(condition.argument, condition.position) if condition.checkable and arguments is not None else None
         if given is None:
             pending.append(condition)
             continue
@@ -84,18 +84,6 @@ def check_conditions(entry: AdvisoryEntryPoint | None, arguments: Arguments | No
     return ConditionCheck(tuple(met), tuple(pending))
 
 
-def _given(condition: Condition, arguments: Arguments) -> tuple[bool, str | None] | None:
-    """Whether the call gives the condition's argument, and what it denotes: ``(True,
-    value)`` when given, ``(False, None)`` when surely absent, None when it cannot tell."""
-
-    for name, value in arguments.keywords:
-        if name == condition.argument:
-            return True, value
-    if condition.position is not None and condition.position < len(arguments.positional):
-        return True, arguments.positional[condition.position]
-    return None if arguments.unpacked else (False, None)
-
-
 def ruled_out(module: str, site: CallSite, check: ConditionCheck) -> str:
     """Which call a contradicted condition rules out, and why: ``app:12
     python.yaml.load(Loader=python.yaml.SafeLoader)``."""