The Unified and Autonomous Development Platform
Added the ui code to check if ssh is enabled and show/hide the related ui components
Andrea Del Benef7a1016e5260
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex f20feaa5b1..08ed73acaf 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -13,17 +13,14 @@ 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;@@ -38,7 +35,6 @@ import io.onedev.server.event.system.SystemStopped;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.git.ssh.SimpleGitSshServer;import io.onedev.server.maintenance.DataManager;-import io.onedev.server.model.support.administration.SshSettings;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.persistence.PersistManager;import io.onedev.server.persistence.SessionManager;@@ -119,11 +115,8 @@ public class OneDev extends AbstractPlugin implements Serializable {initStage.waitForFinish();}- //TODO: provide better config support for Git server its certificates- try {- simpleGitSshServer.start();- } catch (IOException e) {- throw new RuntimeException(e);+ if (serverConfig.getSshPort() != 0) {+ simpleGitSshServer.start();}sessionManager.openSession();@@ -141,7 +134,6 @@ public class OneDev extends AbstractPlugin implements Serializable {listenerRegistry.post(new SystemStarted());SystemSetting systemSetting = configManager.getSystemSetting();- SshSettings sshSettings = configManager.getSshSettings();logger.info("Server is ready at " + systemSetting.getServerUrl() + ".");initStage = null;}diff --git a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.javaindex 3d61ab796d..281da7e4d8 100644--- a/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java+++ b/server-core/src/main/java/io/onedev/server/git/ssh/SimpleGitSshServer.java@@ -90,9 +90,13 @@ public class SimpleGitSshServer {return sshKeyManager.loadKeyByDigest(fingerPrint) != null;}- public int start() throws IOException {- server.start();- return server.getPort();+ public int start() {+ try {+ server.start();+ return server.getPort();+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}public void stop() throws IOException {diff --git a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.javaindex 9c478d6b73..7b7e812941 100644--- a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -5,12 +5,10 @@ import java.util.ArrayList;import java.util.List;import java.util.Map;import java.util.Set;-import javax.inject.Inject;import javax.inject.Singleton;import javax.servlet.http.HttpServletRequest;import javax.servlet.http.HttpServletResponse;-import org.apache.wicket.Application;import org.apache.wicket.Component;import org.apache.wicket.DefaultExceptionMapper;@@ -51,11 +49,11 @@ import org.apache.wicket.request.http.WebResponse;import org.apache.wicket.request.mapper.info.PageComponentInfo;import org.apache.wicket.util.IProvider;import org.apache.wicket.util.time.Duration;-import de.agilecoders.wicket.core.settings.BootstrapSettings;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;+import io.onedev.server.util.ServerConfig;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.error.ErrorPage;import io.onedev.server.web.page.layout.UICustomization;@@ -69,12 +67,15 @@ public class OneWebApplication extends WebApplication {private final Set<WebApplicationConfigurator> applicationConfigurators;private final UICustomization uiCustomization;++ private final ServerConfig serverConfig;@Injectpublic OneWebApplication(Set<WebApplicationConfigurator> applicationConfigurators,- UICustomization uiCustomization) {+ UICustomization uiCustomization, ServerConfig serverConfig) {this.applicationConfigurators = applicationConfigurators;this.uiCustomization = uiCustomization;+ this.serverConfig = serverConfig;}@Override@@ -243,6 +244,10 @@ public class OneWebApplication extends WebApplication {};}+ public boolean isSshEnabled() {+ return serverConfig.getSshPort() != 0;+ }+public static OneWebApplication get() {return (OneWebApplication) Application.get();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 83149c5aac..780b5d41e8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -17,6 +17,7 @@ import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.component.floating.AlignPlacement;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -97,7 +98,11 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", UserPasswordPage.class));tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));- tabs.add(new UserTab("Ssh Keys", "fa fa-fw fa-shield", UserSshKeys.class));++ if (OneWebApplication.get().isSshEnabled()) {+ tabs.add(new UserTab("Ssh Keys", "fa fa-fw fa-shield", UserSshKeys.class));+ }+tabs.add(new UserTab("Build Setting", "fa fa-fw fa-cubes", UserJobSecretsPage.class, UserBuildSettingPage.class));tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.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 bff59dd51d..9e0d4dfcc3 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@@ -19,6 +19,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;@@ -59,7 +60,7 @@ import io.onedev.server.web.page.security.RegisterPage;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {-+public LayoutPage(PageParameters params) {super(params);}@@ -114,11 +115,12 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof AuthenticatorPage)item.add(AttributeAppender.append("class", "active"));- administrationContainer.add(item = new WebMarkupContainer("sshSetting"));- item.add(new ViewStateAwarePageLink<Void>("link", SshSettingPage.class));- if (getPage() instanceof SshSettingPage)- item.add(AttributeAppender.append("class", "active"));-+ administrationContainer.add(item = new WebMarkupContainer("sshSetting"));+ item.add(new ViewStateAwarePageLink<Void>("link", SshSettingPage.class));+ if (getPage() instanceof SshSettingPage)+ item.add(AttributeAppender.append("class", "active"));+ item.setVisible(OneWebApplication.get().isSshEnabled());+administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));if (getPage() instanceof JobExecutorPage)@@ -213,7 +215,8 @@ public abstract class LayoutPage extends BasePage {item.add(new ViewStateAwarePageLink<Void>("link", MySshKeysPage.class));if (getPage() instanceof MySshKeysPage)item.add(AttributeAppender.append("class", "active"));-+ item.setVisible(OneWebApplication.get().isSshEnabled());+signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));item.add(new ViewStateAwarePageLink<Void>("link", MyJobSecretsPage.class));if (getPage() instanceof MyBuildSettingPage)diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.javaindex 2944577ff1..4058f7d95c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/InsertSshKeyPanel.java@@ -31,6 +31,7 @@ public abstract class InsertSshKeyPanel extends Panel {@Overrideprotected void onInitialize() {super.onInitialize();+add(new AjaxLink<Void>("close") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.javaindex 89d58cdc43..483176d6ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java@@ -14,8 +14,10 @@ import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.model.SshKey;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.web.OneWebApplication;@SuppressWarnings("serial")public class SshKeysListPanel extends Panel {@@ -24,6 +26,12 @@ public class SshKeysListPanel extends Panel {public SshKeysListPanel(String id, IModel<List<SshKey>> model) {super(id);++ if (!OneWebApplication.get().isSshEnabled()) {+ throw new OneException("This page requires Ssh support to be enabled. "+ + " You need to specify ssh_port parameter in server.properties");+ }+WebMarkupContainer keyList = new WebMarkupContainer("keyList");keyList.add(new ListView<SshKey>("keys", model)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex 494c9c1225..615b84b731 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -24,6 +24,7 @@ import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.project.ProjectQueryLexer;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.criteria.Criteria;+import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.MarkdownViewer;@@ -70,7 +71,8 @@ public abstract class ProjectInfoPanel extends Panel {});}- add(new ModalLink("forkNow") {+ boolean canReadCode = SecurityUtils.canReadCode(getProject());+ add(new ModalLink("forkNow") {@Overridepublic void onClick(AjaxRequestTarget target) {@@ -90,7 +92,7 @@ public abstract class ProjectInfoPanel extends Panel {};}- }.setVisible(SecurityUtils.canCreateProjects() && SecurityUtils.canReadCode(getProject())));+ }.setVisible(SecurityUtils.canCreateProjects() && canReadCode));String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "+ Criteria.quote(getProject().getName());@@ -131,12 +133,14 @@ public abstract class ProjectInfoPanel extends Panel {Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));add(new TextField<String>("cloneUrl", cloneUrlModel)- .setVisible(SecurityUtils.canReadCode(getProject())));+ .setVisible(canReadCode));add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));+ boolean isSshEnabled = OneWebApplication.get().isSshEnabled();+Model<String> cloneSshUrlModel = Model.of(urlManager.sshUrlFor(getProject()));add(new TextField<String>("cloneSshUrl", cloneSshUrlModel)- .setVisible(SecurityUtils.canReadCode(getProject())));+ .setVisible(isSshEnabled && canReadCode));add(new WebMarkupContainer("copySshUrl").add(new CopyClipboardBehavior(cloneSshUrlModel)));}