Skip to content

The Unified and Autonomous Development Platform

Move isSshEnabled() directly into BasePage for simplicity

Robin Shen4afb5bdc90d2
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.java
index 7b7e812941..2a5c6a3e29 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,10 +5,12 @@ 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;
@@ -49,11 +51,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;
@@ -68,14 +70,11 @@ public class OneWebApplication extends WebApplication {
private final UICustomization uiCustomization;
- private final ServerConfig serverConfig;
-
@Inject
public OneWebApplication(Set<WebApplicationConfigurator> applicationConfigurators,
- UICustomization uiCustomization, ServerConfig serverConfig) {
+ UICustomization uiCustomization) {
this.applicationConfigurators = applicationConfigurators;
this.uiCustomization = uiCustomization;
- this.serverConfig = serverConfig;
}
@Override
@@ -244,10 +243,6 @@ 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/ssh/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
index 9a485bd915..34e0953543 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java
@@ -2,13 +2,14 @@ package io.onedev.server.web.page.admin.ssh;
import java.util.Collection;
import java.util.HashSet;
+
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.SshSettings;
-import io.onedev.server.web.OneWebApplication;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.admin.AdministrationPage;
@@ -21,7 +22,7 @@ public class SshSettingPage extends AdministrationPage {
public SshSettingPage(PageParameters params) {
super(params);
- if (!OneWebApplication.get().isSshEnabled()) {
+ if (!isSshEnabled()) {
throw new OneException("This page requires Ssh support to be enabled. "
+ " You need to specify ssh_port parameter in server.properties");
}
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.java
index 8473f927df..98d0352f94 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
@@ -99,7 +99,7 @@ public abstract class UserPage extends AdministrationPage {
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));
- if (OneWebApplication.get().isSshEnabled()) {
+ if (isSshEnabled()) {
tabs.add(new UserTab("Ssh Keys", "fa fa-fw fa-shield", UserSshKeysPage.class));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
index 8495bfc6a5..3b7b5020e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/ssh/UserSshKeysPage.java
@@ -1,14 +1,15 @@
package io.onedev.server.web.page.admin.user.ssh;
import java.util.List;
+
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
-import io.onedev.server.web.OneWebApplication;
import io.onedev.server.web.page.admin.user.UserPage;
import io.onedev.server.web.page.my.sshkeys.SshKeysListPanel;
@@ -18,7 +19,7 @@ public class UserSshKeysPage extends UserPage {
public UserSshKeysPage(PageParameters params) {
super(params);
- if (!OneWebApplication.get().isSshEnabled()) {
+ if (!isSshEnabled()) {
throw new OneException("This page requires Ssh support to be enabled. "
+ " You need to specify ssh_port parameter in server.properties");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 220f216547..8c853a795e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -47,6 +47,7 @@ import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.model.User;
import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.util.ServerConfig;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.page.init.ServerInitPage;
@@ -259,6 +260,10 @@ public abstract class BasePage extends WebPage {
return SecurityUtils.getUser();
}
+ public boolean isSshEnabled() {
+ return OneDev.getInstance(ServerConfig.class).getSshPort() != 0;
+ }
+
public void unauthorized() {
if (getLoginUser() != null)
throw new UnauthorizedException("You are not allowed to perform this operation");
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.java
index 9e0d4dfcc3..67bf078023 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
@@ -13,13 +13,13 @@ import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.launcher.loader.Plugin;
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;
@@ -119,7 +119,7 @@ public abstract class LayoutPage extends BasePage {
item.add(new ViewStateAwarePageLink<Void>("link", SshSettingPage.class));
if (getPage() instanceof SshSettingPage)
item.add(AttributeAppender.append("class", "active"));
- item.setVisible(OneWebApplication.get().isSshEnabled());
+ item.setVisible(isSshEnabled());
administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
@@ -215,7 +215,7 @@ 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());
+ item.setVisible(!isSshEnabled());
signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));
item.add(new ViewStateAwarePageLink<Void>("link", MyJobSecretsPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
index 2d8161a023..9f69e2f521 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java
@@ -13,7 +13,6 @@ import io.onedev.server.OneException;
import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.model.SshKey;
import io.onedev.server.model.User;
-import io.onedev.server.web.OneWebApplication;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.my.MyPage;
@@ -26,7 +25,7 @@ public class MySshKeysPage extends MyPage {
public MySshKeysPage(PageParameters params) {
super(params);
- if (!OneWebApplication.get().isSshEnabled()) {
+ if (!isSshEnabled()) {
throw new OneException("This page requires Ssh support to be enabled. "
+ " You need to specify ssh_port parameter in server.properties");
}
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.java
index 0b3b258683..52faeb2a5f 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
@@ -16,6 +16,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.Project;
@@ -24,13 +25,13 @@ 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;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.page.admin.user.profile.UserProfilePage;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.my.profile.MyProfilePage;
import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;
import io.onedev.server.web.page.project.ProjectListPage;
@@ -140,7 +141,7 @@ public abstract class ProjectInfoPanel extends Panel {
add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
boolean userHasNoKeys = loggedInUser.getSshKeys().isEmpty();
- boolean isSshEnabled = OneWebApplication.get().isSshEnabled();
+ boolean isSshEnabled = ((BasePage)getPage()).isSshEnabled();
Model<String> cloneSshUrlModel = Model.of(urlManager.sshUrlFor(getProject()));
add(new TextField<String>("cloneSshUrl", cloneSshUrlModel)