Skip to content

LG-12265: Stop reading from sp_session[:piv_cac_requested] #10153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solipet merged 2 commits into from
Feb 23, 2024
Merged

LG-12265: Stop reading from sp_session[:piv_cac_requested] #10153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e89140
LG-12265: Stop reading from sp_session[:piv_cac_requested]
solipet Feb 23, 2024
35df66c
Remove misspelled and unnecessary property in sp_session
solipet Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ def service_provider_mfa_policy
service_provider: sp_from_sp_session,
auth_methods_session:,
aal_level_requested: sp_session[:aal_level_requested],
piv_cac_requested: sp_session[:piv_cac_requested],
piv_cac_requested: resolved_authn_context_result.hspd12?,
phishing_resistant_requested: resolved_authn_context_result.phishing_resistant?,
)
end
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users/piv_cac_login_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def piv_cac_login_form
@piv_cac_login_form ||= UserPivCacLoginForm.new(
token: params[:token],
nonce: piv_cac_nonce,
piv_cac_required: sp_session[:piv_cac_requested],
piv_cac_required: resolved_authn_context_result.hspd12?,
)
end

Expand Down
2 changes: 1 addition & 1 deletion app/services/vot/legacy_component_values.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ module LegacyComponentValues
)
AAL2_PHISHING_RESISTANT = ComponentValue.new(
name: Saml::Idp::Constants::AAL2_PHISHING_RESISTANT_AUTHN_CONTEXT_CLASSREF,
description: 'Legacy AAL2 with phishing resitance',
description: 'Legacy AAL2 with phishing resistance',
implied_component_values: [],
requirements: [:aal2, :phishing_resistant],
)
Expand Down
7 changes: 6 additions & 1 deletion spec/controllers/users/two_factor_authentication_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,14 @@ def index
end

context 'when SP requires PIV/CAC' do
let(:service_provider) { create(:service_provider) }

before do
stub_sign_in(user)
controller.session[:sp] = { phishing_resistant_requeste: true, piv_cac_requested: true }
controller.session[:sp] = {
issuer: service_provider.issuer,
acr_values: Saml::Idp::Constants::AAL2_HSPD12_AUTHN_CONTEXT_CLASSREF,
}
end

it 'redirects to MFA setup if no PIV/CAC is enabled' do
Expand Down