Skip to content

[v12] Fixes a SharedDirectoryAnnounce incompatibility#26091

Merged
ibeckermayer merged 2 commits intobranch/v12from
isaiah/backport-25931-branch/v12
May 16, 2023
Merged

[v12] Fixes a SharedDirectoryAnnounce incompatibility#26091
ibeckermayer merged 2 commits intobranch/v12from
isaiah/backport-25931-branch/v12

Conversation

@ibeckermayer
Copy link
Copy Markdown
Contributor

Backport #25931 to branch/v12

* Fixes a SharedDirectoryAnnounce incompatibility

The SharedDirectoryAnnounce message was changed to remove an unnecessary
completionID field, however this change caused an incompatibility between
the proxy and previous versions of the wds. This commit reverts that specific
change and adds notes to the code explaining the situation.

The original change is here: https://github.com/gravitational/teleport/pull/25260/files#diff-98a4bee57beb7f007614e4810d2cf8413bddf48484c8aad6dd0756a218797c36R677-R678

* changes completionId to discard

* adds discard bit to sda.Encode to make fuzz tests happy
@github-actions github-actions Bot added application-access audit-log Issues related to Teleports Audit Log bpf Used to bugs with bpf and enhanced session recording. database-access Database access related issues and PRs desktop-access discovery documentation helm kubernetes-access machine-id rdp rfd Request for Discussion size/xl tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ui labels May 11, 2023
@github-actions github-actions Bot requested a review from xinding33 May 11, 2023 17:42
@public-teleport-github-review-bot
Copy link
Copy Markdown

@ibeckermayer - this PR will require admin approval to merge due to its size. Consider breaking it up into a series smaller changes.

@codingllama
Copy link
Copy Markdown
Contributor

Targeting the wrong branch?

@ibeckermayer ibeckermayer changed the base branch from master to branch/v12 May 11, 2023 17:55
@ibeckermayer
Copy link
Copy Markdown
Contributor Author

Targeting the wrong branch?

Indeed

@ibeckermayer ibeckermayer enabled auto-merge May 11, 2023 17:57
@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from kimlisa May 11, 2023 18:23
@ibeckermayer ibeckermayer added this pull request to the merge queue May 16, 2023
Merged via the queue into branch/v12 with commit 7e6f338 May 16, 2023
@ibeckermayer ibeckermayer deleted the isaiah/backport-25931-branch/v12 branch May 16, 2023 20:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

application-access audit-log Issues related to Teleports Audit Log bpf Used to bugs with bpf and enhanced session recording. database-access Database access related issues and PRs desktop-access discovery documentation helm kubernetes-access machine-id rdp rfd Request for Discussion size/xl tctl tctl - Teleport admin tool tsh tsh - Teleport's command line tool for logging into nodes running Teleport. ui

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants