Move API OpenID-Connect support to Apache configuration

Fixes ManageIQ#19866
jvlcek · May 6, 2020 · a6feb2c · a6feb2c
1 parent 927b99f
commit a6feb2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 181 deletions.
diff --git a/app/models/authenticator/httpd.rb b/app/models/authenticator/httpd.rb
@@ -1,7 +1,5 @@
 module Authenticator
   class Httpd < Base
-    include Oauth2
-
     def self.proper_name
       'External httpd'
     end
@@ -27,19 +25,9 @@ def user_authorizable_without_authentication?
       true
     end
 
-    def _authenticate(username, password, request)
-      return false if request.blank?
-      return true if request.headers['X-REMOTE-USER'].present? # Provided by Apache auth modules
-
-      if oidc_configured?
-        if username.present?
-          oauth2_basic_authenticate(username, password, request)
-        else
-          oauth2_token_authenticate(request)
-        end
-      end
-
-      request.headers['X-REMOTE-USER'].present?
+    def _authenticate(_username, _password, request)
+      request.present? &&
+        request.headers['X-REMOTE-USER'].present?
     end
 
     def failure_reason(_username, request)

diff --git a/app/models/authenticator/httpd/oauth2.rb b/app/models/authenticator/httpd/oauth2.rb