Skip to content

Commit f9dbffe

Browse files
cquintana92cquintana92
committed
test: fix tests
1 parent 948c897 commit f9dbffe

File tree

3 files changed

+18
-73
lines changed

3 files changed

+18
-73
lines changed

‎proton-pass-common/src/sshkey.rs‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub fn generate_ssh_key(
9191
}
9292
};
9393

94-
let sanitized_comment = comment.replace('\n', " ").replace('\r', " ").trim().to_string();
94+
let sanitized_comment = comment.replace(['\n', '\r'], " ").trim().to_string();
9595
private_key.set_comment(sanitized_comment);
9696

9797
let public_key = private_key.public_key();
@@ -141,11 +141,7 @@ mod tests {
141141

142142
#[test]
143143
fn test_generate_ed25519_key() {
144-
let result = generate_ssh_key(
145-
"Test User <test@example.com>".to_string(),
146-
SshKeyType::Ed25519,
147-
None,
148-
);
144+
let result = generate_ssh_key("Test User <test@example.com>".to_string(), SshKeyType::Ed25519, None);
149145
assert!(result.is_ok());
150146

151147
let key_pair = result.unwrap();
@@ -156,11 +152,7 @@ mod tests {
156152

157153
#[test]
158154
fn test_generate_rsa2048_key() {
159-
let result = generate_ssh_key(
160-
"Test User <test@example.com>".to_string(),
161-
SshKeyType::RSA2048,
162-
None,
163-
);
155+
let result = generate_ssh_key("Test User <test@example.com>".to_string(), SshKeyType::RSA2048, None);
164156
assert!(result.is_ok());
165157

166158
let key_pair = result.unwrap();
@@ -183,12 +175,7 @@ mod tests {
183175

184176
#[test]
185177
fn test_validate_generated_keys() {
186-
let key_pair = generate_ssh_key(
187-
"Test User <test@example.com>".to_string(),
188-
SshKeyType::Ed25519,
189-
None,
190-
)
191-
.unwrap();
178+
let key_pair = generate_ssh_key("Test User <test@example.com>".to_string(), SshKeyType::Ed25519, None).unwrap();
192179

193180
assert!(validate_public_key(&key_pair.public_key).is_ok());
194181
assert!(validate_private_key(&key_pair.private_key).is_ok());
@@ -247,12 +234,8 @@ mod tests {
247234

248235
#[test]
249236
fn test_decrypt_unencrypted_key() {
250-
let key_pair = generate_ssh_key(
251-
"Charlie <charlie@example.com>".to_string(),
252-
SshKeyType::Ed25519,
253-
None,
254-
)
255-
.unwrap();
237+
let key_pair =
238+
generate_ssh_key("Charlie <charlie@example.com>".to_string(), SshKeyType::Ed25519, None).unwrap();
256239

257240
let result = decrypt_private_key(&key_pair.private_key, "any-password").unwrap();
258241

‎proton-pass-common/tests/sshkey.rs‎

Lines changed: 11 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,7 @@ fn test_validate_valid_ed25519_public_key() {
88

99
#[test]
1010
fn test_validate_valid_rsa_public_key() {
11-
let key_pair = generate_ssh_key(
12-
"Test".to_string(),
13-
"test@example.com".to_string(),
14-
SshKeyType::RSA2048,
15-
None,
16-
)
17-
.unwrap();
11+
let key_pair = generate_ssh_key("Test <test@example.com>".to_string(), SshKeyType::RSA2048, None).unwrap();
1812
assert!(validate_public_key(&key_pair.public_key).is_ok());
1913
}
2014

@@ -38,13 +32,7 @@ fn test_validate_malformed_public_key() {
3832

3933
#[test]
4034
fn test_validate_valid_private_key_openssh_format() {
41-
let key_pair = generate_ssh_key(
42-
"Test".to_string(),
43-
"test@example.com".to_string(),
44-
SshKeyType::Ed25519,
45-
None,
46-
)
47-
.unwrap();
35+
let key_pair = generate_ssh_key("Test <test@example.com>".to_string(), SshKeyType::Ed25519, None).unwrap();
4836

4937
assert!(validate_private_key(&key_pair.private_key).is_ok());
5038
}
@@ -63,12 +51,7 @@ fn test_validate_empty_private_key() {
6351

6452
#[test]
6553
fn test_generate_ed25519_key_without_passphrase() {
66-
let result = generate_ssh_key(
67-
"John Doe".to_string(),
68-
"john@example.com".to_string(),
69-
SshKeyType::Ed25519,
70-
None,
71-
);
54+
let result = generate_ssh_key("John Doe <john@example.com>".to_string(), SshKeyType::Ed25519, None);
7255

7356
assert!(result.is_ok());
7457
let key_pair = result.unwrap();
@@ -90,8 +73,7 @@ fn test_generate_ed25519_key_without_passphrase() {
9073
#[test]
9174
fn test_generate_ed25519_key_with_passphrase() {
9275
let result = generate_ssh_key(
93-
"Jane Doe".to_string(),
94-
"jane@example.com".to_string(),
76+
"Jane Doe <jane@example.com>".to_string(),
9577
SshKeyType::Ed25519,
9678
Some("my-secure-passphrase".to_string()),
9779
);
@@ -113,12 +95,7 @@ fn test_generate_ed25519_key_with_passphrase() {
11395

11496
#[test]
11597
fn test_generate_rsa2048_key_without_passphrase() {
116-
let result = generate_ssh_key(
117-
"Alice".to_string(),
118-
"alice@example.com".to_string(),
119-
SshKeyType::RSA2048,
120-
None,
121-
);
98+
let result = generate_ssh_key("Alice <alice@example.com>".to_string(), SshKeyType::RSA2048, None);
12299

123100
assert!(result.is_ok());
124101
let key_pair = result.unwrap();
@@ -144,7 +121,7 @@ fn test_generate_all_key_types() {
144121
];
145122

146123
for key_type in key_types {
147-
let result = generate_ssh_key("Test User".to_string(), "test@example.com".to_string(), key_type, None);
124+
let result = generate_ssh_key("Test User <test@example.com>".to_string(), key_type, None);
148125

149126
assert!(result.is_ok(), "Failed to generate key");
150127
let key_pair = result.unwrap();
@@ -160,21 +137,9 @@ fn test_generate_all_key_types() {
160137

161138
#[test]
162139
fn test_generated_keys_are_unique() {
163-
let key_pair1 = generate_ssh_key(
164-
"User1".to_string(),
165-
"user1@example.com".to_string(),
166-
SshKeyType::Ed25519,
167-
None,
168-
)
169-
.unwrap();
140+
let key_pair1 = generate_ssh_key("User1 <user1@example.com>".to_string(), SshKeyType::Ed25519, None).unwrap();
170141

171-
let key_pair2 = generate_ssh_key(
172-
"User2".to_string(),
173-
"user2@example.com".to_string(),
174-
SshKeyType::Ed25519,
175-
None,
176-
)
177-
.unwrap();
142+
let key_pair2 = generate_ssh_key("User2 <user2@example.com>".to_string(), SshKeyType::Ed25519, None).unwrap();
178143

179144
// Keys should be different
180145
assert_ne!(key_pair1.public_key, key_pair2.public_key);
@@ -183,10 +148,8 @@ fn test_generated_keys_are_unique() {
183148

184149
#[test]
185150
fn test_comment_included_in_public_key() {
186-
let name = "Test Name";
187-
let email = "test@domain.com";
188-
let key_pair = generate_ssh_key(name.to_string(), email.to_string(), SshKeyType::Ed25519, None).unwrap();
151+
let comment = "Test Name <test@domain.com>";
152+
let key_pair = generate_ssh_key(comment.to_string(), SshKeyType::Ed25519, None).unwrap();
189153

190-
let expected_comment = format!("{} <{}>", name, email);
191-
assert!(key_pair.public_key.contains(&expected_comment));
154+
assert!(key_pair.public_key.contains(comment));
192155
}

‎proton-pass-web/src/worker/sshkey.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ pub fn generate_ssh_key_pair(
5656
passphrase: Option<String>,
5757
) -> Result<WasmSshKeyPair, JsError> {
5858
let ssh_key_type = SshKeyType::from(key_type);
59-
let result =
60-
generate_ssh_key(comment, ssh_key_type, passphrase).map_err(|e| JsError::new(&format!("{:?}", e)))?;
59+
let result = generate_ssh_key(comment, ssh_key_type, passphrase).map_err(|e| JsError::new(&format!("{:?}", e)))?;
6160
Ok(WasmSshKeyPair::from(result))
6261
}
6362

0 commit comments

Comments
 (0)