Add latest changes from gitlab-org/gitlab@master

config/initializers_before_autoloader/100_patch_omniauth_saml.rb

@@ -5,6 +5,9 @@ require 'omniauth/strategies/saml'
 module OmniAuth
   module Strategies
     class SAML
+      # Store the original method
+      alias_method :original_callback_url, :callback_url
+
       # NOTE: This method duplicates code from omniauth-saml
       #       so that we can access authn_request to store it
       #       See: https://github.com/omniauth/omniauth-saml/issues/172
@@ -18,6 +21,13 @@ module OmniAuth
         end
       end
 
+      # NOTE: Overriding the callback_url method since in certain cases
+      #       IDP doesn't return the correct ACS URL for us to validate
+      #       See: https://gitlab.com/gitlab-org/gitlab/-/issues/491634
+      def callback_url
+        full_host + callback_path
+      end
+
       private
 
       def store_authn_request_id(authn_request)