X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0ad0ce519da703b3f13c0ad8a74ea8235b7d90e5..d53271e587b7bdbfe37b8ae8eaf890dd69c2796b:/services/keepstore/handlers.go diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go index 0974549fdb..2b96dbc582 100644 --- a/services/keepstore/handlers.go +++ b/services/keepstore/handlers.go @@ -134,7 +134,7 @@ func PutBlockHandler(resp http.ResponseWriter, req *http.Request) { returnHash := fmt.Sprintf("%s+%d", hash, req.ContentLength) apiToken := GetApiToken(req) if PermissionSecret != nil && apiToken != "" { - expiry := time.Now().Add(blob_signature_ttl) + expiry := time.Now().Add(blobSignatureTTL) returnHash = SignLocator(returnHash, apiToken, expiry) } resp.Write([]byte(returnHash + "\n")) @@ -281,7 +281,7 @@ func DeleteHandler(resp http.ResponseWriter, req *http.Request) { return } - if never_delete { + if neverDelete { http.Error(resp, MethodDisabledError.Error(), MethodDisabledError.HTTPCode) return } @@ -618,7 +618,7 @@ func IsValidLocator(loc string) bool { var authRe = regexp.MustCompile(`^OAuth2\s+(.*)`) -// GetAPIToken returns the OAuth2 token from the Authorization +// GetApiToken returns the OAuth2 token from the Authorization // header of a HTTP request, or an empty string if no matching // token is found. func GetApiToken(req *http.Request) string { @@ -662,5 +662,5 @@ func CanDelete(apiToken string) bool { // IsDataManagerToken returns true if apiToken represents the data // manager's token. func IsDataManagerToken(apiToken string) bool { - return data_manager_token != "" && apiToken == data_manager_token + return dataManagerToken != "" && apiToken == dataManagerToken }