From e8c2dc6fc7050e0e9b7c60932f3a7d58db8071ce Mon Sep 17 00:00:00 2001 From: Nicholas Hinds Date: Sat, 7 Jan 2017 18:40:29 -0700 Subject: [PATCH] (MODULES-4265) Detect security updates from multiple sources The apt_security_updates and apt_package_security_updates facts now detect security updates which come from more than one source repository. --- lib/facter/apt_updates.rb | 6 +-- .../apt_package_security_updates_spec.rb | 42 +++++++++++++++---- spec/unit/facter/apt_security_updates_spec.rb | 25 +++++++++-- 3 files changed, 59 insertions(+), 14 deletions(-) diff --git a/lib/facter/apt_updates.rb b/lib/facter/apt_updates.rb index e101dd7..a95a79b 100644 --- a/lib/facter/apt_updates.rb +++ b/lib/facter/apt_updates.rb @@ -10,10 +10,10 @@ Facter.add("apt_has_updates") do package = line.gsub(/^Inst\s([^\s]+)\s.*/, '\1').strip apt_package_updates[0].push(package) security_matches = [ - / Debian[^\s]+-updates /, + / Debian[^\s]+-updates[, ]/, / Debian-Security:/, - / Ubuntu[^\s]+-security /, - / gNewSense[^\s]+-security / + / Ubuntu[^\s]+-security[, ]/, + / gNewSense[^\s]+-security[, ]/ ] re = Regexp.union(security_matches) if line.match(re) diff --git a/spec/unit/facter/apt_package_security_updates_spec.rb b/spec/unit/facter/apt_package_security_updates_spec.rb index 868375e..bc51aee 100644 --- a/spec/unit/facter/apt_package_security_updates_spec.rb +++ b/spec/unit/facter/apt_package_security_updates_spec.rb @@ -17,18 +17,44 @@ describe 'apt_package_security_updates fact' do File.stubs(:executable?) # Stub all other calls Facter::Util::Resolution.stubs(:exec) # Catch all other calls File.expects(:executable?).with('/usr/bin/apt-get').returns true - Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns ""+ + Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_get_upgrade_output + } + + describe 'on Debian' do + let(:apt_get_upgrade_output) do "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n"+ "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n"+ "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"+ "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" - } - it { - if Facter.version < '2.0.0' - is_expected.to eq('tzdata') - else - is_expected.to eq(['tzdata']) end - } + + it { + if Facter.version < '2.0.0' + is_expected.to eq('tzdata') + else + is_expected.to eq(['tzdata']) + end + } + end + + describe 'on Ubuntu' do + let(:apt_get_upgrade_output) do + "Inst tzdata [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n"+ + "Conf tzdata (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n"+ + "Inst curl [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n"+ + "Conf curl (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n"+ + "Inst procps [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"+ + "Conf procps (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" + end + + it { + if Facter.version < '2.0.0' + is_expected.to eq('tzdata,curl') + else + is_expected.to eq(['tzdata', 'curl']) + end + } + end + end end diff --git a/spec/unit/facter/apt_security_updates_spec.rb b/spec/unit/facter/apt_security_updates_spec.rb index f0dcab2..1e54216 100644 --- a/spec/unit/facter/apt_security_updates_spec.rb +++ b/spec/unit/facter/apt_security_updates_spec.rb @@ -17,13 +17,32 @@ describe 'apt_security_updates fact' do File.stubs(:executable?) # Stub all other calls Facter::Util::Resolution.stubs(:exec) # Catch all other calls File.expects(:executable?).with('/usr/bin/apt-get').returns true - Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns ""+ + Facter::Util::Resolution.expects(:exec).with('/usr/bin/apt-get -s -o Debug::NoLocking=true upgrade 2>&1').returns apt_get_upgrade_output + } + + describe 'on Debian' do + let(:apt_get_upgrade_output) do "Inst tzdata [2015f-0+deb8u1] (2015g-0+deb8u1 Debian:stable-updates [all])\n"+ "Conf tzdata (2015g-0+deb8u1 Debian:stable-updates [all])\n"+ "Inst unhide.rb [13-1.1] (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n"+ "Conf unhide.rb (22-2~bpo8+1 Debian Backports:jessie-backports [all])\n" - } - it { is_expected.to eq(1) } + end + + it { is_expected.to eq(1) } + end + + describe 'on Ubuntu' do + let(:apt_get_upgrade_output) do + "Inst tzdata [2016f-0ubuntu0.16.04] (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n"+ + "Conf tzdata (2016j-0ubuntu0.16.04 Ubuntu:16.04/xenial-security, Ubuntu:16.04/xenial-updates [all])\n"+ + "Inst curl [7.47.0-1ubuntu2] (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64]) []\n"+ + "Conf curl (7.47.0-1ubuntu2.2 Ubuntu:16.04/xenial-security [amd64])\n"+ + "Inst procps [2:3.3.10-4ubuntu2] (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n"+ + "Conf procps (2:3.3.10-4ubuntu2.3 Ubuntu:16.04/xenial-updates [amd64])\n" + end + + it { is_expected.to eq(2) } + end end end -- 2.32.3