Skip to content

The Unified and Autonomous Development Platform

Implemented a DefaultKeyPairProvider that uses the keypair generated during configuration step.

Andrea Del Bene884fc9feda3c
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index c343293339..83b3599edd 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -85,8 +85,8 @@ 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.DefaultKeyPairProvider;
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;
@@ -392,7 +392,7 @@ public class CoreModule extends AbstractPluginModule {
bind(WebHookManager.class);
bind(SshKeyManager.class).to(DefaultSshKeyManager.class);
- bind(KeyPairProvider.class).to(DefaultTestKeyPairProvider.class);
+ bind(KeyPairProvider.class).to(DefaultKeyPairProvider.class);
bind(ServerKeyPairPopulator.class).to(DefaultServerKeyPairPopulator.class);
bind(SimpleGitSshServer.class);
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
new file mode 100644
index 0000000000..dad2369758
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/crypto/DefaultKeyPairProvider.java
@@ -0,0 +1,61 @@
+package io.onedev.server.crypto;
+
+import java.io.StringReader;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+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 org.apache.sshd.common.util.security.SecurityUtils;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemReader;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.support.administration.SshSettings;
+
+@Singleton
+public class DefaultKeyPairProvider implements KeyPairProvider {
+
+ private final SettingManager settingManager;
+
+ @Inject
+ public DefaultKeyPairProvider(SettingManager settingManager) {
+ this.settingManager = settingManager;
+ }
+
+ @Override
+ public Iterable<KeyPair> loadKeys() {
+ Setting setting = settingManager.getSetting(Key.SSH);
+ SshSettings sshSettings = (SshSettings) setting.getValue();
+
+ try (PemReader pemReaderPrivate = new PemReader(new StringReader(sshSettings.getPrivateKey()));
+ PemReader pemReaderPublic = new PemReader(new StringReader(sshSettings.getPublicKey()));
+ ) {
+ KeyFactory kf = SecurityUtils.getKeyFactory(KeyUtils.RSA_ALGORITHM);
+
+ PemObject pemObjectPrivate = pemReaderPrivate.readPemObject();
+ PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(pemObjectPrivate.getContent());
+ PrivateKey privateKey = kf.generatePrivate(spec);
+
+ PemObject pemObjectPublic = pemReaderPublic.readPemObject();
+ X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(pemObjectPublic.getContent());
+ PublicKey publicKey = kf.generatePublic(x509EncodedKeySpec);
+
+ List<KeyPair> keys = new ArrayList<>();
+
+ keys.add(new KeyPair(publicKey, privateKey));
+
+ return keys;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
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 8199ce1a4f..3a7c1d8843 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
@@ -15,13 +15,12 @@ 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);
+ KeyPair keyPair = KeyUtils.generateKeyPair("ssh-rsa", 4096);
privatePemWriter.writeObject(new PemObject("RSA PRIVATE KEY", keyPair.getPrivate().getEncoded()));
privatePemWriter.flush();
@@ -33,7 +32,7 @@ public class DefaultServerKeyPairPopulator implements ServerKeyPairPopulator {
sshSettings.setPrivateKey(privateWriter.toString());
} catch (GeneralSecurityException | IOException e) {
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
}
diff --git a/server-core/src/test/java/io/onedev/server/crypto/DefaultKeyPairProviderGeneratorTest.java b/server-core/src/test/java/io/onedev/server/crypto/DefaultKeyPairProviderGeneratorTest.java
new file mode 100644
index 0000000000..22817c3bde
--- /dev/null
+++ b/server-core/src/test/java/io/onedev/server/crypto/DefaultKeyPairProviderGeneratorTest.java
@@ -0,0 +1,44 @@
+package io.onedev.server.crypto;
+
+import static org.junit.Assert.assertEquals;
+import java.io.StringWriter;
+import java.security.KeyPair;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemWriter;
+import org.junit.Test;
+import org.mockito.Mockito;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.support.administration.SshSettings;
+
+public class DefaultKeyPairProviderGeneratorTest {
+ @Test
+ public void generateAndDecode() throws Exception {
+ DefaultServerKeyPairPopulator populator = new DefaultServerKeyPairPopulator();
+ SshSettings sshSettings = new SshSettings();
+
+ populator.populateSettings(sshSettings);
+
+ SettingManager settingManager = Mockito.mock(SettingManager.class);
+ Setting setting = new Setting();
+ setting.setValue(sshSettings);
+
+ Mockito.when(settingManager.getSetting(Mockito.any(Key.class))).thenReturn(setting);
+ DefaultKeyPairProvider provider = new DefaultKeyPairProvider(settingManager);
+ Iterable<KeyPair> keysIterable = provider.loadKeys();
+
+ KeyPair keyPair = keysIterable.iterator().next();
+
+ //encode private key again
+ StringWriter privateWriter = new StringWriter();
+ PemWriter privatePemWriter = new PemWriter(privateWriter);
+
+ privatePemWriter.writeObject(new PemObject("RSA PRIVATE KEY", keyPair.getPrivate().getEncoded()));
+ privatePemWriter.flush();
+ privatePemWriter.close();
+
+ assertEquals(sshSettings.getPrivateKey(), privateWriter.toString());
+
+ }
+}