Skip to content

Commit b724aa2

Browse files
marainomaraino
committed
Rename UPNType with UserPrincipalNameType
1 parent d04d926 commit b724aa2

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎x509util/certificate_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ func TestNewCertificateTemplate(t *testing.T) {
306306
(dict "type" "dn" "value" ` + "`" + `{"country":"US","organization":"ACME","commonName":"rocket"}` + "`" + `)
307307
(dict "type" "permanentIdentifier" "value" .Token.pi)
308308
(dict "type" "hardwareModuleName" "value" .Insecure.User.hmn)
309-
(dict "type" "upn" "value" .Token.upn)
309+
(dict "type" "userPrincipalName" "value" .Token.upn)
310310
(dict "type" "1.2.3.4" "value" (printf "int:%s" .Insecure.User.id))
311311
) | toJson }},
312312
{{- if typeIs "*rsa.PublicKey" .Insecure.CR.PublicKey }}
@@ -363,7 +363,7 @@ func TestNewCertificateTemplate(t *testing.T) {
363363
{Type: DirectoryNameType, ASN1Value: []byte(`{"country":"US","organization":"ACME","commonName":"rocket"}`)},
364364
{Type: PermanentIdentifierType, Value: "0123456789"},
365365
{Type: HardwareModuleNameType, ASN1Value: []byte(`{"type":"1.2.3.1", "serialNumber": "MTIzNDU2"}`)},
366-
{Type: UPNType, Value: "foo@upn.com"},
366+
{Type: UserPrincipalNameType, Value: "foo@upn.com"},
367367
{Type: "1.2.3.4", Value: "int:123456"},
368368
} {
369369
rawValue, err := san.RawValue()

‎x509util/extensions.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const (
6666
RegisteredIDType = "registeredID"
6767
PermanentIdentifierType = "permanentIdentifier"
6868
HardwareModuleNameType = "hardwareModuleName"
69-
UPNType = "upn"
69+
UserPrincipalNameType = "userPrincipalName"
7070
)
7171

7272
//nolint:deadcode // ignore
@@ -374,7 +374,7 @@ func (s SubjectAlternativeName) RawValue() (asn1.RawValue, error) {
374374
case s.Value != "":
375375
data = []byte(s.Value)
376376
default:
377-
return zero, errors.New("error parsing HardwareModuleName SAN: empty asn1Value is not allowed")
377+
return zero, errors.New("error parsing HardwareModuleName SAN: empty value or asn1Value is not allowed")
378378
}
379379
var v HardwareModuleName
380380
if err := json.Unmarshal(data, &v); err != nil {
@@ -393,7 +393,7 @@ func (s SubjectAlternativeName) RawValue() (asn1.RawValue, error) {
393393
case s.Value != "":
394394
data = []byte(s.Value)
395395
default:
396-
return zero, errors.New("error parsing DirectoryName SAN: empty asn1Value is not allowed")
396+
return zero, errors.New("error parsing DirectoryName SAN: empty value or asn1Value is not allowed")
397397
}
398398
var dn Name
399399
if err := json.Unmarshal(data, &dn); err != nil {
@@ -412,9 +412,9 @@ func (s SubjectAlternativeName) RawValue() (asn1.RawValue, error) {
412412
IsCompound: true,
413413
Bytes: rdn,
414414
}, nil
415-
case UPNType:
415+
case UserPrincipalNameType:
416416
if s.Value == "" {
417-
return zero, errors.New("error parsing UserPrincipalName SAN: empty Value is not allowed")
417+
return zero, errors.New("error parsing UserPrincipalName SAN: empty value is not allowed")
418418
}
419419
rawBytes, err := marshalExplicitValue(s.Value, "utf8")
420420
if err != nil {
@@ -425,7 +425,7 @@ func (s SubjectAlternativeName) RawValue() (asn1.RawValue, error) {
425425
Value: asn1.RawValue{FullBytes: rawBytes},
426426
}, "tag:0")
427427
if err != nil {
428-
return zero, errors.Wrap(err, "unable to Marshal UserPrincipalName SAN")
428+
return zero, errors.Wrap(err, "error marshaling UserPrincipalName SAN")
429429
}
430430
return asn1.RawValue{FullBytes: upnBytes}, nil
431431
case X400AddressType, EDIPartyNameType:
@@ -456,7 +456,7 @@ func (s SubjectAlternativeName) RawValue() (asn1.RawValue, error) {
456456
Value: asn1.RawValue{FullBytes: rawBytes},
457457
}, "tag:0")
458458
if err != nil {
459-
return zero, errors.Wrap(err, "unable to Marshal otherName SAN")
459+
return zero, errors.Wrap(err, "error marshaling otherName SAN")
460460
}
461461
return asn1.RawValue{FullBytes: otherNameBytes}, nil
462462
}

‎x509util/extensions_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func TestSubjectAlternativeName_RawValue(t *testing.T) {
331331
{49, 15, 48, 13, 6, 3, 85, 4, 3, asn1.TagPrintableString, 6}, []byte("rocket"),
332332
}, nil),
333333
}, false},
334-
{"userPrincipalName", fields{"upn", "foo@bar.com", nil}, asn1.RawValue{
334+
{"userPrincipalName", fields{"userPrincipalName", "foo@bar.com", nil}, asn1.RawValue{
335335
FullBytes: []byte{160, 27, 6, 10, 43, 6, 1, 4, 1, 130, 55, 20, 2, 3, 160, 13, 12, 11, 102, 111, 111, 64, 98, 97, 114, 46, 99, 111, 109},
336336
}, false},
337337
{"otherName int", fields{"1.2.3.4", "int:1024", nil}, asn1.RawValue{
@@ -392,8 +392,8 @@ func TestSubjectAlternativeName_RawValue(t *testing.T) {
392392
{"fail registeredID", fields{"registeredID", "4.3.2.1", nil}, asn1.RawValue{}, true},
393393
{"fail registeredID empty", fields{"registeredID", "", nil}, asn1.RawValue{}, true},
394394
{"fail registeredID parse", fields{"registeredID", "a.b.c.d", nil}, asn1.RawValue{}, true},
395-
{"fail upn empty", fields{"upn", "", nil}, asn1.RawValue{}, true},
396-
{"fail upn value", fields{"upn", "foo\xff@mail.com", nil}, asn1.RawValue{}, true},
395+
{"fail userPrincipalName empty", fields{"userPrincipalName", "", nil}, asn1.RawValue{}, true},
396+
{"fail userPrincipalName value", fields{"userPrincipalName", "foo\xff@mail.com", nil}, asn1.RawValue{}, true},
397397
{"fail otherName parse", fields{"a.b.c.d", "foo", nil}, asn1.RawValue{}, true},
398398
{"fail otherName marshal", fields{"1", "foo", nil}, asn1.RawValue{}, true},
399399
{"fail otherName int", fields{"1.2.3.4", "int:abc", nil}, asn1.RawValue{}, true},

0 commit comments

Comments
 (0)