manageiq-appliance_console 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aab719558452873f17db2eb66a1aeebd73d6e3f23eb41cc00955325e3004907
-  data.tar.gz: 515bf0fc47ceecd4441b0599a198ac81194056f5fc936102cd65d6d0ea31023f
+  metadata.gz: c6ba8e9cdf053c6d1eee9360c074ed3584d54e848d7d60e4f63c77a9d673ad60
+  data.tar.gz: 1ade599ce3628695ecf5b6a0444195ab3593e5ab539f5c3585f1ceffc9ace600
 SHA512:
-  metadata.gz: a4ea565696b02cef54acac874cc8e3260e8a7b3795e68d4f99cd5c59d3c0b1affe230c75739e05e306693aba7de17faf20721db40e533a442baca1832d91dadc
-  data.tar.gz: 9fe682258cd1cefd700ce0ace41d61dce0060dcb4097c63d1a539e180ea8a65f7c7559e2853525ebe342631b9c607ddceab937755b409bba89a790581f8e9855
+  metadata.gz: fd63b37fb4fb850a6b94efe35ebbb4d643992e7a9855fed584fb267b8939c122b93d4488c1b3eb2caaba37e7871e74280c07a4c5944f783a01cf10cb55ffd521
+  data.tar.gz: 9aa0a97f69f677a8b395c1fbaa724ae136f297f77ec9874ad7ffbbe4239b7d8b4e93bb619f8c43a271e36d0cf89f14cce264ebcb36a5e54cdb1b31f8e9b16cdd

data/lib/manageiq/appliance_console/cli.rb

@@ -8,6 +8,9 @@ unless defined?(say)
   end
 end
 
+# define SCAP_RULES_DIR for scap fucntionality
+SCAP_RULES_DIR = File.expand_path("productization/appliance_console/config", ManageIQ::ApplianceConsole::RAILS_ROOT)
+
 module ManageIQ
 module ApplianceConsole
   class CliError < StandardError; end
@@ -97,6 +100,10 @@ module ApplianceConsole
       options[:replication] == "primary" || (options[:replication] == "standby" && options[:primary_host])
     end
 
+    def openscap?
+      options[:openscap]
+    end
+
     def initialize(options = {})
       self.options = options
     end
@@ -164,6 +171,7 @@ module ApplianceConsole
         opt :oidc_enable_sso,      "Optionally enable SSO with OpenID-Connect Authentication",       :type => :boolean, :default => false
         opt :oidc_unconfig,        "Unconfigure Appliance OpenID-Connect Authentication",            :type => :boolean, :default => false
         opt :server,               "{start|stop|restart} actions on evmserverd Server",   :type => :string
+        opt :openscap,             "Setup OpenScap", :type => :boolean, :default => false
       end
       Optimist.die :region, "needed when setting up a local database" if region_number_required? && options[:region].nil?
       self
@@ -176,9 +184,10 @@ module ApplianceConsole
     def run
       Optimist.educate unless set_host? || key? || database? || tmp_disk? || log_disk? ||
                               uninstall_ipa? || install_ipa? || certs? || extauth_opts? ||
-                              set_server_state? || set_replication? ||
+                              set_server_state? || set_replication? || openscap? ||
                               saml_config? || saml_unconfig? ||
                               oidc_config? || oidc_unconfig?
+
       if set_host?
         system_hosts = LinuxAdmin::Hosts.new
         system_hosts.hostname = options[:host]
@@ -200,6 +209,7 @@ module ApplianceConsole
       oidc_config if oidc_config?
       oidc_unconfig if oidc_unconfig?
       set_server_state if set_server_state?
+      openscap if openscap?
     rescue CliError => e
       say(e.message)
       say("")
@@ -343,6 +353,11 @@ module ApplianceConsole
       config.deactivate if config.ipa_client_configured?
     end
 
+    def openscap
+      say("Configuring Openscap")
+      ManageIQ::ApplianceConsole::Scap.new(SCAP_RULES_DIR).lockdown
+    end
+
     def config_tmp_disk
       if (tmp_disk = disk_from_string(options[:tmpdisk]))
         say "creating temp disk"

data/lib/manageiq/appliance_console/scap.rb

@@ -13,7 +13,7 @@ module ApplianceConsole
         require 'yaml'
         scap_config = YAML.load_file(yaml_filename)
         begin
-          LinuxAdmin::Scap.new("rhel7").lockdown(*scap_config['rules'], scap_config['values'])
+          LinuxAdmin::Scap.new("rhel8").lockdown(*scap_config['rules'], scap_config['values'])
         rescue => e
           say("Configuration failed: #{e.message}")
         else
@@ -32,7 +32,7 @@ module ApplianceConsole
       if !LinuxAdmin::Scap.openscap_available?
         say("OpenSCAP has not been installed")
         false
-      elsif !LinuxAdmin::Scap.ssg_available?("rhel7")
+      elsif !LinuxAdmin::Scap.ssg_available?("rhel8")
         say("SCAP Security Guide has not been installed")
         false
       else

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '5.2.0'.freeze
+    VERSION = '5.3.0'.freeze
   end
 end

data/manageiq-appliance_console.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bcrypt",                  "~> 3.1.10"
   spec.add_runtime_dependency "highline",                "~> 1.6.21"
   spec.add_runtime_dependency "i18n",                    "~> 0.8"
-  spec.add_runtime_dependency "linux_admin",             ["~> 1.0", ">=1.2.4"]
+  spec.add_runtime_dependency "linux_admin",             "~> 2.0"
   spec.add_runtime_dependency "manageiq-password",       "~> 0.3"
   spec.add_runtime_dependency "optimist",                "~> 3.0"
   spec.add_runtime_dependency "pg"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,20 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: manageiq-password
   requirement: !ruby/object:Gem::Requirement