Skip to content

The Unified and Autonomous Development Platform

Do not detect .git extension for project name

Robin Shen54f843665683
diff --git a/core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java b/core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java
index bfa99fa2a3..a129af165d 100644
--- a/core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java
+++ b/core/src/main/java/com/gitplex/server/util/jetty/AssetServlet.java
@@ -7,6 +7,7 @@ import javax.servlet.DispatcherType;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jetty.http.HttpContent;
@@ -106,7 +107,13 @@ public abstract class AssetServlet extends DefaultServlet {
@Override
protected void putHeaders(HttpServletResponse response, HttpContent content, long contentLength) {
super.putHeaders(response, content, contentLength);
- HttpFields fields = ((Response) response).getHttpFields();
+
+ HttpFields fields;
+ if (response instanceof Response)
+ fields = ((Response) response).getHttpFields();
+ else
+ fields = ((Response)((HttpServletResponseWrapper) response).getResponse()).getHttpFields();
+
if (requestHolder.get().getDispatcherType() == DispatcherType.ERROR) {
/*
* Do not cache error page and also makes sure that error page is not eligible for
diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java
index 7097e49cb1..c3b920beb9 100644
--- a/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/ArchiveResource.java
@@ -16,7 +16,6 @@ import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.archive.TgzFormat;
import org.eclipse.jgit.archive.ZipFormat;
-import org.eclipse.jgit.lib.Constants;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.ProjectManager;
@@ -43,17 +42,14 @@ public class ArchiveResource extends AbstractResource {
protected ResourceResponse newResourceResponse(Attributes attributes) {
PageParameters params = attributes.getParameters();
- String repoName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());
- if (StringUtils.isBlank(repoName))
+ String projectName = Preconditions.checkNotNull(params.get(PARAM_DEPOT).toString());
+ if (StringUtils.isBlank(projectName))
throw new IllegalArgumentException("project name has to be specified");
- if (repoName.endsWith(Constants.DOT_GIT_EXT))
- repoName = repoName.substring(0, repoName.length() - Constants.DOT_GIT_EXT.length());
-
- Project project = GitPlex.getInstance(ProjectManager.class).find(repoName);
+ Project project = GitPlex.getInstance(ProjectManager.class).find(projectName);
if (project == null)
- throw new EntityNotFoundException("Unable to find project " + repoName);
+ throw new EntityNotFoundException("Unable to find project " + projectName);
String revision = params.get(PARAM_REVISION).toString();
if (StringUtils.isBlank(revision))
diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java
index 4289f84abf..1dfa1df7f1 100644
--- a/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/AttachmentResource.java
@@ -13,7 +13,6 @@ import org.apache.shiro.authz.UnauthorizedException;
import org.apache.tika.io.IOUtils;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
-import org.eclipse.jgit.lib.Constants;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AttachmentManager;
@@ -37,17 +36,14 @@ public class AttachmentResource extends AbstractResource {
protected ResourceResponse newResourceResponse(Attributes attributes) {
PageParameters params = attributes.getParameters();
- String repoName = Preconditions.checkNotNull(params.get(PARAM_PROJECT).toString());
- if (StringUtils.isBlank(repoName))
+ String projectName = Preconditions.checkNotNull(params.get(PARAM_PROJECT).toString());
+ if (StringUtils.isBlank(projectName))
throw new IllegalArgumentException("project name has to be specified");
- if (repoName.endsWith(Constants.DOT_GIT_EXT))
- repoName = repoName.substring(0, repoName.length() - Constants.DOT_GIT_EXT.length());
-
- Project project = GitPlex.getInstance(ProjectManager.class).find(repoName);
+ Project project = GitPlex.getInstance(ProjectManager.class).find(projectName);
if (project == null)
- throw new EntityNotFoundException("Unable to find project " + repoName);
+ throw new EntityNotFoundException("Unable to find project " + projectName);
if (!SecurityUtils.canRead(project))
throw new UnauthorizedException();
diff --git a/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java b/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java
index 16849616f8..3358cf8a8e 100644
--- a/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java
+++ b/web/src/main/java/com/gitplex/server/web/util/resource/RawBlobResource.java
@@ -15,7 +15,6 @@ import org.apache.shiro.authz.UnauthorizedException;
import org.apache.tika.io.IOUtils;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
-import org.eclipse.jgit.lib.Constants;
import com.gitplex.server.GitPlex;
import com.gitplex.server.git.Blob;
@@ -45,9 +44,6 @@ public class RawBlobResource extends AbstractResource {
if (StringUtils.isBlank(projectName))
throw new IllegalArgumentException("project name has to be specified");
- if (projectName.endsWith(Constants.DOT_GIT_EXT))
- projectName = projectName.substring(0, projectName.length() - Constants.DOT_GIT_EXT.length());
-
Project project = GitPlex.getInstance(ProjectManager.class).find(projectName);
if (project == null)