Skip to content

Dev: proof code from injections #296

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

Merged
aleksei-burlakov merged 1 commit into from
Mar 18, 2025
Merged

Dev: proof code from injections #296

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion hawk/app/lib/util.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def popen3(user, *cmd)
# RORSCAN_INL: cmd always has > 1 elem, so safe from shell injection
exec(*cmd)
else
command = ['su', '-', user, 'sh', '-c', "#{cmd.join(" ")}"]
command = ['su', '-', user.shellescape, 'sh', '-c', cmd.shelljoin]
exec(*command)
end
}
Expand Down
7 changes: 3 additions & 4 deletions hawk/app/models/crm_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def persisted?

class << self
def get_parameters_from(crm_config, cmd)
#todo: this doesn't work with safe_x. research why.
REXML::Document.new(%x[#{cmd} 2>/dev/null]).tap do |xml|
REXML::Document.new(Util.safe_x(*cmd)).tap do |xml|
return unless xml.root

xml.elements.each("//parameter") do |param|
Expand Down Expand Up @@ -108,7 +107,7 @@ def mapping
# The crm_attribute --list-options is only available since pacemaker 2.1.8
# Let's try crm_attribute first, and if fails,
# then do as before (with pengine, crmd, ..., pacemaker-based)
cmd = "crm_attribute --list-options=cluster --all --output-as=xml"
cmd = ["crm_attribute", "--list-options=cluster", "--all", "--output-as=xml"]
get_parameters_from(crm_config, cmd)
if crm_config.empty?
[
Expand All @@ -121,7 +120,7 @@ def mapping
].each do |binary|
path = "#{Rails.configuration.x.crm_daemon_dir}/#{binary}"
next unless File.executable? path
cmd = "#{path} metadata"
cmd = ["#{path}", "metadata"]
get_parameters_from(crm_config, cmd)
end
end
Expand Down