manageiq-appliance_console 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d64670c30bb37f4487aefa66bc59a4cf610650416157fe04efbe9400e96ba98
-  data.tar.gz: 89a871ff8bdbb6b5a44df5e1a733527534f41bd45200138fa939b5bb9091592d
+  metadata.gz: cbde93f7bdbda18b731e479d91b349495b2cc47960c066179032c62c6e0dc107
+  data.tar.gz: 598f33a8a57bb83d3ec9189ef4cbf41ecb9057b9e1547c961971d7b2aa91b4bb
 SHA512:
-  metadata.gz: 381c19281a65a2617e269cac0fbe16bb0e2dc75d6f58a2439550e14f2bb4b56d47cc676491c0ce1f89f15891bed6e57199b66fa14fc3a5b9f2653a8d2c7bd068
-  data.tar.gz: 4a649d02282f5301b2aa6452455037cc35121d75e7888a5613508b7009578d6c398f9953ea7e210230626b4049d7db347c5bafedcf2dc66976b4207a34bf1778
+  metadata.gz: 92f7be3e27e20d6d510ce97581386538353368beefa6b95384e633259ac1be1586c050fe209fa1e32821cbd738ea6c51ddbd90bf46a91637887b9ab7cb69cd57
+  data.tar.gz: 7eae83f6bb97a3a565674cb3b07e0d1a55694ed2e035691905f764ca417d836da08a1650cf059fe37ebab2942f89616a522a47748239b4abe7c3fcccd1853e2b

data/lib/manageiq/appliance_console/cli.rb

@@ -169,6 +169,7 @@ module ApplianceConsole
         opt :oidc_client_host,     "Optional Appliance host used for OpenID-Connect Authentication", :type => :string
         opt :oidc_client_id,       "The OpenID-Connect Provider Client ID",                          :type => :string
         opt :oidc_client_secret,   "The OpenID-Connect Provider Client Secret",                      :type => :string
+        opt :oidc_introspection_endpoint, "The OpenID-Connect Provider Introspect Endpoint",         :type => :string
         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

data/lib/manageiq/appliance_console/oidc_authentication.rb

@@ -5,6 +5,10 @@ module ManageIQ
 
       attr_accessor :host, :options
 
+      URL_SUFFIX = /\/\.well-known\/openid-configuration$/.freeze
+      INTROSPECT_SUFFIX = "/protocol/openid-connect/token/introspect".freeze
+      INTROSPECT_ENDPOINT_ERROR = "Unable to derive the OpenID-Connect Client Introspection Endpoint. Use --oidc-introspection-endpoint".freeze
+
       def initialize(options)
         @options = options
       end
@@ -12,6 +16,7 @@ module ManageIQ
       def configure(host)
         @host = host
         validate_oidc_options
+        derive_introspection_endpoint
 
         say("Configuring OpenID-Connect Authentication for https://#{host} ...")
         copy_apache_oidc_configfiles
@@ -52,10 +57,11 @@ module ManageIQ
         debug_msg("Copying Apache OpenID-Connect Config files ...")
         copy_template(HTTPD_CONFIG_DIRECTORY, "manageiq-remote-user-openidc.conf")
         copy_template(HTTPD_CONFIG_DIRECTORY, "manageiq-external-auth-openidc.conf.erb",
-                      :miq_appliance              => host,
-                      :oidc_provider_metadata_url => options[:oidc_url],
-                      :oidc_client_id             => options[:oidc_client_id],
-                      :oidc_client_secret         => options[:oidc_client_secret])
+                      :miq_appliance               => host,
+                      :oidc_provider_metadata_url  => options[:oidc_url],
+                      :oidc_client_id              => options[:oidc_client_id],
+                      :oidc_client_secret          => options[:oidc_client_secret],
+                      :oidc_introspection_endpoint => options[:oidc_introspection_endpoint])
       end
 
       def remove_apache_oidc_configfiles
@@ -76,6 +82,13 @@ module ManageIQ
         raise "Must specify the OpenID-Connect Client Secret via --oidc-client-secret" if options[:oidc_client_secret].blank?
       end
 
+      def derive_introspection_endpoint
+        return if options[:oidc_introspection_endpoint].present?
+
+        options[:oidc_introspection_endpoint] = options[:oidc_url].sub(URL_SUFFIX, INTROSPECT_SUFFIX) if options[:oidc_url].match(URL_SUFFIX)
+        raise INTROSPECT_ENDPOINT_ERROR if options[:oidc_introspection_endpoint].blank?
+      end
+
       # Appliance Settings
 
       def configure_auth_settings_oidc

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '5.4.0'.freeze
+    VERSION = '5.5.0'.freeze
   end
 end

data/locales/appliance/en.yml

@@ -28,7 +28,7 @@ en:
     app_config: Configure Application
     db_replication: Configure Database Replication
     log_config: Logfile Configuration
-    failover_monitor: Configure Application Database Failover Monitor
+    failover_monitor: Control Application Database Failover Monitor
     httpdauth: Configure External Authentication (httpd)
     extauth_opts: Update External Authentication Options
     evmstop: Stop EVM Server Processes

data/locales/container/en.yml

@@ -17,7 +17,7 @@ en:
     dbrestore: Restore Database From Backup
     app_config: Configure Application
     db_replication: Configure Database Replication
-    failover_monitor: Configure Application Database Failover Monitor
+    failover_monitor: Control Application Database Failover Monitor
     evmstop: Stop EVM Server Processes
     key_gen: Generate Custom Encryption Key
     evmstart: Start EVM Server Processes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord