Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-24 01:09:48 +01:00
Code Issues Packages Projects Releases Activity

Correct servlet paths for svn requests

Browse Source
This commit is contained in:
René Pfeuffer
2018-07-11 10:14:00 +02:00
parent f3304e6973
commit 8391e75a15
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/web/SvnDAVServlet.java
View File

@@ -37,13 +37,10 @@ package sonia.scm.web;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Singleton; import com.google.inject.Singleton;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.tmatesoft.svn.core.internal.server.dav.DAVConfig; import org.tmatesoft.svn.core.internal.server.dav.DAVConfig;
import org.tmatesoft.svn.core.internal.server.dav.DAVServlet; import org.tmatesoft.svn.core.internal.server.dav.DAVServlet;
import sonia.scm.repository.Repository; import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryProvider; import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.RepositoryRequestListenerUtil; import sonia.scm.repository.RepositoryRequestListenerUtil;
@@ -51,14 +48,13 @@ import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.HttpUtil; import sonia.scm.util.HttpUtil;
//~--- JDK imports ------------------------------------------------------------
import java.io.IOException;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
//~--- JDK imports ------------------------------------------------------------
/** /**
* *
@@ -224,7 +220,7 @@ public class SvnDAVServlet extends DAVServlet
pathInfo = pathInfo.substring(1); pathInfo = pathInfo.substring(1);
} }
pathInfo = pathInfo.substring(repository.getName().length()); pathInfo = pathInfo.substring(repository.getNamespace().length() + 1 + repository.getName().length());
} }
return pathInfo; return pathInfo;
@@ -249,7 +245,7 @@ public class SvnDAVServlet extends DAVServlet
servletPath = servletPath.concat(HttpUtil.SEPARATOR_PATH); servletPath = servletPath.concat(HttpUtil.SEPARATOR_PATH);
} }
servletPath = servletPath.concat(repository.getName()); servletPath = servletPath + repository.getNamespace() + "/" + repository.getName();
} }
return servletPath; return servletPath;