Skip to content
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.

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

Upstream Rails 5 no conflicts #4

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Upstream Rails 5 no conflicts #4

wants to merge 22 commits into from

Conversation

gryaznov
Copy link

No description provided.

Derrick Zhang and others added 22 commits June 16, 2016 14:15
Remove uuid gem in favor of SecureRandom
[Gems]/ruby-saml-idp-0.3.2/lib/saml_idp/controller.rb:54:in `inflate'
[Gems]/ruby-saml-idp-0.3.2/lib/saml_idp/controller.rb:54:in `decode_SAMLRequest'
[Gems]/ruby-saml-idp-0.3.2/lib/saml_idp/controller.rb:49:in `validate_saml_request'
TheInResponseTo is optional. If it's not specified we should not render it because it will fail schema validation.
I noticed this was missing while running an automated licensing audit for a project I'm working on that may use this gem.
Add optional session expiration information
The Controller makes reference to SecureRandom.uuid but the library is
never imported.
Copy link

@stevenjonescgm stevenjonescgm left a comment

Choose a reason for hiding this comment

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

This looks fine.

I was intending for https://github.com/RepairShopr/domo-auth/pull/7 to update domo-auth to use a Gemfile reference to a new branch on RepairShopr/ruby-saml-idp so that the fork could maintain parity with upstream without complicated merges on master branch
I did not intend https://github.com/RepairShopr/ruby-saml-idp/pull/3/files?diff=unified&w=1 to be merged into this branch, and was instead hoping to reset the master branch.

All that said, it's probably not worth working on the git branch management on this repository right now.

Strictly speaking, we also do not need to merge this branch and update https://github.com/RepairShopr/domo-auth/pull/7 to point to master branch#head or the specific merge commit. it should be fine for domo-auth to point at whatever specific commit on this branch that works for us

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants