Adds partial support for tls directive

imap.go

@@ -0,0 +1,10 @@
+package maddy
+
+import (
+	"github.com/mholt/caddy/caddyfile"
+	imapserver "github.com/emersion/go-imap/server"
+)
+
+func newIMAPServer(tokens map[string][]caddyfile.Token) server {
+	return imapserver.New(nil)
+}

maddy.go

@@ -1,15 +1,18 @@
 package maddy
 
 import (
+	"crypto/tls"
 	"fmt"
 	"log"
 	"net"
 
 	"github.com/mholt/caddy/caddyfile"
-	imapserver "github.com/emersion/go-imap/server"
-	"github.com/emersion/go-smtp"
 )
 
+type server interface {
+	Serve(net.Listener) error
+}
+
 var Directives = []string{
 	"bind",
 	"tls",
@@ -21,6 +24,8 @@ var Directives = []string{
 }
 
 func Start(blocks []caddyfile.ServerBlock) error {
+	done := make(chan error, 1)
+
 	for _, block := range blocks {
 		var proto string
 		var adresses []Address
@@ -40,37 +45,43 @@ func Start(blocks []caddyfile.ServerBlock) error {
 			adresses = append(adresses, addr)
 		}
 
-		// TODO: parse directives
+		var s server
-
 		switch proto {
 		case "imap":
-			s := imapserver.New(nil) // TODO
+			s = newIMAPServer(block.Tokens)
-
-			for _, addr := range adresses {
-				l, err := net.Listen("tcp", fmt.Sprintf("%s:%s", addr.Host, addr.Port))
-				if err != nil {
-					return fmt.Errorf("Cannot listen: %v", err)
-				}
-
-				log.Println("IMAP server listening on", l.Addr().String())
-				go s.Serve(l)
-			}
 		case "smtp":
-			s := smtp.NewServer(nil) // TODO
+			s = newSMTPServer(block.Tokens)
-
-			for _, addr := range adresses {
-				l, err := net.Listen("tcp", fmt.Sprintf("%s:%s", addr.Host, addr.Port))
-				if err != nil {
-					return fmt.Errorf("Cannot listen: %v", err)
-				}
-
-				log.Println("SMTP server listening on", l.Addr().String())
-				go s.Serve(l)
-			}
 		default:
 			return fmt.Errorf("Unsupported protocol %q", proto)
 		}
+
+		var tlsConfig *tls.Config
+		if tokens, ok := block.Tokens["tls"]; ok {
+			var err error
+			tlsConfig, err = getTLSConfig(caddyfile.NewDispenserTokens("", tokens))
+			if err != nil {
+				return err
+			}
+		}
+
+		for _, addr := range adresses {
+			var l net.Listener
+			var err error
+			l, err = net.Listen("tcp", fmt.Sprintf("%s:%s", addr.Host, addr.Port))
+			if err != nil {
+				return fmt.Errorf("Cannot listen: %v", err)
+			}
+
+			if tlsConfig != nil {
+				l = tls.NewListener(l, tlsConfig)
+			}
+
+			log.Printf("%s server listening on %s\n", proto, l.Addr().String())
+			go func() {
+				done <- s.Serve(l)
+			}()
+		}
 	}
 
-	select {}
+	return <-done
 }

smtp.go

@@ -0,0 +1,10 @@
+package maddy
+
+import (
+	"github.com/mholt/caddy/caddyfile"
+	"github.com/emersion/go-smtp"
+)
+
+func newSMTPServer(tokens map[string][]caddyfile.Token) server {
+	return smtp.NewServer(nil)
+}

tls.go

@@ -0,0 +1,39 @@
+package maddy
+
+import (
+	"crypto/tls"
+	"fmt"
+
+	"github.com/mholt/caddy/caddyfile"
+)
+
+func getTLSConfig(d caddyfile.Dispenser) (*tls.Config, error) {
+	config := new(tls.Config)
+
+	for d.Next() {
+		args := d.RemainingArgs()
+		switch len(args) {
+		case 1:
+			switch args[0] {
+			case "off":
+				return nil, nil
+			case "self_signed":
+				if err := makeSelfSignedCert(config); err != nil {
+					return nil, err
+				}
+			}
+		case 2:
+			if cert, err := tls.LoadX509KeyPair(args[0], args[1]); err != nil {
+				return nil, err
+			} else {
+				config.Certificates = append(config.Certificates, cert)
+			}
+		}
+	}
+
+	return config, nil
+}
+
+func makeSelfSignedCert(config *tls.Config) error {
+	return fmt.Errorf("Not yet implemented")
+}