sashakoshka/go-gemini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove (*KnownHosts).Has function

Browse Source
This commit is contained in:
adnano 2020-09-26 13:29:29 -04:00
parent bf3e6b3c5c
commit 1b3f9a0655
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client.go
View File

@ -195,8 +195,10 @@ func (c *Client) Send(req *Request) (*Response, error) {
} }
// Check that the client trusts the certificate // Check that the client trusts the certificate
if c.TrustCertificate == nil { if c.TrustCertificate == nil {
if c.KnownHosts == nil || !c.KnownHosts.Has(cert) { if c.KnownHosts == nil {
return ErrCertificateNotTrusted return ErrCertificateNotTrusted
} else if err := c.KnownHosts.Lookup(cert); err != nil {
return err
} }
} else if err := c.TrustCertificate(cert, c.KnownHosts); err != nil { } else if err := c.TrustCertificate(cert, c.KnownHosts); err != nil {
return err return err

14
tofu.go
View File

@ -57,20 +57,6 @@ func (k *KnownHosts) Add(cert *x509.Certificate) {
} }
} }
// Has reports whether the provided certificate is in the list.
func (k *KnownHosts) Has(cert *x509.Certificate) bool {
now := time.Now().Unix()
hostname := cert.Subject.CommonName
fingerprint := Fingerprint(cert)
for i := range k.hosts {
if k.hosts[i].Expires > now && k.hosts[i].Hostname == hostname &&
k.hosts[i].Fingerprint == fingerprint {
return true
}
}
return false
}
// Lookup looks for the provided certificate in the list of known hosts. // Lookup looks for the provided certificate in the list of known hosts.
// If the hostname is in the list, but the fingerprint differs, // If the hostname is in the list, but the fingerprint differs,
// Lookup returns ErrCertificateNotTrusted. // Lookup returns ErrCertificateNotTrusted.