-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
[v9] Backport #12530, #12531, #12405, #12615, and #12684 #14012
[v9] Backport #12530, #12531, #12405, #12615, and #12684 #14012
Conversation
…for handling them (#12531)
Co-authored-by: Zac Bergquist <zmb3@users.noreply.github.com>
Hmmm, I'm not sure I want to backport all of this to v9. I'm especially concerned about putting the new role options in v9. I agree that some of the more fundamental changes can be included if it makes backports easier for non-directory sharing features. I just wonder if there's a way to do this without pulling in everything. |
My thinking was that the new role was fine to include -- it will just take the default value ( teleport/lib/srv/desktop/windows_server.go Line 842 in b6fb176
which is still modulated by the directory_sharing build flag (represented by && allowDirectorySharing() ). But I'm not an expert on our RBAC system and could be overlooking some problem.
This is essentially a lazy "kitchen sink" approach, just put all of our changes in v9 and rely on the build flag to protect us, rather than trying to pick out which ones will be structurally important one by one as they come in. That said, the RBAC changes fall outside of the possibility of causing "fundamental changes to how the rdp client works", and I don't see that changing in the near future. So what if I just remove #12684? |
@zmb3 and I chatted in Slack and agree that the "kitchen sink" approach referenced in this comment is actually the right way to go. PTAL when you have a moment @probakowski @LKozlowski @xacrimon. |
@ibeckermayer - this PR is large and will require admin approval to merge. Consider breaking it up into a series smaller changes. |
@ibeckermayer - this PR is large and will require admin approval to merge. Consider breaking it up into a series smaller changes. |
@ibeckermayer - this PR is large and will require admin approval to merge. Consider breaking it up into a series smaller changes. |
@ibeckermayer - this PR is large and will require admin approval to merge. Consider breaking it up into a series smaller changes. |
@ibeckermayer - this PR is large and will require admin approval to merge. Consider breaking it up into a series smaller changes. |
Backport #12530, #12531, #12405, #12615, and #12684 to branch/v9
This catches
branch/v9
up with all of the backports necessary to make it on par withbranch/v10
in terms of directory sharing changes.Initially I wasn't planning to backport directory sharing stuff to
branch/v9
, however I've later come to realize that directory sharing development is making certain fundamental changes to how the rdp client works inmaster
/branch/v10
, which is making backporting tobranch/v9
a lot more fragile and in need of manual assistance (e.g. #13391, #13590). Because the feature is safely hidden behind a build flag, I figure its not harm in just keeping v9 up to date with directory sharing changes while we're still supporting it. That way, as we come up with non-directory-sharing improvements that nevertheless interact with these fundamental changes, we can still updatebranch/v9
with them with relative ease.