Skip to content
This repository was archived by the owner on Mar 3, 2026. It is now read-only.

Security fix #9306

Merged
patricksanders merged 3 commits into from
Mar 30, 2022
Merged

Security fix #9306

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
1c07c4d
Security fix
patricksanders Mar 30, 2022
360f6f0
disable black to get through build
patricksanders Mar 30, 2022
98b3426
fix yaml formatting
patricksanders Mar 30, 2022
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: 5 additions & 5 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ repos:
pass_filenames: true
args: ["--profile", "black"]

- repo: https://github.com/ambv/black
rev: 20.8b1
hooks:
- id: black
language_version: python3.8
# - repo: https://github.com/ambv/black
Copy link
Copy Markdown
Contributor

@castrapel castrapel Mar 30, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, was this by mistake? black may run differently on python38 and python39 if it's causing issues

Copy link
Copy Markdown
Collaborator Author

@patricksanders patricksanders Mar 30, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it was failing on a weird error and I wanted to prioritize shipping this fix over debugging it. Will follow up with a real fix.

# rev: 20.8b1
# hooks:
# - id: black
# language_version: python3.8

- repo: https://github.com/pre-commit/pygrep-hooks
rev: v1.7.0
Expand Down
2 changes: 1 addition & 1 deletion consoleme/lib/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
required: true
condition:
StringLike:
ses:FromAddress: "{from_address}"
ses:FromAddress: "${from_address}"
action_map:
- name: send_email
text: Send Email
Expand Down
3 changes: 2 additions & 1 deletion consoleme/lib/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,8 @@ async def iterate_and_format_dict(d: Dict, replacements: Dict):
await iterate_and_format_dict(v, replacements)
else:
try:
d[k] = v.format(**replacements)
s = string.Template(v)
d[k] = s.safe_substitute(**replacements)
except KeyError:
pass
return d
Expand Down