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

Fixes a SharedDirectoryAnnounce incompatibility #25931

Merged
merged 4 commits into from May 10, 2023

Conversation

ibeckermayer
Copy link
Contributor

@ibeckermayer ibeckermayer commented May 9, 2023

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

closes #25939

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
@ibeckermayer ibeckermayer requested a review from zmb3 May 9, 2023 16:54
lib/srv/desktop/tdp/proto.go Outdated Show resolved Hide resolved
@public-teleport-github-review-bot public-teleport-github-review-bot bot removed the request for review from kimlisa May 10, 2023 12:58
@ibeckermayer ibeckermayer added this pull request to the merge queue May 10, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 10, 2023
@ibeckermayer ibeckermayer added this pull request to the merge queue May 10, 2023
Merged via the queue into master with commit e42b072 May 10, 2023
27 checks passed
@ibeckermayer ibeckermayer deleted the isaiah/fix-sda-incompatibility branch May 10, 2023 20:57
@public-teleport-github-review-bot

@ibeckermayer See the table below for backport results.

Branch Result
branch/v10 Create PR
branch/v11 Create PR
branch/v12 Failed
branch/v13 Create PR

@zmb3
Copy link
Collaborator

zmb3 commented May 11, 2023

Interesting that v12 backport failed, I wonder what's different about v12.

ibeckermayer added a commit that referenced this pull request May 11, 2023
* 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
ibeckermayer added a commit that referenced this pull request May 11, 2023
* 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
ibeckermayer added a commit that referenced this pull request May 16, 2023
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Directory sharing broken for Teleport v12.2.5, v12.3.0 - v12.3.3, and v13.0.0 (windows_desktop_service)
3 participants