feat(bcrypt): hash support string salt (#851)

* feat(bcrypt): hash support string salt * fix(bcrypt): fix string logic
napi-rs · Jul 10, 2024 · 1992fa2 · 1992fa2
1 parent a2016ee
commit 1992fa2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/bcrypt/binding.d.ts b/packages/bcrypt/binding.d.ts
@@ -6,9 +6,9 @@ export declare function genSalt(round: number, version?: '2a' | '2x' | '2y' | '2
 
 export declare function genSaltSync(round: number, version?: '2a' | '2x' | '2y' | '2b'): string
 
-export declare function hash(input: string | Buffer, cost?: number | undefined | null, salt?: Buffer | undefined | null, signal?: AbortSignal | undefined | null): Promise<string>
+export declare function hash(input: string | Buffer, cost?: number | undefined | null, salt?: string | Buffer | undefined | null, signal?: AbortSignal | undefined | null): Promise<string>
 
-export declare function hashSync(input: string | Buffer, cost?: number | undefined | null, salt?: Buffer | undefined | null): string
+export declare function hashSync(input: string | Buffer, cost?: number | undefined | null, salt?: string | Buffer | undefined | null): string
 
 export declare function verify(password: string | Buffer, hash: string | Buffer, signal?: AbortSignal | undefined | null): Promise<boolean>
 

diff --git a/packages/bcrypt/src/lib.rs b/packages/bcrypt/src/lib.rs
@@ -52,11 +52,12 @@ pub fn gen_salt_js(
 pub fn hash_sync(
   input: Either<String, Buffer>,
   cost: Option<u32>,
-  salt: Option<Buffer>,
+  salt: Option<Either<String, Buffer>>,
 ) -> Result<String> {
   let salt = if let Some(salt) = salt {
     let mut s = [0u8; 16];
-    s.copy_from_slice(salt.as_ref());
+    let buf = either_string_buffer_as_bytes(&salt);
+    s.copy_from_slice(&buf[..16]);
     s
   } else {
     gen_salt().map_err(|err| Error::new(Status::InvalidArg, format!("{err}")))?
@@ -71,12 +72,13 @@ pub fn hash_sync(
 pub fn hash(
   input: Either<String, JsBuffer>,
   cost: Option<u32>,
-  salt: Option<Buffer>,
+  salt: Option<Either<String, Buffer>>,
   signal: Option<AbortSignal>,
 ) -> Result<AsyncTask<HashTask>> {
   let salt = if let Some(salt) = salt {
     let mut s = [0u8; 16];
-    s.copy_from_slice(salt.as_ref());
+    let buf = either_string_buffer_as_bytes(&salt);
+    s.copy_from_slice(&buf[..16]);
     s
   } else {
     gen_salt().map_err(|err| Error::new(Status::InvalidArg, format!("{err}")))?