Skip to content

Bring back a default cert, to fix NoMethodErrors on nil #5224

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
zachmargolis merged 2 commits into from
Jul 21, 2021
Merged

Bring back a default cert, to fix NoMethodErrors on nil #5224

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
62a86b4
Bring back a default cert, to fix NoMethodErrors on nil
zachmargolis Jul 21, 2021
413c37e
Add regression spec for NoMethodError
zachmargolis Jul 21, 2021
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
4 changes: 3 additions & 1 deletion app/controllers/concerns/saml_idp_auth_concern.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,10 @@ def encryption_opts
if query_params[:skip_encryption].present? && current_service_provider&.skip_encryption_allowed
nil
elsif current_service_provider&.encrypt_responses?
cert = saml_request.service_provider.matching_cert ||
current_service_provider&.ssl_certs&.first
{
cert: saml_request.service_provider.matching_cert,
cert: cert,
block_encryption: current_service_provider&.block_encryption,
key_transport: 'rsa-oaep-mgf1p',
}
Expand Down
36 changes: 26 additions & 10 deletions spec/controllers/saml_idp_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,16 @@ def name_id_version(format_urn)
end
end

let(:second_cert_settings) do
saml_settings.tap do |settings|
settings.issuer = service_provider.issuer
settings.certificate = File.read(Rails.root.join('certs', 'sp', 'saml_test_sp2.crt'))
settings.private_key = OpenSSL::PKey::RSA.new(
File.read(Rails.root + 'keys/saml_test_sp2.key'),
).to_pem
end
end

context 'service provider has multiple certs' do
let(:service_provider) do
create(
Expand All @@ -445,16 +455,6 @@ def name_id_version(format_urn)
end
end

let(:second_cert_settings) do
saml_settings.tap do |settings|
settings.issuer = service_provider.issuer
settings.certificate = File.read(Rails.root.join('certs', 'sp', 'saml_test_sp2.crt'))
settings.private_key = OpenSSL::PKey::RSA.new(
File.read(Rails.root + 'keys/saml_test_sp2.key'),
).to_pem
end
end

it 'encrypts the response to the right key' do
user = create(:user, :signed_up)
generate_saml_response(user, second_cert_settings)
Expand All @@ -468,6 +468,22 @@ def name_id_version(format_urn)
end
end

context 'service provider has the wrong certs' do
let(:service_provider) do
create(
:service_provider,
certs: ['saml_test_sp'],
active: true,
)
end

it 'deoes not blow up' do
user = create(:user, :signed_up)

expect { generate_saml_response(user, second_cert_settings) }.to_not raise_error
end
end

context 'POST to auth correctly stores SP in session' do
before do
@user = create(:user, :signed_up)
Expand Down