The Unified and Autonomous Development Platform
Added DefaultServerKeyPairPopulator to generate a server ssh rsa key
Andrea Del Bene6b80e09c84ff
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 33d37c5a24..c343293339 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -85,7 +85,9 @@ import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.log.DefaultLogManager;import io.onedev.server.buildspec.job.log.LogManager;import io.onedev.server.buildspec.job.log.instruction.LogInstruction;-import io.onedev.server.crypto.DefaultTestKeyPair;+import io.onedev.server.crypto.DefaultServerKeyPairPopulator;+import io.onedev.server.crypto.DefaultTestKeyPairProvider;+import io.onedev.server.crypto.ServerKeyPairPopulator;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildParamManager;@@ -390,7 +392,9 @@ public class CoreModule extends AbstractPluginModule {bind(WebHookManager.class);bind(SshKeyManager.class).to(DefaultSshKeyManager.class);- bind(KeyPairProvider.class).to(DefaultTestKeyPair.class);+ bind(KeyPairProvider.class).to(DefaultTestKeyPairProvider.class);+ bind(ServerKeyPairPopulator.class).to(DefaultServerKeyPairPopulator.class);+bind(SimpleGitSshServer.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);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.javanew file mode 100644index 0000000000..8199ce1a4f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/crypto/DefaultServerKeyPairPopulator.java@@ -0,0 +1,39 @@+package io.onedev.server.crypto;++import java.io.IOException;+import java.io.StringWriter;+import java.security.GeneralSecurityException;+import java.security.KeyPair;+import javax.inject.Singleton;+import org.apache.sshd.common.config.keys.KeyUtils;+import org.bouncycastle.util.io.pem.PemObject;+import org.bouncycastle.util.io.pem.PemWriter;+import io.onedev.server.model.support.administration.SshSettings;++@Singleton+public class DefaultServerKeyPairPopulator implements ServerKeyPairPopulator {++ @Override+ public void populateSettings(SshSettings sshSettings) {+ KeyPair keyPair;+ try (StringWriter privateWriter = new StringWriter();+ StringWriter publicWriter = new StringWriter();+ PemWriter privatePemWriter = new PemWriter(privateWriter);+ PemWriter publicPemWriter = new PemWriter(publicWriter);+ ) {+ 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) {+ e.printStackTrace();+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/crypto/DefaultTestKeyPair.java b/server-core/src/main/java/io/onedev/server/crypto/DefaultTestKeyPairProvider.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/crypto/DefaultTestKeyPair.javarename to server-core/src/main/java/io/onedev/server/crypto/DefaultTestKeyPairProvider.javaindex 4714fcbbbf..f449a5d218 100644--- a/server-core/src/main/java/io/onedev/server/crypto/DefaultTestKeyPair.java+++ b/server-core/src/main/java/io/onedev/server/crypto/DefaultTestKeyPairProvider.java@@ -21,7 +21,7 @@ import javax.inject.Singleton;import org.apache.sshd.common.keyprovider.KeyPairProvider;@Singleton-public class DefaultTestKeyPair implements KeyPairProvider {+public class DefaultTestKeyPairProvider implements KeyPairProvider {private byte[] loadPEM(String resource) throws IOException {URL url = getClass().getResource(resource);diff --git a/server-core/src/main/java/io/onedev/server/crypto/ServerKeyPairPopulator.java b/server-core/src/main/java/io/onedev/server/crypto/ServerKeyPairPopulator.javanew file mode 100644index 0000000000..55b9b3c2ec--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/crypto/ServerKeyPairPopulator.java@@ -0,0 +1,8 @@+package io.onedev.server.crypto;++import io.onedev.server.model.support.administration.SshSettings;++@FunctionalInterface+public interface ServerKeyPairPopulator {+ public void populateSettings(SshSettings sshSettings);+}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 1111d03f4f..bf4a163de5 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -8,11 +8,9 @@ import java.util.Collection;import java.util.HashSet;import java.util.List;import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;import javax.validation.Validator;-import org.apache.shiro.authc.credential.PasswordService;import org.apache.wicket.request.Url;import org.apache.wicket.request.Url.StringMode;@@ -20,11 +18,9 @@ import org.joda.time.DateTime;import org.joda.time.format.DateTimeFormat;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;-import com.google.common.base.Throwables;import com.google.common.collect.Lists;import com.google.common.collect.Sets;-import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ManagedSerializedForm;@@ -32,6 +28,7 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.ZipUtils;import io.onedev.server.OneDev;+import io.onedev.server.crypto.ServerKeyPairPopulator;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;@@ -84,13 +81,15 @@ public class DefaultDataManager implements DataManager, Serializable {private String backupTaskId;private ServerConfig serverConfig;++ private ServerKeyPairPopulator keyPairPopulator;@Injectpublic DefaultDataManager(IdManager idManager, UserManager userManager,SettingManager settingManager, PersistManager persistManager,MailManager mailManager, Validator validator, TaskScheduler taskScheduler,PasswordService passwordService, RoleManager roleManager,- ServerConfig serverConfig) {+ ServerConfig serverConfig, ServerKeyPairPopulator keyPairPopulator) {this.userManager = userManager;this.settingManager = settingManager;this.validator = validator;@@ -101,6 +100,7 @@ public class DefaultDataManager implements DataManager, Serializable {this.passwordService = passwordService;this.roleManager = roleManager;this.serverConfig = serverConfig;+ this.keyPairPopulator = keyPairPopulator;}@SuppressWarnings("serial")@@ -187,6 +187,7 @@ public class DefaultDataManager implements DataManager, Serializable {}sshSettings.setServerSshUrl("ssh://git@" + sshUrl);+ keyPairPopulator.populateSettings(sshSettings);} else if (!validator.validate(setting.getValue()).isEmpty()) {sshSettings = (SshSettings) setting.getValue();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.javaindex 9a9a911069..5bc219468b 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@@ -6,6 +6,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.util.validation.Validatable;import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;@Editable@ClassValidating@@ -29,7 +30,8 @@ public class SshSettings implements Serializable, Validatable {this.serverSshUrl = serverSshUrl;}- @Editable(name="Server private Key", order=90, description="Specify the private key (in PEM format) used by SSH server to establish connections")+ @Editable(name="Server private Key", order=90, description="Specify the private key (in PEM format) used by SSH server to establish connections")+ @Multiline@NotEmptypublic String getPrivateKey() {return privateKey;@@ -40,6 +42,7 @@ public class SshSettings implements Serializable, Validatable {}@Editable(name="Server public Key", order=90, description="Specify the public key (in PEM format) used by SSH server to establish connections")+ @Multiline@NotEmptypublic String getPublicKey() {return publicKey;