Skip to content

bugfix: JinjaAnalysis: handle recursive macros #43

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bugfix: JinjaAnalysis: handle recursive macros #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ctf/analysis/JinjaAnalysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@


class JinjaMacroChange:
def __init__(self, name):
def __init__(self, name, seen=None):
self.name = name
self.seen = set() if seen is None else seen
self.higher_macros = []
self.in_rules = set()
self.in_templates = set()
Expand Down Expand Up @@ -47,7 +48,12 @@ def find_usages(self):
if content_file.endswith(".jinja"):
higher_macros = self.find_where_macro_used(self.name, content_file)
for macro in higher_macros:
higher_macro_class = JinjaMacroChange(macro)
# Avoid recursion
if macro in self.seen:
continue
new_seen = self.seen.copy()
new_seen.add(macro)
higher_macro_class = JinjaMacroChange(macro, new_seen)
self.higher_macros.append(higher_macro_class)
else:
self.parse_macro_usage(content_file)
Expand Down