opendev/gerrit
Code Issues Proposed changes

PushCertificateChecker: Refactor to use Joiner in signature check

Browse Source 
Change-Id: I6eca2fe4a4dc1bef70dd5b631318bf432f92944a
This commit is contained in:
David Pursehouse
2015-09-10 10:55:02 +09:00
parent b2a8d76c7d
commit d66feee4e3
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gerrit-gpg/src/main/java/com/google/gerrit/gpg/PushCertificateChecker.java
View File

@@ -17,6 +17,8 @@ package com.google.gerrit.gpg;
import static com.google.gerrit.gpg.PublicKeyStore.keyIdToString; import static com.google.gerrit.gpg.PublicKeyStore.keyIdToString;
import static com.google.gerrit.gpg.PublicKeyStore.keyToString; import static com.google.gerrit.gpg.PublicKeyStore.keyToString;
import com.google.common.base.Joiner;
import org.bouncycastle.bcpg.ArmoredInputStream; import org.bouncycastle.bcpg.ArmoredInputStream;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPObjectFactory; import org.bouncycastle.openpgp.PGPObjectFactory;
@@ -145,13 +147,10 @@ public abstract class PushCertificateChecker {
} }
CheckResult result = publicKeyChecker.check(signer, store); CheckResult result = publicKeyChecker.check(signer, store);
if (!result.isOk()) { if (!result.isOk()) {
StringBuilder err = new StringBuilder("Invalid public key ") problems.add("Invalid public key "
.append(keyToString(signer)) + keyToString(signer)
.append(":"); + ":\n "
for (String problem : result.getProblems()) { + Joiner.on("\n ").join(result.getProblems()));
err.append("\n ").append(problem);
}
problems.add(err.toString());
} }
} }
} }