X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1d1c6de3c842a33a57b7d469fdaaaa1b873433dc..91f976b99d4e7f00d2c1fbfee75812c3b1b780c6:/services/keep-web/main.go

diff --git a/services/keep-web/main.go b/services/keep-web/main.go
index 751543e8fa..c4103f4097 100644
--- a/services/keep-web/main.go
+++ b/services/keep-web/main.go
@@ -1,29 +1,111 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
 	"flag"
 	"log"
 	"os"
+	"time"
+
+	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.curoverse.com/arvados.git/sdk/go/config"
+	"github.com/coreos/go-systemd/daemon"
+)
+
+var (
+	defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
 )
 
+// Config specifies server configuration.
+type Config struct {
+	Client arvados.Client
+
+	Listen string
+
+	AnonymousTokens    []string
+	AttachmentOnlyHost string
+	TrustAllContent    bool
+
+	Cache cache
+
+	// Hack to support old command line flag, which is a bool
+	// meaning "get actual token from environment".
+	deprecatedAllowAnonymous bool
+}
+
+// DefaultConfig returns the default configuration.
+func DefaultConfig() *Config {
+	return &Config{
+		Listen: ":80",
+		Cache: cache{
+			TTL:                  arvados.Duration(5 * time.Minute),
+			MaxCollectionEntries: 1000,
+			MaxCollectionBytes:   100000000,
+			MaxPermissionEntries: 1000,
+			MaxUUIDEntries:       1000,
+		},
+	}
+}
+
 func init() {
 	// MakeArvadosClient returns an error if this env var isn't
 	// available as a default token (even if we explicitly set a
 	// different token before doing anything with the client). We
 	// set this dummy value during init so it doesn't clobber the
 	// one used by "run test servers".
-	os.Setenv("ARVADOS_API_TOKEN", "xxx")
+	if os.Getenv("ARVADOS_API_TOKEN") == "" {
+		os.Setenv("ARVADOS_API_TOKEN", "xxx")
+	}
 }
 
 func main() {
+	cfg := DefaultConfig()
+
+	var configPath string
+	deprecated := " (DEPRECATED -- use config file instead)"
+	flag.StringVar(&configPath, "config", defaultConfigPath,
+		"`path` to JSON or YAML configuration file")
+	flag.StringVar(&cfg.Listen, "listen", "",
+		"address:port or :port to listen on"+deprecated)
+	flag.BoolVar(&cfg.deprecatedAllowAnonymous, "allow-anonymous", false,
+		"Load an anonymous token from the ARVADOS_API_TOKEN environment variable"+deprecated)
+	flag.StringVar(&cfg.AttachmentOnlyHost, "attachment-only-host", "",
+		"Only serve attachments at the given `host:port`"+deprecated)
+	flag.BoolVar(&cfg.TrustAllContent, "trust-all-content", false,
+		"Serve non-public content from a single origin. Dangerous: read docs before using!"+deprecated)
+	dumpConfig := flag.Bool("dump-config", false,
+		"write current configuration to stdout and exit")
+	flag.Usage = usage
 	flag.Parse()
-	if os.Getenv("ARVADOS_API_HOST") == "" {
-		log.Fatal("ARVADOS_API_HOST environment variable must be set.")
+
+	if err := config.LoadFile(cfg, configPath); err != nil {
+		if h := os.Getenv("ARVADOS_API_HOST"); h != "" && configPath == defaultConfigPath {
+			log.Printf("DEPRECATED: Using ARVADOS_API_HOST environment variable. Use config file instead.")
+			cfg.Client.APIHost = h
+		} else {
+			log.Fatal(err)
+		}
 	}
-	srv := &server{}
+	if cfg.deprecatedAllowAnonymous {
+		log.Printf("DEPRECATED: Using -allow-anonymous command line flag with ARVADOS_API_TOKEN environment variable. Use config file instead.")
+		cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")}
+	}
+
+	if *dumpConfig {
+		log.Fatal(config.DumpAndExit(cfg))
+	}
+
+	os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
+	srv := &server{Config: cfg}
 	if err := srv.Start(); err != nil {
 		log.Fatal(err)
 	}
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
+		log.Printf("Error notifying init daemon: %v", err)
+	}
 	log.Println("Listening at", srv.Addr)
 	if err := srv.Wait(); err != nil {
 		log.Fatal(err)