Skip to content

The Unified and Autonomous Development Platform

feat: SSH: Post-quantum key exchange algorithm support (OD-2623)

Robin Shen014797a2660a
diff --git a/pom.xml b/pom.xml
index 59d9bfcdaa..f31572b954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.74</version>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bctls-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.unbescape</groupId>
@@ -550,7 +555,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>2.12.1</version>
+ <version>2.16.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -674,5 +679,6 @@
<jackson.version>2.15.0</jackson.version>
<tika.version>3.2.2</tika.version>
<langchain4j.version>1.8.0</langchain4j.version>
+ <bouncycastle.version>1.83</bouncycastle.version>
</properties>
</project>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index adeb07fb01..35d16822b8 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -72,6 +72,10 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bctls-jdk18on</artifactId>
+ </dependency>
<dependency>
<groupId>org.unbescape</groupId>
<artifactId>unbescape</artifactId>
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 1738fa8bac..9a6ea0e94f 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
@@ -38,7 +38,8 @@ public class SshSignatureVerifier implements SignatureVerifier {
@Override
public VerificationResult verify(byte[] data, byte[] signatureData, String emailAddressValue) {
- try (var pemReader = new PemReader(new StringReader(new String(signatureData)))) {
+ var normalizedSignature = normalizePem(new String(signatureData));
+ try (var pemReader = new PemReader(new StringReader(normalizedSignature))) {
var signatureBlob = pemReader.readPemObject().getContent();
var signatureBlobReader = new TypesReader(signatureBlob);
var magicPreamble = new String(signatureBlobReader.readBytes(6));
@@ -121,4 +122,13 @@ public class SshSignatureVerifier implements SignatureVerifier {
return "-----BEGIN SSH SIGNATURE-----";
}
+ private String normalizePem(String pem) {
+ var lines = pem.split("\n");
+ var result = new StringBuilder();
+ for (var line : lines) {
+ result.append(line.stripLeading()).append("\n");
+ }
+ return result.toString();
+ }
+
}