Skip to content

Commit 51df6ca

Browse files
[autofix.ci] apply automated fixes
1 parent df3d38b commit 51df6ca

File tree

4 files changed

+21
-19
lines changed

4 files changed

+21
-19
lines changed

crates/api-keys-simplified/src/domain.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ impl ApiKeyManagerV0 {
5858
let prefix = KeyPrefix::new(prefix)?;
5959
let generator = KeyGenerator::new(prefix, config)?;
6060
let hasher = KeyHasher::new(hash_config.clone());
61-
61+
6262
// Generate dummy key and its hash for timing attack protection
6363
let dummy_key = generator.dummy_key().clone();
6464
let dummy_hash = hasher.hash(&dummy_key)?;
65-
65+
6666
let validator = KeyValidator::new(&hash_config, include_checksum, dummy_key, dummy_hash)?;
6767

6868
Ok(Self {
@@ -73,9 +73,7 @@ impl ApiKeyManagerV0 {
7373
})
7474
}
7575

76-
pub fn init_default_config(
77-
prefix: impl Into<String>,
78-
) -> std::result::Result<Self, InitError> {
76+
pub fn init_default_config(prefix: impl Into<String>) -> std::result::Result<Self, InitError> {
7977
Self::init(prefix, KeyConfig::default(), HashConfig::default())
8078
}
8179
pub fn init_high_security_config(

crates/api-keys-simplified/src/error.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,19 @@ pub enum OperationError {
8080

8181
pub type Result<T> = std::result::Result<T, Error>;
8282

83-
8483
/// Error type for initialization operations that can fail with either
8584
/// configuration errors or runtime operation errors.
8685
#[derive(Debug, Error)]
8786
pub enum InitError {
8887
/// Configuration error during initialization
8988
#[error(transparent)]
9089
Config(#[from] ConfigError),
91-
90+
9291
/// Operation error during initialization (i.e., dummy key generation)
9392
#[error(transparent)]
9493
Operation(#[from] Error),
9594
}
9695

97-
9896
#[cfg(test)]
9997
mod tests {
10098
use super::*;

crates/api-keys-simplified/src/generator.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ impl KeyGenerator {
3131
config: config.clone(),
3232
dummy_key: SecureString::from(String::new()), // Temporary placeholder
3333
};
34-
34+
3535
let dummy_key = dummy_generator.generate(Environment::Production, None)?;
36-
36+
3737
Ok(Self {
3838
prefix,
3939
config,
4040
dummy_key,
4141
})
4242
}
43-
43+
4444
/// Returns a reference to the dummy key for timing attack protection.
4545
/// This is used by KeyValidator to perform dummy work.
4646
pub(crate) fn dummy_key(&self) -> &SecureString {

crates/api-keys-simplified/src/validator.rs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ impl KeyValidator {
3838
dummy_key: SecureString,
3939
dummy_hash: String,
4040
) -> std::result::Result<KeyValidator, ConfigError> {
41-
let hash = PasswordHashString::new(&dummy_hash)
42-
.map_err(|_| ConfigError::InvalidArgon2Hash)?;
41+
let hash =
42+
PasswordHashString::new(&dummy_hash).map_err(|_| ConfigError::InvalidArgon2Hash)?;
4343

4444
Ok(KeyValidator {
4545
hash,
@@ -150,7 +150,8 @@ mod tests {
150150
let hash = hasher.hash(&key).unwrap();
151151

152152
let (dummy_key, dummy_hash) = dummy_key_and_hash();
153-
let validator = KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
153+
let validator =
154+
KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
154155
assert_eq!(
155156
validator
156157
.verify(key.expose_secret(), hash.as_ref())
@@ -166,7 +167,8 @@ mod tests {
166167
#[test]
167168
fn test_invalid_hash_format() {
168169
let (dummy_key, dummy_hash) = dummy_key_and_hash();
169-
let validator = KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
170+
let validator =
171+
KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
170172
let result = validator.verify("any_key", "invalid_hash");
171173
// After timing oracle fix: invalid hash format returns Ok(Invalid) instead of Err
172174
// to prevent timing-based user enumeration attacks
@@ -182,7 +184,8 @@ mod tests {
182184
let hash = hasher.hash(&valid_key).unwrap();
183185

184186
let (dummy_key, dummy_hash) = dummy_key_and_hash();
185-
let validator = KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
187+
let validator =
188+
KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
186189
let result = validator.verify(&oversized_key, hash.as_ref());
187190
assert!(result.is_err());
188191
assert!(matches!(result.unwrap_err(), Error::InvalidFormat));
@@ -193,7 +196,8 @@ mod tests {
193196
let oversized_hash = "a".repeat(513); // Exceeds MAX_HASH_LENGTH
194197

195198
let (dummy_key, dummy_hash) = dummy_key_and_hash();
196-
let validator = KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
199+
let validator =
200+
KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
197201
let result = validator.verify("valid_key", &oversized_hash);
198202
assert!(result.is_err());
199203
assert!(matches!(result.unwrap_err(), Error::InvalidFormat));
@@ -206,7 +210,8 @@ mod tests {
206210
let hash = hasher.hash(&valid_key).unwrap();
207211

208212
let (dummy_key, dummy_hash) = dummy_key_and_hash();
209-
let validator = KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
213+
let validator =
214+
KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
210215

211216
// Test at boundary (512 chars - should pass)
212217
let max_key = "a".repeat(512);
@@ -227,7 +232,8 @@ mod tests {
227232
let valid_hash = hasher.hash(&valid_key).unwrap();
228233

229234
let (dummy_key, dummy_hash) = dummy_key_and_hash();
230-
let validator = KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
235+
let validator =
236+
KeyValidator::new(&HashConfig::default(), true, dummy_key, dummy_hash).unwrap();
231237

232238
let result1 = validator.verify("wrong_key", valid_hash.as_ref());
233239
assert!(result1.is_ok());

0 commit comments

Comments
 (0)