Skip to content

The Unified and Autonomous Development Platform

Throw exception in page constructor to fail as soon as possible

Robin Shen495dd162e59c
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 b9d40b2a0c..9a485bd915 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
@@ -20,17 +20,18 @@ public class SshSettingPage extends AdministrationPage {
public SshSettingPage(PageParameters params) {
super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
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");
}
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
SshSettings sshSetting = OneDev.getInstance(SettingManager.class).getSshSettings();
Form<?> form = new Form<Void>("form") {
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 cdad60d7be..8495bfc6a5 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
@@ -4,9 +4,11 @@ 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;
@@ -15,6 +17,11 @@ public class UserSshKeysPage extends UserPage {
public UserSshKeysPage(PageParameters params) {
super(params);
+
+ 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");
+ }
}
@Override
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 7448caceaf..2d8161a023 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
@@ -2,10 +2,12 @@ package io.onedev.server.web.page.my.sshkeys;
import java.time.format.DateTimeFormatter;
import java.util.List;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
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;
@@ -23,16 +25,16 @@ public class MySshKeysPage extends MyPage {
public MySshKeysPage(PageParameters params) {
super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
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");
}
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
User user = getLoginUser();