Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: automatically use file storage if storage in keychain fails (#189336)

Browse Source 
Fixes #187380
This commit is contained in:
Connor Peet
2023-07-31 10:56:08 -07:00
committed by GitHub
parent 150d8194e2
commit 660d22c3ef
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cli/src/auth.rs
View File

@@ -161,6 +161,7 @@ impl StoredCredential {
struct StorageWithLastRead { struct StorageWithLastRead {
storage: Box<dyn StorageImplementation>, storage: Box<dyn StorageImplementation>,
fallback_storage: Option<FileStorage>,
last_read: Cell<Result<Option<StoredCredential>, WrappedError>>, last_read: Cell<Result<Option<StoredCredential>, WrappedError>>,
} }
@@ -392,14 +393,18 @@ impl Auth {
let mut keyring_storage = ThreadKeyringStorage::default(); let mut keyring_storage = ThreadKeyringStorage::default();
let mut file_storage = FileStorage(PersistedState::new(self.file_storage_path.clone())); let mut file_storage = FileStorage(PersistedState::new(self.file_storage_path.clone()));
let keyring_storage_result = match std::env::var("VSCODE_CLI_USE_FILE_KEYCHAIN") { let native_storage_result = if std::env::var("VSCODE_CLI_USE_FILE_KEYCHAIN").is_ok()
Ok(_) => Err(wrap("", "user prefers file storage").into()), || self.file_storage_path.exists()
_ => keyring_storage.read(), {
Err(wrap("", "user prefers file storage").into())
} else {
keyring_storage.read()
}; };
let mut storage = match keyring_storage_result { let mut storage = match native_storage_result {
Ok(v) => StorageWithLastRead { Ok(v) => StorageWithLastRead {
last_read: Cell::new(Ok(v)), last_read: Cell::new(Ok(v)),
fallback_storage: Some(file_storage),
storage: Box::new(keyring_storage), storage: Box::new(keyring_storage),
}, },
Err(e) => { Err(e) => {
@@ -410,6 +415,7 @@ impl Auth {
.read() .read()
.map_err(|e| wrap(e, "could not read from file storage")), .map_err(|e| wrap(e, "could not read from file storage")),
), ),
fallback_storage: None,
storage: Box::new(file_storage), storage: Box::new(file_storage),
} }
} }
@@ -531,7 +537,18 @@ impl Auth {
"Failed to update keyring with new credentials: {}", "Failed to update keyring with new credentials: {}",
e e
); );
if let Some(fb) = storage.fallback_storage.take() {
storage.storage = Box::new(fb);
match storage.storage.store(creds.clone()) {
Err(e) => {
warning!(self.log, "Also failed to update fallback storage: {}", e)
}
Ok(_) => debug!(self.log, "Updated fallback storage successfully"),
}
}
} }
storage.last_read.set(Ok(Some(creds))); storage.last_read.set(Ok(Some(creds)));
}) })
} }