opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  AccountSshKey: Strip newline characters out of public key string

Change-Id: Ia6d8973e347af80c945ef7b4bb19c79e03d91b89
This commit is contained in:
David Pursehouse
2016-11-24 18:58:17 +09:00
parent 198976610d a291706e96
commit 926166ef94
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/AccountSshKey.java
View File

@@ -67,7 +67,7 @@ public final class AccountSshKey {
public AccountSshKey(final AccountSshKey.Id i, final String pub) { public AccountSshKey(final AccountSshKey.Id i, final String pub) {
id = i; id = i;
sshPublicKey = pub; sshPublicKey = pub.replace("\n", "").replace("\r", "");
valid = id.isValid(); valid = id.isValid();
} }

16
gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountSshKeyTest.java
View File

@@ -25,6 +25,12 @@ public class AccountSshKeyTest {
+ "vf8IZixgjCmiBhaL2gt3wff6pP+NXJpTSA4aeWE5DfNK5tZlxlSxqkKOS8JRSUeNQov5T" + "vf8IZixgjCmiBhaL2gt3wff6pP+NXJpTSA4aeWE5DfNK5tZlxlSxqkKOS8JRSUeNQov5T"
+ "w== john.doe@example.com"; + "w== john.doe@example.com";
private static final String KEY_WITH_NEWLINES =
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCgug5VyMXQGnem2H1KVC4/HcRcD4zzBqS\n"
+ "uJBRWVonSSoz3RoAZ7bWXCVVGwchtXwUURD689wFYdiPecOrWOUgeeyRq754YWRhU+W28\n"
+ "vf8IZixgjCmiBhaL2gt3wff6pP+NXJpTSA4aeWE5DfNK5tZlxlSxqkKOS8JRSUeNQov5T\n"
+ "w== john.doe@example.com";
private final Account.Id accountId = new Account.Id(1); private final Account.Id accountId = new Account.Id(1);
@Test @Test
@@ -47,4 +53,14 @@ public class AccountSshKeyTest {
assertThat(key.getEncodedKey()).isEqualTo(KEY.split(" ")[1]); assertThat(key.getEncodedKey()).isEqualTo(KEY.split(" ")[1]);
assertThat(key.getComment()).isEqualTo(KEY.split(" ")[2]); assertThat(key.getComment()).isEqualTo(KEY.split(" ")[2]);
} }
@Test
public void testKeyWithNewLines() throws Exception {
AccountSshKey key = new AccountSshKey(
new AccountSshKey.Id(accountId, 1), KEY_WITH_NEWLINES);
assertThat(key.getSshPublicKey()).isEqualTo(KEY);
assertThat(key.getAlgorithm()).isEqualTo(KEY.split(" ")[0]);
assertThat(key.getEncodedKey()).isEqualTo(KEY.split(" ")[1]);
assertThat(key.getComment()).isEqualTo(KEY.split(" ")[2]);
}
} }