bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-27 23:03:31 +00:00
Code Issues Releases Wiki Activity

remove non-startup runtime panics

Browse Source
This commit is contained in:
Matt Gibson
2026-01-22 14:48:18 -08:00
parent 2cbe753a4b
commit 843c7ce9bb
8 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
akd/crates/akd_storage/src/ms_sql/tables/akd_storable_for_ms_sql.rs
View File

@@ -437,9 +437,8 @@ impl AkdStorableForMsSql for DbRecord {
}
StorageType::TreeNode => {
let bin = St::get_full_binary_key_id(key);
// These are constructed from a safe key, they should never fail
let key = TreeNodeWithPreviousValue::key_from_full_binary(&bin)
.expect("Failed to decode key"); // TODO: should this be an error?
.map_err(|e| StorageError::Other(format!("Failed to decode TreeNode key: {}", e)))?;
params.add("label_len", Box::new(key.0.label_len as i32));
params.add("label_val", Box::new(key.0.label_val.to_vec()));
@@ -455,8 +454,8 @@ impl AkdStorableForMsSql for DbRecord {
}
StorageType::ValueState => {
let bin = St::get_full_binary_key_id(key);
// These are constructed from a safe key, they should never fail
let key = ValueState::key_from_full_binary(&bin).expect("Failed to decode key"); // TODO: should this be an error?
let key = ValueState::key_from_full_binary(&bin)
.map_err(|e| StorageError::Other(format!("Failed to decode ValueState key: {}", e)))?;
params.add("raw_label", Box::new(key.0.clone()));
params.add("epoch", Box::new(key.1 as i64));
@@ -485,9 +484,8 @@ impl AkdStorableForMsSql for DbRecord {
let mut rows = Vec::new();
for k in key {
let bin = St::get_full_binary_key_id(k);
// These are constructed from a safe key, they should never fail
let key = TreeNodeWithPreviousValue::key_from_full_binary(&bin)
.expect("Failed to decode key");
.map_err(|e| StorageError::Other(format!("Failed to decode TreeNode key: {}", e)))?;
let row = (key.0.label_len as i32, key.0.label_val.to_vec()).into_row();
rows.push(row);
@@ -498,8 +496,8 @@ impl AkdStorableForMsSql for DbRecord {
let mut rows = Vec::new();
for k in key {
let bin = St::get_full_binary_key_id(k);
// These are constructed from a safe key, they should never fail
let key = ValueState::key_from_full_binary(&bin).expect("Failed to decode key"); // TODO: should this be an error?
let key = ValueState::key_from_full_binary(&bin)
.map_err(|e| StorageError::Other(format!("Failed to decode ValueState key: {}", e)))?;
let row = (key.0.clone(), key.1 as i64).into_row();
rows.push(row);

7
akd/crates/akd_storage/src/ms_sql/tables/vrf_key.rs
View File

@@ -79,9 +79,14 @@ pub fn from_row(row: &ms_database::Row) -> Result<VrfKeyTableData, VrfKeyStorage
VrfKeyStorageError("sym_enc_vrf_key_nonce is NULL or missing".to_string())
})?;
let root_key_type = root_key_type.try_into().map_err(|err| {
error!(%err, "Invalid root_key_type value from database");
VrfKeyStorageError(format!("Invalid root_key_type value from database: {}", err))
})?;
Ok(VrfKeyTableData {
root_key_hash: root_key_hash.to_vec(),
root_key_type: root_key_type.into(),
root_key_type,
enc_sym_key: enc_sym_key.map(|k| k.to_vec()),
sym_enc_vrf_key: sym_enc_vrf_key.to_vec(),
sym_enc_vrf_key_nonce: sym_enc_vrf_key_nonce.to_vec(),

21
akd/crates/akd_storage/src/vrf_key_database.rs
View File

@@ -162,14 +162,23 @@ pub(crate) enum VrfRootKeyType {
RsaKey = 2,
}
impl From<i16> for VrfRootKeyType {
fn from(value: i16) -> Self {
#[derive(Debug, Error)]
#[error("Invalid VrfRootKeyType value from database: {0}")]
pub struct InvalidVrfRootKeyTypeError(i16);
impl TryFrom<i16> for VrfRootKeyType {
type Error = InvalidVrfRootKeyTypeError;
fn try_from(value: i16) -> Result<Self, Self::Error> {
match value {
1 => VrfRootKeyType::SymmetricKey,
2 => VrfRootKeyType::RsaKey,
1 => Ok(VrfRootKeyType::SymmetricKey),
2 => Ok(VrfRootKeyType::RsaKey),
#[cfg(test)]
0 => VrfRootKeyType::None,
_ => panic!("Invalid VrfRootKeyType value: {}", value),
0 => Ok(VrfRootKeyType::None),
_ => {
error!("Invalid VrfRootKeyType value from database: {}", value);
Err(InvalidVrfRootKeyTypeError(value))
}
}
}
}

14
akd/crates/ms_database/src/pool.rs
View File

@@ -101,14 +101,22 @@ impl ManagedConnection {
}
async fn ping(&mut self) -> Result<i32, tiberius::error::Error> {
let row = self
let rows = self
.0
.simple_query("SELECT 1")
.await?
.into_first_result()
.await?;
debug!(?row, "Ping response");
let value = row[0].get(0).expect("value is present");
debug!(?rows, "Ping response");
let row = rows.first().ok_or_else(|| {
tiberius::error::Error::Conversion("Ping query returned no rows".into())
})?;
let value = row.get(0).ok_or_else(|| {
tiberius::error::Error::Conversion("Ping query returned no columns".into())
})?;
Ok(value)
}
}

5
akd/crates/publisher/src/config.rs
View File

@@ -103,11 +103,10 @@ impl ApplicationConfig {
}
/// Get the web server bind address as a SocketAddr
/// Panics if the address is invalid
pub fn socket_address(&self) -> std::net::SocketAddr {
pub fn socket_address(&self) -> Result<std::net::SocketAddr, ConfigError> {
self.web_server_bind_address
.parse()
.expect("Invalid web server bind address")
.map_err(|e| ConfigError::Message(format!("Invalid web server bind address '{}': {}", self.web_server_bind_address, e)))
}
pub fn api_key_valid(&self, api_key: &str) -> bool {

5
akd/crates/publisher/src/lib.rs
View File

@@ -151,12 +151,13 @@ async fn start_web(
.route_layer(from_fn_with_state(app_state.clone(), auth))
.with_state(app_state);
let listener = TcpListener::bind(&config.socket_address())
let socket_addr = config.socket_address().context("Failed to parse socket address")?;
let listener = TcpListener::bind(&socket_addr)
.await
.context("Socket bind failed")?;
info!(
"Publisher web server listening on {}",
config.socket_address()
socket_addr
);
axum::serve(listener, app.into_make_service())
.with_graceful_shutdown(async move {

5
akd/crates/reader/src/config.rs
View File

@@ -75,10 +75,9 @@ impl ApplicationConfig {
}
/// Get the web server bind address as a SocketAddr
/// Panics if the address is invalid
pub fn socket_address(&self) -> std::net::SocketAddr {
pub fn socket_address(&self) -> Result<std::net::SocketAddr, ConfigError> {
self.web_server_bind_address
.parse()
.expect("Invalid web server bind address")
.map_err(|e| ConfigError::Message(format!("Invalid web server bind address '{}': {}", self.web_server_bind_address, e)))
}
}

5
akd/crates/reader/src/lib.rs
View File

@@ -48,11 +48,12 @@ pub async fn start(
.merge(crate::routes::api_routes())
.with_state(app_state);
let listener = TcpListener::bind(&config.socket_address())
let socket_addr = config.socket_address().context("Failed to parse socket address")?;
let listener = TcpListener::bind(&socket_addr)
.await
.context("Socket bind failed")?;
info!(
socket_address = %config.socket_address(),
socket_address = %socket_addr,
"Reader web server listening"
);