The Unified and Autonomous Development Platform
Add curl config setting
robin shen9051bf146fc4
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.javaindex f3ab47154f..d479c3e6b9 100644--- a/core/src/main/java/com/gitplex/server/CoreModule.java+++ b/core/src/main/java/com/gitplex/server/CoreModule.java@@ -5,8 +5,6 @@ import java.lang.reflect.AnnotatedElement;import java.lang.reflect.Field;import java.lang.reflect.Method;import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;import java.util.Set;import javax.inject.Singleton;@@ -36,7 +34,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.launcher.bootstrap.Bootstrap;import com.gitplex.launcher.loader.AbstractPlugin;import com.gitplex.launcher.loader.AbstractPluginModule;-import com.gitplex.launcher.loader.ImplementationProvider;import com.gitplex.server.command.ApplyDBConstraintsCommand;import com.gitplex.server.command.BackupDBCommand;import com.gitplex.server.command.CheckDataVersionCommand;@@ -47,8 +44,6 @@ import com.gitplex.server.command.ResetAdminPasswordCommand;import com.gitplex.server.command.RestoreDBCommand;import com.gitplex.server.command.UpgradeCommand;import com.gitplex.server.git.config.GitConfig;-import com.gitplex.server.git.config.SpecifiedGit;-import com.gitplex.server.git.config.SystemGit;import com.gitplex.server.git.jackson.GitObjectMapperConfigurator;import com.gitplex.server.manager.AccountManager;import com.gitplex.server.manager.AttachmentManager;@@ -67,12 +62,12 @@ import com.gitplex.server.manager.OrganizationMembershipManager;import com.gitplex.server.manager.PullRequestCommentManager;import com.gitplex.server.manager.PullRequestManager;import com.gitplex.server.manager.PullRequestReferenceManager;-import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.PullRequestStatusChangeManager;import com.gitplex.server.manager.PullRequestTaskManager;import com.gitplex.server.manager.PullRequestUpdateManager;import com.gitplex.server.manager.PullRequestWatchManager;import com.gitplex.server.manager.ReviewInvitationManager;+import com.gitplex.server.manager.ReviewManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.TeamAuthorizationManager;import com.gitplex.server.manager.TeamManager;@@ -98,12 +93,12 @@ import com.gitplex.server.manager.impl.DefaultOrganizationMembershipManager;import com.gitplex.server.manager.impl.DefaultPullRequestCommentManager;import com.gitplex.server.manager.impl.DefaultPullRequestManager;import com.gitplex.server.manager.impl.DefaultPullRequestReferenceManager;-import com.gitplex.server.manager.impl.DefaultReviewManager;import com.gitplex.server.manager.impl.DefaultPullRequestStatusChangeManager;import com.gitplex.server.manager.impl.DefaultPullRequestTaskManager;import com.gitplex.server.manager.impl.DefaultPullRequestUpdateManager;import com.gitplex.server.manager.impl.DefaultPullRequestWatchManager;import com.gitplex.server.manager.impl.DefaultReviewInvitationManager;+import com.gitplex.server.manager.impl.DefaultReviewManager;import com.gitplex.server.manager.impl.DefaultStorageManager;import com.gitplex.server.manager.impl.DefaultTeamAuthorizationManager;import com.gitplex.server.manager.impl.DefaultTeamManager;@@ -216,22 +211,6 @@ public class CoreModule extends AbstractPluginModule {}});- contribute(ImplementationProvider.class, new ImplementationProvider() {-- @Override- public Collection<Class<?>> getImplementations() {- Collection<Class<?>> implementations = new HashSet<Class<?>>();- implementations.add(SystemGit.class);- implementations.add(SpecifiedGit.class);- return implementations;- }-- @Override- public Class<?> getAbstractClass() {- return GitConfig.class;- }- });-bind(GitConfig.class).toProvider(GitConfigProvider.class);/*diff --git a/core/src/main/java/com/gitplex/server/git/GitFilter.java b/core/src/main/java/com/gitplex/server/git/GitFilter.javaindex fd6c1784be..bc80e4b24a 100644--- a/core/src/main/java/com/gitplex/server/git/GitFilter.java+++ b/core/src/main/java/com/gitplex/server/git/GitFilter.java@@ -32,6 +32,7 @@ import com.gitplex.server.git.command.AdvertiseUploadRefsCommand;import com.gitplex.server.git.command.ReceiveCommand;import com.gitplex.server.git.command.UploadCommand;import com.gitplex.server.git.exception.GitException;+import com.gitplex.server.manager.ConfigManager;import com.gitplex.server.manager.DepotManager;import com.gitplex.server.manager.StorageManager;import com.gitplex.server.manager.WorkExecutor;@@ -60,14 +61,17 @@ public class GitFilter implements Filter {private final ServerConfig serverConfig;+ private final ConfigManager configManager;+@Injectpublic GitFilter(GitPlex gitPlex, StorageManager storageManager, DepotManager repositoryManager,- WorkExecutor workManager, ServerConfig serverConfig) {+ WorkExecutor workManager, ServerConfig serverConfig, ConfigManager configManager) {this.gitPlex = gitPlex;this.storageManager = storageManager;this.repositoryManager = repositoryManager;this.workExecutor = workManager;this.serverConfig = serverConfig;+ this.configManager = configManager;}private String getPathInfo(HttpServletRequest request) {@@ -124,10 +128,11 @@ public class GitFilter implements Filter {elseserverUrl = "https://localhost:" + serverConfig.getSslConfig().getPort();+ environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());environments.put("GITPLEX_URL", serverUrl);environments.put("GITPLEX_USER_ID", Account.getCurrentId().toString());environments.put("GITPLEX_REPOSITORY_ID", depot.getId().toString());- final File gitDir = storageManager.getGitDir(depot);+ File gitDir = storageManager.getGitDir(depot);if (GitSmartHttpTools.isUploadPack(request)) {if (!SecurityUtils.getSubject().isPermitted(ObjectPermission.ofDepotRead(depot))) {diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.javaindex 2218621fd2..67c1f8f8e7 100644--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java@@ -117,7 +117,7 @@ public class GitPreReceiveCallback extends HttpServlet {break;}} else if (refName.startsWith(Constants.R_HEADS)) {- String branchName = Preconditions.checkNotNull(GitUtils.branch2ref(refName));+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(refName));if (!oldObjectId.equals(ObjectId.zeroId())) {if (newObjectId.equals(ObjectId.zeroId())) {@@ -129,7 +129,7 @@ public class GitPreReceiveCallback extends HttpServlet {if (protection != null && protection.isNoForcedPush())error(output, refName, "Can not force-push to this branch according to branch protection setting");} else {- if (!reviewManager.canPush(user, depot, refName, oldObjectId, newObjectId)) {+ if (!reviewManager.canPush(user, depot, branchName, oldObjectId, newObjectId)) {error(output, refName,"Your changes need to be reviewed. Please submit pull request instead");}diff --git a/core/src/main/java/com/gitplex/server/git/config/CurlConfig.java b/core/src/main/java/com/gitplex/server/git/config/CurlConfig.javanew file mode 100644index 0000000000..39969d285f--- /dev/null+++ b/core/src/main/java/com/gitplex/server/git/config/CurlConfig.java@@ -0,0 +1,73 @@+package com.gitplex.server.git.config;++import java.io.Serializable;++import javax.validation.ConstraintValidatorContext;++import org.apache.commons.lang3.exception.ExceptionUtils;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.gitplex.server.util.editable.annotation.Editable;+import com.gitplex.server.util.execution.Commandline;+import com.gitplex.server.util.execution.LineConsumer;+import com.gitplex.server.util.validation.Validatable;+import com.gitplex.server.util.validation.annotation.ClassValidating;++/**+ * Git relevant settings.+ *+ * @author robin+ *+ */+@Editable+@ClassValidating+@SuppressWarnings("serial")+public abstract class CurlConfig implements Serializable, Validatable {++ private static final Logger logger = LoggerFactory.getLogger(CurlConfig.class);++ public abstract String getExecutable();++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ String curlExe = getExecutable();+ if (curlExe != null) {+ String errorMessage = null;+ try {+ new Commandline(curlExe).addArgs("--version").execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.debug(line);+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(line);+ }++ }).checkReturnCode();+ } catch (Exception e) {+ errorMessage = ExceptionUtils.getMessage(e);+ if (errorMessage.contains("CreateProcess error=2"))+ errorMessage = "Unable to find curl command: " + curlExe;+ else if (errorMessage.contains("error launching curl"))+ errorMessage = "Unable to launch git command: " + curlExe;+ }++ if (errorMessage != null) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();+ return false;+ } else {+ return true;+ }+ } else {+ return true;+ }+ }++}diff --git a/core/src/main/java/com/gitplex/server/git/config/SpecifiedCurl.java b/core/src/main/java/com/gitplex/server/git/config/SpecifiedCurl.javanew file mode 100644index 0000000000..c3b50d916e--- /dev/null+++ b/core/src/main/java/com/gitplex/server/git/config/SpecifiedCurl.java@@ -0,0 +1,28 @@+package com.gitplex.server.git.config;++import org.hibernate.validator.constraints.NotEmpty;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable(name="Use Specified curl", order=200)+@SuppressWarnings("serial")+public class SpecifiedCurl extends CurlConfig {++ private String curlPath;++ @Editable(description="Specify path to curl executable, for instance: <tt>/usr/bin/curl</tt>")+ @NotEmpty+ public String getCurlPath() {+ return curlPath;+ }++ public void setCurlPath(String curlPath) {+ this.curlPath = curlPath;+ }++ @Override+ public String getExecutable() {+ return curlPath;+ }++}diff --git a/core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.java b/core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.javaindex f7dfae8052..a778abfb1d 100644--- a/core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.java+++ b/core/src/main/java/com/gitplex/server/git/config/SpecifiedGit.java@@ -4,13 +4,13 @@ import org.hibernate.validator.constraints.NotEmpty;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(name="Use Specified Git", order=200)+@Editable(name="Use Specified git", order=200)@SuppressWarnings("serial")public class SpecifiedGit extends GitConfig {private String gitPath;- @Editable(description="Specify path to git executable, for instance: <tt>/usr/bin/git</tt>.")+ @Editable(description="Specify path to git executable, for instance: <tt>/usr/bin/git</tt>")@NotEmptypublic String getGitPath() {return gitPath;diff --git a/core/src/main/java/com/gitplex/server/git/config/SystemCurl.java b/core/src/main/java/com/gitplex/server/git/config/SystemCurl.javanew file mode 100644index 0000000000..56af7d83d0--- /dev/null+++ b/core/src/main/java/com/gitplex/server/git/config/SystemCurl.java@@ -0,0 +1,14 @@+package com.gitplex.server.git.config;++import com.gitplex.server.util.editable.annotation.Editable;++@Editable(name="Use curl in System Path", order=100)+@SuppressWarnings("serial")+public class SystemCurl extends CurlConfig {++ @Override+ public String getExecutable() {+ return "curl";+ }++}diff --git a/core/src/main/java/com/gitplex/server/git/config/SystemGit.java b/core/src/main/java/com/gitplex/server/git/config/SystemGit.javaindex 2c95c03760..e7d9978690 100644--- a/core/src/main/java/com/gitplex/server/git/config/SystemGit.java+++ b/core/src/main/java/com/gitplex/server/git/config/SystemGit.java@@ -2,7 +2,7 @@ package com.gitplex.server.git.config;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(name="Use Git in System Path", order=100)+@Editable(name="Use git in System Path", order=100)@SuppressWarnings("serial")public class SystemGit extends GitConfig {diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.javaindex 8291cd504e..093cacbd20 100644--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java@@ -160,7 +160,17 @@ public class DatabaseMigrator {private void migrate8(File dataDir, Stack<Integer> versions) {for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Accounts.xml")) {+ if (file.getName().startsWith("Configs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("SYSTEM")) {+ Element settingElement = element.element("setting");+ settingElement.addElement("curlConfig")+ .addAttribute("class", "com.gitplex.server.git.config.SystemCurl");+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Accounts.xml")) {VersionedDocument dom = VersionedDocument.fromFile(file);for (Element element: dom.getRootElement().elements()) {element.element("reviewEffort").detach();diff --git a/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java b/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.javaindex 69e466df0b..729f6c690c 100644--- a/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java+++ b/core/src/main/java/com/gitplex/server/model/support/setting/SystemSetting.java@@ -9,7 +9,9 @@ import javax.validation.constraints.NotNull;import org.apache.commons.lang3.StringUtils;import org.hibernate.validator.constraints.NotEmpty;+import com.gitplex.server.git.config.CurlConfig;import com.gitplex.server.git.config.GitConfig;+import com.gitplex.server.git.config.SystemCurl;import com.gitplex.server.git.config.SystemGit;import com.gitplex.server.util.editable.annotation.Editable;import com.gitplex.server.util.validation.Validatable;@@ -28,6 +30,8 @@ public class SystemSetting implements Serializable, Validatable {private GitConfig gitConfig = new SystemGit();+ private CurlConfig curlConfig = new SystemCurl();+private boolean gravatarEnabled = true;@Editable(name="Server URL", order=90, description="Specify root URL to access this server. GitPlex uses this url "@@ -64,6 +68,17 @@ public class SystemSetting implements Serializable, Validatable {this.gitConfig = gitConfig;}+ @Editable(order=250, description="GitPlex configures git hooks to communicate with itself via curl")+ @Valid+ @NotNull+ public CurlConfig getCurlConfig() {+ return curlConfig;+ }++ public void setCurlConfig(CurlConfig curlConfig) {+ this.curlConfig = curlConfig;+ }+@Editable(order=300, description="Whether or not to enable user gravatar.")public boolean isGravatarEnabled() {return gravatarEnabled;diff --git a/core/src/main/resources/git-receive-hook b/core/src/main/resources/git-receive-hookindex 2a5cb9e4c5..ea78cabea8 100644--- a/core/src/main/resources/git-receive-hook+++ b/core/src/main/resources/git-receive-hook@@ -1,6 +1,6 @@#!/bin/bashIFS=$'\r\n';-lines=($(curl -k -s -S -f -X POST -d @- ${GITPLEX_URL}/%s/${GITPLEX_REPOSITORY_ID}/${GITPLEX_USER_ID} 2>&1))+lines=($(${GITPLEX_CURL} -k -s -S -f -X POST -d @- ${GITPLEX_URL}/%s/${GITPLEX_REPOSITORY_ID}/${GITPLEX_USER_ID} 2>&1))returnCode=0;