Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-09-21 15:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Modify linux regular expression to handle process names with spaces (#2117)

Browse source 
* Modify linux regular expression to handle process names with spaces

Signed-off-by: Chad Scott <cscott@chadikins.com>

* Add mocks, tests, etc.

Signed-off-by: Chad Scott <cscott@chadikins.com>
This commit is contained in:
ChadScott 2017-09-05 05:36:55 -07:00 committed by Dominik Richter
parent f3c3de241e
commit 09b145122d
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/resources/processes.rb
View file

@ -81,7 +81,7 @@ module Inspec::Resources
if os.linux?
command = 'ps axo label,pid,pcpu,pmem,vsz,rss,tty,stat,start,time,user:32,command'
regex = /^([^ ]+)\s+([^ ]+)\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+(.*)$/
elsif os.windows?
command = '$Proc = Get-Process -IncludeUserName | Where-Object {$_.Path -ne $null } | Select-Object PriorityClass,Id,CPU,PM,VirtualMemorySize,NPM,SessionId,Responding,StartTime,TotalProcessorTime,UserName,Path | ConvertTo-Csv -NoTypeInformation;$Proc.Replace("""","").Replace("`r`n","`n")'
# Wanted to use /(?:^|,)([^,]*)/; works on rubular.com not sure why here?

1
test/unit/mock/cmd/ps-axoZ
View file

@ -6,3 +6,4 @@ system_u:system_r:init_t:s0 5169 0.0 0.0 4084 536 ? S 10:54
- 11662 0.0 0.0 70992 1460 ? S Nov 28 00:00:13 httpd /usr/local/apache2/bin/httpd -k start
- 11663 0.0 0.1 874196 4792 ? Sl Nov 28 00:00:12 httpd /usr/local/apache2/bin/httpd -k start
- 11664 0.0 0.1 874156 4468 ? Sl Nov 28 00:00:11 httpd /usr/local/apache2/bin/httpd -k start
/usr/sbin/ntpd (enforce) 14415 0.0 0.5 110032 5164 ? Ssl 22:39:25 00:00:00 ntp /usr/sbin/ntpd -p /var/run/ntpd.pid -g -u 112:117

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

@ -52,7 +52,7 @@ describe 'Inspec::Resources::Processes' do
it 'verify processes resource using where filters on linux os. String match regex' do
resource = MockLoader.new(:centos6).load_resource('processes', '.+')
_(resource.entries.length).must_equal 7
_(resource.entries.length).must_equal 8
_(resource.where { pid < 11663 && cpu == '0.0' }.users).must_equal(["opscode-pgsql", "opscode", "root", "httpd"])
_(resource.where { user =~ /opscode-.*/ }.entries[0].to_h).must_equal({
label: 'system_u:system_r:init_t:s0',
@ -122,6 +122,25 @@ describe 'Inspec::Resources::Processes' do
_(resource.to_s).must_equal 'Processes /mysqld/'
end
it 'handles labels with spaces' do
resource = MockLoader.new(:centos6).load_resource('processes', 'ntpd')
_(resource.entries.length).must_equal 1
_(resource.entries[0].to_h).must_equal({
label: '/usr/sbin/ntpd (enforce)',
pid: 14415,
cpu: '0.0',
mem: '0.5',
vsz: 110032,
rss: 5164,
tty: '?',
stat: 'Ssl',
start: '22:39:25',
time: '00:00:00',
user: 'ntp',
command: '/usr/sbin/ntpd -p /var/run/ntpd.pid -g -u 112:117',
})
end
it 'command name matches with output (string)' do
resource = MockLoader.new(:windows).load_resource('processes', 'winlogon.exe')
_(resource.to_s).must_equal 'Processes winlogon.exe'