Skip to content

[v6.2] backport #10741 (leaf cluster CA sanitizing)#10745

Merged
r0mant merged 5 commits intobranch/v6.2from
espadolini/v6.2-remotecluster-ca-sanitize
Mar 2, 2022
Merged

[v6.2] backport #10741 (leaf cluster CA sanitizing)#10745
r0mant merged 5 commits intobranch/v6.2from
espadolini/v6.2-remotecluster-ca-sanitize

Conversation

@espadolini
Copy link
Copy Markdown
Contributor

@espadolini espadolini commented Mar 2, 2022

Backport of #10741, with an extra check on the consistency of cluster names.

This also fixes an issue introduced in #10226 when backporting #9822 down to v6, as in v7 and v6 there's still an if/else if/else chain in events.FromOneOf that was removed in v8 and above.

@espadolini espadolini added security Security Issues trusted-cluster tctl tctl - Teleport admin tool backport labels Mar 2, 2022
@espadolini espadolini requested review from r0mant and zmb3 March 2, 2022 17:33
@github-actions github-actions Bot requested review from nklaassen and xacrimon March 2, 2022 17:33
@espadolini espadolini added the audit-log Issues related to Teleports Audit Log label Mar 2, 2022
@r0mant r0mant enabled auto-merge (squash) March 2, 2022 18:11
@r0mant r0mant merged commit 837718e into branch/v6.2 Mar 2, 2022
@r0mant r0mant deleted the espadolini/v6.2-remotecluster-ca-sanitize branch March 2, 2022 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

audit-log Issues related to Teleports Audit Log backport security Security Issues tctl tctl - Teleport admin tool trusted-cluster

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants