manageiq-appliance_console 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 321a59af1bedf7724c6a91de23b21d132f721cc368a514035ff04fc137fa4736
-  data.tar.gz: '04968551c5da4d87cc95696b4a608babc6f588b9eb14a3524b2d4791a20020ef'
+  metadata.gz: 4c51a1645cacd16b9f78f45db22f3a1ae65976639e4cf4b350fac41e3cb8e736
+  data.tar.gz: d8307195379d0abd4d7379aa02ec3d0a9a779845f801b537b62861c63153aed3
 SHA512:
-  metadata.gz: 157cd575271810d91800e6ca1b2e7c6ef4194d7ec7bc750a40f311c1917ed526a23d8488fe8785da70605765e844b0894e019f3558b1a7138ab1ce91c222a7c9
-  data.tar.gz: 85220ed73c634509697d25020b6f9023dd0f3c1524ec05d5bca79c9e27866b5b220c0d5f4be5b451682fcbe04ea2dd73965cebb009e34d07dd91a3e415d21940
+  metadata.gz: 703481bd2a07952b373444c4e1b2b7b65978341e2d6a9007ecbe66481a98b1b49122593149ce8b7b4109b7f148482e6281f090bae405112debd4c1a372bab4b2
+  data.tar.gz: 4a9b89883776c42b38861a371d657ffc4be786e9f109bc6a39c9c68b3df88ae4ccf701d4c0720b9dee95d28deada418ce8c2c21a25561760e6bbd3bd985791f5

data/lib/manageiq/appliance_console/database_admin.rb

@@ -102,21 +102,22 @@ module ManageIQ
           Example: 'amazon_aws_user'
         PROMPT
 
-        @uri         = ask_for_uri(*remote_file_prompt_args_for("s3"))
+        @filename    = just_ask(*filename_prompt_args) unless action == :restore
+        @uri         = ask_for_uri(*remote_file_prompt_args_for("s3"), :optional_path => true)
+        region       = just_ask("Amazon Region for database file", "us-east-1")
         user         = just_ask(access_key_prompt)
         pass         = ask_for_password("Secret Access Key for #{user}")
-        region       = just_ask("Amazon Region for database file", "us-east-1")
+
+        params = {
+          :uri          => uri,
+          :uri_username => user,
+          :uri_password => pass,
+          :aws_region   => region
+        }
+        params[:remote_file_name] = filename if filename
 
         @task        = "evm:db:#{action}:remote"
-        @task_params = [
-          "--",
-          {
-            :uri          => uri,
-            :uri_username => user,
-            :uri_password => pass,
-            :aws_region   => region
-          }
-        ]
+        @task_params = ["--", params]
       end
 
       def ask_to_delete_backup_after_restore

data/lib/manageiq/appliance_console/external_auth_options.rb

@@ -7,10 +7,10 @@ module ApplianceConsole
     AUTH_PATH = "/authentication".freeze
 
     EXT_AUTH_OPTIONS = {
-      "#{AUTH_PATH}/sso_enabled"          => {:label => "Single Sign-On", :logic  => true},
-      "#{AUTH_PATH}/saml_enabled"         => {:label => "SAML",           :logic  => true},
-      "#{AUTH_PATH}/oidc_enabled"         => {:label => "OIDC",           :logic  => true},
-      "#{AUTH_PATH}/local_login_disabled" => {:label => "Local Login",    :logic  => false}
+      "#{AUTH_PATH}/sso_enabled"          => {:label => "Single Sign-On",               :logic  => true},
+      "#{AUTH_PATH}/saml_enabled"         => {:label => "SAML",                         :logic  => true},
+      "#{AUTH_PATH}/oidc_enabled"         => {:label => "OIDC",                         :logic  => true},
+      "#{AUTH_PATH}/local_login_disabled" => {:label => "Local Login for SAML or OIDC", :logic  => false}
     }.freeze
 
     include ManageIQ::ApplianceConsole::Logging
@@ -100,6 +100,8 @@ module ApplianceConsole
         configure_oidc!(params)
       elsif params.include?("/authentication/oidc_enabled=false") || params.include?("/authentication/saml_enabled=false")
         configure_none!(params)
+      else
+        params
       end
     end
 

data/lib/manageiq/appliance_console/external_httpd_authentication/external_httpd_configuration.rb

@@ -8,28 +8,29 @@ module ApplianceConsole
       #
       # External Authentication Definitions
       #
-      IPA_COMMAND          = "/usr/bin/ipa".freeze
-      IPA_INSTALL_COMMAND  = "/usr/sbin/ipa-client-install".freeze
-      IPA_GETKEYTAB        = "/usr/sbin/ipa-getkeytab".freeze
-
-      KERBEROS_CONFIG_FILE = "/etc/krb5.conf".freeze
-
-      SSSD_CONFIG          = "/etc/sssd/sssd.conf".freeze
-      PAM_CONFIG           = "/etc/pam.d/httpd-auth".freeze
-      HTTP_KEYTAB          = "/etc/http.keytab".freeze
-      HTTP_REMOTE_USER     = "/etc/httpd/conf.d/manageiq-remote-user.conf".freeze
-      HTTP_EXTERNAL_AUTH   = "/etc/httpd/conf.d/manageiq-external-auth.conf".freeze
+      IPA_COMMAND           = "/usr/bin/ipa".freeze
+      IPA_INSTALL_COMMAND   = "/usr/sbin/ipa-client-install".freeze
+      IPA_GETKEYTAB         = "/usr/sbin/ipa-getkeytab".freeze
+
+      KERBEROS_CONFIG_FILE  = "/etc/krb5.conf".freeze
+
+      SSSD_CONFIG           = "/etc/sssd/sssd.conf".freeze
+      PAM_CONFIG            = "/etc/pam.d/httpd-auth".freeze
+      HTTP_KEYTAB           = "/etc/http.keytab".freeze
+      HTTP_REMOTE_USER      = "/etc/httpd/conf.d/manageiq-remote-user.conf".freeze
+      HTTP_REMOTE_USER_OIDC = "/etc/httpd/conf.d/manageiq-remote-user-openidc.conf".freeze
+      HTTP_EXTERNAL_AUTH    = "/etc/httpd/conf.d/manageiq-external-auth.conf".freeze
       HTTP_EXTERNAL_AUTH_TEMPLATE = "#{HTTP_EXTERNAL_AUTH}.erb".freeze
 
-      GETSEBOOL_COMMAND    = "/usr/sbin/getsebool".freeze
-      SETSEBOOL_COMMAND    = "/usr/sbin/setsebool".freeze
-      GETENFORCE_COMMAND   = "/usr/sbin/getenforce".freeze
+      GETSEBOOL_COMMAND     = "/usr/sbin/getsebool".freeze
+      SETSEBOOL_COMMAND     = "/usr/sbin/setsebool".freeze
+      GETENFORCE_COMMAND    = "/usr/sbin/getenforce".freeze
 
-      APACHE_USER          = "apache".freeze
+      APACHE_USER           = "apache".freeze
 
-      TIMESTAMP_FORMAT     = "%Y%m%d_%H%M%S".freeze
+      TIMESTAMP_FORMAT      = "%Y%m%d_%H%M%S".freeze
 
-      LDAP_ATTRS           = {
+      LDAP_ATTRS            = {
         "mail"        => "REMOTE_USER_EMAIL",
         "givenname"   => "REMOTE_USER_FIRSTNAME",
         "sn"          => "REMOTE_USER_LASTNAME",
@@ -219,7 +220,11 @@ module ApplianceConsole
     end
 
     def self.config_status
-      fetch_ipa_configuration("ipa_server") || fetch_sssd_domain || "not configured"
+      fetch_ipa_configuration("ipa_server") ||
+        fetch_sssd_domain                   ||
+        oidc_status                         ||
+        saml_status                         ||
+        "not configured"
     end
 
     def self.ipa_client_configured?
@@ -243,6 +248,14 @@ module ApplianceConsole
       config_file_read(SSSD_CONFIG)[/\[domain\/(.*)\]/, 1] if File.exist?(SSSD_CONFIG)
     end
 
+    def self.saml_status
+      "External Auth SAML" if File.exist?(HTTP_REMOTE_USER)
+    end
+
+    def self.oidc_status
+      "External Auth OpenID Connect" if File.exist?(HTTP_REMOTE_USER_OIDC)
+    end
+
     delegate :ipa_client_configured?, :config_file_read, :fetch_ipa_configuration, :config_status, :to => self
   end
 end

data/lib/manageiq/appliance_console/prompts.rb

@@ -25,7 +25,7 @@ module ApplianceConsole
       SAMPLE_URLS[scheme]
     end
 
-    def ask_for_uri(prompt, expected_scheme)
+    def ask_for_uri(prompt, expected_scheme, opts = {})
       require 'uri'
       just_ask(prompt, nil, nil, 'a valid URI') do |q|
         q.validate = lambda do |a|
@@ -36,14 +36,14 @@ module ApplianceConsole
           # validate it has a hostname/ip and a share
           u.scheme == expected_scheme &&
             (u.host =~ HOSTNAME_REGEXP || u.hostname =~ IP_REGEXP) &&
-            !u.path.empty?
+            (opts[:optional_path] || !u.path.empty?)
         end
       end
     end
 
     def press_any_key
       say("\nPress any key to continue.")
-      STDIN.noecho(&:getc)
+      STDIN.noecho(&:getch)
     end
 
     def clear_screen

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '3.1.0'.freeze
+    VERSION = '3.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord