Skip to content

Commit f1914a5

Browse files
autofix-ci[bot]autofix-ci[bot]
authored
[autofix.ci] apply automated fixes
1 parent 90631eb commit f1914a5

File tree

7 files changed

+75
-26
lines changed

7 files changed

+75
-26
lines changed

‎crates/api-keys-simplified/src/hasher.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl KeyHasher {
1818
pub fn new(config: HashConfig) -> Self {
1919
Self { config }
2020
}
21-
21+
2222
/// Hashes an API key using Argon2id with a randomly generated salt.
2323
///
2424
/// Returns a tuple containing:
@@ -148,7 +148,7 @@ mod tests {
148148

149149
// Get a salt from the first hash
150150
let (_hash, salt) = hasher.hash(&key).unwrap();
151-
151+
152152
// Use the same salt to generate two hashes
153153
let hash1 = hasher.hash_with_salt(&key, &salt).unwrap();
154154
let hash2 = hasher.hash_with_salt(&key, &salt).unwrap();

‎crates/api-keys-simplified/tests/checksum_dos_protection.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ fn test_valid_checksum_proceeds_to_argon2() {
5555
let key = generator.generate(Environment::production()).unwrap();
5656

5757
let start = Instant::now();
58-
let result = generator.verify(key.key(), key.expose_hash().hash()).unwrap();
58+
let result = generator
59+
.verify(key.key(), key.expose_hash().hash())
60+
.unwrap();
5961
let duration = start.elapsed();
6062

6163
// Should succeed
@@ -145,14 +147,18 @@ fn test_without_checksum_still_works() {
145147

146148
// Should still verify correctly
147149
assert_eq!(
148-
generator.verify(key.key(), key.expose_hash().hash()).unwrap(),
150+
generator
151+
.verify(key.key(), key.expose_hash().hash())
152+
.unwrap(),
149153
KeyStatus::Valid
150154
);
151155

152156
// Invalid key should still fail
153157
let invalid = SecureString::from("nochk-test-invalid".to_string());
154158
assert_eq!(
155-
generator.verify(&invalid, key.expose_hash().hash()).unwrap(),
159+
generator
160+
.verify(&invalid, key.expose_hash().hash())
161+
.unwrap(),
156162
KeyStatus::Invalid
157163
);
158164
}

‎crates/api-keys-simplified/tests/concurrency.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,10 @@ fn test_high_contention_mixed_operations() {
211211
} else {
212212
// Generate and verify
213213
let key = gen.generate(Environment::test()).unwrap();
214-
assert_eq!(gen.verify(key.key(), key.expose_hash().hash()).unwrap(), KeyStatus::Valid);
214+
assert_eq!(
215+
gen.verify(key.key(), key.expose_hash().hash()).unwrap(),
216+
KeyStatus::Valid
217+
);
215218
}
216219
}
217220
}));

‎crates/api-keys-simplified/tests/configuration.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ fn test_high_security_preset() {
4545

4646
assert!(key.key().len() > 50); // Higher entropy = longer key
4747
assert_eq!(
48-
generator.verify(key.key(), key.expose_hash().hash()).unwrap(),
48+
generator
49+
.verify(key.key(), key.expose_hash().hash())
50+
.unwrap(),
4951
KeyStatus::Valid
5052
);
5153
}
@@ -71,7 +73,9 @@ fn test_custom_hash_config() {
7173
let key = generator.generate(Environment::dev()).unwrap();
7274

7375
assert_eq!(
74-
generator.verify(key.key(), key.expose_hash().hash()).unwrap(),
76+
generator
77+
.verify(key.key(), key.expose_hash().hash())
78+
.unwrap(),
7579
KeyStatus::Valid
7680
);
7781
}

‎crates/api-keys-simplified/tests/key_expiry.rs‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ fn test_expiry_across_environments() {
153153
.unwrap();
154154

155155
assert_eq!(
156-
manager.verify(dev_valid.key(), dev_valid.expose_hash().hash()).unwrap(),
156+
manager
157+
.verify(dev_valid.key(), dev_valid.expose_hash().hash())
158+
.unwrap(),
157159
KeyStatus::Valid
158160
);
159161
assert_eq!(
@@ -261,15 +263,21 @@ fn test_multiple_keys_same_expiry() {
261263

262264
// All should be valid
263265
assert_eq!(
264-
manager.verify(key1.key(), key1.expose_hash().hash()).unwrap(),
266+
manager
267+
.verify(key1.key(), key1.expose_hash().hash())
268+
.unwrap(),
265269
KeyStatus::Valid
266270
);
267271
assert_eq!(
268-
manager.verify(key2.key(), key2.expose_hash().hash()).unwrap(),
272+
manager
273+
.verify(key2.key(), key2.expose_hash().hash())
274+
.unwrap(),
269275
KeyStatus::Valid
270276
);
271277
assert_eq!(
272-
manager.verify(key3.key(), key3.expose_hash().hash()).unwrap(),
278+
manager
279+
.verify(key3.key(), key3.expose_hash().hash())
280+
.unwrap(),
273281
KeyStatus::Valid
274282
);
275283
}
@@ -423,11 +431,15 @@ fn test_expiry_with_custom_prefix() {
423431
.unwrap();
424432

425433
assert_eq!(
426-
manager1.verify(key1.key(), key1.expose_hash().hash()).unwrap(),
434+
manager1
435+
.verify(key1.key(), key1.expose_hash().hash())
436+
.unwrap(),
427437
KeyStatus::Invalid
428438
);
429439
assert_eq!(
430-
manager2.verify(key2.key(), key2.expose_hash().hash()).unwrap(),
440+
manager2
441+
.verify(key2.key(), key2.expose_hash().hash())
442+
.unwrap(),
431443
KeyStatus::Invalid
432444
);
433445
}

‎crates/api-keys-simplified/tests/security.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,15 @@ fn test_different_keys_same_hash() {
2121

2222
// Different keys should not validate against each other's hashes
2323
assert_eq!(
24-
generator.verify(key2.key(), key1.expose_hash().hash()).unwrap(),
24+
generator
25+
.verify(key2.key(), key1.expose_hash().hash())
26+
.unwrap(),
2527
KeyStatus::Invalid
2628
);
2729
assert_eq!(
28-
generator.verify(key1.key(), key2.expose_hash().hash()).unwrap(),
30+
generator
31+
.verify(key1.key(), key2.expose_hash().hash())
32+
.unwrap(),
2933
KeyStatus::Invalid
3034
);
3135
}

‎crates/api-keys-simplified/tests/versioning.rs‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,35 @@ fn test_different_versions_verify_correctly() {
126126

127127
// Each manager should successfully verify its own key
128128
assert_eq!(
129-
manager_v0.verify(key_v0.key(), key_v0.expose_hash().hash()).unwrap(),
129+
manager_v0
130+
.verify(key_v0.key(), key_v0.expose_hash().hash())
131+
.unwrap(),
130132
KeyStatus::Valid
131133
);
132134
assert_eq!(
133-
manager_v1.verify(key_v1.key(), key_v1.expose_hash().hash()).unwrap(),
135+
manager_v1
136+
.verify(key_v1.key(), key_v1.expose_hash().hash())
137+
.unwrap(),
134138
KeyStatus::Valid
135139
);
136140
assert_eq!(
137-
manager_v2.verify(key_v2.key(), key_v2.expose_hash().hash()).unwrap(),
141+
manager_v2
142+
.verify(key_v2.key(), key_v2.expose_hash().hash())
143+
.unwrap(),
138144
KeyStatus::Valid
139145
);
140146

141147
// Keys should not cross-verify (wrong hash)
142148
assert_eq!(
143-
manager_v0.verify(key_v1.key(), key_v0.expose_hash().hash()).unwrap(),
149+
manager_v0
150+
.verify(key_v1.key(), key_v0.expose_hash().hash())
151+
.unwrap(),
144152
KeyStatus::Invalid
145153
);
146154
assert_eq!(
147-
manager_v1.verify(key_v2.key(), key_v1.expose_hash().hash()).unwrap(),
155+
manager_v1
156+
.verify(key_v2.key(), key_v1.expose_hash().hash())
157+
.unwrap(),
148158
KeyStatus::Invalid
149159
);
150160
}
@@ -176,15 +186,21 @@ fn test_versioned_keys_support_all_environments() {
176186
KeyStatus::Valid
177187
);
178188
assert_eq!(
179-
manager.verify(test.key(), test.expose_hash().hash()).unwrap(),
189+
manager
190+
.verify(test.key(), test.expose_hash().hash())
191+
.unwrap(),
180192
KeyStatus::Valid
181193
);
182194
assert_eq!(
183-
manager.verify(staging.key(), staging.expose_hash().hash()).unwrap(),
195+
manager
196+
.verify(staging.key(), staging.expose_hash().hash())
197+
.unwrap(),
184198
KeyStatus::Valid
185199
);
186200
assert_eq!(
187-
manager.verify(prod.key(), prod.expose_hash().hash()).unwrap(),
201+
manager
202+
.verify(prod.key(), prod.expose_hash().hash())
203+
.unwrap(),
188204
KeyStatus::Valid
189205
);
190206
}
@@ -281,11 +297,15 @@ fn test_migration_scenario() {
281297

282298
// Both systems should work independently
283299
assert_eq!(
284-
old_manager.verify(old_key.key(), old_key.expose_hash().hash()).unwrap(),
300+
old_manager
301+
.verify(old_key.key(), old_key.expose_hash().hash())
302+
.unwrap(),
285303
KeyStatus::Valid
286304
);
287305
assert_eq!(
288-
new_manager.verify(new_key.key(), new_key.expose_hash().hash()).unwrap(),
306+
new_manager
307+
.verify(new_key.key(), new_key.expose_hash().hash())
308+
.unwrap(),
289309
KeyStatus::Valid
290310
);
291311

0 commit comments

Comments
 (0)