Hack in command-line specification of domain, cert and key

This commit is contained in:
2018-03-05 19:53:48 +00:00
parent 811b90224f
commit bf1ca421aa
6 changed files with 107 additions and 8 deletions

View File

@@ -19,11 +19,13 @@ type Server interface {
func NewServer(cancel context.CancelFunc, datastore store.Interface, starttls bool) Server {
out := &concrete{
cancel: cancel,
store: datastore,
cancel: cancel,
store: datastore,
starttls: starttls,
}
out.server = imapserver.New(out)
out.server.TLSConfig = out.store.TLSConfig()
if starttls {
out.server.Addr = ":143"
@@ -35,13 +37,22 @@ func NewServer(cancel context.CancelFunc, datastore store.Interface, starttls bo
}
type concrete struct {
cancel context.CancelFunc
store store.Interface
server *imapserver.Server
cancel context.CancelFunc
store store.Interface
server *imapserver.Server
starttls bool
}
func (c *concrete) Run() {
if err := c.server.ListenAndServe(); err != nil {
var err error
if c.starttls {
err = c.server.ListenAndServe()
} else {
err = c.server.ListenAndServeTLS()
}
if err != nil {
log.Printf("Error serving IMAP %s: %v", c.server.Addr, err)
} else {
log.Printf("Stopped listening on IMAP %s", c.server.Addr)
@@ -56,7 +67,7 @@ func (c *concrete) Login(string, string) (imapbackend.User, error) {
}
func (c *concrete) Close() error {
c.cancel() // FIXME: this doesn't touch the server
c.cancel() // FIXME: this doesn't touch the server
return nil
}

View File

@@ -24,6 +24,7 @@ func NewServer(cancel context.CancelFunc, datastore store.Interface, submission
out.server = smtp.NewServer(out)
out.server.Domain = datastore.Domain()
out.server.TLSConfig = datastore.TLSConfig()
if submission {
out.server.Addr = ":587"

View File

@@ -2,20 +2,60 @@ package store
import (
"context"
"crypto/tls"
)
type Interface interface {
Domain() string
TLS() tls.Certificate
TLSConfig() *tls.Config
SetDomain(string)
SetTLS(tls.Certificate)
}
func New(ctx context.Context, filename string) (Interface, error) {
return &concrete{domain: "example.com"}, nil
return &concrete{
filename: filename,
}, nil
}
type concrete struct {
filename string
// TODO: these will eventually be persisted to the file in `filename`
domain string
cert tls.Certificate
}
func (c *concrete) Domain() string {
return c.domain
}
func (c *concrete) TLS() tls.Certificate {
return c.cert
}
func (c *concrete) TLSConfig() *tls.Config {
return &tls.Config{
GetCertificate: func(*tls.ClientHelloInfo) (*tls.Certificate, error) {
certCopy := c.TLS()
return &certCopy, nil
},
ServerName: c.Domain(),
}
}
func (c *concrete) SetDomain(domain string) {
c.domain = domain
return
}
func (c *concrete) SetTLS(cert tls.Certificate) {
c.cert = cert
return
}