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

Jump to bottom

Update sanitizing masking for Salt SSH #62483

Merged
merged 2 commits into from
Aug 17, 2022
Merged

Update sanitizing masking for Salt SSH #62483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ded63d
Removing unneccessary loggint that could display sensitive data. Mas…
garethgreenaway Aug 17, 2022
e3d181a
Adding changelog.
garethgreenaway Aug 17, 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
1 change: 1 addition & 0 deletions changelog/62483.fixed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update sanitizing masking for Salt SSH to include additional password like strings.
Ch3LL marked this conversation as resolved.
Show resolved Hide resolved
1 change: 0 additions & 1 deletion salt/renderers/yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ def render(yaml_data, saltenv="base", sls="", argline="", **kws):
)
if not data:
data = {}
log.debug("Results of YAML rendering: \n%s", data)

def _validate_data(data):
"""
Expand Down
1 change: 0 additions & 1 deletion salt/roster/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,5 +103,4 @@ def targets(self, tgt, tgt_type):
except OSError as exc:
log.error("Can't access roster for backend %s: %s", back, exc)

log.debug("Matched minions: %s", targets)
return targets
2 changes: 1 addition & 1 deletion salt/roster/dir.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def _render(roster_file, **kwargs):
__opts__["renderer"],
__opts__["renderer_blacklist"],
__opts__["renderer_whitelist"],
mask_value="passw*",
mask_value="*passw*",
**kwargs
)
result.setdefault("host", "{}.{}".format(os.path.basename(roster_file), domain))
Expand Down
2 changes: 1 addition & 1 deletion salt/roster/flat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def targets(tgt, tgt_type="glob", **kwargs):
__opts__["renderer"],
__opts__["renderer_blacklist"],
__opts__["renderer_whitelist"],
mask_value="passw*",
mask_value="*passw*",
**kwargs
)
conditioned_raw = {}
Expand Down