Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 25 additions & 4 deletions sos/report/plugins/foremanctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class Foremanctl(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
plugin_name = 'foremanctl'
profiles = ('sysmgmt',)
packages = ('foremanctl', )
containers = ('foreman', 'foreman-proxy',)

def setup(self):
self.add_copy_spec([
Expand All @@ -29,14 +30,34 @@ def setup(self):

self.add_cmd_output([
"foremanctl features",
"foremanctl health",
])

self.add_dir_listing(["/var/lib/foremanctl/"], recursive=True)

def postproc(self):
self.do_path_regex_sub("/var/lib/foremanctl/parameters.yaml",
r"(foreman_initial_admin_password:\s*)(.*)",
r"\1********")

# Scrub passwords, credentials, tokens, secrets, and keys
self.do_path_regex_sub(
"/var/lib/foremanctl/parameters.yaml",
r"((.*)?(passw|cred|token|secret|key).*(\:\s|=))(.*)",
r"\1********")
Comment thread
archanaserver marked this conversation as resolved.

# Scrub passwords from foremanctl logs - Pattern 1: key=value format
self.do_path_regex_sub(
"/var/log/foremanctl/foremanctl.*log*",
r"((passw|cred|token|secret|key)\w*\s*=\s*)(.*?)(\s|,|\"|'|$)",
r"\1********\4")

# Scrub passwords from foremanctl logs - Pattern 2: "password something" format
self.do_path_regex_sub(
"/var/log/foremanctl/foremanctl.*log*",
r"(password\s+)(.*?)(\s|,|\"|$)",
r"\1********\3")

# Scrub admin credentials in username:password format
self.do_path_regex_sub(
"/var/log/foremanctl/foremanctl.*log*",
r"(Admin credentials:\s+\w+:)(.*?)(\"|,|$)",
r"\1********\3")

# vim: set et ts=4 sw=4 :
1 change: 1 addition & 0 deletions sos/report/plugins/valkey.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class Valkey(Plugin, IndependentPlugin):
profiles = ('services',)

packages = ('valkey',)
containers = ('valkey',)

var_puppet_gen = "/var/lib/config-data/puppet-generated/valkey"

Expand Down
Loading