Skip to content
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

Hotfix: Fix blank cloud server names causing issues with report generation #481

Merged
merged 6 commits into from
Jul 24, 2024
Merged

Hotfix: Fix blank cloud server names causing issues with report generation #481

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20702d6
Fixed error with report generation when a cloud server lacked a name
chrismaddalena Jul 18, 2024
d4dd105
Updated admin panel to better split figure settings
chrismaddalena Jul 23, 2024
66c5d63
Added `ref` tags to autocomplete options
chrismaddalena Jul 23, 2024
2ac130f
Enabled autocomplete and evidence on extra fields for obs & findings
chrismaddalena Jul 23, 2024
ea81b2c
Updated for v4.2.3
chrismaddalena Jul 24, 2024
3b81878
Merge branch 'master' into hotfix/cloud-server-report-error
chrismaddalena Jul 24, 2024
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
88 changes: 56 additions & 32 deletions ghostwriter/modules/reportwriter/project/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

from collections import ChainMap
import copy

Expand Down Expand Up @@ -26,10 +25,7 @@ def serialize_object(self, object):

def map_rich_texts(self):
base_context = copy.deepcopy(self.data)
rich_text_context = ChainMap(
ExportProjectBase.rich_text_jinja_overlay(self.data),
base_context
)
rich_text_context = ChainMap(ExportProjectBase.rich_text_jinja_overlay(self.data), base_context)

# Fields on Project
ExportProjectBase.process_projects_richtext(self, base_context, rich_text_context)
Expand Down Expand Up @@ -80,64 +76,84 @@ def process_projects_richtext(
f"client {base_context['client']['name']}",
base_context["client"]["extra_fields"],
Client,
rich_text_context
rich_text_context,
)

# Project
base_context["project"]["note_rt"] = ex.create_lazy_template("the project note", base_context["project"]["note"], rich_text_context)
base_context["project"]["note_rt"] = ex.create_lazy_template(
"the project note", base_context["project"]["note"], rich_text_context
)
ex.process_extra_fields("the project", base_context["project"]["extra_fields"], Project, rich_text_context)

# Assignments
for assignment in base_context["team"]:
if isinstance(assignment, dict):
if assignment["note"]:
assignment["note_rt"] = ex.create_lazy_template(f"the note of person {assignment['name']}", assignment["note"], rich_text_context)
assignment["note_rt"] = ex.create_lazy_template(
f"the note of person {assignment['name']}", assignment["note"], rich_text_context
)

# Contacts
for contact in base_context["client"]["contacts"]:
if isinstance(contact, dict):
if contact["note"]:
contact["note_rt"] = ex.create_lazy_template(f"the note of contact {contact['name']}", contact["note"], rich_text_context)
contact["note_rt"] = ex.create_lazy_template(
f"the note of contact {contact['name']}", contact["note"], rich_text_context
)

# Objectives
for objective in base_context["objectives"]:
if isinstance(objective, dict):
if objective["description"]:
objective["description_rt"] = ex.create_lazy_template(f"the description of objective {objective['objective']}", objective["description"], rich_text_context)
objective["description_rt"] = ex.create_lazy_template(
f"the description of objective {objective['objective']}",
objective["description"],
rich_text_context,
)

# Scope Lists
for scope_list in base_context["scope"]:
if isinstance(scope_list, dict):
if scope_list["description"]:
scope_list["description_rt"] = ex.create_lazy_template(f"the description of scope {scope_list['name']}", scope_list["description"], rich_text_context)
scope_list["description_rt"] = ex.create_lazy_template(
f"the description of scope {scope_list['name']}", scope_list["description"], rich_text_context
)

# Targets
for target in base_context["targets"]:
if isinstance(target, dict):
if target["note"]:
target["note_rt"] = ex.create_lazy_template(f"the note of target {target['ip_address']}", target["note"], rich_text_context)
target["note_rt"] = ex.create_lazy_template(
f"the note of target {target['ip_address']}", target["note"], rich_text_context
)

# Deconfliction Events
for event in base_context["deconflictions"]:
if isinstance(event, dict):
if event["description"]:
event["description_rt"] = ex.create_lazy_template(f"the description of deconfliction event {event['title']}", event["description"], rich_text_context)
event["description_rt"] = ex.create_lazy_template(
f"the description of deconfliction event {event['title']}",
event["description"],
rich_text_context,
)

# White Cards
for card in base_context["whitecards"]:
if isinstance(card, dict):
if card["description"]:
card["description_rt"] = ex.create_lazy_template(f"the descriptio of whitecard {card['title']}", card["description"], rich_text_context)
card["description_rt"] = ex.create_lazy_template(
f"the descriptio of whitecard {card['title']}", card["description"], rich_text_context
)

# Infrastructure
for asset_type in base_context["infrastructure"]:
for asset in base_context["infrastructure"][asset_type]:
if isinstance(asset, dict):
if asset["note"]:
asset["note_rt"] = ex.create_lazy_template(
f"the note of {asset_type} {asset.get('name') or asset['domain']}",
f"the note of {asset_type} {asset.get('name') or asset.get('domain') or asset['ip_address']}",
asset["note"],
rich_text_context
rich_text_context,
)

for asset in base_context["infrastructure"]["domains"]:
Expand All @@ -148,25 +164,33 @@ def process_projects_richtext(
# Logs
for log in base_context["logs"]:
for entry in log["entries"]:
ex.process_extra_fields(f"log entry {entry['description']} of log {log['name']}", entry["extra_fields"], OplogEntry, rich_text_context)
ex.process_extra_fields(
f"log entry {entry['description']} of log {log['name']}",
entry["extra_fields"],
OplogEntry,
rich_text_context,
)

@classmethod
def generate_lint_data(cls):
context = {name: copy.deepcopy(LINTER_CONTEXT[name]) for name in [
"project",
"client",
"team",
"objectives",
"targets",
"scope",
"deconflictions",
"whitecards",
"infrastructure",
"logs",
"company",
"report_date",
"extra_fields",
]}
context = {
name: copy.deepcopy(LINTER_CONTEXT[name])
for name in [
"project",
"client",
"team",
"objectives",
"targets",
"scope",
"deconflictions",
"whitecards",
"infrastructure",
"logs",
"company",
"report_date",
"extra_fields",
]
}
for field in ExtraFieldSpec.objects.filter(target_model=Report._meta.label):
context["extra_fields"][field.internal_name] = field.empty_value()
for field in ExtraFieldSpec.objects.filter(target_model=Project._meta.label):
Expand Down