Skip to content

Update saml_idp with better logic for matching_cert #5220

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

Update saml_idp with better logic for matching_cert #5220

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
0711cf6
Update saml_idp with better logic for matching_cert
zachmargolis Jul 19, 2021
5c65b92
use tag
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem 'rails', '~> 6.1.4'
@doc_auth_gem ||= { github: '18F/identity-doc-auth', tag: 'v0.11.0' }
@hostdata_gem ||= { github: '18F/identity-hostdata', tag: 'v3.3.0' }
@logging_gem ||= { github: '18F/identity-logging', tag: 'v0.1.0' }
@saml_gem ||= { github: '18F/saml_idp', tag: 'v0.14.2-18f' }
@saml_gem ||= { github: '18F/saml_idp', tag: 'v0.14.3-18f' }
@telephony_gem ||= { github: '18f/identity-telephony', tag: 'v0.3.0' }
@validations_gem ||= { github: '18F/identity-validations', tag: 'v0.6.0' }

Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ GIT

GIT
remote: https://github.com/18F/saml_idp.git
revision: 89d93da7b45cad7f01b5335f762f5f020d40765f
tag: v0.14.2-18f
revision: cf2ec293aa2c12e8679adfa7d6807a8d77814f4c
tag: v0.14.3-18f
specs:
saml_idp (0.14.2.pre.18f)
saml_idp (0.14.3.pre.18f)
activesupport
builder
faraday
Expand Down
5 changes: 1 addition & 4 deletions 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,11 +158,8 @@ 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
Copy link
Contributor Author

@zachmargolis zachmargolis Jul 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the .first was masking an issue where we couldn't find a matching cert, so we sent back a wrong cert... this may cause some nil errors in the specs, will see how it goes

Copy link
Contributor Author

@zachmargolis zachmargolis Jul 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good news, removing this didn't break the build so it didn't cause a regression that we know about


{
cert: cert,
cert: saml_request.service_provider.matching_cert,
block_encryption: current_service_provider&.block_encryption,
key_transport: 'rsa-oaep-mgf1p',
}
Expand Down