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

Merge upstream #15

Closed
wants to merge 5 commits into from
Closed

Merge upstream #15

wants to merge 5 commits into from

Conversation

orgads
Copy link

@orgads orgads commented Dec 25, 2022

Fixes critical vulnerability CVE-2022-41912.

@CLAassistant
Copy link

CLAassistant commented Dec 25, 2022

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 3 committers have signed the CLA.

✅ orgads
❌ crewjam
❌ davidv1992
You have signed the CLA already but the status is still pending? Let us recheck it.

@orgads
Copy link
Author

orgads commented Dec 25, 2022

@Jguer There were conflicts in service_provider.go. Please review this file carefully.

Regarding the CLA, I think it should not be applied to merged commits. Otherwise, you should have required all the authors of the original repository to sign it, right?

@orgads orgads changed the base branch from master to preview December 25, 2022 07:45
@Jguer
Copy link

Jguer commented Dec 27, 2022

Hi @orgads, this patch is already included in the main branch.

The preview branch is not used anymore. Thanks for taking the time to open the PR

@Jguer Jguer closed this Dec 27, 2022
@orgads orgads deleted the merge-upstream branch December 27, 2022 18:45
@orgads
Copy link
Author

orgads commented Dec 27, 2022

Well, grafana has this in go.mod, and this commit (61cd9c9) is from the preview branch:

// Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream
replace github.com/crewjam/saml => github.com/grafana/saml v0.4.9-0.20220727151557-61cd9c9353fc

So do you plan to update it?

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.

None yet

5 participants