X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1e3eacb0ca6f2228f50f13514c7577a149a707e6..887a23521d1f8b284e510041b269e5c9608687d6:/lib/boot/nginx.go

diff --git a/lib/boot/nginx.go b/lib/boot/nginx.go
index 6b2d6777fd..5826e5c013 100644
--- a/lib/boot/nginx.go
+++ b/lib/boot/nginx.go
@@ -9,8 +9,10 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"net/url"
 	"os"
 	"os/exec"
+	"os/user"
 	"path/filepath"
 	"regexp"
 
@@ -26,15 +28,18 @@ func (runNginx) String() string {
 }
 
 func (runNginx) Run(ctx context.Context, fail func(error), super *Supervisor) error {
+	err := super.wait(ctx, createCertificates{})
+	if err != nil {
+		return err
+	}
 	vars := map[string]string{
 		"LISTENHOST": super.ListenHost,
-		"SSLCERT":    filepath.Join(super.SourcePath, "services", "api", "tmp", "self-signed.pem"), // TODO: root ca
-		"SSLKEY":     filepath.Join(super.SourcePath, "services", "api", "tmp", "self-signed.key"), // TODO: root ca
+		"SSLCERT":    filepath.Join(super.tempdir, "server.crt"),
+		"SSLKEY":     filepath.Join(super.tempdir, "server.key"),
 		"ACCESSLOG":  filepath.Join(super.tempdir, "nginx_access.log"),
 		"ERRORLOG":   filepath.Join(super.tempdir, "nginx_error.log"),
-		"TMPDIR":     super.tempdir,
+		"TMPDIR":     super.wwwtempdir,
 	}
-	var err error
 	for _, cmpt := range []struct {
 		varname string
 		svc     arvados.Service
@@ -44,28 +49,41 @@ func (runNginx) Run(ctx context.Context, fail func(error), super *Supervisor) er
 		{"KEEPWEBDL", super.cluster.Services.WebDAVDownload},
 		{"KEEPPROXY", super.cluster.Services.Keepproxy},
 		{"GIT", super.cluster.Services.GitHTTP},
+		{"HEALTH", super.cluster.Services.Health},
 		{"WORKBENCH1", super.cluster.Services.Workbench1},
 		{"WS", super.cluster.Services.Websocket},
 	} {
-		port, err := internalPort(cmpt.svc)
-		if err != nil {
-			return fmt.Errorf("%s internal port: %s (%v)", cmpt.varname, err, cmpt.svc)
-		}
-		if ok, err := addrIsLocal(net.JoinHostPort(super.ListenHost, port)); !ok || err != nil {
-			return fmt.Errorf("urlIsLocal() failed for host %q port %q: %v", super.ListenHost, port, err)
+		var host, port string
+		if len(cmpt.svc.InternalURLs) == 0 {
+			// We won't run this service, but we need an
+			// upstream port to write in our templated
+			// nginx config. Choose a port that will
+			// return 502 Bad Gateway.
+			port = "9"
+		} else if host, port, err = internalPort(cmpt.svc); err != nil {
+			return fmt.Errorf("%s internal port: %w (%v)", cmpt.varname, err, cmpt.svc)
+		} else if ok, err := addrIsLocal(net.JoinHostPort(host, port)); !ok || err != nil {
+			return fmt.Errorf("%s addrIsLocal() failed for host %q port %q: %v", cmpt.varname, host, port, err)
 		}
 		vars[cmpt.varname+"PORT"] = port
 
 		port, err = externalPort(cmpt.svc)
 		if err != nil {
-			return fmt.Errorf("%s external port: %s (%v)", cmpt.varname, err, cmpt.svc)
+			return fmt.Errorf("%s external port: %w (%v)", cmpt.varname, err, cmpt.svc)
 		}
-		if ok, err := addrIsLocal(net.JoinHostPort(super.ListenHost, port)); !ok || err != nil {
-			return fmt.Errorf("urlIsLocal() failed for host %q port %q: %v", super.ListenHost, port, err)
+		listenAddr := net.JoinHostPort(super.ListenHost, port)
+		if ok, err := addrIsLocal(listenAddr); !ok || err != nil {
+			return fmt.Errorf("%s addrIsLocal(%q) failed: %w", cmpt.varname, listenAddr, err)
 		}
 		vars[cmpt.varname+"SSLPORT"] = port
 	}
-	tmpl, err := ioutil.ReadFile(filepath.Join(super.SourcePath, "sdk", "python", "tests", "nginx.conf"))
+	var conftemplate string
+	if super.ClusterType == "production" {
+		conftemplate = "/var/lib/arvados/share/nginx.conf"
+	} else {
+		conftemplate = filepath.Join(super.SourcePath, "sdk", "python", "tests", "nginx.conf")
+	}
+	tmpl, err := ioutil.ReadFile(conftemplate)
 	if err != nil {
 		return err
 	}
@@ -89,13 +107,32 @@ func (runNginx) Run(ctx context.Context, fail func(error), super *Supervisor) er
 			}
 		}
 	}
+
+	args := []string{
+		"-g", "error_log stderr info;",
+		"-g", "pid " + filepath.Join(super.wwwtempdir, "nginx.pid") + ";",
+		"-c", conffile,
+	}
+	// Nginx ignores "user www-data;" when running as a non-root
+	// user... except that it causes it to ignore our other -g
+	// options. So we still have to decide for ourselves whether
+	// it's needed.
+	if u, err := user.Current(); err != nil {
+		return fmt.Errorf("user.Current(): %w", err)
+	} else if u.Uid == "0" {
+		args = append([]string{"-g", "user www-data;"}, args...)
+	}
+
 	super.waitShutdown.Add(1)
 	go func() {
 		defer super.waitShutdown.Done()
-		fail(super.RunProgram(ctx, ".", nil, nil, nginx,
-			"-g", "error_log stderr info;",
-			"-g", "pid "+filepath.Join(super.tempdir, "nginx.pid")+";",
-			"-c", conffile))
+		fail(super.RunProgram(ctx, ".", runOptions{}, nginx, args...))
 	}()
-	return waitForConnect(ctx, super.cluster.Services.Controller.ExternalURL.Host)
+	// Choose one of the ports where Nginx should listen, and wait
+	// here until we can connect. If ExternalURL is https://foo (with no port) then we connect to "foo:https"
+	testurl := url.URL(super.cluster.Services.Controller.ExternalURL)
+	if testurl.Port() == "" {
+		testurl.Host = net.JoinHostPort(testurl.Host, testurl.Scheme)
+	}
+	return waitForConnect(ctx, testurl.Host)
 }