Skip to content

fix(iast): invalid f-string type conversions exception in format_value_aspect #13156

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

Merged
merged 3 commits into from
Apr 11, 2025
Merged

fix(iast): invalid f-string type conversions exception in format_value_aspect #13156

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
75f4595
fix(iast): excluded exception on invalid f-string
avara1986 Apr 10, 2025
619342a
fix(iast): excluded exception on invalid f-string
avara1986 Apr 10, 2025
fef883b
Update releasenotes/notes/iast-fstring-exception-d460a37b6e44f972.yaml
avara1986 Apr 10, 2025
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
14 changes: 7 additions & 7 deletions ddtrace/appsec/_iast/_taint_tracking/aspects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ def format_value_aspect(
return format(new_text, format_spec)
return format(new_text)

try:
if format_spec:
if format_spec:
try:
# Apply formatting
text_ranges = get_tainted_ranges(new_text)
if text_ranges:
Expand All @@ -466,11 +466,11 @@ def format_value_aspect(
return ("{:%s}" % format_spec).format(new_text)
else:
return ("{:%s}" % format_spec).format(new_text)
else:
return format(new_text)
except Exception as e:
iast_propagation_error_log(f"format_value_aspect. {e}")
return new_text
except Exception as e:
iast_propagation_error_log(f"format_value_aspect. {e}")
return ("{:%s}" % format_spec).format(new_text)

return format(new_text)


def incremental_translation(self, incr_coder, funcode, empty):
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/iast-fstring-exception-d460a37b6e44f972.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
IAST: Fixes a bug where invalid f-strings didn’t raise the expected "Unknown format code" error when IAST was enabled.
13 changes: 13 additions & 0 deletions tests/appsec/iast/aspects/test_str_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from hypothesis import given
from hypothesis.strategies import text
import pytest

from ddtrace.appsec._iast._taint_tracking import as_formatted_evidence
Expand All @@ -10,6 +12,17 @@
mod_py3 = _iast_patched_module("benchmarks.bm.iast_fixtures.str_methods_py3")


@given(text())
def test_int_fstring_zero_padding_text(text):
with pytest.raises(ValueError) as excinfo:
f"{text:05d}"
assert str(excinfo.value) == "Unknown format code 'd' for object of type 'str'"

with pytest.raises(ValueError) as excinfo:
mod_py3.do_zero_padding_fstring(text)
assert str(excinfo.value) == "Unknown format code 'd' for object of type 'str'"


class TestOperatorsReplacement(BaseReplacement):
@staticmethod
def test_taint(): # type: () -> None
Expand Down
Loading