Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2025-02-19 23:48:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5232 from rgeissert/processes-output-truncation-issue

Browse source 
Run ps with an ulimited width on linux
This commit is contained in:
Nick Schwaderer 2020-09-02 15:57:42 +01:00 • committed by GitHub
commit 508861b80f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/inspec/resources/processes.rb
View file

@ -138,7 +138,7 @@ module Inspec::Resources
command: 8, command: 8,
} }
else else
command = "ps axo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command" command = "ps wwaxo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command"
regex = /^(.+?)\s+(\d+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(\w{3} \d{2}|\d{2}:\d{2}:\d{2})\s+([^ ]+)\s+([^ ]+)\s+(.*)$/ regex = /^(.+?)\s+(\d+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+([^ ]+)\s+(\w{3} \d{2}|\d{2}:\d{2}:\d{2})\s+([^ ]+)\s+([^ ]+)\s+(.*)$/
field_map = { field_map = {
label: 1, label: 1,

2
test/helpers/mock_loader.rb
View file

@ -210,7 +210,7 @@ class MockLoader
'find /sys/class/net/eth1/ -maxdepth 1 -type f -exec sh -c \'echo "[$(basename {})]"; cat {} || echo -n\' \;' => empty.call, 'find /sys/class/net/eth1/ -maxdepth 1 -type f -exec sh -c \'echo "[$(basename {})]"; cat {} || echo -n\' \;' => empty.call,
"Get-Package -Name 'Not available' | ConvertTo-Json" => empty.call, "Get-Package -Name 'Not available' | ConvertTo-Json" => empty.call,
"ps axo pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user,command" => cmd.call("ps-axo"), "ps axo pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user,command" => cmd.call("ps-axo"),
"ps axo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command" => cmd.call("ps-axoZ"), "ps wwaxo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command" => cmd.call("ps-axoZ"),
"ps -o pid,vsz,rss,tty,stat,time,ruser,args" => cmd.call("ps-busybox"), "ps -o pid,vsz,rss,tty,stat,time,ruser,args" => cmd.call("ps-busybox"),
"env" => cmd.call("env"), "env" => cmd.call("env"),
"${Env:PATH}" => cmd.call("$env-PATH"), "${Env:PATH}" => cmd.call("$env-PATH"),

2
test/unit/resources/processes_test.rb
View file

@ -228,6 +228,6 @@ describe "Inspec::Resources::Processes" do
it "returns the correct command for non-busybox linux" do it "returns the correct command for non-busybox linux" do
resource = MockLoader.new(:centos7).load_resource("processes") resource = MockLoader.new(:centos7).load_resource("processes")
resource.expects(:busybox_ps?).returns(false) resource.expects(:busybox_ps?).returns(false)
_(resource.send(:ps_configuration_for_linux)[0]).must_equal "ps axo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command" _(resource.send(:ps_configuration_for_linux)[0]).must_equal "ps wwaxo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command"
end end
end end