Add support for UPN SANs #333
Merged
Conversation
This file contains 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
This PR adds a new type otherName SAN UPN with OID 1.3.6.1.4.1.311.20.2.3. This change also allows the use of the HardwareModuleName and DirectoryName SANs in the template. The previous version only allowed the use of those using code.
hslatman
reviewed
Oct 6, 2023
x509util/extensions.go
Outdated
| @@ -66,6 +66,7 @@ const ( | |||
| RegisteredIDType = "registeredID" | |||
| PermanentIdentifierType = "permanentIdentifier" | |||
| HardwareModuleNameType = "hardwareModuleName" | |||
| UPNType = "upn" | |||
There was a problem hiding this comment.
Would propose to use UserPrincipalNameType internally instead of UPNType, but ain't blocking this from being used. There are others acronyms, like DNSType, but those are generally more well known.
Besides that, maybe it should be "userPrincipalName" as the JSON property? That's more in line with the rest of the properties. Curious if it would be possible to use two names for the same, like an alias?
x509util/extensions.go
Outdated
| @@ -389,6 +412,22 @@ func (s SubjectAlternativeName) RawValue() (asn1.RawValue, error) { | |||
| IsCompound: true, | |||
| Bytes: rdn, | |||
| }, nil | |||
| case UPNType: | |||
| if s.Value == "" { | |||
| return zero, errors.New("error parsing UserPrincipalName SAN: empty Value is not allowed") | |||
There was a problem hiding this comment.
Minor, but I think more consistent with the error message below
Suggested change
| return zero, errors.New("error parsing UserPrincipalName SAN: empty Value is not allowed") | |
| return zero, errors.New("error parsing UserPrincipalName SAN: empty value is not allowed") |
x509util/extensions.go
Outdated
| Value: asn1.RawValue{FullBytes: rawBytes}, | ||
| }, "tag:0") | ||
| if err != nil { | ||
| return zero, errors.Wrap(err, "unable to Marshal UserPrincipalName SAN") |
There was a problem hiding this comment.
In line with other (un)marshaling errors:
Suggested change
| return zero, errors.Wrap(err, "unable to Marshal UserPrincipalName SAN") | |
| return zero, errors.Wrap(err, "error marshaling UserPrincipalName SAN") |
hslatman
approved these changes
Oct 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
This PR adds a new type otherName SAN UPN with OID 1.3.6.1.4.1.311.20.2.3. This change also allows the use of the HardwareModuleName and DirectoryName SANs in the template. The previous version only allowed the use of those using code.