X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2abdbcf641c2c6cb14764a3ed0d83849a4c7736a..08bf214e0170019e78c4c5496944ede12bf14978:/services/keepproxy/keepproxy.go

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 0191e5ba45..4e5014ef82 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -167,7 +167,7 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
 	return http.Serve(listener, httpserver.AddRequestIDs(httpserver.LogRequests(router)))
 }
 
-type ApiTokenCache struct {
+type APITokenCache struct {
 	tokens     map[string]int64
 	lock       sync.Mutex
 	expireTime int64
@@ -175,7 +175,7 @@ type ApiTokenCache struct {
 
 // 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) {
+func (this *APITokenCache) RememberToken(token string) {
 	this.lock.Lock()
 	defer this.lock.Unlock()
 
@@ -186,7 +186,7 @@ func (this *ApiTokenCache) RememberToken(token string) {
 }
 
 // Check if the cached token is known and still believed to be valid.
-func (this *ApiTokenCache) RecallToken(token string) bool {
+func (this *APITokenCache) RecallToken(token string) bool {
 	this.lock.Lock()
 	defer this.lock.Unlock()
 
@@ -211,7 +211,7 @@ func GetRemoteAddress(req *http.Request) string {
 	return req.RemoteAddr
 }
 
-func CheckAuthorizationHeader(kc *keepclient.KeepClient, cache *ApiTokenCache, req *http.Request) (pass bool, tok string) {
+func CheckAuthorizationHeader(kc *keepclient.KeepClient, cache *APITokenCache, req *http.Request) (pass bool, tok string) {
 	parts := strings.SplitN(req.Header.Get("Authorization"), " ", 2)
 	if len(parts) < 2 || !(parts[0] == "OAuth2" || parts[0] == "Bearer") || len(parts[1]) == 0 {
 		return false, ""
@@ -265,7 +265,7 @@ var defaultTransport = *(http.DefaultTransport.(*http.Transport))
 type proxyHandler struct {
 	http.Handler
 	*keepclient.KeepClient
-	*ApiTokenCache
+	*APITokenCache
 	timeout   time.Duration
 	transport *http.Transport
 }
@@ -289,7 +289,7 @@ func MakeRESTRouter(kc *keepclient.KeepClient, timeout time.Duration, mgmtToken
 		KeepClient: kc,
 		timeout:    timeout,
 		transport:  &transport,
-		ApiTokenCache: &ApiTokenCache{
+		APITokenCache: &APITokenCache{
 			tokens:     make(map[string]int64),
 			expireTime: 300,
 		},
@@ -349,9 +349,9 @@ 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")
+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}(\\+|$)")
 
@@ -379,8 +379,8 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
 
 	var pass bool
 	var tok string
-	if pass, tok = CheckAuthorizationHeader(kc, h.ApiTokenCache, req); !pass {
-		status, err = http.StatusForbidden, BadAuthorizationHeader
+	if pass, tok = CheckAuthorizationHeader(kc, h.APITokenCache, req); !pass {
+		status, err = http.StatusForbidden, errBadAuthorizationHeader
 		return
 	}
 
@@ -402,7 +402,7 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
 			defer reader.Close()
 		}
 	default:
-		status, err = http.StatusNotImplemented, MethodNotSupported
+		status, err = http.StatusNotImplemented, errMethodNotSupported
 		return
 	}
 
@@ -420,7 +420,7 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
 		case "GET":
 			responseLength, err = io.Copy(resp, reader)
 			if err == nil && expectLength > -1 && responseLength != expectLength {
-				err = ContentLengthMismatch
+				err = errContentLengthMismatch
 			}
 		}
 	case keepclient.Error:
@@ -436,8 +436,8 @@ func (h *proxyHandler) Get(resp http.ResponseWriter, req *http.Request) {
 	}
 }
 
-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 {
@@ -474,7 +474,7 @@ func (h *proxyHandler) Put(resp http.ResponseWriter, req *http.Request) {
 
 	_, err = fmt.Sscanf(req.Header.Get("Content-Length"), "%d", &expectLength)
 	if err != nil || expectLength < 0 {
-		err = LengthRequiredError
+		err = errLengthRequired
 		status = http.StatusLengthRequired
 		return
 	}
@@ -485,7 +485,7 @@ func (h *proxyHandler) Put(resp http.ResponseWriter, req *http.Request) {
 			status = http.StatusBadRequest
 			return
 		} else if loc.Size > 0 && int64(loc.Size) != expectLength {
-			err = LengthMismatchError
+			err = errLengthMismatch
 			status = http.StatusBadRequest
 			return
 		}
@@ -493,8 +493,8 @@ func (h *proxyHandler) Put(resp http.ResponseWriter, req *http.Request) {
 
 	var pass bool
 	var tok string
-	if pass, tok = CheckAuthorizationHeader(kc, h.ApiTokenCache, req); !pass {
-		err = BadAuthorizationHeader
+	if pass, tok = CheckAuthorizationHeader(kc, h.APITokenCache, req); !pass {
+		err = errBadAuthorizationHeader
 		status = http.StatusForbidden
 		return
 	}
@@ -575,9 +575,9 @@ func (h *proxyHandler) Index(resp http.ResponseWriter, req *http.Request) {
 	}()
 
 	kc := h.makeKeepClient(req)
-	ok, token := CheckAuthorizationHeader(kc, h.ApiTokenCache, req)
+	ok, token := CheckAuthorizationHeader(kc, h.APITokenCache, req)
 	if !ok {
-		status, err = http.StatusForbidden, BadAuthorizationHeader
+		status, err = http.StatusForbidden, errBadAuthorizationHeader
 		return
 	}
 
@@ -588,7 +588,7 @@ func (h *proxyHandler) Index(resp http.ResponseWriter, req *http.Request) {
 
 	// Only GET method is supported
 	if req.Method != "GET" {
-		status, err = http.StatusNotImplemented, MethodNotSupported
+		status, err = http.StatusNotImplemented, errMethodNotSupported
 		return
 	}