The Unified and Autonomous Development Platform
Fix to SshKeyUtils to decode ssh public keys. Implemented some minor UI improvements.
Andrea Del Benedf32fb85d242
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 77a796d38b..f20feaa5b1 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -13,14 +13,17 @@ import java.util.List;import java.util.Set;import java.util.concurrent.ExecutorService;import java.util.concurrent.atomic.AtomicReference;+import javax.annotation.Nullable;import javax.inject.Inject;+import org.apache.commons.lang3.StringUtils;import org.apache.commons.lang3.SystemUtils;import org.apache.wicket.request.Url;import org.apache.wicket.request.Url.StringMode;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.AbstractPlugin;import io.onedev.commons.launcher.loader.AppLoader;@@ -140,7 +143,6 @@ public class OneDev extends AbstractPlugin implements Serializable {SystemSetting systemSetting = configManager.getSystemSetting();SshSettings sshSettings = configManager.getSshSettings();logger.info("Server is ready at " + systemSetting.getServerUrl() + ".");- logger.info("Git server started at " + sshSettings.getServerSshUrl());initStage = null;}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.javaindex 6b27968964..3c622488a2 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@@ -30,8 +30,8 @@ public class DefaultKeyPairProvider implements KeyPairProvider {SshSettings sshSettings = (SshSettings) setting.getValue();try {- PublicKey publicKey = SshKeyUtils.decodePublicKey(sshSettings.getPublicKey());- PrivateKey privateKey = SshKeyUtils.decodePrivateKey(sshSettings.getPrivateKey());+ PublicKey publicKey = SshKeyUtils.decodePEMPublicKey(sshSettings.getPublicKey());+ PrivateKey privateKey = SshKeyUtils.decodePEMPrivateKey(sshSettings.getPrivateKey());List<KeyPair> keys = new ArrayList<>();keys.add(new KeyPair(publicKey, privateKey));diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/SshKeyUtils.java b/server-core/src/main/java/io/onedev/server/git/ssh/SshKeyUtils.javaindex e62c4fffe0..09b613c2ea 100644--- a/server-core/src/main/java/io/onedev/server/git/ssh/SshKeyUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/ssh/SshKeyUtils.java@@ -8,7 +8,11 @@ import java.security.PrivateKey;import java.security.PublicKey;import java.security.spec.PKCS8EncodedKeySpec;import java.security.spec.X509EncodedKeySpec;+import java.util.List;++import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;import org.apache.sshd.common.config.keys.KeyUtils;+import org.apache.sshd.common.config.keys.PublicKeyEntryResolver;import org.apache.sshd.common.digest.BaseDigest;import org.apache.sshd.common.util.security.SecurityUtils;import org.bouncycastle.util.io.pem.PemObject;@@ -17,7 +21,16 @@ import org.bouncycastle.util.io.pem.PemReader;public class SshKeyUtils {public static final BaseDigest MD5_DIGESTER = new BaseDigest("MD5", 512);- public static PublicKey decodePublicKey(String publicKey) throws IOException, GeneralSecurityException {+ public static PublicKey decodeSshPublicKey(String publicKey) throws IOException, GeneralSecurityException {+ StringReader stringReader = new StringReader(publicKey);+ List<AuthorizedKeyEntry> entries = AuthorizedKeyEntry.readAuthorizedKeys(stringReader, true);++ AuthorizedKeyEntry entry = entries.get(0);+ PublicKey pubEntry = entry.resolvePublicKey(PublicKeyEntryResolver.FAILING);+ return pubEntry;+ }++ public static PublicKey decodePEMPublicKey(String publicKey) throws IOException, GeneralSecurityException {try (PemReader pemReaderPublic = new PemReader(new StringReader(publicKey))) {KeyFactory kf = SecurityUtils.getKeyFactory(KeyUtils.RSA_ALGORITHM);@@ -27,7 +40,7 @@ public class SshKeyUtils {}}- public static PrivateKey decodePrivateKey(String privateKey) throws IOException, GeneralSecurityException {+ public static PrivateKey decodePEMPrivateKey(String privateKey) throws IOException, GeneralSecurityException {try (PemReader pemReaderPrivate = new PemReader(new StringReader(privateKey))) {KeyFactory kf = SecurityUtils.getKeyFactory(KeyUtils.RSA_ALGORITHM);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 d5b8cc3480..0288efdb81 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@@ -61,9 +61,9 @@ public class SshSettings implements Serializable, Validatable {boolean hasErrors = false;String propertyNode = "privateKey";try {- SshKeyUtils.decodePrivateKey(privateKey);+ SshKeyUtils.decodePEMPrivateKey(privateKey);propertyNode = "publicKey";- SshKeyUtils.decodePublicKey(publicKey);+ SshKeyUtils.decodePEMPublicKey(publicKey);} catch (Exception e) {context.buildConstraintViolationWithTemplate("The provided key is not valid. Please check it and try again.").addPropertyNode(propertyNode).addConstraintViolation()diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSetting.html b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.htmlsimilarity index 83%rename from server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSetting.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.htmlindex 135e9a6c03..bd06d164e8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSetting.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div class="page-title">System Setting</div>+ <div class="page-title">SSH Setting</div><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSetting.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.javasimilarity index 83%rename from server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSetting.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.javaindex 745f04b20e..02458178ba 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSetting.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java@@ -10,8 +10,13 @@ import io.onedev.server.model.support.administration.SshSettings;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;-public class SshSetting extends AdministrationPage {- public SshSetting(PageParameters params) {+public class SshSettingPage extends AdministrationPage {+ /**+ *+ */+ private static final long serialVersionUID = 1L;++ public SshSettingPage(PageParameters params) {super(params);}@@ -29,7 +34,7 @@ public class SshSetting extends AdministrationPage {OneDev.getInstance(SettingManager.class).saveSshSetting(sshSetting);getSession().success("SSH setting has been updated");- setResponsePage(SshSetting.class);+ setResponsePage(SshSettingPage.class);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 7e5737734e..bff59dd51d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -38,7 +38,7 @@ import io.onedev.server.web.page.admin.role.RoleListPage;import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;import io.onedev.server.web.page.admin.serverlog.ServerLogPage;-import io.onedev.server.web.page.admin.ssh.SshSetting;+import io.onedev.server.web.page.admin.ssh.SshSettingPage;import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.UserPage;@@ -115,8 +115,8 @@ public abstract class LayoutPage extends BasePage {item.add(AttributeAppender.append("class", "active"));administrationContainer.add(item = new WebMarkupContainer("sshSetting"));- item.add(new ViewStateAwarePageLink<Void>("link", SshSetting.class));- if (getPage() instanceof SshSetting)+ item.add(new ViewStateAwarePageLink<Void>("link", SshSettingPage.class));+ if (getPage() instanceof SshSettingPage)item.add(AttributeAppender.append("class", "active"));administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.javaindex 30783ab4de..568956d834 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshValidator.java@@ -3,12 +3,14 @@ package io.onedev.server.web.page.my.sshkeys;import java.io.IOException;import java.security.GeneralSecurityException;import java.security.PublicKey;+import org.apache.sshd.common.config.keys.KeyUtils;import org.apache.wicket.model.IModel;import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidationError;import org.apache.wicket.validation.IValidator;import org.apache.wicket.validation.ValidationError;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.git.ssh.SshKeyUtils;@@ -30,7 +32,7 @@ public class SshValidator implements IValidator<String> {public void validate(IValidatable<String> validatable) {try {SshKeyManager sshKeyManager = OneDev.getInstance(SshKeyManager.class);- PublicKey pubEntry = SshKeyUtils.decodePublicKey(validatable.getValue());+ PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(validatable.getValue());String fingerPrint = KeyUtils.getFingerPrint(SshKeyUtils.MD5_DIGESTER, pubEntry);boolean alreadyInUse = sshKeyManager.isKeyAlreadyInUse(fingerPrint);