Include AD/non-AD status in certificate#44549
Merged
probakowski merged 7 commits intomasterfrom Mar 7, 2025
Merged
Conversation
zmb3
reviewed
Feb 25, 2025
Comment on lines
+1328
to
+1329
| // ad is true if we're connection to AD-joined desktop | ||
| ad bool |
Collaborator
There was a problem hiding this comment.
Do we need an extra field, or can we tell based on domain being empty?
Contributor
Author
There was a problem hiding this comment.
If we have domain configured for WDS it will be present for both AD and non-AD hosts (at least in case of static hosts from config), so we'd either have to change that or add new field. New field is cleaner in my opinion
Collaborator
There was a problem hiding this comment.
desktop.GetDomain() would return the empty string, even if WDS is configured for AD, right? (Because if you set ad: false in static_hosts then we won't set the domain.
Doesn't really matter though.
Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com>
Co-authored-by: Edward Dowling <EdwardDowling@users.noreply.github.com>
zmb3
approved these changes
Mar 6, 2025
russjones
approved these changes
Mar 7, 2025
probakowski
added a commit
that referenced
this pull request
Mar 19, 2025
* ad/non-ad * use separate OID for AD status * Update lib/auth/windows/windows.go Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> * Update lib/srv/desktop/windows_server.go Co-authored-by: Edward Dowling <EdwardDowling@users.noreply.github.com> --------- Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> Co-authored-by: Edward Dowling <EdwardDowling@users.noreply.github.com>
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Mar 20, 2025
* ad/non-ad * use separate OID for AD status * Update lib/auth/windows/windows.go * Update lib/srv/desktop/windows_server.go --------- Co-authored-by: Zac Bergquist <zac.bergquist@goteleport.com> Co-authored-by: Edward Dowling <EdwardDowling@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This change adds extension to the certificate to signify AD login so it can be checked in auth package.
changelog: Allow AD and non-AD logins to single Windows desktop