X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/37ab0eedec5eaf99c27b6b64fd04cc9248081713..e12c1fed6336048d6ab854bbfab95eccf7c1b372:/lib/boot/nginx.go diff --git a/lib/boot/nginx.go b/lib/boot/nginx.go index 6b2d6777fd..b391c4dc8c 100644 --- a/lib/boot/nginx.go +++ b/lib/boot/nginx.go @@ -9,10 +9,12 @@ import ( "fmt" "io/ioutil" "net" + "net/url" "os" "os/exec" "path/filepath" "regexp" + "strings" "git.arvados.org/arvados.git/sdk/go/arvados" ) @@ -26,15 +28,41 @@ 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 + } + extListenHost := "0.0.0.0" + if super.ClusterType == "test" { + // Our dynamic port number assignment strategy (choose + // an available port, write it in a config file, and + // have another process/goroutine bind to it) is prone + // to races when used by concurrent supervisors. In + // test mode we don't accept remote connections, so we + // can avoid collisions by using the per-cluster + // loopback address instead of 0.0.0.0. + extListenHost = super.ListenHost + } 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 - "ACCESSLOG": filepath.Join(super.tempdir, "nginx_access.log"), - "ERRORLOG": filepath.Join(super.tempdir, "nginx_error.log"), - "TMPDIR": super.tempdir, + "LISTENHOST": extListenHost, + "UPSTREAMHOST": super.ListenHost, + "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.wwwtempdir, + "ARVADOS_API_HOST": super.cluster.Services.Controller.ExternalURL.Host, + } + u := url.URL(super.cluster.Services.Controller.ExternalURL) + ctrlHost := u.Hostname() + if strings.HasPrefix(super.cluster.TLS.Certificate, "file:/") && strings.HasPrefix(super.cluster.TLS.Key, "file:/") { + vars["SSLCERT"] = filepath.Clean(super.cluster.TLS.Certificate[5:]) + vars["SSLKEY"] = filepath.Clean(super.cluster.TLS.Key[5:]) + } else if f, err := os.Open("/var/lib/acme/live/" + ctrlHost + "/privkey"); err == nil { + f.Close() + vars["SSLCERT"] = "/var/lib/acme/live/" + ctrlHost + "/cert" + vars["SSLKEY"] = "/var/lib/acme/live/" + ctrlHost + "/privkey" } - var err error for _, cmpt := range []struct { varname string svc arvados.Service @@ -44,28 +72,42 @@ 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}, + {"WORKBENCH2", super.cluster.Services.Workbench2}, {"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 +131,22 @@ func (runNginx) Run(ctx context.Context, fail func(error), super *Supervisor) er } } } + + configs := "error_log stderr info; " + configs += "pid " + filepath.Join(super.wwwtempdir, "nginx.pid") + "; " + configs += "user www-data; " + 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, "-g", configs, "-c", conffile)) }() - 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) }