upstream/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2026-02-03 20:39:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Handle empty token file as nonexistent

Browse source 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2026-01-30 00:04:26 +00:00 committed by Brad Davidson
parent d9c422a3ab
commit 5e63bbe260
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkg/util/token.go
View file

@ -22,27 +22,20 @@ func Random(size int) (string, error) {
return hex.EncodeToString(token), err
}
// ReadTokenFromFile will attempt to get the token from <data-dir>/token if it the file not found
// in case of fresh installation it will try to use the runtime serverToken saved in memory
// after stripping it from any additional information like the username or cahash, if the file
// found then it will still strip the token from any additional info
// ReadTokenFromFile will attempt to get the token from <data-dir>/token.
// If the file is not found or is empty (in case of fresh installation) it will
// try to use provided serverToken value, instead.
func ReadTokenFromFile(serverToken, certs, dataDir string) (string, error) {
tokenFile := filepath.Join(dataDir, "token")
b, err := os.ReadFile(tokenFile)
if err != nil {
if os.IsNotExist(err) {
token, err := clientaccess.FormatToken(serverToken, certs)
if err != nil {
return token, err
}
return token, nil
}
return "", err
b = bytes.TrimSpace(b)
if os.IsNotExist(err) || len(b) == 0 {
return clientaccess.FormatToken(serverToken, certs)
}
// strip the token from any new line if its read from file
return string(bytes.TrimRight(b, "\n")), nil
return string(b), err
}
// NormalizeToken will normalize the token read from file or passed as a cli flag