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

Make TrustCertificate accept hostname instead of request

Browse Source
This commit is contained in:
adnano 2020-09-27 16:10:36 -04:00
parent 32a9fcba0c
commit 73a1692a5b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client.go
View File

@ -185,7 +185,7 @@ type Client struct {
// TrustCertificate, if not nil, will be called to determine whether the
// client should trust the given certificate.
// If error is not nil, the connection will be aborted.
TrustCertificate func(req *Request, cert *x509.Certificate, knownHosts *KnownHosts) error
TrustCertificate func(hostname string, cert *x509.Certificate, knownHosts *KnownHosts) error
}
// Send sends a Gemini request and returns a Gemini response.
@ -219,7 +219,7 @@ func (c *Client) Send(req *Request) (*Response, error) {
if err := c.KnownHosts.Lookup(req.Hostname(), cert); err != nil {
return err
}
} else if err := c.TrustCertificate(req, cert, &c.KnownHosts); err != nil {
} else if err := c.TrustCertificate(req.Hostname(), cert, &c.KnownHosts); err != nil {
return err
}
return nil

6
examples/client/client.go
View File

@ -22,8 +22,8 @@ func init() {
client = &gemini.Client{}
client.KnownHosts.Load()
client.TrustCertificate = func(req *gemini.Request, cert *x509.Certificate, knownHosts *gemini.KnownHosts) error {
err := knownHosts.Lookup(req.Hostname(), cert)
client.TrustCertificate = func(hostname string, cert *x509.Certificate, knownHosts *gemini.KnownHosts) error {
err := knownHosts.Lookup(hostname, cert)
if err != nil {
switch err {
case gemini.ErrCertificateNotTrusted:
@ -37,7 +37,7 @@ func init() {
return nil
} else if userTrustsCertificatePermanently() {
// Add the certificate to the known hosts file
knownHosts.Add(req.Hostname(), cert)
knownHosts.Add(hostname, cert)
return nil
}
}

4
gemini.go
View File

@ -48,11 +48,11 @@ var DefaultClient *Client
func init() {
DefaultClient = &Client{
TrustCertificate: func(req *Request, cert *x509.Certificate, knownHosts *KnownHosts) error {
TrustCertificate: func(hostname string, cert *x509.Certificate, knownHosts *KnownHosts) error {
// Load the hosts only once. This is so that the hosts don't have to be loaded
// for those using their own clients.
setupDefaultClientOnce.Do(setupDefaultClient)
return knownHosts.Lookup(req.Hostname(), cert)
return knownHosts.Lookup(hostname, cert)
},
}
}