mirror of
https://github.com/openai/codex.git
synced 2026-10-20 17:38:45 +00:00
## Why Successful file fallback can hide a secure-store failure. Storage diagnostics need to distinguish that fallback from explicit file storage while keeping credential values out of error output. ## What changed - Record credential load, save, delete, and fallback-file cleanup outcomes, including secure-store failures and fallback reasons. - Preserve the initiating client's attribution across app-server requests, login tasks, sessions, turns, and blocking token persistence. - Preserve storage error context and typed causes while redacting credential JSON data errors and payload-bearing keyring errors. - Include sanitized fallback completion warnings in the default `codex login` file logs. ## Testing Add coverage for storage policy and metric attribution, credential redaction, login diagnostics, concurrent app-server clients, device-code login, and token refresh during a turn. GitOrigin-RevId: 6d5651c1718d184016fa77befa02aa528750b2ae
250 lines
7.6 KiB
Rust
250 lines
7.6 KiB
Rust
use keyring::Entry;
|
|
use keyring::Error as KeyringError;
|
|
use std::error::Error;
|
|
use std::fmt;
|
|
use std::fmt::Debug;
|
|
use tracing::trace;
|
|
|
|
pub enum CredentialStoreError {
|
|
Other(KeyringError),
|
|
}
|
|
|
|
impl CredentialStoreError {
|
|
pub fn new(error: KeyringError) -> Self {
|
|
Self::Other(error)
|
|
}
|
|
|
|
pub fn message(&self) -> String {
|
|
self.to_string()
|
|
}
|
|
|
|
pub fn into_error(self) -> KeyringError {
|
|
match self {
|
|
Self::Other(error) => error,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for CredentialStoreError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
match self {
|
|
Self::Other(KeyringError::Ambiguous(items)) => {
|
|
write!(f, "Entry is matched by {} credentials", items.len())
|
|
}
|
|
Self::Other(error) => write!(f, "{error}"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for CredentialStoreError {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
fmt::Display::fmt(self, f)
|
|
}
|
|
}
|
|
|
|
impl Error for CredentialStoreError {
|
|
fn source(&self) -> Option<&(dyn Error + 'static)> {
|
|
match self {
|
|
// Do not expose payload-bearing variants to error-chain formatters.
|
|
Self::Other(KeyringError::Ambiguous(_) | KeyringError::BadEncoding(_)) => None,
|
|
Self::Other(error) => Some(error),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "error_display_tests.rs"]
|
|
mod error_display_tests;
|
|
|
|
mod error_kind;
|
|
|
|
impl From<CredentialStoreError> for std::io::Error {
|
|
fn from(error: CredentialStoreError) -> Self {
|
|
Self::new(error_kind::classify(&error), error)
|
|
}
|
|
}
|
|
|
|
/// Shared credential store abstraction for keyring-backed implementations.
|
|
pub trait KeyringStore: Debug + Send + Sync {
|
|
fn load(&self, service: &str, account: &str) -> Result<Option<String>, CredentialStoreError>;
|
|
fn save(&self, service: &str, account: &str, value: &str) -> Result<(), CredentialStoreError>;
|
|
fn delete(&self, service: &str, account: &str) -> Result<bool, CredentialStoreError>;
|
|
}
|
|
|
|
#[derive(Debug, Clone, Copy)]
|
|
pub struct DefaultKeyringStore;
|
|
|
|
impl KeyringStore for DefaultKeyringStore {
|
|
fn load(&self, service: &str, account: &str) -> Result<Option<String>, CredentialStoreError> {
|
|
trace!("keyring.load start");
|
|
let entry = Entry::new(service, account).map_err(CredentialStoreError::new)?;
|
|
match entry.get_password() {
|
|
Ok(password) => {
|
|
trace!("keyring.load success");
|
|
Ok(Some(password))
|
|
}
|
|
Err(keyring::Error::NoEntry) => {
|
|
trace!("keyring.load no entry");
|
|
Ok(None)
|
|
}
|
|
Err(error) => {
|
|
trace!("keyring.load error");
|
|
Err(CredentialStoreError::new(error))
|
|
}
|
|
}
|
|
}
|
|
|
|
fn save(&self, service: &str, account: &str, value: &str) -> Result<(), CredentialStoreError> {
|
|
trace!("keyring.save start");
|
|
let entry = Entry::new(service, account).map_err(CredentialStoreError::new)?;
|
|
match entry.set_password(value) {
|
|
Ok(()) => {
|
|
trace!("keyring.save success");
|
|
Ok(())
|
|
}
|
|
Err(error) => {
|
|
trace!("keyring.save error");
|
|
Err(CredentialStoreError::new(error))
|
|
}
|
|
}
|
|
}
|
|
|
|
fn delete(&self, service: &str, account: &str) -> Result<bool, CredentialStoreError> {
|
|
trace!("keyring.delete start");
|
|
let entry = Entry::new(service, account).map_err(CredentialStoreError::new)?;
|
|
match entry.delete_credential() {
|
|
Ok(()) => {
|
|
trace!("keyring.delete success");
|
|
Ok(true)
|
|
}
|
|
Err(keyring::Error::NoEntry) => {
|
|
trace!("keyring.delete no entry");
|
|
Ok(false)
|
|
}
|
|
Err(error) => {
|
|
trace!("keyring.delete error");
|
|
Err(CredentialStoreError::new(error))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
pub mod tests {
|
|
use super::CredentialStoreError;
|
|
use super::KeyringStore;
|
|
use keyring::Error as KeyringError;
|
|
use keyring::credential::CredentialApi as _;
|
|
use keyring::mock::MockCredential;
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
use std::sync::Mutex;
|
|
use std::sync::PoisonError;
|
|
|
|
#[derive(Default, Clone, Debug)]
|
|
pub struct MockKeyringStore {
|
|
credentials: Arc<Mutex<HashMap<String, Arc<MockCredential>>>>,
|
|
}
|
|
|
|
impl MockKeyringStore {
|
|
pub fn credential(&self, account: &str) -> Arc<MockCredential> {
|
|
let mut guard = self
|
|
.credentials
|
|
.lock()
|
|
.unwrap_or_else(PoisonError::into_inner);
|
|
guard
|
|
.entry(account.to_string())
|
|
.or_insert_with(|| Arc::new(MockCredential::default()))
|
|
.clone()
|
|
}
|
|
|
|
pub fn saved_value(&self, account: &str) -> Option<String> {
|
|
let credential = {
|
|
let guard = self
|
|
.credentials
|
|
.lock()
|
|
.unwrap_or_else(PoisonError::into_inner);
|
|
guard.get(account).cloned()
|
|
}?;
|
|
credential.get_password().ok()
|
|
}
|
|
|
|
pub fn set_error(&self, account: &str, error: KeyringError) {
|
|
let credential = self.credential(account);
|
|
credential.set_error(error);
|
|
}
|
|
|
|
pub fn contains(&self, account: &str) -> bool {
|
|
let guard = self
|
|
.credentials
|
|
.lock()
|
|
.unwrap_or_else(PoisonError::into_inner);
|
|
guard.contains_key(account)
|
|
}
|
|
}
|
|
|
|
impl KeyringStore for MockKeyringStore {
|
|
fn load(
|
|
&self,
|
|
_service: &str,
|
|
account: &str,
|
|
) -> Result<Option<String>, CredentialStoreError> {
|
|
let credential = {
|
|
let guard = self
|
|
.credentials
|
|
.lock()
|
|
.unwrap_or_else(PoisonError::into_inner);
|
|
guard.get(account).cloned()
|
|
};
|
|
|
|
let Some(credential) = credential else {
|
|
return Ok(None);
|
|
};
|
|
|
|
match credential.get_password() {
|
|
Ok(password) => Ok(Some(password)),
|
|
Err(KeyringError::NoEntry) => Ok(None),
|
|
Err(error) => Err(CredentialStoreError::new(error)),
|
|
}
|
|
}
|
|
|
|
fn save(
|
|
&self,
|
|
_service: &str,
|
|
account: &str,
|
|
value: &str,
|
|
) -> Result<(), CredentialStoreError> {
|
|
let credential = self.credential(account);
|
|
credential
|
|
.set_password(value)
|
|
.map_err(CredentialStoreError::new)
|
|
}
|
|
|
|
fn delete(&self, _service: &str, account: &str) -> Result<bool, CredentialStoreError> {
|
|
let credential = {
|
|
let guard = self
|
|
.credentials
|
|
.lock()
|
|
.unwrap_or_else(PoisonError::into_inner);
|
|
guard.get(account).cloned()
|
|
};
|
|
|
|
let Some(credential) = credential else {
|
|
return Ok(false);
|
|
};
|
|
|
|
let removed = match credential.delete_credential() {
|
|
Ok(()) => Ok(true),
|
|
Err(KeyringError::NoEntry) => Ok(false),
|
|
Err(error) => Err(CredentialStoreError::new(error)),
|
|
}?;
|
|
|
|
let mut guard = self
|
|
.credentials
|
|
.lock()
|
|
.unwrap_or_else(PoisonError::into_inner);
|
|
guard.remove(account);
|
|
Ok(removed)
|
|
}
|
|
}
|
|
}
|