Multi-client servers + bring back stdinserver support

daemon/serve/serve_tls.go

@@ -8,13 +8,13 @@ import (
 	"github.com/zrepl/zrepl/tlsconf"
 	"net"
 	"time"
+	"context"
 )
 
 type TLSListenerFactory struct {
 	address          string
 	clientCA         *x509.CertPool
 	serverCert       tls.Certificate
-	clientCommonName string
 	handshakeTimeout time.Duration
 }
 
@@ -23,12 +23,10 @@ func TLSListenerFactoryFromConfig(c *config.Global, in *config.TLSServe) (lf *TL
 		address: in.Listen,
 	}
 
-	if in.Ca == "" || in.Cert == "" || in.Key == "" || in.ClientCN == "" {
-		return nil, errors.New("fields 'ca', 'cert', 'key' and 'client_cn' must be specified")
+	if in.Ca == "" || in.Cert == "" || in.Key == "" {
+		return nil, errors.New("fields 'ca', 'cert' and 'key'must be specified")
 	}
 
-	lf.clientCommonName = in.ClientCN
-
 	lf.clientCA, err = tlsconf.ParseCAFile(in.Ca)
 	if err != nil {
 		return nil, errors.Wrap(err, "cannot parse ca file")
@@ -42,11 +40,25 @@ func TLSListenerFactoryFromConfig(c *config.Global, in *config.TLSServe) (lf *TL
 	return lf, nil
 }
 
-func (f *TLSListenerFactory) Listen() (net.Listener, error) {
+func (f *TLSListenerFactory) Listen() (AuthenticatedListener, error) {
 	l, err := net.Listen("tcp", f.address)
 	if err != nil {
 		return nil, err
 	}
-	tl := tlsconf.NewClientAuthListener(l, f.clientCA, f.serverCert, f.clientCommonName, f.handshakeTimeout)
-	return tl, nil
+	tl := tlsconf.NewClientAuthListener(l, f.clientCA, f.serverCert, f.handshakeTimeout)
+	return tlsAuthListener{tl}, nil
 }
+
+type tlsAuthListener struct {
+	*tlsconf.ClientAuthListener
+}
+
+func (l tlsAuthListener) Accept(ctx context.Context) (AuthenticatedConn, error) {
+	c, cn, err := l.ClientAuthListener.Accept()
+	if err != nil {
+		return nil, err
+	}
+	return authConn{c, cn}, nil
+}
+
+