Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/services/saml_request_validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def registered_cert_exists
# if there is no service provider, this error has already been added
return if service_provider.blank?
return if service_provider.certs.present?
return unless service_provider.encrypt_responses?

errors.add(
:service_provider, :no_cert_registered,
Expand Down
21 changes: 21 additions & 0 deletions spec/controllers/saml_idp_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1365,6 +1365,27 @@ def name_id_version(format_urn)
),
)
end

context 'when service provider has block_encryption set to none' do
before do
service_provider.update!(block_encryption: 'none')
end

it 'is succesful' do
user = create(:user, :fully_registered)
stub_analytics

generate_saml_response(user, settings)

expect(response.body).to_not include(t('errors.messages.no_cert_registered'))
expect(@analytics).to have_logged_event(
'SAML Auth',
hash_including(
success: true,
),
)
end
end
end

context 'service provider has multiple certs' do
Expand Down
46 changes: 30 additions & 16 deletions spec/services/saml_request_validator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,38 @@

context 'when the sp has no certs registered' do
before { sp.update!(certs: nil) }
let(:errors) do
{
service_provider: [t('errors.messages.no_cert_registered')],
}
end
let(:error_details) do
{
service_provider: {
no_cert_registered: true,
},
}

context 'when it has block_encryption turned on' do
before { sp.update!(block_encryption: 'aes256-cbc') }
let(:errors) do
{
service_provider: [t('errors.messages.no_cert_registered')],
}
end
let(:error_details) do
{
service_provider: {
no_cert_registered: true,
},
}
end

it 'returns an error' do
expect(response.to_h).to include(
errors:,
error_details:,
)
end
end

it 'returns an error' do
expect(response.to_h).to include(
errors:,
error_details:,
)
context 'when block encryption is not turned on' do
it 'is valid' do
expect(response.to_h).to include(
success: true,
errors: {},
**extra,
)
end
end
end

Expand Down