Merge pull request #67 from mholt/master

Refactor handlers: make Config not global

cmd/rest-server/main.go

@@ -25,73 +25,82 @@ var cmdRoot = &cobra.Command{
 	//Version:       fmt.Sprintf("rest-server %s compiled with %v on %v/%v\n", version, runtime.Version(), runtime.GOOS, runtime.GOARCH),
 }
 
+var server = restserver.Server{
+	Path:   "/tmp/restic",
+	Listen: ":8000",
+}
+
+var (
+	showVersion bool
+	cpuProfile  string
+)
+
 func init() {
 	flags := cmdRoot.Flags()
-	flags.StringVar(&restserver.Config.CPUProfile, "cpu-profile", restserver.Config.CPUProfile, "write CPU profile to file")
-	flags.BoolVar(&restserver.Config.Debug, "debug", restserver.Config.Debug, "output debug messages")
-	flags.StringVar(&restserver.Config.Listen, "listen", restserver.Config.Listen, "listen address")
-	flags.StringVar(&restserver.Config.Log, "log", restserver.Config.Log, "log HTTP requests in the combined log format")
-	flags.StringVar(&restserver.Config.Path, "path", restserver.Config.Path, "data directory")
-	flags.BoolVar(&restserver.Config.TLS, "tls", restserver.Config.TLS, "turn on TLS support")
-	flags.StringVar(&restserver.Config.TLSCert, "tls-cert", restserver.Config.TLSCert, "TLS certificate path")
-	flags.StringVar(&restserver.Config.TLSKey, "tls-key", restserver.Config.TLSKey, "TLS key path")
-	flags.BoolVar(&restserver.Config.NoAuth, "no-auth", restserver.Config.NoAuth, "disable .htpasswd authentication")
-	flags.BoolVar(&restserver.Config.AppendOnly, "append-only", restserver.Config.AppendOnly, "enable append only mode")
-	flags.BoolVar(&restserver.Config.PrivateRepos, "private-repos", restserver.Config.PrivateRepos, "users can only access their private repo")
-	flags.BoolVar(&restserver.Config.Prometheus, "prometheus", restserver.Config.Prometheus, "enable Prometheus metrics")
-	flags.BoolVarP(&restserver.Config.Version, "version", "V", restserver.Config.Version, "output version and exit")
+	flags.StringVar(&cpuProfile, "cpu-profile", cpuProfile, "write CPU profile to file")
+	flags.BoolVar(&server.Debug, "debug", server.Debug, "output debug messages")
+	flags.StringVar(&server.Listen, "listen", server.Listen, "listen address")
+	flags.StringVar(&server.Log, "log", server.Log, "log HTTP requests in the combined log format")
+	flags.StringVar(&server.Path, "path", server.Path, "data directory")
+	flags.BoolVar(&server.TLS, "tls", server.TLS, "turn on TLS support")
+	flags.StringVar(&server.TLSCert, "tls-cert", server.TLSCert, "TLS certificate path")
+	flags.StringVar(&server.TLSKey, "tls-key", server.TLSKey, "TLS key path")
+	flags.BoolVar(&server.NoAuth, "no-auth", server.NoAuth, "disable .htpasswd authentication")
+	flags.BoolVar(&server.AppendOnly, "append-only", server.AppendOnly, "enable append only mode")
+	flags.BoolVar(&server.PrivateRepos, "private-repos", server.PrivateRepos, "users can only access their private repo")
+	flags.BoolVar(&server.Prometheus, "prometheus", server.Prometheus, "enable Prometheus metrics")
+	flags.BoolVarP(&showVersion, "version", "V", showVersion, "output version and exit")
 }
 
 var version = "manually"
 
 func tlsSettings() (bool, string, string, error) {
 	var key, cert string
-	enabledTLS := restserver.Config.TLS
-	if !enabledTLS && (restserver.Config.TLSKey != "" || restserver.Config.TLSCert != "") {
+	if !server.TLS && (server.TLSKey != "" || server.TLSCert != "") {
 		return false, "", "", errors.New("requires enabled TLS")
-	} else if !enabledTLS {
+	} else if !server.TLS {
 		return false, "", "", nil
 	}
-	if restserver.Config.TLSKey != "" {
-		key = restserver.Config.TLSKey
+	if server.TLSKey != "" {
+		key = server.TLSKey
 	} else {
-		key = filepath.Join(restserver.Config.Path, "private_key")
+		key = filepath.Join(server.Path, "private_key")
 	}
-	if restserver.Config.TLSCert != "" {
-		cert = restserver.Config.TLSCert
+	if server.TLSCert != "" {
+		cert = server.TLSCert
 	} else {
-		cert = filepath.Join(restserver.Config.Path, "public_key")
+		cert = filepath.Join(server.Path, "public_key")
 	}
-	return enabledTLS, key, cert, nil
+	return server.TLS, key, cert, nil
 }
 
-func getHandler() (http.Handler, error) {
-	mux := restserver.NewMux()
-	if restserver.Config.NoAuth {
+func getHandler(server restserver.Server) (http.Handler, error) {
+	mux := restserver.NewHandler(server)
+	if server.NoAuth {
 		log.Println("Authentication disabled")
 		return mux, nil
 	}
 
 	log.Println("Authentication enabled")
-	htpasswdFile, err := restserver.NewHtpasswdFromFile(filepath.Join(restserver.Config.Path, ".htpasswd"))
+	htpasswdFile, err := restserver.NewHtpasswdFromFile(filepath.Join(server.Path, ".htpasswd"))
 	if err != nil {
 		return nil, fmt.Errorf("cannot load .htpasswd (use --no-auth to disable): %v", err)
 	}
-	return restserver.AuthHandler(htpasswdFile, mux), nil
+	return server.AuthHandler(htpasswdFile, mux), nil
 }
 
 func runRoot(cmd *cobra.Command, args []string) error {
-	if restserver.Config.Version {
+	if showVersion {
 		fmt.Printf("rest-server %s compiled with %v on %v/%v\n", version, runtime.Version(), runtime.GOOS, runtime.GOARCH)
 		os.Exit(0)
 	}
 
 	log.SetFlags(0)
 
-	log.Printf("Data directory: %s", restserver.Config.Path)
+	log.Printf("Data directory: %s", server.Path)
 
-	if restserver.Config.CPUProfile != "" {
-		f, err := os.Create(restserver.Config.CPUProfile)
+	if cpuProfile != "" {
+		f, err := os.Create(cpuProfile)
 		if err != nil {
 			return err
 		}
@@ -102,12 +111,12 @@ func runRoot(cmd *cobra.Command, args []string) error {
 		defer pprof.StopCPUProfile()
 	}
 
-	handler, err := getHandler()
+	handler, err := getHandler(server)
 	if err != nil {
 		log.Fatalf("error: %v", err)
 	}
 
-	if restserver.Config.PrivateRepos {
+	if server.PrivateRepos {
 		log.Println("Private repositories enabled")
 	} else {
 		log.Println("Private repositories disabled")
@@ -118,15 +127,15 @@ func runRoot(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	if !enabledTLS {
-		log.Printf("Starting server on %s\n", restserver.Config.Listen)
-		err = http.ListenAndServe(restserver.Config.Listen, handler)
+		log.Printf("Starting server on %s\n", server.Listen)
+		err = http.ListenAndServe(server.Listen, handler)
 	} else {
 
 		log.Println("TLS enabled")
 		log.Printf("Private key: %s", privateKey)
 		log.Printf("Public key(certificate): %s", publicKey)
-		log.Printf("Starting server on %s\n", restserver.Config.Listen)
-		err = http.ListenAndServeTLS(restserver.Config.Listen, publicKey, privateKey, handler)
+		log.Printf("Starting server on %s\n", server.Listen)
+		err = http.ListenAndServeTLS(server.Listen, publicKey, privateKey, handler)
 	}
 
 	return err

cmd/rest-server/main_test.go

@@ -35,17 +35,16 @@ func TestTLSSettings(t *testing.T) {
 		{passed{Path: "/tmp", TLS: false, TLSCert: "/etc/restic/cert"}, expected{"", "", true}},
 	}
 
-	defaultConfig := restserver.Config
 	for _, test := range tests {
 
 		t.Run("", func(t *testing.T) {
-			defer func() { restserver.Config = defaultConfig }()
+			// defer func() { restserver.Server = defaultConfig }()
 			if test.passed.Path != "" {
-				restserver.Config.Path = test.passed.Path
+				server.Path = test.passed.Path
 			}
-			restserver.Config.TLS = test.passed.TLS
-			restserver.Config.TLSKey = test.passed.TLSKey
-			restserver.Config.TLSCert = test.passed.TLSCert
+			server.TLS = test.passed.TLS
+			server.TLSKey = test.passed.TLSKey
+			server.TLSCert = test.passed.TLSCert
 
 			gotTLS, gotKey, gotCert, err := tlsSettings()
 			if err != nil && !test.expected.Error {
@@ -76,27 +75,20 @@ func TestTLSSettings(t *testing.T) {
 }
 
 func TestGetHandler(t *testing.T) {
-	// Save and restore config
-	defaultConfig := restserver.Config
-	defer func() { restserver.Config = defaultConfig }()
-
 	dir, err := ioutil.TempDir("", "rest-server-test")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer os.Remove(dir)
-	restserver.Config.Path = dir
 
 	// With NoAuth = false and no .htpasswd
-	restserver.Config.NoAuth = false // default
-	_, err = getHandler()
+	_, err = getHandler(restserver.Server{Path: dir})
 	if err == nil {
 		t.Errorf("NoAuth=false: expected error, got nil")
 	}
 
 	// With NoAuth = true and no .htpasswd
-	restserver.Config.NoAuth = true
-	_, err = getHandler()
+	_, err = getHandler(restserver.Server{NoAuth: true, Path: dir})
 	if err != nil {
 		t.Errorf("NoAuth=true: expected no error, got %v", err)
 	}
@@ -110,8 +102,7 @@ func TestGetHandler(t *testing.T) {
 	defer os.Remove(htpasswd)
 
 	// With NoAuth = false and with .htpasswd
-	restserver.Config.NoAuth = false // default
-	_, err = getHandler()
+	_, err = getHandler(restserver.Server{Path: dir})
 	if err != nil {
 		t.Errorf("NoAuth=false with .htpasswd: expected no error, got %v", err)
 	}

handlers.go

@@ -20,7 +20,23 @@ import (
 	"goji.io/pat"
 )
 
-func isHashed(dir string) bool {
+// Server determines how a Mux's handlers behave.
+type Server struct {
+	Path         string
+	Listen       string
+	Log          string
+	CPUProfile   string
+	TLSKey       string
+	TLSCert      string
+	TLS          bool
+	NoAuth       bool
+	AppendOnly   bool
+	PrivateRepos bool
+	Prometheus   bool
+	Debug        bool
+}
+
+func (s Server) isHashed(dir string) bool {
 	return dir == "data"
 }
 
@@ -39,7 +55,7 @@ func valid(name string) bool {
 
 var validTypes = []string{"data", "index", "keys", "locks", "snapshots", "config"}
 
-func isValidType(name string) bool {
+func (s Server) isValidType(name string) bool {
 	for _, tpe := range validTypes {
 		if name == tpe {
 			return true
@@ -69,8 +85,8 @@ func join(base string, names ...string) (string, error) {
 	return filepath.Join(clean...), nil
 }
 
-// getRepo returns the repository location, relative to Config.Path.
-func getRepo(r *http.Request) string {
+// getRepo returns the repository location, relative to s.Path.
+func (s Server) getRepo(r *http.Request) string {
 	if strings.HasPrefix(fmt.Sprintf("%s", middleware.Pattern(r.Context())), "/:repo") {
 		return pat.Param(r, "repo")
 	}
@@ -79,32 +95,32 @@ func getRepo(r *http.Request) string {
 }
 
 // getPath returns the path for a file type in the repo.
-func getPath(r *http.Request, fileType string) (string, error) {
-	if !isValidType(fileType) {
+func (s Server) getPath(r *http.Request, fileType string) (string, error) {
+	if !s.isValidType(fileType) {
 		return "", errors.New("invalid file type")
 	}
-	return join(Config.Path, getRepo(r), fileType)
+	return join(s.Path, s.getRepo(r), fileType)
 }
 
 // getFilePath returns the path for a file in the repo.
-func getFilePath(r *http.Request, fileType, name string) (string, error) {
-	if !isValidType(fileType) {
+func (s Server) getFilePath(r *http.Request, fileType, name string) (string, error) {
+	if !s.isValidType(fileType) {
 		return "", errors.New("invalid file type")
 	}
 
-	if isHashed(fileType) {
+	if s.isHashed(fileType) {
 		if len(name) < 2 {
 			return "", errors.New("file name is too short")
 		}
 
-		return join(Config.Path, getRepo(r), fileType, name[:2], name)
+		return join(s.Path, s.getRepo(r), fileType, name[:2], name)
 	}
 
-	return join(Config.Path, getRepo(r), fileType, name)
+	return join(s.Path, s.getRepo(r), fileType, name)
 }
 
 // getUser returns the username from the request, or an empty string if none.
-func getUser(r *http.Request) string {
+func (s Server) getUser(r *http.Request) string {
 	username, _, ok := r.BasicAuth()
 	if !ok {
 		return ""
@@ -113,10 +129,10 @@ func getUser(r *http.Request) string {
 }
 
 // getMetricLabels returns the prometheus labels from the request.
-func getMetricLabels(r *http.Request) prometheus.Labels {
+func (s Server) getMetricLabels(r *http.Request) prometheus.Labels {
 	labels := prometheus.Labels{
-		"user": getUser(r),
-		"repo": getRepo(r),
+		"user": s.getUser(r),
+		"repo": s.getRepo(r),
 		"type": pat.Param(r, "type"),
 	}
 	return labels
@@ -134,14 +150,14 @@ func isUserPath(username, path string) bool {
 
 // AuthHandler wraps h with a http.HandlerFunc that performs basic authentication against the user/passwords pairs
 // stored in f and returns the http.HandlerFunc.
-func AuthHandler(f *HtpasswdFile, h http.Handler) http.HandlerFunc {
+func (s Server) AuthHandler(f *HtpasswdFile, h http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		username, password, ok := r.BasicAuth()
 		if !ok || !f.Validate(username, password) {
 			http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
 			return
 		}
-		if Config.PrivateRepos && !isUserPath(username, r.URL.Path) {
+		if s.PrivateRepos && !isUserPath(username, r.URL.Path) {
 			http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
 			return
 		}
@@ -150,11 +166,11 @@ func AuthHandler(f *HtpasswdFile, h http.Handler) http.HandlerFunc {
 }
 
 // CheckConfig checks whether a configuration exists.
-func CheckConfig(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) CheckConfig(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("CheckConfig()")
 	}
-	cfg, err := getPath(r, "config")
+	cfg, err := s.getPath(r, "config")
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -162,7 +178,7 @@ func CheckConfig(w http.ResponseWriter, r *http.Request) {
 
 	st, err := os.Stat(cfg)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -173,11 +189,11 @@ func CheckConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 // GetConfig allows for a config to be retrieved.
-func GetConfig(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) GetConfig(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("GetConfig()")
 	}
-	cfg, err := getPath(r, "config")
+	cfg, err := s.getPath(r, "config")
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -185,7 +201,7 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
 
 	bytes, err := ioutil.ReadFile(cfg)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -196,11 +212,11 @@ func GetConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 // SaveConfig allows for a config to be saved.
-func SaveConfig(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) SaveConfig(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("SaveConfig()")
 	}
-	cfg, err := getPath(r, "config")
+	cfg, err := s.getPath(r, "config")
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -208,7 +224,7 @@ func SaveConfig(w http.ResponseWriter, r *http.Request) {
 
 	f, err := os.OpenFile(cfg, os.O_CREATE|os.O_WRONLY|os.O_EXCL, 0600)
 	if err != nil && os.IsExist(err) {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
@@ -217,7 +233,7 @@ func SaveConfig(w http.ResponseWriter, r *http.Request) {
 
 	_, err = io.Copy(f, r.Body)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -234,24 +250,24 @@ func SaveConfig(w http.ResponseWriter, r *http.Request) {
 }
 
 // DeleteConfig removes a config.
-func DeleteConfig(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) DeleteConfig(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("DeleteConfig()")
 	}
 
-	if Config.AppendOnly {
+	if s.AppendOnly {
 		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
 		return
 	}
 
-	cfg, err := getPath(r, "config")
+	cfg, err := s.getPath(r, "config")
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 
 	if err := os.Remove(cfg); err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		if os.IsNotExist(err) {
@@ -269,26 +285,26 @@ const (
 )
 
 // ListBlobs lists all blobs of a given type in an arbitrary order.
-func ListBlobs(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) ListBlobs(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("ListBlobs()")
 	}
 
 	switch r.Header.Get("Accept") {
 	case mimeTypeAPIV2:
-		ListBlobsV2(w, r)
+		s.ListBlobsV2(w, r)
 	default:
-		ListBlobsV1(w, r)
+		s.ListBlobsV1(w, r)
 	}
 }
 
 // ListBlobsV1 lists all blobs of a given type in an arbitrary order.
-func ListBlobsV1(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) ListBlobsV1(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("ListBlobsV1()")
 	}
 	fileType := pat.Param(r, "type")
-	path, err := getPath(r, fileType)
+	path, err := s.getPath(r, fileType)
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -296,7 +312,7 @@ func ListBlobsV1(w http.ResponseWriter, r *http.Request) {
 
 	items, err := ioutil.ReadDir(path)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -305,12 +321,12 @@ func ListBlobsV1(w http.ResponseWriter, r *http.Request) {
 
 	var names []string
 	for _, i := range items {
-		if isHashed(fileType) {
+		if s.isHashed(fileType) {
 			subpath := filepath.Join(path, i.Name())
 			var subitems []os.FileInfo
 			subitems, err = ioutil.ReadDir(subpath)
 			if err != nil {
-				if Config.Debug {
+				if s.Debug {
 					log.Print(err)
 				}
 				http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -326,7 +342,7 @@ func ListBlobsV1(w http.ResponseWriter, r *http.Request) {
 
 	data, err := json.Marshal(names)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -344,12 +360,12 @@ type Blob struct {
 }
 
 // ListBlobsV2 lists all blobs of a given type, together with their sizes, in an arbitrary order.
-func ListBlobsV2(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) ListBlobsV2(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("ListBlobsV2()")
 	}
 	fileType := pat.Param(r, "type")
-	path, err := getPath(r, fileType)
+	path, err := s.getPath(r, fileType)
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -357,7 +373,7 @@ func ListBlobsV2(w http.ResponseWriter, r *http.Request) {
 
 	items, err := ioutil.ReadDir(path)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -366,12 +382,12 @@ func ListBlobsV2(w http.ResponseWriter, r *http.Request) {
 
 	var blobs []Blob
 	for _, i := range items {
-		if isHashed(fileType) {
+		if s.isHashed(fileType) {
 			subpath := filepath.Join(path, i.Name())
 			var subitems []os.FileInfo
 			subitems, err = ioutil.ReadDir(subpath)
 			if err != nil {
-				if Config.Debug {
+				if s.Debug {
 					log.Print(err)
 				}
 				http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -387,7 +403,7 @@ func ListBlobsV2(w http.ResponseWriter, r *http.Request) {
 
 	data, err := json.Marshal(blobs)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -399,12 +415,12 @@ func ListBlobsV2(w http.ResponseWriter, r *http.Request) {
 }
 
 // CheckBlob tests whether a blob exists.
-func CheckBlob(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) CheckBlob(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("CheckBlob()")
 	}
 
-	path, err := getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
+	path, err := s.getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -412,7 +428,7 @@ func CheckBlob(w http.ResponseWriter, r *http.Request) {
 
 	st, err := os.Stat(path)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -423,12 +439,12 @@ func CheckBlob(w http.ResponseWriter, r *http.Request) {
 }
 
 // GetBlob retrieves a blob from the repository.
-func GetBlob(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) GetBlob(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("GetBlob()")
 	}
 
-	path, err := getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
+	path, err := s.getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -436,7 +452,7 @@ func GetBlob(w http.ResponseWriter, r *http.Request) {
 
 	file, err := os.Open(path)
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
@@ -451,20 +467,20 @@ func GetBlob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if Config.Prometheus {
-		labels := getMetricLabels(r)
+	if s.Prometheus {
+		labels := s.getMetricLabels(r)
 		metricBlobReadTotal.With(labels).Inc()
 		metricBlobReadBytesTotal.With(labels).Add(float64(wc.Count()))
 	}
 }
 
 // SaveBlob saves a blob to the repository.
-func SaveBlob(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) SaveBlob(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("SaveBlob()")
 	}
 
-	path, err := getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
+	path, err := s.getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
@@ -488,7 +504,7 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -499,7 +515,7 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		_ = tf.Close()
 		_ = os.Remove(path)
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
@@ -509,7 +525,7 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
 	if err := tf.Sync(); err != nil {
 		_ = tf.Close()
 		_ = os.Remove(path)
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
@@ -518,39 +534,39 @@ func SaveBlob(w http.ResponseWriter, r *http.Request) {
 
 	if err := tf.Close(); err != nil {
 		_ = os.Remove(path)
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 
-	if Config.Prometheus {
-		labels := getMetricLabels(r)
+	if s.Prometheus {
+		labels := s.getMetricLabels(r)
 		metricBlobWriteTotal.With(labels).Inc()
 		metricBlobWriteBytesTotal.With(labels).Add(float64(written))
 	}
 }
 
 // DeleteBlob deletes a blob from the repository.
-func DeleteBlob(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) DeleteBlob(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("DeleteBlob()")
 	}
 
-	if Config.AppendOnly && pat.Param(r, "type") != "locks" {
+	if s.AppendOnly && pat.Param(r, "type") != "locks" {
 		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
 		return
 	}
 
-	path, err := getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
+	path, err := s.getFilePath(r, pat.Param(r, "type"), pat.Param(r, "name"))
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return
 	}
 
 	var size int64
-	if Config.Prometheus {
+	if s.Prometheus {
 		stat, err := os.Stat(path)
 		if err != nil {
 			size = stat.Size()
@@ -558,7 +574,7 @@ func DeleteBlob(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if err := os.Remove(path); err != nil {
-		if Config.Debug {
+		if s.Debug {
 			log.Print(err)
 		}
 		if os.IsNotExist(err) {
@@ -569,20 +585,20 @@ func DeleteBlob(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if Config.Prometheus {
-		labels := getMetricLabels(r)
+	if s.Prometheus {
+		labels := s.getMetricLabels(r)
 		metricBlobDeleteTotal.With(labels).Inc()
 		metricBlobDeleteBytesTotal.With(labels).Add(float64(size))
 	}
 }
 
 // CreateRepo creates repository directories.
-func CreateRepo(w http.ResponseWriter, r *http.Request) {
-	if Config.Debug {
+func (s Server) CreateRepo(w http.ResponseWriter, r *http.Request) {
+	if s.Debug {
 		log.Println("CreateRepo()")
 	}
 
-	repo, err := join(Config.Path, getRepo(r))
+	repo, err := join(s.Path, s.getRepo(r))
 	if err != nil {
 		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
 		return

handlers_test.go

@@ -229,11 +229,11 @@ func TestResticHandler(t *testing.T) {
 		}
 	}()
 
-	// globally set append-only mode and configure path
-	Config.AppendOnly = true
-	Config.Path = tempdir
-
-	mux := NewMux()
+	// set append-only mode and configure path
+	mux := NewHandler(Server{
+		AppendOnly: true,
+		Path:       tempdir,
+	})
 
 	// create the repo
 	checkRequest(t, mux.ServeHTTP,

mux.go

@@ -12,28 +12,7 @@ import (
 	"goji.io/pat"
 )
 
-// Config struct holds program configuration.
-var Config = struct {
-	Path         string
-	Listen       string
-	Log          string
-	CPUProfile   string
-	TLSKey       string
-	TLSCert      string
-	TLS          bool
-	NoAuth       bool
-	AppendOnly   bool
-	PrivateRepos bool
-	Prometheus   bool
-	Debug        bool
-	Version      bool
-}{
-	Path:       "/tmp/restic",
-	Listen:     ":8000",
-	AppendOnly: false,
-}
-
-func debugHandler(next http.Handler) http.Handler {
+func (s Server) debugHandler(next http.Handler) http.Handler {
 	return http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
 			log.Printf("%s %s", r.Method, r.URL)
@@ -41,8 +20,8 @@ func debugHandler(next http.Handler) http.Handler {
 		})
 }
 
-func logHandler(next http.Handler) http.Handler {
-	accessLog, err := os.OpenFile(Config.Log, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+func (s Server) logHandler(next http.Handler) http.Handler {
+	accessLog, err := os.OpenFile(s.Log, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
 	if err != nil {
 		log.Fatalf("error: %v", err)
 	}
@@ -50,43 +29,43 @@ func logHandler(next http.Handler) http.Handler {
 	return handlers.CombinedLoggingHandler(accessLog, next)
 }
 
-// NewMux is master HTTP multiplexer/router.
-func NewMux() *goji.Mux {
+// NewHandler returns the master HTTP multiplexer/router.
+func NewHandler(server Server) *goji.Mux {
 	mux := goji.NewMux()
 
-	if Config.Debug {
-		mux.Use(debugHandler)
+	if server.Debug {
+		mux.Use(server.debugHandler)
 	}
 
-	if Config.Log != "" {
-		mux.Use(logHandler)
+	if server.Log != "" {
+		mux.Use(server.logHandler)
 	}
 
-	if Config.Prometheus {
+	if server.Prometheus {
 		mux.Handle(pat.Get("/metrics"), promhttp.Handler())
 	}
 
-	mux.HandleFunc(pat.Head("/config"), CheckConfig)
-	mux.HandleFunc(pat.Head("/:repo/config"), CheckConfig)
-	mux.HandleFunc(pat.Get("/config"), GetConfig)
-	mux.HandleFunc(pat.Get("/:repo/config"), GetConfig)
-	mux.HandleFunc(pat.Post("/config"), SaveConfig)
-	mux.HandleFunc(pat.Post("/:repo/config"), SaveConfig)
-	mux.HandleFunc(pat.Delete("/config"), DeleteConfig)
-	mux.HandleFunc(pat.Delete("/:repo/config"), DeleteConfig)
-	mux.HandleFunc(pat.Get("/:type/"), ListBlobs)
-	mux.HandleFunc(pat.Get("/:repo/:type/"), ListBlobs)
-	mux.HandleFunc(pat.Head("/:type/:name"), CheckBlob)
-	mux.HandleFunc(pat.Head("/:repo/:type/:name"), CheckBlob)
-	mux.HandleFunc(pat.Get("/:type/:name"), GetBlob)
-	mux.HandleFunc(pat.Get("/:repo/:type/:name"), GetBlob)
-	mux.HandleFunc(pat.Post("/:type/:name"), SaveBlob)
-	mux.HandleFunc(pat.Post("/:repo/:type/:name"), SaveBlob)
-	mux.HandleFunc(pat.Delete("/:type/:name"), DeleteBlob)
-	mux.HandleFunc(pat.Delete("/:repo/:type/:name"), DeleteBlob)
-	mux.HandleFunc(pat.Post("/"), CreateRepo)
-	mux.HandleFunc(pat.Post("/:repo"), CreateRepo)
-	mux.HandleFunc(pat.Post("/:repo/"), CreateRepo)
+	mux.HandleFunc(pat.Head("/config"), server.CheckConfig)
+	mux.HandleFunc(pat.Head("/:repo/config"), server.CheckConfig)
+	mux.HandleFunc(pat.Get("/config"), server.GetConfig)
+	mux.HandleFunc(pat.Get("/:repo/config"), server.GetConfig)
+	mux.HandleFunc(pat.Post("/config"), server.SaveConfig)
+	mux.HandleFunc(pat.Post("/:repo/config"), server.SaveConfig)
+	mux.HandleFunc(pat.Delete("/config"), server.DeleteConfig)
+	mux.HandleFunc(pat.Delete("/:repo/config"), server.DeleteConfig)
+	mux.HandleFunc(pat.Get("/:type/"), server.ListBlobs)
+	mux.HandleFunc(pat.Get("/:repo/:type/"), server.ListBlobs)
+	mux.HandleFunc(pat.Head("/:type/:name"), server.CheckBlob)
+	mux.HandleFunc(pat.Head("/:repo/:type/:name"), server.CheckBlob)
+	mux.HandleFunc(pat.Get("/:type/:name"), server.GetBlob)
+	mux.HandleFunc(pat.Get("/:repo/:type/:name"), server.GetBlob)
+	mux.HandleFunc(pat.Post("/:type/:name"), server.SaveBlob)
+	mux.HandleFunc(pat.Post("/:repo/:type/:name"), server.SaveBlob)
+	mux.HandleFunc(pat.Delete("/:type/:name"), server.DeleteBlob)
+	mux.HandleFunc(pat.Delete("/:repo/:type/:name"), server.DeleteBlob)
+	mux.HandleFunc(pat.Post("/"), server.CreateRepo)
+	mux.HandleFunc(pat.Post("/:repo"), server.CreateRepo)
+	mux.HandleFunc(pat.Post("/:repo/"), server.CreateRepo)
 
 	return mux
 }