github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return http.StatusOK instead of 0 

Signed-off-by: Erik Wilson <Erik.E.Wilson@gmail.com>
pull/2744/head
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 return
} }
nodeName, code, err := auth(req) nodeName, errCode, err := auth(req)
if err != nil || code != 0 { if err != nil {
sendError(err, resp, code) sendError(err, resp, errCode)
return return
} }
@ -188,9 +188,9 @@ func clientKubeletCert(server *config.Control, keyFile string, auth nodePassBoot
return return
} }
nodeName, code, err := auth(req) nodeName, errCode, err := auth(req)
if err != nil || code != 0 { if err != nil {
sendError(err, resp, code) sendError(err, resp, errCode)
return return
} }
@ -271,19 +271,19 @@ func serveStatic(urlPrefix, staticDir string) http.Handler {
} }
func sendError(err error, resp http.ResponseWriter, status ...int) { func sendError(err error, resp http.ResponseWriter, status ...int) {
code := http.StatusInternalServerError var code int
if len(status) == 1 && status[0] != 0 { if len(status) == 1 {
code = status[0] code = status[0]
} }
if err == nil { if code == 0 || code == http.StatusOK {
err = errors.New("unknown") code = http.StatusInternalServerError
} }
logrus.Error(err) logrus.Error(err)
resp.WriteHeader(code) resp.WriteHeader(code)
resp.Write([]byte(err.Error())) 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) type nodePassBootstrapper func(req *http.Request) (string, int, error)
func passwordBootstrap(ctx context.Context, config *Config) nodePassBootstrapper { 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 "", 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) logrus.Debugf("password verified locally for node '%s'", nodeName)
return nodeName, 0, nil return nodeName, http.StatusOK, nil
} }