From 9a9bcee340848ce65f5d0bbd2d06b1fb3fbe54e6 Mon Sep 17 00:00:00 2001
From: Aboobacker MK <akarakath@gitlab.com>
Date: Tue, 12 Sep 2023 19:10:15 +0000
Subject: [PATCH] Support max_byte_size settings for instance SAML
We had saml_message_max_byte_size settings which was only applicable for
group SAML. This MR enables the instance same config to configure
maximum message size
Changelog: fixed
---
config/initializers/1_settings.rb | 4 ++++
scripts/setup-test-env | 1 +
2 files changed, 5 insertions(+)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index c87d54b9bd481..6657b4faceb59 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -160,6 +160,10 @@
end
end
+# Fill out default Settings for omniauth-saml
+
+OmniAuth::Strategies::SAML.default_options['message_max_bytesize'] = Settings.omniauth['saml_message_max_byte_size']
+
# SAML should be enabled for the tests automatically, but only for EE.
saml_provider_enabled = Settings.omniauth.providers.any? do |provider|
provider['name'] == 'group_saml'
diff --git a/scripts/setup-test-env b/scripts/setup-test-env
index 50bec46b71acd..a9d1be7a0cee1 100755
--- a/scripts/setup-test-env
+++ b/scripts/setup-test-env
@@ -24,6 +24,7 @@ require_relative '../lib/system_check/helpers'
# Required for config/initializers/1_settings.rb
require 'omniauth'
require 'omniauth-github'
+require 'omniauth-saml'
require 'etc'
require 'gitlab/utils/all'
require 'gitlab/safe_request_store'
--
GitLab