Skip to content

forgot to fix this and range over the certs #62

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.

Sign up for GitHub

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

Merged
dovholuknf merged 2 commits into from
Feb 11, 2025
Merged

forgot to fix this and range over the certs #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae8fa33
forgot to fix this and range over the certs
dovholuknf Feb 10, 2025
7a1c6c8
handle empty server certs/client cert. add tests
dovholuknf Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,8 +846,11 @@ func (e *AddressError) Unwrap() error {
func ValidFor(id Identity, hostnameOrIp string) error {
var err error
// Check server certificate
if len(id.ServerCert()) > 0 {
err = id.ServerCert()[0].Leaf.VerifyHostname(hostnameOrIp)
for _, c := range id.ServerCert() {
err = c.Leaf.VerifyHostname(hostnameOrIp)
if err == nil {
return nil
}
}

// Check client certificate if server cert validation fails
Expand All @@ -858,6 +861,10 @@ func ValidFor(id Identity, hostnameOrIp string) error {
if err != nil {
return &AddressError{BaseErr: ErrInvalidAddressForIdentity, Host: hostnameOrIp, ValidFor: getUniqueAddresses(id)}
}
if len(id.ServerCert()) == 0 && id.Cert() == nil {
return &AddressError{BaseErr: ErrInvalidAddressForIdentity, Host: hostnameOrIp}
}

return nil
}

Expand Down
38 changes: 38 additions & 0 deletions token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,3 +247,41 @@ func TestValidFor_NonWildcardCert(t *testing.T) {
err := id.ValidFor("ctrl.example.com")
require.ErrorIs(t, err, ErrInvalidAddressForIdentity)
}

func TestValidFor_ClientCertOnly(t *testing.T) {
leaf := &x509.Certificate{}
leaf.DNSNames = append(leaf.DNSNames, validDNS)
leaf.IPAddresses = append(leaf.IPAddresses, net.ParseIP(validIP4))
leaf.IPAddresses = append(leaf.IPAddresses, net.ParseIP(validIP6))

tlsCert := &tls.Certificate{Leaf: leaf}
mi := &mockIdentity{
serverCerts: []*tls.Certificate{tlsCert},
clientCert: tlsCert,
}
id := &TokenId{
Identity: mi,
Token: "",
Data: nil,
}

require.NoError(t, id.ValidFor(validDNS))
require.NoError(t, id.ValidFor(validIP4))
require.NoError(t, id.ValidFor(validIP6))
require.ErrorIs(t, id.ValidFor(invalidDNS), ErrInvalidAddressForIdentity)
}

func TestValidFor_NoServerNoClient(t *testing.T) {
mi := &mockIdentity{
serverCerts: []*tls.Certificate{},
clientCert: nil,
}
id := &TokenId{
Identity: mi,
Token: "",
Data: nil,
}

err := id.ValidFor("ctrl.example.com")
require.ErrorIs(t, err, ErrInvalidAddressForIdentity)
}
Loading