chore: merge master into 6.x - #612
Merged
Merged
Conversation
…t it needs a certificate (#610)
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Advanced Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brings the
6.xrelease branch up to date withmasterahead of 6.3.1.What comes in
docs: say that privateKey and publicCert are read for one key eachfix: read a signing publicCert given as bare base64, and document that it needs a certificatetest: cover the toPem() cases node-saml's suite has and ours did not#610 is the only source change. It affects signing only: when
publicCertholds no PEM certificate,getKeyInfoContentnow also publishes the value if it is the bare base64 of exactly one certificate. Verification is unchanged. Nothing that signs today now throws, so this is a patch release.Result
The merge had no conflicts. The merged tree is identical to
masterexcept for the release files6.xkeeps for itself:CHANGELOG.md,.grenrc.js, andpackage.json/package-lock.json.The version stays at
6.3.0. The bump goes in its ownRelease 6.3.1commit after this merge.npm run build,npm test(450 passing), andnpm run lintall pass on the merged tree.🤖 Generated with Claude Code