Commit 722dca57 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'jej/e2e-saml-qa-allows-configurable-fingerprint' into 'master'

Configurable SAML fingerprint in e2e tests

See merge request gitlab-org/gitlab!18387
parents e62f7651 5badf57f
...@@ -16,6 +16,10 @@ module QA ...@@ -16,6 +16,10 @@ module QA
def simple_saml_hostname def simple_saml_hostname
ENV['SIMPLE_SAML_HOSTNAME'] ENV['SIMPLE_SAML_HOSTNAME']
end end
def simple_saml_fingerprint
ENV['SIMPLE_SAML_FINGERPRINT']
end
end end
end end
end end
......
...@@ -3,12 +3,25 @@ module QA ...@@ -3,12 +3,25 @@ module QA
module EE module EE
module Runtime module Runtime
module Saml module Saml
def self.idp_base_url
host = QA::Runtime::Env.simple_saml_hostname || 'localhost'
"https://#{host}:8443/simplesaml/saml2/idp"
end
def self.idp_sso_url def self.idp_sso_url
"https://#{QA::Runtime::Env.simple_saml_hostname || 'localhost'}:8443/simplesaml/saml2/idp/SSOService.php" "#{idp_base_url}/SSOService.php"
end
def self.idp_metadata_url
"#{idp_base_url}/metadata.php"
end
def self.idp_issuer
idp_metadata_url
end end
def self.idp_certificate_fingerprint def self.idp_certificate_fingerprint
'119b9e027959cdb7c662cfd075d9e2ef384e445f' QA::Runtime::Env.simple_saml_fingerprint || '119b9e027959cdb7c662cfd075d9e2ef384e445f'
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment