bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-22 11:13:46 +00:00
Code Issues Releases Wiki Activity

[SM-243] Upgrade windows-rs (#3516)

Browse Source
This commit is contained in:
Oscar Hinton
2022-10-24 11:46:50 +02:00
committed by GitHub
parent 67c4e34669
commit 9c292028e1
7 changed files with 101 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/desktop/desktop_native/src/biometric/macos.rs
View File

@@ -1,4 +1,4 @@
use anyhow::{Result, bail};
use anyhow::{bail, Result};
pub fn prompt(_hwnd: Vec<u8>, _message: String) -> Result<bool> {
bail!("platform not supported");

2
apps/desktop/desktop_native/src/biometric/unix.rs
View File

@@ -1,4 +1,4 @@
use anyhow::{Result, bail};
use anyhow::{bail, Result};
pub fn prompt(_hwnd: Vec<u8>, _message: String) -> Result<bool> {
bail!("platform not supported");

8
apps/desktop/desktop_native/src/biometric/windows.rs
View File

@@ -8,10 +8,10 @@ use windows::{
System::WinRT::IUserConsentVerifierInterop,
UI::{
Input::KeyboardAndMouse::{
self, keybd_event, GetAsyncKeyState, SetFocus, KEYEVENTF_EXTENDEDKEY,
KEYEVENTF_KEYUP, VK_MENU,
keybd_event, GetAsyncKeyState, SetFocus, KEYEVENTF_EXTENDEDKEY, KEYEVENTF_KEYUP,
VK_MENU,
},
WindowsAndMessaging::{self, SetForegroundWindow},
WindowsAndMessaging::SetForegroundWindow,
},
},
};
@@ -75,6 +75,7 @@ mod tests {
use super::*;
#[test]
#[cfg(feature = "manual_test")]
fn test_prompt() {
prompt(
vec![0, 0, 0, 0, 0, 0, 0, 0],
@@ -84,6 +85,7 @@ mod tests {
}
#[test]
#[cfg(feature = "manual_test")]
fn test_available() {
assert!(available().unwrap())
}

31
apps/desktop/desktop_native/src/password/windows.rs
View File

@@ -1,10 +1,13 @@
use anyhow::{anyhow, Result};
use widestring::{U16CString, U16String};
use windows::Win32::{
Foundation::{GetLastError, ERROR_NOT_FOUND, FILETIME, PWSTR, WIN32_ERROR},
Security::Credentials::{
CredDeleteW, CredFree, CredReadW, CredWriteW, CREDENTIALW, CRED_FLAGS,
CRED_PERSIST_ENTERPRISE, CRED_TYPE_GENERIC,
use windows::{
core::{PCWSTR, PWSTR},
Win32::{
Foundation::{GetLastError, ERROR_NOT_FOUND, FILETIME, WIN32_ERROR},
Security::Credentials::{
CredDeleteW, CredFree, CredReadW, CredWriteW, CREDENTIALW, CRED_FLAGS,
CRED_PERSIST_ENTERPRISE, CRED_TYPE_GENERIC,
},
},
};
@@ -18,7 +21,7 @@ pub fn get_password<'a>(service: &str, account: &str) -> Result<String> {
let result = unsafe {
CredReadW(
PWSTR(target_name.as_ptr()),
PCWSTR(target_name.as_ptr()),
CRED_TYPE_GENERIC.0,
CRED_FLAGS_NONE,
credential_ptr,
@@ -53,7 +56,7 @@ pub fn get_password_keytar<'a>(service: &str, account: &str) -> Result<String> {
let result = unsafe {
CredReadW(
PWSTR(target_name.as_ptr()),
PCWSTR(target_name.as_ptr()),
CRED_TYPE_GENERIC.0,
CRED_FLAGS_NONE,
credential_ptr,
@@ -79,8 +82,8 @@ pub fn get_password_keytar<'a>(service: &str, account: &str) -> Result<String> {
}
pub fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
let target_name = U16CString::from_str(target_name(service, account))?;
let user_name = U16CString::from_str(account)?;
let mut target_name = U16CString::from_str(target_name(service, account))?;
let mut user_name = U16CString::from_str(account)?;
let last_written = FILETIME {
dwLowDateTime: 0,
dwHighDateTime: 0,
@@ -92,16 +95,16 @@ pub fn set_password(service: &str, account: &str, password: &str) -> Result<()>
let credential = CREDENTIALW {
Flags: CRED_FLAGS(CRED_FLAGS_NONE),
Type: CRED_TYPE_GENERIC,
TargetName: PWSTR(target_name.as_ptr()),
Comment: PWSTR::default(),
TargetName: PWSTR(unsafe { target_name.as_mut_ptr() }),
Comment: PWSTR::null(),
LastWritten: last_written,
CredentialBlobSize: credential_len,
CredentialBlob: credential.as_ptr() as *mut u8,
Persist: CRED_PERSIST_ENTERPRISE,
AttributeCount: 0,
Attributes: std::ptr::null_mut(),
TargetAlias: PWSTR::default(),
UserName: PWSTR(user_name.as_ptr()),
TargetAlias: PWSTR::null(),
UserName: PWSTR(unsafe { user_name.as_mut_ptr() }),
};
let result = unsafe { CredWriteW(&credential, 0) };
@@ -117,7 +120,7 @@ pub fn delete_password(service: &str, account: &str) -> Result<()> {
unsafe {
CredDeleteW(
PWSTR(target_name.as_ptr()),
PCWSTR(target_name.as_ptr()),
CRED_TYPE_GENERIC.0,
CRED_FLAGS_NONE,
)