The Unified and Autonomous Development Platform
Remove /projects segment in http clone url
Robin Shen266ff76900e7
diff --git a/server-core/src/main/java/io/onedev/server/GitConfigProvider.java b/server-core/src/main/java/io/onedev/server/GitConfigProvider.javaindex afc64df0e2..6df3f88027 100644--- a/server-core/src/main/java/io/onedev/server/GitConfigProvider.java+++ b/server-core/src/main/java/io/onedev/server/GitConfigProvider.java@@ -10,16 +10,16 @@ import io.onedev.server.git.config.GitConfig;@Singletonpublic class GitConfigProvider implements Provider<GitConfig> {- private final SettingManager configManager;+ private final SettingManager settingManager;@Inject- public GitConfigProvider(SettingManager configManager) {- this.configManager = configManager;+ public GitConfigProvider(SettingManager settingManager) {+ this.settingManager = settingManager;}@Overridepublic GitConfig get() {- return configManager.getSystemSetting().getGitConfig();+ return settingManager.getSystemSetting().getGitConfig();}}diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.javaindex 580c35b84e..7bc0e15a46 100644--- a/server-core/src/main/java/io/onedev/server/OneDev.java+++ b/server-core/src/main/java/io/onedev/server/OneDev.java@@ -60,7 +60,7 @@ public class OneDev extends AbstractPlugin implements Serializable {private final SessionManager sessionManager;- private final SettingManager configManager;+ private final SettingManager settingManager;private final DataManager dataManager;@@ -77,13 +77,13 @@ public class OneDev extends AbstractPlugin implements Serializable {@Injectpublic OneDev(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler,SessionManager sessionManager, ServerConfig serverConfig, DataManager dataManager,- SettingManager configManager, ExecutorService executorService,+ SettingManager settingManager, ExecutorService executorService,ListenerRegistry listenerRegistry) {this.jettyRunner = jettyRunner;this.persistManager = persistManager;this.taskScheduler = taskScheduler;this.sessionManager = sessionManager;- this.configManager = configManager;+ this.settingManager = settingManager;this.dataManager = dataManager;this.serverConfig = serverConfig;this.executorService = executorService;@@ -127,7 +127,7 @@ public class OneDev extends AbstractPlugin implements Serializable {SecurityUtils.bindAsSystem();listenerRegistry.post(new SystemStarted());- SystemSetting systemSetting = configManager.getSystemSetting();+ SystemSetting systemSetting = settingManager.getSystemSetting();logger.info("Server is ready at " + systemSetting.getServerUrl() + ".");initStage = null;}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.javaindex dc3f0a3b8b..a99916b767 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UrlManager.java@@ -37,6 +37,8 @@ public interface UrlManager {String urlFor(CodeCommentReply reply, @Nullable PullRequest request);- String sshUrlFor(Project project);+ String sshCloneUrlFor(Project project);+ String httpCloneUrlFor(Project project);+}diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.javaindex 8066b87be1..a2a012c16a 100644--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java@@ -31,8 +31,8 @@ import org.hibernate.Hibernate;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.commons.utils.command.ExecuteResult;import io.onedev.commons.utils.command.ErrorCollector;+import io.onedev.commons.utils.command.ExecuteResult;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;@@ -96,15 +96,9 @@ public class GitFilter implements Filter {private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)throws IOException {- projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");-- if (StringUtils.isBlank(projectInfo) || !projectInfo.startsWith("projects/")) {- String url = request.getRequestURL().toString();- String urlRoot = url.substring(0, url.length()-getPathInfo(request).length());- throw new GitException(String.format("Expecting url of format %sprojects/<project name>", urlRoot));- }-- String projectName = StringUtils.substringAfter(projectInfo, "/");+ String projectName = StringUtils.strip(projectInfo, "/");+ if (projectName.contains("/"))+ projectName = StringUtils.substringAfterLast(projectName, "/");Project project = projectManager.find(projectName);if (project == null)diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.javaindex 6be1813e5a..d29e1caaf8 100644--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java@@ -167,7 +167,7 @@ public class GitSshCommandCreator implements SshCommandCreator {String projectName = StringUtils.stripEnd(StringUtils.substringAfterLast(command, "/"), "'");Project project = projectManager.find(projectName);if (project == null) {- onExit(-1, "Project '" + projectName + "' not found!");+ onExit(-1, "Unable to find project " + projectName);return;}diff --git a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.javaindex 77a9322dcd..b4cfe06c10 100644--- a/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java+++ b/server-core/src/main/java/io/onedev/server/web/DefaultUrlManager.java@@ -31,21 +31,26 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest@Singletonpublic class DefaultUrlManager implements UrlManager {- private final SettingManager configManager;+ private final SettingManager settingManager;@Inject- public DefaultUrlManager(SettingManager configManager) {- this.configManager = configManager;+ public DefaultUrlManager(SettingManager settingManager) {+ this.settingManager = settingManager;}@Overridepublic String urlFor(Project project) {- return configManager.getSystemSetting().getServerUrl() + "/projects/" + project.getName();+ return settingManager.getSystemSetting().getServerUrl() + "/projects/" + project.getName();}@Override- public String sshUrlFor(Project project) {- return configManager.getSshSetting().getServerUrl() + "/" + project.getName();+ public String sshCloneUrlFor(Project project) {+ return settingManager.getSshSetting().getServerUrl() + "/" + project.getName();+ }++ @Override+ public String httpCloneUrlFor(Project project) {+ return settingManager.getSystemSetting().getServerUrl() + "/" + project.getName();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex ba916111ff..8cc180e16e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -29,8 +29,8 @@ public class GitLinkPanel extends BlobViewPanel {Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);Submodule submodule = Submodule.fromString(blob.getText().getContent());WebMarkupContainer link;- SettingManager configManager = OneDev.getInstance(SettingManager.class);- if (submodule.getUrl().startsWith(configManager.getSystemSetting().getServerUrl() + "/")) {+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ if (submodule.getUrl().startsWith(settingManager.getSystemSetting().getServerUrl() + "/")) {link = new WebMarkupContainer("link");link.add(AttributeModifier.replace("href", submodule.getUrl() + "/blob/" + submodule.getCommitId()));} else {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 7cd21c3f42..541e738ea5 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@@ -73,7 +73,7 @@ public abstract class ProjectInfoPanel extends Panel {};}- }.setVisible(SecurityUtils.canCreateProjects() && canReadCode));+ }.setVisible(SecurityUtils.canCreateProjects() && canReadCode));String query = ProjectQuery.getRuleName(ProjectQueryLexer.ForksOf) + " "+ Criteria.quote(getProject().getName());@@ -112,7 +112,7 @@ public abstract class ProjectInfoPanel extends Panel {UrlManager urlManager = OneDev.getInstance(UrlManager.class);- Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getProject()));+ Model<String> cloneUrlModel = Model.of(urlManager.httpCloneUrlFor(getProject()));add(new TextField<String>("cloneUrl", cloneUrlModel).setVisible(canReadCode));add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));@@ -121,7 +121,7 @@ public abstract class ProjectInfoPanel extends Panel {boolean userHasNoKeys = loggedInUser.getSshKeys().isEmpty();boolean isSshEnabled = ((BasePage)getPage()).isSshEnabled();- Model<String> cloneSshUrlModel = Model.of(urlManager.sshUrlFor(getProject()));+ Model<String> cloneSshUrlModel = Model.of(urlManager.sshCloneUrlFor(getProject()));add(new TextField<String>("cloneSshUrl", cloneSshUrlModel).setVisible(isSshEnabled && canReadCode));add(new WebMarkupContainer("copySshUrl").add(new CopyClipboardBehavior(cloneSshUrlModel)));diff --git a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java b/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.javaindex b54ed99844..44da535c2b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java@@ -51,8 +51,8 @@ public class ForgetPage extends BasePage {if (user == null) {throw new OneException("No user found with name or email: " + bean.getUserNameOrEmailAddress());} else {- SettingManager configManager = OneDev.getInstance(SettingManager.class);- if (configManager.getMailSetting() != null) {+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ if (settingManager.getMailSetting() != null) {String password = RandomStringUtils.random(10, true, true);user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password));userManager.save(user);@@ -67,7 +67,7 @@ public class ForgetPage extends BasePage {+ "-- Sent by OneDev",user.getDisplayName(), user.getName(), password);- mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user.getEmail()),+ mailManager.sendMail(settingManager.getMailSetting(), Arrays.asList(user.getEmail()),"Your OneDev password has been reset", mailBody);return "Please check your email " + user.getEmail() + " for the reset password";} else {