diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd966ea1112..2739ebc2e1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -163,6 +163,17 @@ check_changelog: exit 0 fi +check_content_freeze: + stage: test + script: |- + echo "Content change is not allowed during content freeze" + exit 1 + rules: + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "external_pull_request_event" || $CI_PIPELINE_SOURCE == "web"' + changes: + compare_to: 'refs/heads/main' + paths: + - config/locales/**/en.yml specs: stage: test needs: diff --git a/app/forms/openid_connect_authorize_form.rb b/app/forms/openid_connect_authorize_form.rb index 9000ec7c518..6906ef1e049 100644 --- a/app/forms/openid_connect_authorize_form.rb +++ b/app/forms/openid_connect_authorize_form.rb @@ -17,15 +17,7 @@ class OpenidConnectAuthorizeForm state ].freeze - ATTRS = [ - :unauthorized_scope, - :acr_values, - :scope, - :verified_within, - :biometric_comparison_required, - *SIMPLE_ATTRS, - ].freeze - + ATTRS = [:unauthorized_scope, :acr_values, :scope, :verified_within, *SIMPLE_ATTRS].freeze AALS_BY_PRIORITY = [Saml::Idp::Constants::AAL2_HSPD12_AUTHN_CONTEXT_CLASSREF, Saml::Idp::Constants::AAL3_HSPD12_AUTHN_CONTEXT_CLASSREF, Saml::Idp::Constants::AAL2_PHISHING_RESISTANT_AUTHN_CONTEXT_CLASSREF, @@ -63,7 +55,6 @@ def initialize(params) @prompt ||= 'select_account' @scope = parse_to_values(params[:scope], scopes) @unauthorized_scope = check_for_unauthorized_scope(params) - @biometric_comparison_required = params[:biometric_comparison_required].to_s == 'true' if verified_within_allowed? @duration_parser = DurationParser.new(params[:verified_within]) @@ -139,10 +130,6 @@ def requested_aal_value :ial2_or_greater?, :ial2_requested? - def biometric_comparison_required? - @biometric_comparison_required - end - private attr_reader :identity, :success diff --git a/app/models/federated_protocols/oidc.rb b/app/models/federated_protocols/oidc.rb index 33b92251cf3..74b82e1697b 100644 --- a/app/models/federated_protocols/oidc.rb +++ b/app/models/federated_protocols/oidc.rb @@ -20,10 +20,6 @@ def requested_attributes OpenidConnectAttributeScoper.new(request.scope).requested_attributes end - def biometric_comparison_required? - request.biometric_comparison_required? - end - def service_provider request.service_provider end diff --git a/app/models/federated_protocols/saml.rb b/app/models/federated_protocols/saml.rb index ecc0dea6569..0840edfb97c 100644 --- a/app/models/federated_protocols/saml.rb +++ b/app/models/federated_protocols/saml.rb @@ -26,10 +26,6 @@ def service_provider current_service_provider end - def biometric_comparison_required? - false - end - private attr_reader :request diff --git a/app/models/service_provider_request.rb b/app/models/service_provider_request.rb index 06f39863ddf..ba4fe894ff1 100644 --- a/app/models/service_provider_request.rb +++ b/app/models/service_provider_request.rb @@ -2,8 +2,7 @@ class ServiceProviderRequest # WARNING - Modification of these params requires particular care # since these objects are serialized to/from Redis and may be present # upon deployment - attr_accessor :uuid, :issuer, :url, :ial, :aal, :requested_attributes, - :biometric_comparison_required + attr_accessor :uuid, :issuer, :url, :ial, :aal, :requested_attributes def initialize( uuid: nil, @@ -12,7 +11,7 @@ def initialize( ial: nil, aal: nil, requested_attributes: [], - biometric_comparison_required: false + biometric_comparison_required: false # rubocop:disable Lint/UnusedMethodArgument ) @uuid = uuid @issuer = issuer @@ -20,7 +19,6 @@ def initialize( @ial = ial @aal = aal @requested_attributes = requested_attributes&.map(&:to_s) - @biometric_comparison_required = biometric_comparison_required end def ==(other) diff --git a/app/services/service_provider_request_handler.rb b/app/services/service_provider_request_handler.rb index 089293b8f77..d23aecbf837 100644 --- a/app/services/service_provider_request_handler.rb +++ b/app/services/service_provider_request_handler.rb @@ -64,7 +64,6 @@ def attributes ial: protocol.ial, aal: protocol.aal, requested_attributes: protocol.requested_attributes, - biometric_comparison_required: protocol.biometric_comparison_required?, uuid: request_id, url: url, } diff --git a/app/services/service_provider_request_proxy.rb b/app/services/service_provider_request_proxy.rb index d39e615c085..0840f2ae695 100644 --- a/app/services/service_provider_request_proxy.rb +++ b/app/services/service_provider_request_proxy.rb @@ -33,8 +33,7 @@ def self.find_or_create_by(uuid:) return obj if obj spr = ServiceProviderRequest.new( uuid: uuid, issuer: nil, url: nil, ial: nil, - aal: nil, requested_attributes: nil, - biometric_comparison_required: false + aal: nil, requested_attributes: nil ) yield(spr) create( @@ -44,15 +43,12 @@ def self.find_or_create_by(uuid:) ial: spr.ial, aal: spr.aal, requested_attributes: spr.requested_attributes, - biometric_comparison_required: spr.biometric_comparison_required, ) end def self.create(hash) uuid = hash[:uuid] - obj = hash.slice( - :issuer, :url, :ial, :aal, :requested_attributes, :biometric_comparison_required - ) + obj = hash.slice(:issuer, :url, :ial, :aal, :requested_attributes) write(obj, uuid) hash_to_spr(obj, uuid) end diff --git a/app/services/store_sp_metadata_in_session.rb b/app/services/store_sp_metadata_in_session.rb index 13c052b2646..fc44045b9df 100644 --- a/app/services/store_sp_metadata_in_session.rb +++ b/app/services/store_sp_metadata_in_session.rb @@ -36,7 +36,6 @@ def update_session request_url: sp_request.url, request_id: sp_request.uuid, requested_attributes: sp_request.requested_attributes, - biometric_comparison_required: sp_request.biometric_comparison_required, } end diff --git a/app/views/pages/not_acceptable.html b/app/views/pages/not_acceptable.html index 781f84e1640..cdbf85fe2b6 100644 --- a/app/views/pages/not_acceptable.html +++ b/app/views/pages/not_acceptable.html @@ -9,7 +9,7 @@