Skip to content

The Unified and Autonomous Development Platform

fix: "malformed url" error when protocol is not defined in URL (#1457)

Robin Shen96d8fcc474af
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index 260affa5e8..9b03e359ee 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -168,7 +168,12 @@ public class SystemSetting implements Serializable, Validatable {
isValid = false;
}
} catch (MalformedURLException e) {
- context.buildConstraintViolationWithTemplate("Malformed url")
+ String errorMessage;
+ if (!serverUrl.startsWith("http://") && !serverUrl.startsWith("https://"))
+ errorMessage = "Should start with either http:// or https://";
+ else
+ errorMessage = "Malformed url";
+ context.buildConstraintViolationWithTemplate(errorMessage)
.addPropertyNode("serverUrl").addConstraintViolation();
isValid = false;
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java
index 01ee30846a..c0623a0547 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistenceManager.java
@@ -707,8 +707,10 @@ public class DefaultPersistenceManager implements PersistenceManager, Serializab
systemSetting = null;
} else if (serverUrl != null) {
systemSetting.setServerUrl(StringUtils.stripEnd(serverUrl, "/\\"));
- settingManager.saveSystemSetting(systemSetting);
- systemSetting = null;
+ if (validator.validate(systemSetting).isEmpty()) {
+ settingManager.saveSystemSetting(systemSetting);
+ systemSetting = null;
+ }
} else {
systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());
}