Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch panic from oo7 when reading credentials (#21617)

Browse source
This commit is contained in:
Cole Miller 2024-12-06 08:45:03 -05:00 • committed by GitHub
parent e8f0ebc881
commit 304158ed79
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/gpui/src/platform/linux/platform.rs
View file

@ -8,7 +8,7 @@ use std::fs::File;
use std::io::Read; use std::io::Read;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use std::os::fd::{AsFd, AsRawFd, FromRawFd}; use std::os::fd::{AsFd, AsRawFd, FromRawFd};
use std::panic::Location; use std::panic::{AssertUnwindSafe, Location};
use std::rc::Weak; use std::rc::Weak;
use std::{ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
@ -23,7 +23,7 @@ use async_task::Runnable;
use calloop::channel::Channel; use calloop::channel::Channel;
use calloop::{EventLoop, LoopHandle, LoopSignal}; use calloop::{EventLoop, LoopHandle, LoopSignal};
use flume::{Receiver, Sender}; use flume::{Receiver, Sender};
use futures::channel::oneshot; use futures::{channel::oneshot, future::FutureExt};
use parking_lot::Mutex; use parking_lot::Mutex;
use util::ResultExt; use util::ResultExt;
@ -489,7 +489,12 @@ impl<P: LinuxClient + 'static> Platform for P {
let username = attributes let username = attributes
.get("username") .get("username")
.ok_or_else(|| anyhow!("Cannot find username in stored credentials"))?; .ok_or_else(|| anyhow!("Cannot find username in stored credentials"))?;
let secret = item.secret().await?; // oo7 panics if the retrieved secret can't be decrypted due to
// unexpected padding.
let secret = AssertUnwindSafe(item.secret())
.catch_unwind()
.await
.map_err(|_| anyhow!("oo7 panicked while trying to read credentials"))??;
// we lose the zeroizing capabilities at this boundary, // we lose the zeroizing capabilities at this boundary,
// a current limitation GPUI's credentials api // a current limitation GPUI's credentials api