Skip to content

The Unified and Autonomous Development Platform

fix: Project Commits view fails to display and shows error due to commit signing verification failure. (OD-2231)

Robin Shenb8f1ea0b2bfb
diff --git a/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java b/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java
index 29ba08fa56..6fd5773a40 100644
--- a/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java
+++ b/server-core/src/main/java/io/onedev/server/git/signatureverification/ssh/SshSignatureVerifier.java
@@ -49,7 +49,6 @@ public class SshSignatureVerifier implements SignatureVerifier {
var publicKeyBytes = signatureBlobReader.readByteString();
var keyType = new TypesReader(publicKeyBytes).readString();
var fingerprint = getFingerPrint(BuiltinDigests.sha256, publicKeyBytes);
- var publicKey = parsePublicKey(publicKeyBytes);
var keyInfo = new SshKeyInfo(keyType, fingerprint);
var sshKey = sshKeyManager.findByFingerprint(fingerprint);
@@ -102,7 +101,8 @@ public class SshSignatureVerifier implements SignatureVerifier {
default:
return new SshVerificationFailed(keyInfo, "Unsupported ssh signature algorithm: " + signatureAlgorithm);
}
-
+
+ var publicKey = parsePublicKey(publicKeyBytes);
signer.init(false, publicKey);
var signBytes = writer.getBytes();
signer.update(signBytes, 0, signBytes.length);