Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return http.StatusOK instead of 0

Browse Source 
Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>
This commit is contained in:
Erik Wilson 2020-12-23 16:55:47 -07:00
parent 2fb411fc83
commit 4245fd7b67
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/server/router.go
View File

@ -140,9 +140,9 @@ func servingKubeletCert(server *config.Control, keyFile string, auth nodePassBoo
return
}
nodeName, code, err := auth(req)
if err != nil || code != 0 {
sendError(err, resp, code)
nodeName, errCode, err := auth(req)
if err != nil {
sendError(err, resp, errCode)
return
}
@ -188,9 +188,9 @@ func clientKubeletCert(server *config.Control, keyFile string, auth nodePassBoot
return
}
nodeName, code, err := auth(req)
if err != nil || code != 0 {
sendError(err, resp, code)
nodeName, errCode, err := auth(req)
if err != nil {
sendError(err, resp, errCode)
return
}
@ -271,19 +271,19 @@ func serveStatic(urlPrefix, staticDir string) http.Handler {
}
func sendError(err error, resp http.ResponseWriter, status ...int) {
code := http.StatusInternalServerError
if len(status) == 1 && status[0] != 0 {
var code int
if len(status) == 1 {
code = status[0]
}
if err == nil {
err = errors.New("unknown")
if code == 0 || code == http.StatusOK {
code = http.StatusInternalServerError
}
logrus.Error(err)
resp.WriteHeader(code)
resp.Write([]byte(err.Error()))
}
// nodePassBootstrapper returns a node name, http code, and error
// nodePassBootstrapper returns a node name, or http error code and error
type nodePassBootstrapper func(req *http.Request) (string, int, error)
func passwordBootstrap(ctx context.Context, config *Config) nodePassBootstrapper {
@ -314,7 +314,7 @@ func passwordBootstrap(ctx context.Context, config *Config) nodePassBootstrapper
return "", http.StatusForbidden, err
}
return nodeName, 0, nil
return nodeName, http.StatusOK, nil
})
}
@ -361,5 +361,5 @@ func verifyLocalPassword(ctx context.Context, config *Config, once *sync.Once, n
logrus.Debugf("password verified locally for node '%s'", nodeName)
return nodeName, 0, nil
return nodeName, http.StatusOK, nil
}