Skip to content

fix(bcrypt): version of genSalt should be optional #675

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
merged 1 commit into from
Apr 28, 2023
Merged

fix(bcrypt): version of genSalt should be optional #675

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
26 changes: 11 additions & 15 deletions packages/bcrypt/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,25 @@ mod verify_task;
pub const DEFAULT_COST: u32 = 12;

#[napi]
pub fn gen_salt_sync(round: u32, version: String) -> Result<String> {
pub fn gen_salt_sync(round: u32, version: Option<String>) -> Result<String> {
let salt = gen_salt().map_err(|err| {
Error::new(
Status::GenericFailure,
format!("Generate salt failed {err}"),
)
})?;
Ok(format_salt(
round,
&version_from_str(version.as_str())?,
&salt,
))
Ok(format_salt(round, &version_from_str(version)?, &salt))
}

#[napi(js_name = "genSalt")]
pub fn gen_salt_js(
round: u32,
version: String,
version: Option<String>,
signal: Option<AbortSignal>,
) -> Result<AsyncTask<salt_task::SaltTask>> {
let task = salt_task::SaltTask {
round,
version: version_from_str(version.as_str())?,
version: version_from_str(version)?,
};
Ok(AsyncTask::with_optional_signal(task, signal))
}
Expand Down Expand Up @@ -119,13 +115,13 @@ pub fn verify(
}

#[inline]
fn version_from_str(version: &str) -> Result<Version> {
match version {
"2a" => Ok(Version::TwoA),
"2b" => Ok(Version::TwoB),
"2y" => Ok(Version::TwoX),
"2x" => Ok(Version::TwoY),
_ => Err(Error::new(
fn version_from_str(version: Option<String>) -> Result<Version> {
match version.as_deref() {
Some("2a") => Ok(Version::TwoA),
Some("2b") | None => Ok(Version::TwoB),
Some("2y") => Ok(Version::TwoX),
Some("2x") => Ok(Version::TwoY),
Some(version) => Err(Error::new(
Status::InvalidArg,
format!("{version} is not a valid version"),
)),
Expand Down