[v18] Port circleci join method to new join service (#61130)
#61796
+357
−178
Conversation
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
* Port `circleci` join method to new join service This ports the `circleci` join method to the new join service. The `circleci` package has been moved to `lib/join` with minimal changes, and a small compatibility shim has been added to reuse the same verification logic between the legacy and new entrypoints. See also: [RFD 27e](https://github.com/gravitational/teleport.e/blob/master/rfd/0027e-auth-assigned-uuids.md) * Fix imports * Whitelist circleci in the new joinclient * SSRF-harden issuerURL and remove unnecessary clock * Remove unnecessary circleci validator wrapper funciton * Move redefined errMockInvalid to spacelift for now * Fix issuerURL plumbing for tests The change to remove template strings to harden against SSRF broke tests that depended on this functionality. This reintroduces a non-templated issuerURL, and leaves it to callers to call `IssuerURL()`. * Don't export issuerURL
timothyb89
added
the
no-changelog
timothyb89
changed the title
circleci join method to new join service (#61130)circleci join method to new join service (#61130)
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.
Backport of #61130 to branch/v18
Re-tested this branch against CircleCI:
circlecijoin method to new join serviceThis ports the
circlecijoin method to the new join service. Thecirclecipackage has been moved tolib/joinwith minimal changes, and a small compatibility shim has been added to reuse the same verification logic between the legacy and new entrypoints.See also: RFD 27e
Fix imports
Whitelist circleci in the new joinclient
SSRF-harden issuerURL and remove unnecessary clock
Remove unnecessary circleci validator wrapper funciton
Move redefined errMockInvalid to spacelift for now
Fix issuerURL plumbing for tests
The change to remove template strings to harden against SSRF broke tests that depended on this functionality. This reintroduces a non-templated issuerURL, and leaves it to callers to call
IssuerURL().