[v13] Allow for Windows PKI operations to target a different domain#31440
Closed
zmb3 wants to merge 4 commits intobranch/v13from
Closed
[v13] Allow for Windows PKI operations to target a different domain#31440zmb3 wants to merge 4 commits intobranch/v13from
zmb3 wants to merge 4 commits intobranch/v13from
Conversation
zmb3
force-pushed
the
zmb3/separate-pki-domain
branch
from
b8f036d to
05c6c73
Compare
ibeckermayer
reviewed
Sep 6, 2023
| <string>APPL</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>13.3.8</string> | ||
| <string>1.0</string> |
Contributor
There was a problem hiding this comment.
Not sure why this changed to 1.0 or if it matters (same for the other Info.plist file)
| # Pre-releases: "1.0.0-alpha.1", "1.0.0-beta.2", "1.0.0-rc.3" | ||
| # Master/dev branch: "1.0.0-dev" | ||
| VERSION=13.3.8 | ||
| VERSION=13.3.9-dev.pkidomain.1 |
Contributor
There was a problem hiding this comment.
Technically we're "add[ing] functionality in a backward compatible manner" which would be a MINOR change, though feel free to ignore if it just complicates things.
Comment on lines
+362
to
+364
| if s.cfg.PKIDomain != "" { | ||
| s.cfg.Log.Infof("Windows PKI will be performed against %v", s.cfg.PKIDomain) | ||
| caLDAPconfig.Domain = s.cfg.PKIDomain | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if s.cfg.PKIDomain != "" { | |
| s.cfg.Log.Infof("Windows PKI will be performed against %v", s.cfg.PKIDomain) | |
| caLDAPconfig.Domain = s.cfg.PKIDomain | |
| } | |
| if s.cfg.PKIDomain != "" { | |
| caLDAPconfig.Domain = s.cfg.PKIDomain | |
| } | |
| s.cfg.Log.Infof("Windows PKI will be performed against %v", caLDAPconfig.Domain) |
zmb3
force-pushed
the
zmb3/separate-pki-domain
branch
2 times, most recently
from
0dae389 to
dd9e159
Compare
Today, our AD support largely assumes there is a single active directory domain. The certificates that we generate are for users in this domain, the computers we discover via LDAP come from this domain, and the PKI set up we perform targets this domain. In more complicated AD configurations, PKI is often configured in a root domain, while users, servers, and discovery should be done against a child domain. The new pki_domain configuration field will allow you to override the default domain specified in the ldap section with a root domain that is used for configuring the NTAuth store and publishing the CRL. Teleport continues to do discovery and issue certificates for the domain specified in the ldap section of the config.
zmb3
force-pushed
the
zmb3/separate-pki-domain
branch
from
2e25110 to
1da41b8
Compare
Collaborator
Author
|
Opened #33218 against master now that we've proven this functionality out. |
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
2 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.
Today, our AD support largely assumes there is a single active directory domain. The certificates that we generate are for users in this domain, the computers we discover via LDAP come from this domain, and the PKI set up we perform targets this domain.
In more complicated AD configurations, PKI is often configured in a root domain, while users, servers, and discovery should be done against a child domain.
The new pki_domain configuration field will allow you to override the default domain specified in the ldap section with a root domain that is used for configuring the NTAuth store and publishing the CRL. Teleport continues to do discovery and issue certificates for the domain specified in the ldap section of the config.
Updates #20233
Note: targeting v13 to do a dev build