Skip to content

fix(shacrypt): return none for unknown identifiers #352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
james-d-elliott merged 1 commit into from
Sep 24, 2026
Merged

fix(shacrypt): return none for unknown identifiers #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion algorithm/shacrypt/shacrypt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ func TestNewVariant(t *testing.T) {
{"ShouldReturnSHA256ForName", "sha256", VariantSHA256},
{"ShouldReturnSHA512ForIdentifier", "6", VariantSHA512},
{"ShouldReturnSHA512ForName", "sha512", VariantSHA512},
{"ShouldDefaultToSHA512ForUnknown", "unknown", VariantSHA512},
{"ShouldReturnNoneForUnknown", "unknown", VariantNone},
{"ShouldReturnNoneForEmpty", "", VariantNone},
{"ShouldReturnNoneForMD5Crypt", "1", VariantNone},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -132,6 +134,7 @@ func TestWithVariantName(t *testing.T) {
{"ShouldNotErrSHA256", "sha256", ""},
{"ShouldNotErrSHA512", "sha512", ""},
{"ShouldNotErrEmpty", "", ""},
{"ShouldErrUnknown", "unknown", "shacrypt validation error: parameter is invalid: variant identifier 'unknown' is invalid"},
}

for _, tc := range testCases {
Expand Down Expand Up @@ -371,6 +374,9 @@ func TestDecode(t *testing.T) {
}{
{"ShouldFailInvalidFormat", "$", "shacrypt decode error: provided encoded hash has an invalid format"},
{"ShouldFailTooFewParts", "$5$", "shacrypt decode error: provided encoded hash has an invalid format"},
{"ShouldFailMD5CryptDigest", "$1$saltsalt$abcdefghijklmnopqrstuv", "shacrypt decode error: provided encoded hash has an invalid identifier: identifier '1' is not an encoded shacrypt digest"},
{"ShouldFailBCryptDigest", "$2b$12$abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012", "shacrypt decode error: provided encoded hash has an invalid identifier: identifier '2b' is not an encoded shacrypt digest"},
{"ShouldFailUnknownIdentifierWithRounds", "$7$rounds=5000$saltsalt$abcdefghijklmnopqrstuv", "shacrypt decode error: provided encoded hash has an invalid identifier: identifier '7' is not an encoded shacrypt digest"},
}

for _, tc := range testCases {
Expand Down
2 changes: 1 addition & 1 deletion algorithm/shacrypt/variant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func NewVariant(identifier string) Variant {
case AlgIdentifierSHA512, algorithm.DigestSHA512:
return VariantSHA512
default:
return VariantSHA512
return VariantNone
}
}

Expand Down
Loading