Skip to content

The Unified and Autonomous Development Platform

Removed public key from ssh settings as it can be recovered from private

Andrea Del Bene56590ce18af6
diff --git a/server-core/src/main/java/io/onedev/server/crypto/DefaultKeyPairProvider.java b/server-core/src/main/java/io/onedev/server/crypto/DefaultKeyPairProvider.java
index 3c622488a2..933c160b42 100644
--- a/server-core/src/main/java/io/onedev/server/crypto/DefaultKeyPairProvider.java
+++ b/server-core/src/main/java/io/onedev/server/crypto/DefaultKeyPairProvider.java
@@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.keyprovider.KeyPairProvider;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.git.ssh.SshKeyUtils;
@@ -30,8 +31,9 @@ public class DefaultKeyPairProvider implements KeyPairProvider {
SshSettings sshSettings = (SshSettings) setting.getValue();
try {
- PublicKey publicKey = SshKeyUtils.decodePEMPublicKey(sshSettings.getPublicKey());
PrivateKey privateKey = SshKeyUtils.decodePEMPrivateKey(sshSettings.getPrivateKey());
+ PublicKey publicKey = KeyUtils.recoverPublicKey(privateKey);
+
List<KeyPair> keys = new ArrayList<>();
keys.add(new KeyPair(publicKey, privateKey));
diff --git a/server-core/src/main/java/io/onedev/server/crypto/DefaultServerKeyPairPopulator.java b/server-core/src/main/java/io/onedev/server/crypto/DefaultServerKeyPairPopulator.java
index 3a7c1d8843..f796346b4d 100644
--- a/server-core/src/main/java/io/onedev/server/crypto/DefaultServerKeyPairPopulator.java
+++ b/server-core/src/main/java/io/onedev/server/crypto/DefaultServerKeyPairPopulator.java
@@ -16,19 +16,13 @@ public class DefaultServerKeyPairPopulator implements ServerKeyPairPopulator {
@Override
public void populateSettings(SshSettings sshSettings) {
try (StringWriter privateWriter = new StringWriter();
- StringWriter publicWriter = new StringWriter();
PemWriter privatePemWriter = new PemWriter(privateWriter);
- PemWriter publicPemWriter = new PemWriter(publicWriter);
) {
KeyPair keyPair = KeyUtils.generateKeyPair("ssh-rsa", 4096);
privatePemWriter.writeObject(new PemObject("RSA PRIVATE KEY", keyPair.getPrivate().getEncoded()));
privatePemWriter.flush();
- publicPemWriter.writeObject(new PemObject("PUBLIC KEY", keyPair.getPublic().getEncoded()));
- publicPemWriter.flush();
-
- sshSettings.setPublicKey(publicWriter.toString());
sshSettings.setPrivateKey(privateWriter.toString());
} catch (GeneralSecurityException | IOException e) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSettings.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSettings.java
index 0288efdb81..3a0627f485 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SshSettings.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SshSettings.java
@@ -19,8 +19,6 @@ public class SshSettings implements Serializable, Validatable {
private String privateKey;
- private String publicKey;
-
@Editable(name = "Ssh URL", order = 90,
description = "Specify the URL to use with Git to access repositories via SSH")
@NotEmpty
@@ -44,26 +42,12 @@ public class SshSettings implements Serializable, Validatable {
this.privateKey = privateKey;
}
- @Editable(name = "Server public Key", order = 90,
- description = "Specify the public key (in PEM format) used by SSH server to establish connections")
- @Multiline
- @NotEmpty
- public String getPublicKey() {
- return publicKey;
- }
-
- public void setPublicKey(String publicKey) {
- this.publicKey = publicKey;
- }
-
@Override
public boolean isValid(ConstraintValidatorContext context) {
boolean hasErrors = false;
String propertyNode = "privateKey";
try {
SshKeyUtils.decodePEMPrivateKey(privateKey);
- propertyNode = "publicKey";
- SshKeyUtils.decodePEMPublicKey(publicKey);
} catch (Exception e) {
context.buildConstraintViolationWithTemplate("The provided key is not valid. Please check it and try again.")
.addPropertyNode(propertyNode).addConstraintViolation()