Merge pull request #5872 from jwhonce/wip/options

V2 Fix support for tcp://[::]<port> connections

5 files changed, 27 insertions, 28 deletions

diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index fa1a33faa..6522a45f8 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -57,7 +57,7 @@ func service(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	logrus.Infof("using API endpoint: \"%s\"", apiURI)
+	logrus.Infof("using API endpoint: '%s'", apiURI)
 
 	opts := entities.ServiceOptions{
 		URI:     apiURI,
@@ -75,7 +75,6 @@ func service(cmd *cobra.Command, args []string) error {
 }
 
 func resolveApiURI(_url []string) (string, error) {
-
 	// When determining _*THE*_ listening endpoint --
 	// 1) User input wins always
 	// 2) systemd socket activation
@@ -83,14 +82,15 @@ func resolveApiURI(_url []string) (string, error) {
 	// 4) if varlink -- adapter.DefaultVarlinkAddress
 	// 5) lastly adapter.DefaultAPIAddress
 
-	if _url == nil {
+	if len(_url) == 0 {
 		if v, found := os.LookupEnv("PODMAN_SOCKET"); found {
+			logrus.Debugf("PODMAN_SOCKET='%s' used to determine API endpoint", v)
 			_url = []string{v}
 		}
 	}
 
 	switch {
-	case len(_url) > 0:
+	case len(_url) > 0 && _url[0] != "":
 		return _url[0], nil
 	case systemd.SocketActivated():
 		logrus.Info("using systemd socket activation to determine API endpoint")
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 5f1a86183..9576fd437 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -51,7 +51,7 @@ func NewServerWithSettings(runtime *libpod.Runtime, duration time.Duration, list
 func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Listener) (*APIServer, error) {
 	// If listener not provided try socket activation protocol
 	if listener == nil {
-		if _, found := os.LookupEnv("LISTEN_FDS"); !found {
+		if _, found := os.LookupEnv("LISTEN_PID"); !found {
 			return nil, errors.Errorf("Cannot create API Server, no listener provided and socket activation protocol is not active.")
 		}
 
@@ -125,7 +125,7 @@ func newServer(runtime *libpod.Runtime, duration time.Duration, listener *net.Li
 			if err != nil {
 				methods = []string{"<N/A>"}
 			}
-			logrus.Debugf("Methods: %s Path: %s", strings.Join(methods, ", "), path)
+			logrus.Debugf("Methods: %6s Path: %s", strings.Join(methods, ", "), path)
 			return nil
 		})
 	}
@@ -179,6 +179,7 @@ func (s *APIServer) Shutdown() error {
 	}
 
 	// Gracefully shutdown server, duration of wait same as idle window
+	// TODO: Should we really wait the idle window for shutdown?
 	ctx, cancel := context.WithTimeout(context.Background(), s.idleTracker.Duration)
 	defer cancel()
 	go func() {
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index 4fe4dd72d..29b6f04ec 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -126,7 +126,7 @@ func tcpClient(_url *url.URL) (*http.Client, error) {
 	return &http.Client{
 		Transport: &http.Transport{
 			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
-				return net.Dial("tcp", _url.Path)
+				return net.Dial("tcp", _url.Host)
 			},
 			DisableCompression: true,
 		},
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 67593b2dd..078f5404d 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -35,7 +35,7 @@ func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) {
 
 func (ic *ContainerEngine) RestService(_ context.Context, opts entities.ServiceOptions) error {
 	var (
-		listener net.Listener
+		listener *net.Listener
 		err      error
 	)
 
@@ -45,13 +45,14 @@ func (ic *ContainerEngine) RestService(_ context.Context, opts entities.ServiceO
 			return errors.Errorf("%s is an invalid socket destination", opts.URI)
 		}
 		address := strings.Join(fields[1:], ":")
-		listener, err = net.Listen(fields[0], address)
+		l, err := net.Listen(fields[0], address)
 		if err != nil {
 			return errors.Wrapf(err, "unable to create socket %s", opts.URI)
 		}
+		listener = &l
 	}
 
-	server, err := api.NewServerWithSettings(ic.Libpod, opts.Timeout, &listener)
+	server, err := api.NewServerWithSettings(ic.Libpod, opts.Timeout, listener)
 	if err != nil {
 		return err
 	}
@@ -62,7 +63,9 @@ func (ic *ContainerEngine) RestService(_ context.Context, opts entities.ServiceO
 	}()
 
 	err = server.Serve()
-	_ = listener.Close()
+	if listener != nil {
+		_ = (*listener).Close()
+	}
 	return err
 }
 
diff --git a/pkg/systemd/activation.go b/pkg/systemd/activation.go
index c8b2389dc..8f75f9cca 100644
--- a/pkg/systemd/activation.go
+++ b/pkg/systemd/activation.go
@@ -3,38 +3,33 @@ package systemd
 import (
 	"os"
 	"strconv"
-	"strings"
 )
 
 // SocketActivated determine if podman is running under the socket activation protocol
+// Criteria is based on the expectations of "github.com/coreos/go-systemd/v22/activation"
 func SocketActivated() bool {
-	pid, pid_found := os.LookupEnv("LISTEN_PID")
-	fds, fds_found := os.LookupEnv("LISTEN_FDS")
-	fdnames, fdnames_found := os.LookupEnv("LISTEN_FDNAMES")
-
-	if !(pid_found && fds_found && fdnames_found) {
+	pid, found := os.LookupEnv("LISTEN_PID")
+	if !found {
 		return false
 	}
-
 	p, err := strconv.Atoi(pid)
 	if err != nil || p != os.Getpid() {
 		return false
 	}
 
+	fds, found := os.LookupEnv("LISTEN_FDS")
+	if !found {
+		return false
+	}
 	nfds, err := strconv.Atoi(fds)
-	if err != nil || nfds < 1 {
+	if err != nil || nfds == 0 {
 		return false
 	}
 
-	// First available file descriptor is always 3.
-	if nfds > 1 {
-		names := strings.Split(fdnames, ":")
-		for _, n := range names {
-			if strings.Contains(n, "podman") {
-				return true
-			}
-		}
+	// "github.com/coreos/go-systemd/v22/activation" will use and validate this variable's
+	// value. We're just providing a fast fail
+	if _, found = os.LookupEnv("LISTEN_FDNAMES"); !found {
+		return false
 	}
-
 	return true
 }