Merge b20eba7 into 36c50a4

lib/facts/fedora/os/architecture.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facter
+  module Fedora
+    class OsArchitecture
+      FACT_NAME = 'os.architecture'
+
+      def call_the_resolver
+        fact_value = UnameResolver.resolve(:machine)
+
+        Fact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

lib/facts/scientific/os/family.rb → lib/facts/fedora/os/family.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
 module Facter
-  module Scientific
+  module Fedora
     class OsFamily
       FACT_NAME = 'os.family'
 
       def call_the_resolver
-        fact_value = UnameResolver.resolve(:family)
-
-        Fact.new(FACT_NAME, fact_value)
+        Fact.new(FACT_NAME, 'RedHat')
       end
     end
   end

lib/facts/scientific/os/name.rb → lib/facts/fedora/os/hardware.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Facter
-  module Scientific
-    class OsName
-      FACT_NAME = 'os.name'
+  module Fedora
+    class OsHardware
+      FACT_NAME = 'os.hardware'
 
       def call_the_resolver
         fact_value = UnameResolver.resolve(:machine)

lib/facts/fedora/os/name.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facter
+  module Fedora
+    class OsName
+      FACT_NAME = 'os.name'
+
+      def call_the_resolver
+        fact_value = OsReleaseResolver.resolve('NAME')
+
+        Fact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

lib/facts/fedora/os/release.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facter
+  module Fedora
+    class OsRelease
+      FACT_NAME = 'os.release'
+
+      def call_the_resolver
+        version = OsReleaseResolver.resolve('VERSION_ID')
+
+        Fact.new(FACT_NAME, build_fact_list(version))
+      end
+
+      def build_fact_list(version)
+        {
+          full: version,
+          major: version
+        }
+      end
+    end
+  end
+end

lib/facts/fedora/os/selinux.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facter
+  module Fedora
+    class OsSelinux
+      FACT_NAME = 'os.selinux'
+
+      def call_the_resolver
+        selinux = SELinuxResolver.resolve(:enabled)
+
+        Fact.new(FACT_NAME, build_fact_list(selinux))
+      end
+
+      def build_fact_list(selinux)
+        {
+          enabled: selinux
+        }
+      end
+    end
+  end
+end

lib/resolvers/os_release_resolver.rb

@@ -24,9 +24,14 @@ def resolve(fact_name)
 
     def read_os_release_file(fact_name)
       output, _status = Open3.capture2('cat /etc/os-release')
-      release_info = output.delete('\"').split("\n").map { |e| e.split('=') }
+      pairs = []
+
+      output.each_line do |line|
+        pairs << line.strip.delete('"').split('=', 2)
+      end
+
+      @@fact_list = Hash[*pairs.flatten]
 
-      @@fact_list = Hash[*release_info.flatten]
       @@fact_list[:slug] = @@fact_list['ID'].downcase
 
       @@fact_list[fact_name]

lib/resolvers/selinux_resolver.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class SELinuxResolver < BaseResolver
+  # :name
+  # :version
+  # :codename
+
+  class << self
+    @@semaphore = Mutex.new
+    @@fact_list ||= {}
+
+    def resolve(fact_name)
+      @@semaphore.synchronize do
+        result ||= @@fact_list[fact_name]
+        result || read_lsb_release_file(fact_name)
+      end
+    end
+
+    def read_lsb_release_file(fact_name)
+      output, _s = Open3.capture2('cat /proc/self/mounts')
+      @@fact_list[:enabled] = false
+
+      output.each_line do |line|
+        next unless line.match(/selinuxfs/)
+
+        @@fact_list[:enabled] = true
+        @@fact_list[:mountpoint] = line
+        break
+      end
+
+      @@fact_list[fact_name]
+    end
+
+    def invalidate_cache
+      @@fact_list = {}
+    end
+  end
+end

spec/facter/resolvers/os_release_resolver_spec.rb

@@ -4,18 +4,7 @@
   before do
     allow(Open3).to receive(:capture2)
       .with('cat /etc/os-release')
-      .and_return('NAME="Ubuntu"
-VERSION="18.04.1 LTS (Bionic Beaver)"
-ID=ubuntu
-ID_LIKE=debian
-PRETTY_NAME="Ubuntu 18.04.1 LTS"
-VERSION_ID="18.04"
-HOME_URL="https://www.ubuntu.com/"
-SUPPORT_URL="https://help.ubuntu.com/"
-BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
-PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
-VERSION_CODENAME=bionic
-UBUNTU_CODENAME=bionic')
+      .and_return(load_fixture('os_release').read)
   end
 
   it 'returns os NAME' do

spec/facter/resolvers/selinux_resolver_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+describe 'SELinuxResolver' do
+  after(:each) do
+    SELinuxResolver.invalidate_cache
+  end
+  it 'returns false when selinux is not enabled' do
+    allow(Open3).to receive(:capture2)
+      .with('cat /proc/self/mounts')
+      .and_return(load_fixture('proc_self_mounts').read)
+    result = SELinuxResolver.resolve(:enabled)
+
+    expect(result).to be_falsey
+  end
+
+  it 'returns true when selinux is enabled' do
+    allow(Open3).to receive(:capture2)
+      .with('cat /proc/self/mounts')
+      .and_return(load_fixture('proc_self_mounts_selinux').read)
+    result = SELinuxResolver.resolve(:enabled)
+
+    expect(result).to be_truthy
+  end
+end

spec/fixtures/os_release

@@ -0,0 +1,12 @@
+NAME="Ubuntu"
+VERSION="18.04.1 LTS (Bionic Beaver)"
+ID=
+ID_LIKE=debian
+PRETTY_NAME="Ubuntu 18.04.1 LTS"
+VERSION_ID="18.04"
+HOME_URL="https://www.ubuntu.com/"
+SUPPORT_URL="https://help.ubuntu.com/"
+BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
+PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
+VERSION_CODENAME=bionic
+UBUNTU_CODENAME=bionic

spec/fixtures/proc_self_mounts

@@ -0,0 +1,6 @@
+'sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
+udev /dev devtmpfs rw,nosuid,relatime,size=3023708k,nr_inodes=755927,mode=755 0 0
+devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
+tmpfs /run tmpfs rw,nosuid,noexec,relatime,size=610440k,mode=755 0 0
+/dev/mapper/localhost--vg-root / ext4 rw,relatime,errors=remount-ro,data=ordered 0 0'

spec/fixtures/proc_self_mounts_selinux

@@ -0,0 +1,6 @@
+sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
+proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
+udev /dev devtmpfs rw,nosuid,relatime,size=3023708k,nr_inodes=755927,mode=755 0 0
+devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0
+selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0
+/dev/mapper/localhost--vg-root / ext4 rw,relatime,errors=remount-ro,data=ordered 0 0

spec/spec_helper.rb

@@ -7,6 +7,7 @@
 
 require 'open3'
 require 'thor'
+require 'fileutils'
 
 require_relative '../lib/resolvers/base_resolver'
 require_relative '../spec/helpers/kernel_mock'
@@ -42,3 +43,7 @@
     c.syntax = :expect
   end
 end
+
+def load_fixture(filename)
+  File.open(File.join('spec', 'fixtures', filename))
+end