Skip to content

fix: keep explicit dataflow values when check() applies defaults #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Svastikkka wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: keep explicit dataflow values when check() applies defaults #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c7eb83
fix: keep explicit dataflow values when check() applies defaults
Svastikkka Oct 29, 2026
40de396
Merge branch 'master' into fix/373-tm-check-overwrites-explicit-dataf…
izar Nov 11, 2026
41c6894
fix: skip protocol and port defaults for endpoints that do not have them
Svastikkka Nov 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 14 additions & 29 deletions pytm/pytm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ def _add_data(container, value):
container.append(item)


def _fill(obj, attr, source, source_attr=None):
source_attr = source_attr or attr
if attr not in obj.model_fields_set and hasattr(source, source_attr):
obj._safeset(attr, getattr(source, source_attr))


@dataclass
class _FlowDefaultsBuilder:
"""Collect and apply default relationships for data flows."""
Expand Down Expand Up @@ -400,37 +406,16 @@ def _merge_overrides(self, flow: Dataflow) -> None:
pass

def _apply_response_defaults(self, flow: Dataflow) -> None:
flow._safeset(
"protocol", getattr(flow.source, "protocol", getattr(flow, "protocol", ""))
)
flow._safeset(
"srcPort", getattr(flow.source, "port", getattr(flow, "srcPort", -1))
)
if hasattr(flow.source, "controls"):
flow.controls._safeset(
"isEncrypted", getattr(flow.source.controls, "isEncrypted", False)
)
_fill(flow, "protocol", flow.source)
_fill(flow, "srcPort", flow.source, "port")
_fill(flow.controls, "isEncrypted", flow.source.controls)

def _apply_forward_defaults(self, flow: Dataflow) -> None:
flow._safeset(
"protocol", getattr(flow.sink, "protocol", getattr(flow, "protocol", ""))
)
flow._safeset(
"dstPort", getattr(flow.sink, "port", getattr(flow, "dstPort", -1))
)
if hasattr(flow.sink, "controls"):
flow.controls._safeset(
"isEncrypted", getattr(flow.sink.controls, "isEncrypted", False)
)
if hasattr(flow.source, "controls"):
flow.controls._safeset(
"authenticatesDestination",
getattr(flow.source.controls, "authenticatesDestination", False),
)
flow.controls._safeset(
"checksDestinationRevocation",
getattr(flow.source.controls, "checksDestinationRevocation", False),
)
_fill(flow, "protocol", flow.sink)
_fill(flow, "dstPort", flow.sink, "port")
_fill(flow.controls, "isEncrypted", flow.sink.controls)
_fill(flow.controls, "authenticatesDestination", flow.source.controls)
_fill(flow.controls, "checksDestinationRevocation", flow.source.controls)

def _enrich_data_attributes(self, flow: Dataflow) -> None:
for datum in list(getattr(flow, "data", [])):
Expand Down
32 changes: 32 additions & 0 deletions tests/test_private_func.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
Dataflow,
Datastore,
DatastoreType,
Element,
Finding,
Process,
Server,
Expand Down Expand Up @@ -73,6 +74,37 @@ def test_responses(self):
assert insert.response is None
assert insert.isResponse is False

def test_explicit_dataflow_values_survive_check(self):
tm = TM("TM")
user = Actor("User")
web = Server("Web", port=8080, protocol="HTTP")
login = Dataflow(user, web, "Login")
login.protocol = "HTTPS"
login.dstPort = 443
login.controls.isEncrypted = True
reply = Dataflow(web, user, "Reply", isResponse=True)
reply.protocol = "HTTPS"
reply.srcPort = 443
reply.controls.isEncrypted = True
assert tm.check()
assert login.protocol == "HTTPS"
assert login.dstPort == 443
assert login.controls.isEncrypted is True
assert reply.protocol == "HTTPS"
assert reply.srcPort == 443
assert reply.controls.isEncrypted is True

def test_check_with_element_and_boundary_endpoints(self):
tm = TM("TM")
user = Actor("User")
element = Element("Element")
zone = Boundary("Zone")
Dataflow(user, element, "To element")
Dataflow(element, user, "From element", isResponse=True)
Dataflow(user, zone, "To boundary")
Dataflow(zone, user, "From boundary", isResponse=True)
assert tm.check()

def test_defaults(self):
tm = TM("TM")
user_data = Data("HTTP")
Expand Down