Skip to content

peer cert validation #152

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
ingon merged 1 commit into from
Feb 22, 2026
Merged

peer cert validation #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,10 @@ type serverTLSConfig struct {
func newServerTLSConfig(serverCert []byte) (*serverTLSConfig, error) {
cert, err := x509.ParseCertificate(serverCert)
if err != nil {
return nil, err
return nil, fmt.Errorf("server certificate parse: %w", err)
}
if len(cert.DNSNames) == 0 {
return nil, fmt.Errorf("server certificate has no DNS names")
}
cas := x509.NewCertPool()
cas.AddCert(cert)
Expand Down Expand Up @@ -349,7 +352,10 @@ func (p *peer) getECDHPublicKey(cfg *pbconnect.ECDHConfiguration) (*ecdh.PublicK
for _, remote := range remotes {
cert, err := x509.ParseCertificate(remote.Peer.ServerCertificate)
if err != nil {
return nil, err
return nil, fmt.Errorf("peer certificate parse: %w", err)
}
if len(cert.DNSNames) == 0 {
return nil, fmt.Errorf("peer certificate has no DNS names")
}
if cert.DNSNames[0] == cfg.ClientName {
candidates = append(candidates, cert)
Expand All @@ -365,7 +371,10 @@ func (p *peer) getECDHPublicKey(cfg *pbconnect.ECDHConfiguration) (*ecdh.PublicK
return nil, fmt.Errorf("multiple peers found")
}

certPublic := candidates[0].PublicKey.(ed25519.PublicKey)
certPublic, ok := candidates[0].PublicKey.(ed25519.PublicKey)
if !ok {
return nil, fmt.Errorf("peer certificate has unexpected public key type %T", candidates[0].PublicKey)
}
if !ed25519.Verify(certPublic, cfg.KeyTime, cfg.Signature) {
return nil, fmt.Errorf("signature verification failed")
}
Expand Down