X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6207681aa301ad12d164aab24f52a210945af04b..40dc04d6fa45b6b727e94986491c06132db4a582:/services/keepproxy/keepproxy.go diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go index d3dbeaf89e..f857ed3e4e 100644 --- a/services/keepproxy/keepproxy.go +++ b/services/keepproxy/keepproxy.go @@ -1,318 +1,290 @@ -package main +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +package keepproxy import ( + "context" "errors" - "flag" "fmt" - "git.curoverse.com/arvados.git/sdk/go/arvadosclient" - "git.curoverse.com/arvados.git/sdk/go/keepclient" - "github.com/gorilla/mux" "io" "io/ioutil" - "log" "net" "net/http" - "os" - "os/signal" - "reflect" "regexp" - "sync" - "syscall" + "strings" "time" + + "git.arvados.org/arvados.git/lib/service" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadosclient" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/health" + "git.arvados.org/arvados.git/sdk/go/httpserver" + "git.arvados.org/arvados.git/sdk/go/keepclient" + "github.com/gorilla/mux" + lru "github.com/hashicorp/golang-lru" + "github.com/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" ) -// Default TCP address on which to listen for requests. -// Initialized by the -listen flag. -const DEFAULT_ADDR = ":25107" - -var listener net.Listener - -func main() { - var ( - listen string - no_get bool - no_put bool - default_replicas int - timeout int64 - pidfile string - ) - - flagset := flag.NewFlagSet("default", flag.ExitOnError) - - flagset.StringVar( - &listen, - "listen", - DEFAULT_ADDR, - "Interface on which to listen for requests, in the format "+ - "ipaddr:port. e.g. -listen=10.0.1.24:8000. Use -listen=:port "+ - "to listen on all network interfaces.") - - flagset.BoolVar( - &no_get, - "no-get", - false, - "If set, disable GET operations") - - flagset.BoolVar( - &no_put, - "no-put", - false, - "If set, disable PUT operations") - - flagset.IntVar( - &default_replicas, - "default-replicas", - 2, - "Default number of replicas to write if not specified by the client.") - - flagset.Int64Var( - &timeout, - "timeout", - 15, - "Timeout on requests to internal Keep services (default 15 seconds)") - - flagset.StringVar( - &pidfile, - "pid", - "", - "Path to write pid file") - - flagset.Parse(os.Args[1:]) - - arv, err := arvadosclient.MakeArvadosClient() +const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00" + +var Command = service.Command(arvados.ServiceNameKeepproxy, newHandlerOrErrorHandler) + +func newHandlerOrErrorHandler(ctx context.Context, cluster *arvados.Cluster, token string, reg *prometheus.Registry) service.Handler { + client, err := arvados.NewClientFromConfig(cluster) if err != nil { - log.Fatalf("Error setting up arvados client %s", err.Error()) + return service.ErrorHandler(ctx, cluster, fmt.Errorf("Error setting up arvados client: %w", err)) } - - kc, err := keepclient.MakeKeepClient(&arv) + arv, err := arvadosclient.New(client) if err != nil { - log.Fatalf("Error setting up keep client %s", err.Error()) + return service.ErrorHandler(ctx, cluster, fmt.Errorf("Error setting up arvados client: %w", err)) } - - if pidfile != "" { - f, err := os.Create(pidfile) - if err != nil { - log.Fatalf("Error writing pid file (%s): %s", pidfile, err.Error()) - } - fmt.Fprint(f, os.Getpid()) - f.Close() - defer os.Remove(pidfile) + kc, err := keepclient.MakeKeepClient(arv) + if err != nil { + return service.ErrorHandler(ctx, cluster, fmt.Errorf("Error setting up keep client: %w", err)) } - - kc.Want_replicas = default_replicas - - kc.Client.Timeout = time.Duration(timeout) * time.Second - - listener, err = net.Listen("tcp", listen) + keepclient.RefreshServiceDiscoveryOnSIGHUP() + router, err := newHandler(ctx, kc, time.Duration(keepclient.DefaultProxyRequestTimeout), cluster) if err != nil { - log.Fatalf("Could not listen on %v", listen) + return service.ErrorHandler(ctx, cluster, err) } - - go RefreshServicesList(kc) - - // Shut down the server gracefully (by closing the listener) - // if SIGTERM is received. - term := make(chan os.Signal, 1) - go func(sig <-chan os.Signal) { - s := <-sig - log.Println("caught signal:", s) - listener.Close() - }(term) - signal.Notify(term, syscall.SIGTERM) - signal.Notify(term, syscall.SIGINT) - - log.Printf("Arvados Keep proxy started listening on %v", listener.Addr()) - - // Start listening for requests. - http.Serve(listener, MakeRESTRouter(!no_get, !no_put, kc)) - - log.Println("shutting down") + return router } -type ApiTokenCache struct { - tokens map[string]int64 - lock sync.Mutex - expireTime int64 +type tokenCacheEntry struct { + expire int64 + user *arvados.User } -// Refresh the keep service list every five minutes. -func RefreshServicesList(kc *keepclient.KeepClient) { - var previousRoots = []map[string]string{} - var delay time.Duration = 0 - for { - time.Sleep(delay * time.Second) - delay = 300 - if err := kc.DiscoverKeepServers(); err != nil { - log.Println("Error retrieving services list:", err) - delay = 3 - continue - } - newRoots := []map[string]string{kc.LocalRoots(), kc.GatewayRoots()} - if !reflect.DeepEqual(previousRoots, newRoots) { - log.Printf("Updated services list: locals %v gateways %v", newRoots[0], newRoots[1]) - } - if len(newRoots[0]) == 0 { - log.Print("WARNING: No local services. Retrying in 3 seconds.") - delay = 3 - } - previousRoots = newRoots - } +type apiTokenCache struct { + tokens *lru.TwoQueueCache + expireTime int64 } -// Cache the token and set an expire time. If we already have an expire time -// on the token, it is not updated. -func (this *ApiTokenCache) RememberToken(token string) { - this.lock.Lock() - defer this.lock.Unlock() - +// RememberToken caches the token and set an expire time. If the +// token is already in the cache, it is not updated. +func (cache *apiTokenCache) RememberToken(token string, user *arvados.User) { now := time.Now().Unix() - if this.tokens[token] == 0 { - this.tokens[token] = now + this.expireTime + _, ok := cache.tokens.Get(token) + if !ok { + cache.tokens.Add(token, tokenCacheEntry{ + expire: now + cache.expireTime, + user: user, + }) } } -// Check if the cached token is known and still believed to be valid. -func (this *ApiTokenCache) RecallToken(token string) bool { - this.lock.Lock() - defer this.lock.Unlock() +// RecallToken checks if the cached token is known and still believed to be +// valid. +func (cache *apiTokenCache) RecallToken(token string) (bool, *arvados.User) { + val, ok := cache.tokens.Get(token) + if !ok { + return false, nil + } + cacheEntry := val.(tokenCacheEntry) now := time.Now().Unix() - if this.tokens[token] == 0 { - // Unknown token - return false - } else if now < this.tokens[token] { + if now < cacheEntry.expire { // Token is known and still valid - return true + return true, cacheEntry.user } else { // Token is expired - this.tokens[token] = 0 - return false + cache.tokens.Remove(token) + return false, nil } } -func GetRemoteAddress(req *http.Request) string { - if realip := req.Header.Get("X-Real-IP"); realip != "" { - if forwarded := req.Header.Get("X-Forwarded-For"); forwarded != realip { - return fmt.Sprintf("%s (X-Forwarded-For %s)", realip, forwarded) - } else { - return realip - } - } - return req.RemoteAddr +func (h *proxyHandler) Done() <-chan struct{} { + return nil } -func CheckAuthorizationHeader(kc keepclient.KeepClient, cache *ApiTokenCache, req *http.Request) (pass bool, tok string) { - var auth string - if auth = req.Header.Get("Authorization"); auth == "" { - return false, "" - } +func (h *proxyHandler) CheckHealth() error { + return nil +} - _, err := fmt.Sscanf(auth, "OAuth2 %s", &tok) - if err != nil { - // Scanning error - return false, "" +func (h *proxyHandler) checkAuthorizationHeader(req *http.Request) (pass bool, tok string, user *arvados.User) { + parts := strings.SplitN(req.Header.Get("Authorization"), " ", 2) + if len(parts) < 2 || !(parts[0] == "OAuth2" || parts[0] == "Bearer") || len(parts[1]) == 0 { + return false, "", nil + } + tok = parts[1] + + // Tokens are validated differently depending on what kind of + // operation is being performed. For example, tokens in + // collection-sharing links permit GET requests, but not + // PUT requests. + var op string + if req.Method == "GET" || req.Method == "HEAD" { + op = "read" + } else { + op = "write" } - if cache.RecallToken(tok) { - // Valid in the cache, short circut - return true, tok + if ok, user := h.apiTokenCache.RecallToken(op + ":" + tok); ok { + // Valid in the cache, short circuit + return true, tok, user } - arv := *kc.Arvados + var err error + arv := *h.KeepClient.Arvados arv.ApiToken = tok - if err := arv.Call("HEAD", "users", "", "current", nil, nil); err != nil { - log.Printf("%s: CheckAuthorizationHeader error: %v", GetRemoteAddress(req), err) - return false, "" + arv.RequestID = req.Header.Get("X-Request-Id") + user = &arvados.User{} + userCurrentError := arv.Call("GET", "users", "", "current", nil, user) + err = userCurrentError + if err != nil && op == "read" { + apiError, ok := err.(arvadosclient.APIServerError) + if ok && apiError.HttpStatusCode == http.StatusForbidden { + // If it was a scoped "sharing" token it will + // return 403 instead of 401 for the current + // user check. If it is a download operation + // and they have permission to read the + // keep_services table, we can allow it. + err = arv.Call("HEAD", "keep_services", "", "accessible", nil, nil) + } + } + if err != nil { + ctxlog.FromContext(req.Context()).WithError(err).Info("checkAuthorizationHeader error") + return false, "", nil + } + + if userCurrentError == nil && user.IsAdmin { + // checking userCurrentError is probably redundant, + // IsAdmin would be false anyway. But can't hurt. + if op == "read" && !h.cluster.Collections.KeepproxyPermission.Admin.Download { + return false, "", nil + } + if op == "write" && !h.cluster.Collections.KeepproxyPermission.Admin.Upload { + return false, "", nil + } + } else { + if op == "read" && !h.cluster.Collections.KeepproxyPermission.User.Download { + return false, "", nil + } + if op == "write" && !h.cluster.Collections.KeepproxyPermission.User.Upload { + return false, "", nil + } } // Success! Update cache - cache.RememberToken(tok) + h.apiTokenCache.RememberToken(op+":"+tok, user) - return true, tok + return true, tok, user } -type GetBlockHandler struct { - *keepclient.KeepClient - *ApiTokenCache -} +// We need to make a private copy of the default http transport early +// in initialization, then make copies of our private copy later. It +// won't be safe to copy http.DefaultTransport itself later, because +// its private mutexes might have already been used. (Without this, +// the test suite sometimes panics "concurrent map writes" in +// net/http.(*Transport).removeIdleConnLocked().) +var defaultTransport = *(http.DefaultTransport.(*http.Transport)) -type PutBlockHandler struct { +type proxyHandler struct { + http.Handler *keepclient.KeepClient - *ApiTokenCache + *apiTokenCache + timeout time.Duration + transport *http.Transport + cluster *arvados.Cluster } -type IndexHandler struct { - *keepclient.KeepClient - *ApiTokenCache -} +func newHandler(ctx context.Context, kc *keepclient.KeepClient, timeout time.Duration, cluster *arvados.Cluster) (service.Handler, error) { + rest := mux.NewRouter() -type InvalidPathHandler struct{} + transport := defaultTransport + transport.DialContext = (&net.Dialer{ + Timeout: keepclient.DefaultConnectTimeout, + KeepAlive: keepclient.DefaultKeepAlive, + DualStack: true, + }).DialContext + transport.TLSClientConfig = arvadosclient.MakeTLSConfig(kc.Arvados.ApiInsecure) + transport.TLSHandshakeTimeout = keepclient.DefaultTLSHandshakeTimeout -type OptionsHandler struct{} + cacheQ, err := lru.New2Q(500) + if err != nil { + return nil, fmt.Errorf("Error from lru.New2Q: %v", err) + } -// MakeRESTRouter -// Returns a mux.Router that passes GET and PUT requests to the -// appropriate handlers. -// -func MakeRESTRouter( - enable_get bool, - enable_put bool, - kc *keepclient.KeepClient) *mux.Router { + h := &proxyHandler{ + Handler: rest, + KeepClient: kc, + timeout: timeout, + transport: &transport, + apiTokenCache: &apiTokenCache{ + tokens: cacheQ, + expireTime: 300, + }, + cluster: cluster, + } - t := &ApiTokenCache{tokens: make(map[string]int64), expireTime: 300} + rest.HandleFunc(`/{locator:[0-9a-f]{32}\+.*}`, h.Get).Methods("GET", "HEAD") + rest.HandleFunc(`/{locator:[0-9a-f]{32}}`, h.Get).Methods("GET", "HEAD") - rest := mux.NewRouter() + // List all blocks + rest.HandleFunc(`/index`, h.Index).Methods("GET") - if enable_get { - rest.Handle(`/{locator:[0-9a-f]{32}\+.*}`, - GetBlockHandler{kc, t}).Methods("GET", "HEAD") - rest.Handle(`/{locator:[0-9a-f]{32}}`, GetBlockHandler{kc, t}).Methods("GET", "HEAD") + // List blocks whose hash has the given prefix + rest.HandleFunc(`/index/{prefix:[0-9a-f]{0,32}}`, h.Index).Methods("GET") - // List all blocks - rest.Handle(`/index`, IndexHandler{kc, t}).Methods("GET") + rest.HandleFunc(`/{locator:[0-9a-f]{32}\+.*}`, h.Put).Methods("PUT") + rest.HandleFunc(`/{locator:[0-9a-f]{32}}`, h.Put).Methods("PUT") + rest.HandleFunc(`/`, h.Put).Methods("POST") + rest.HandleFunc(`/{any}`, h.Options).Methods("OPTIONS") + rest.HandleFunc(`/`, h.Options).Methods("OPTIONS") - // List blocks whose hash has the given prefix - rest.Handle(`/index/{prefix:[0-9a-f]{0,32}}`, IndexHandler{kc, t}).Methods("GET") - } + rest.Handle("/_health/{check}", &health.Handler{ + Token: cluster.ManagementToken, + Prefix: "/_health/", + }).Methods("GET") - if enable_put { - rest.Handle(`/{locator:[0-9a-f]{32}\+.*}`, PutBlockHandler{kc, t}).Methods("PUT") - rest.Handle(`/{locator:[0-9a-f]{32}}`, PutBlockHandler{kc, t}).Methods("PUT") - rest.Handle(`/`, PutBlockHandler{kc, t}).Methods("POST") - rest.Handle(`/{any}`, OptionsHandler{}).Methods("OPTIONS") - rest.Handle(`/`, OptionsHandler{}).Methods("OPTIONS") - } + rest.NotFoundHandler = invalidPathHandler{} + return h, nil +} - rest.NotFoundHandler = InvalidPathHandler{} +var errLoopDetected = errors.New("loop detected") - return rest +func (h *proxyHandler) checkLoop(resp http.ResponseWriter, req *http.Request) error { + if via := req.Header.Get("Via"); strings.Index(via, " "+viaAlias) >= 0 { + ctxlog.FromContext(req.Context()).Printf("proxy loop detected (request has Via: %q): perhaps keepproxy is misidentified by gateway config as an external client, or its keep_services record does not have service_type=proxy?", via) + http.Error(resp, errLoopDetected.Error(), http.StatusInternalServerError) + return errLoopDetected + } + return nil } -func SetCorsHeaders(resp http.ResponseWriter) { +func setCORSHeaders(resp http.ResponseWriter) { resp.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, OPTIONS") resp.Header().Set("Access-Control-Allow-Origin", "*") resp.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Length, Content-Type, X-Keep-Desired-Replicas") resp.Header().Set("Access-Control-Max-Age", "86486400") } -func (this InvalidPathHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { - log.Printf("%s: %s %s unroutable", GetRemoteAddress(req), req.Method, req.URL.Path) +type invalidPathHandler struct{} + +func (invalidPathHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { http.Error(resp, "Bad request", http.StatusBadRequest) } -func (this OptionsHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { - log.Printf("%s: %s %s", GetRemoteAddress(req), req.Method, req.URL.Path) - SetCorsHeaders(resp) +func (h *proxyHandler) Options(resp http.ResponseWriter, req *http.Request) { + setCORSHeaders(resp) } -var BadAuthorizationHeader = errors.New("Missing or invalid Authorization header") -var ContentLengthMismatch = errors.New("Actual length != expected content length") -var MethodNotSupported = errors.New("Method not supported") +var errBadAuthorizationHeader = errors.New("Missing or invalid Authorization header, or method not allowed") +var errContentLengthMismatch = errors.New("Actual length != expected content length") +var errMethodNotSupported = errors.New("Method not supported") var removeHint, _ = regexp.Compile("\\+K@[a-z0-9]{5}(\\+|$)") -func (this GetBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { - SetCorsHeaders(resp) +func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) { + if err := h.checkLoop(resp, req); err != nil { + return + } + setCORSHeaders(resp) + resp.Header().Set("Via", req.Proto+" "+viaAlias) locator := mux.Vars(req)["locator"] var err error @@ -320,21 +292,33 @@ func (this GetBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques var expectLength, responseLength int64 var proxiedURI = "-" + logger := ctxlog.FromContext(req.Context()) defer func() { - log.Println(GetRemoteAddress(req), req.Method, req.URL.Path, status, expectLength, responseLength, proxiedURI, err) + httpserver.SetResponseLogFields(req.Context(), logrus.Fields{ + "locator": locator, + "expectLength": expectLength, + "responseLength": responseLength, + "proxiedURI": proxiedURI, + "err": err, + }) if status != http.StatusOK { http.Error(resp, err.Error(), status) } }() - kc := *this.KeepClient + kc := h.makeKeepClient(req) var pass bool var tok string - if pass, tok = CheckAuthorizationHeader(kc, this.ApiTokenCache, req); !pass { - status, err = http.StatusForbidden, BadAuthorizationHeader + var user *arvados.User + if pass, tok, user = h.checkAuthorizationHeader(req); !pass { + status, err = http.StatusForbidden, errBadAuthorizationHeader return } + httpserver.SetResponseLogFields(req.Context(), logrus.Fields{ + "userUUID": user.UUID, + "userFullName": user.FullName, + }) // Copy ArvadosClient struct and use the client's API token arvclient := *kc.Arvados @@ -354,12 +338,12 @@ func (this GetBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques defer reader.Close() } default: - status, err = http.StatusNotImplemented, MethodNotSupported + status, err = http.StatusNotImplemented, errMethodNotSupported return } if expectLength == -1 { - log.Println("Warning:", GetRemoteAddress(req), req.Method, proxiedURI, "Content-Length not provided") + logger.Warn("Content-Length not provided") } switch respErr := err.(type) { @@ -372,7 +356,7 @@ func (this GetBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques case "GET": responseLength, err = io.Copy(resp, reader) if err == nil && expectLength > -1 && responseLength != expectLength { - err = ContentLengthMismatch + err = errContentLengthMismatch } } case keepclient.Error: @@ -388,21 +372,32 @@ func (this GetBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques } } -var LengthRequiredError = errors.New(http.StatusText(http.StatusLengthRequired)) -var LengthMismatchError = errors.New("Locator size hint does not match Content-Length header") +var errLengthRequired = errors.New(http.StatusText(http.StatusLengthRequired)) +var errLengthMismatch = errors.New("Locator size hint does not match Content-Length header") + +func (h *proxyHandler) Put(resp http.ResponseWriter, req *http.Request) { + if err := h.checkLoop(resp, req); err != nil { + return + } + setCORSHeaders(resp) + resp.Header().Set("Via", "HTTP/1.1 "+viaAlias) -func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { - SetCorsHeaders(resp) + kc := h.makeKeepClient(req) - kc := *this.KeepClient var err error - var expectLength int64 = -1 + var expectLength int64 var status = http.StatusInternalServerError var wroteReplicas int var locatorOut string = "-" defer func() { - log.Println(GetRemoteAddress(req), req.Method, req.URL.Path, status, expectLength, kc.Want_replicas, wroteReplicas, locatorOut, err) + httpserver.SetResponseLogFields(req.Context(), logrus.Fields{ + "expectLength": expectLength, + "wantReplicas": kc.Want_replicas, + "wroteReplicas": wroteReplicas, + "locator": strings.SplitN(locatorOut, "+A", 2)[0], + "err": err, + }) if status != http.StatusOK { http.Error(resp, err.Error(), status) } @@ -410,16 +405,18 @@ func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques locatorIn := mux.Vars(req)["locator"] - if req.Header.Get("Content-Length") != "" { - _, err := fmt.Sscanf(req.Header.Get("Content-Length"), "%d", &expectLength) - if err != nil { - resp.Header().Set("Content-Length", fmt.Sprintf("%d", expectLength)) + // Check if the client specified storage classes + if req.Header.Get("X-Keep-Storage-Classes") != "" { + var scl []string + for _, sc := range strings.Split(req.Header.Get("X-Keep-Storage-Classes"), ",") { + scl = append(scl, strings.Trim(sc, " ")) } - + kc.SetStorageClasses(scl) } - if expectLength < 0 { - err = LengthRequiredError + _, err = fmt.Sscanf(req.Header.Get("Content-Length"), "%d", &expectLength) + if err != nil || expectLength < 0 { + err = errLengthRequired status = http.StatusLengthRequired return } @@ -430,7 +427,7 @@ func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques status = http.StatusBadRequest return } else if loc.Size > 0 && int64(loc.Size) != expectLength { - err = LengthMismatchError + err = errLengthMismatch status = http.StatusBadRequest return } @@ -438,11 +435,16 @@ func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques var pass bool var tok string - if pass, tok = CheckAuthorizationHeader(kc, this.ApiTokenCache, req); !pass { - err = BadAuthorizationHeader + var user *arvados.User + if pass, tok, user = h.checkAuthorizationHeader(req); !pass { + err = errBadAuthorizationHeader status = http.StatusForbidden return } + httpserver.SetResponseLogFields(req.Context(), logrus.Fields{ + "userUUID": user.UUID, + "userFullName": user.FullName, + }) // Copy ArvadosClient struct and use the client's API token arvclient := *kc.Arvados @@ -450,50 +452,55 @@ func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques kc.Arvados = &arvclient // Check if the client specified the number of replicas - if req.Header.Get("X-Keep-Desired-Replicas") != "" { + if desiredReplicas := req.Header.Get(keepclient.XKeepDesiredReplicas); desiredReplicas != "" { var r int - _, err := fmt.Sscanf(req.Header.Get(keepclient.X_Keep_Desired_Replicas), "%d", &r) - if err != nil { + _, err := fmt.Sscanf(desiredReplicas, "%d", &r) + if err == nil { kc.Want_replicas = r } } // Now try to put the block through if locatorIn == "" { - if bytes, err := ioutil.ReadAll(req.Body); err != nil { - err = errors.New(fmt.Sprintf("Error reading request body: %s", err)) + bytes, err2 := ioutil.ReadAll(req.Body) + if err2 != nil { + err = fmt.Errorf("Error reading request body: %s", err2) status = http.StatusInternalServerError return - } else { - locatorOut, wroteReplicas, err = kc.PutB(bytes) } + locatorOut, wroteReplicas, err = kc.PutB(bytes) } else { locatorOut, wroteReplicas, err = kc.PutHR(locatorIn, req.Body, expectLength) } // Tell the client how many successful PUTs we accomplished - resp.Header().Set(keepclient.X_Keep_Replicas_Stored, fmt.Sprintf("%d", wroteReplicas)) + resp.Header().Set(keepclient.XKeepReplicasStored, fmt.Sprintf("%d", wroteReplicas)) - switch err { + switch err.(type) { case nil: status = http.StatusOK + if len(kc.StorageClasses) > 0 { + // A successful PUT request with storage classes means that all + // storage classes were fulfilled, so the client will get a + // confirmation via the X-Storage-Classes-Confirmed header. + hdr := "" + isFirst := true + for _, sc := range kc.StorageClasses { + if isFirst { + hdr = fmt.Sprintf("%s=%d", sc, wroteReplicas) + isFirst = false + } else { + hdr += fmt.Sprintf(", %s=%d", sc, wroteReplicas) + } + } + resp.Header().Set(keepclient.XKeepStorageClassesConfirmed, hdr) + } _, err = io.WriteString(resp, locatorOut) - case keepclient.OversizeBlockError: // Too much data status = http.StatusRequestEntityTooLarge - case keepclient.InsufficientReplicasError: - if wroteReplicas > 0 { - // At least one write is considered success. The - // client can decide if getting less than the number of - // replications it asked for is a fatal error. - status = http.StatusOK - _, err = io.WriteString(resp, locatorOut) - } else { - status = http.StatusServiceUnavailable - } - + status = http.StatusServiceUnavailable default: status = http.StatusBadGateway } @@ -506,8 +513,8 @@ func (this PutBlockHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques // Expects "complete" response (terminating with blank new line) // Aborts on any errors // Concatenates responses from all those keep servers and returns -func (handler IndexHandler) ServeHTTP(resp http.ResponseWriter, req *http.Request) { - SetCorsHeaders(resp) +func (h *proxyHandler) Index(resp http.ResponseWriter, req *http.Request) { + setCORSHeaders(resp) prefix := mux.Vars(req)["prefix"] var err error @@ -519,11 +526,10 @@ func (handler IndexHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques } }() - kc := *handler.KeepClient - - ok, token := CheckAuthorizationHeader(kc, handler.ApiTokenCache, req) + kc := h.makeKeepClient(req) + ok, token, _ := h.checkAuthorizationHeader(req) if !ok { - status, err = http.StatusForbidden, BadAuthorizationHeader + status, err = http.StatusForbidden, errBadAuthorizationHeader return } @@ -534,7 +540,7 @@ func (handler IndexHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques // Only GET method is supported if req.Method != "GET" { - status, err = http.StatusNotImplemented, MethodNotSupported + status, err = http.StatusNotImplemented, errMethodNotSupported return } @@ -558,3 +564,16 @@ func (handler IndexHandler) ServeHTTP(resp http.ResponseWriter, req *http.Reques status = http.StatusOK resp.Write([]byte("\n")) } + +func (h *proxyHandler) makeKeepClient(req *http.Request) *keepclient.KeepClient { + kc := *h.KeepClient + kc.RequestID = req.Header.Get("X-Request-Id") + kc.HTTPClient = &proxyClient{ + client: &http.Client{ + Timeout: h.timeout, + Transport: h.transport, + }, + proto: req.Proto, + } + return &kc +}