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

Add ErrorLog field to Server

Browse Source
This commit is contained in:
Adnan Maolood 2020-11-03 16:11:31 -05:00
parent 01670647d2
commit 610c6fc533
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cert.go
View File

@ -8,7 +8,6 @@ import (
"crypto/x509" "crypto/x509"
"crypto/x509/pkix" "crypto/x509/pkix"
"encoding/pem" "encoding/pem"
"log"
"math/big" "math/big"
"net" "net"
"os" "os"
@ -27,7 +26,7 @@ type CertificateStore struct {
// Add adds a certificate for the given scope to the store. // Add adds a certificate for the given scope to the store.
// It tries to parse the certificate if it is not already parsed. // It tries to parse the certificate if it is not already parsed.
func (c *CertificateStore) Add(scope string, cert tls.Certificate) { func (c *CertificateStore) Add(scope string, cert tls.Certificate) error {
if c.store == nil { if c.store == nil {
c.store = map[string]tls.Certificate{} c.store = map[string]tls.Certificate{}
} }
@ -40,14 +39,14 @@ func (c *CertificateStore) Add(scope string, cert tls.Certificate) {
} }
if c.dir { if c.dir {
// Write certificates // Write certificates
log.Printf("gemini: Writing certificate for %s to %s", scope, c.path)
certPath := filepath.Join(c.path, scope+".crt") certPath := filepath.Join(c.path, scope+".crt")
keyPath := filepath.Join(c.path, scope+".key") keyPath := filepath.Join(c.path, scope+".key")
if err := WriteCertificate(cert, certPath, keyPath); err != nil { if err := WriteCertificate(cert, certPath, keyPath); err != nil {
log.Printf("gemini: Failed to write certificate for %s: %s", scope, err) return err
} }
} }
c.store[scope] = cert c.store[scope] = cert
return nil
} }
// Lookup returns the certificate for the given scope. // Lookup returns the certificate for the given scope.

1
examples/auth.go
View File

@ -119,6 +119,7 @@ func logout(w *gemini.ResponseWriter, r *gemini.Request) {
fingerprint := gemini.Fingerprint(r.Certificate.Leaf) fingerprint := gemini.Fingerprint(r.Certificate.Leaf)
delete(sessions, fingerprint) delete(sessions, fingerprint)
fmt.Fprintln(w, "Successfully logged out.") fmt.Fprintln(w, "Successfully logged out.")
fmt.Fprintln(w, "=> / Index")
} }
func profile(w *gemini.ResponseWriter, r *gemini.Request) { func profile(w *gemini.ResponseWriter, r *gemini.Request) {

19
server.go
View File

@ -31,6 +31,11 @@ type Server struct {
// if the current one is expired or missing. // if the current one is expired or missing.
CreateCertificate func(hostname string) (tls.Certificate, error) CreateCertificate func(hostname string) (tls.Certificate, error)
// ErrorLog specifies an optional logger for errors accepting connections
// and file system errors.
// If nil, logging is done via the log package's standard logger.
ErrorLog *log.Logger
// registered responders // registered responders
responders map[responderKey]Responder responders map[responderKey]Responder
hosts map[string]bool hosts map[string]bool
@ -117,7 +122,7 @@ func (s *Server) Serve(l net.Listener) error {
if max := 1 * time.Second; tempDelay > max { if max := 1 * time.Second; tempDelay > max {
tempDelay = max tempDelay = max
} }
log.Printf("gemini: Accept error: %v; retrying in %v", err, tempDelay) s.logf("gemini: Accept error: %v; retrying in %v", err, tempDelay)
time.Sleep(tempDelay) time.Sleep(tempDelay)
continue continue
} }
@ -154,7 +159,9 @@ func (s *Server) getCertificateFor(hostname string) (*tls.Certificate, error) {
if s.CreateCertificate != nil { if s.CreateCertificate != nil {
cert, err := s.CreateCertificate(hostname) cert, err := s.CreateCertificate(hostname)
if err == nil { if err == nil {
s.Certificates.Add(hostname, cert) if err := s.Certificates.Add(hostname, cert); err != nil {
s.logf("gemini: Failed to add new certificate for %s: %s", hostname, err)
}
} }
return &cert, err return &cert, err
} }
@ -241,6 +248,14 @@ func (s *Server) responder(r *Request) Responder {
return nil return nil
} }
func (s *Server) logf(format string, args ...interface{}) {
if s.ErrorLog != nil {
s.ErrorLog.Printf(format, args...)
} else {
log.Printf(format, args...)
}
}
// ResponseWriter is used by a Gemini handler to construct a Gemini response. // ResponseWriter is used by a Gemini handler to construct a Gemini response.
type ResponseWriter struct { type ResponseWriter struct {
b *bufio.Writer b *bufio.Writer