Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ func generateRecoveryRootToken(recovery InitResponse) (string, error) {
}

func decodeGeneratedRootToken(encodedToken, otp string) (string, error) {
encoded, err := base64.StdEncoding.DecodeString(encodedToken)
encoded, err := base64.RawStdEncoding.DecodeString(encodedToken)
if err != nil {
return "", fmt.Errorf("decode generated root token: %w", err)
}
Expand Down
6 changes: 3 additions & 3 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -851,14 +851,14 @@ func TestDecodeGeneratedRootToken(t *testing.T) {
encoded[i] = token[i] ^ otp[i]
}

got, err := decodeGeneratedRootToken(base64.StdEncoding.EncodeToString(encoded), string(otp))
got, err := decodeGeneratedRootToken(base64.RawStdEncoding.EncodeToString(encoded), string(otp))
if err != nil {
t.Fatal(err)
}
if got != string(token) {
t.Fatalf("token = %q, want %q", got, token)
}
if _, err := decodeGeneratedRootToken(base64.StdEncoding.EncodeToString(encoded[:len(encoded)-1]), string(otp)); err == nil {
if _, err := decodeGeneratedRootToken(base64.RawStdEncoding.EncodeToString(encoded[:len(encoded)-1]), string(otp)); err == nil {
t.Fatal("mismatched OTP and encoded token lengths were accepted")
}
}
Expand Down Expand Up @@ -957,7 +957,7 @@ func TestResumeIncompleteKMSBootstrap(t *testing.T) {
"required": 3, "complete": rootGenerationComplete,
}
if rootGenerationComplete {
result["encoded_token"] = base64.StdEncoding.EncodeToString(encodedToken)
result["encoded_token"] = base64.RawStdEncoding.EncodeToString(encodedToken)
}
writeJSON(response, result)
case "GET /v1/sys/audit":
Expand Down
Loading