Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 11:35:57 +01:00
Code Issues Packages Projects Releases Activity

merge with branch issue-436

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-08-27 20:37:10 +02:00
parent 19e7e45395 bc08d33a99
commit e4da1a9404
1 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,8 +45,8 @@ import org.tmatesoft.svn.core.internal.server.dav.DAVConfig;
import org.tmatesoft.svn.core.internal.server.dav.DAVServlet;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.repository.RepositoryProvider;
import sonia.scm.repository.RepositoryRequestListenerUtil;
import sonia.scm.repository.SvnRepositoryHandler;
import sonia.scm.util.AssertUtil;
import sonia.scm.util.HttpUtil;
@@ -68,6 +68,9 @@ import javax.servlet.http.HttpServletResponse;
public class SvnDAVServlet extends DAVServlet
{
/** Field description */
private static final String HEADER_CONTEXTPATH = "X-Forwarded-Ctx";
/** Field description */
private static final long serialVersionUID = -1462257085465785945L;
@@ -86,8 +89,7 @@ public class SvnDAVServlet extends DAVServlet
* @param repositoryRequestListenerUtil
*/
@Inject
public SvnDAVServlet(
SvnRepositoryHandler handler,
public SvnDAVServlet(SvnRepositoryHandler handler,
RepositoryProvider repositoryProvider,
RepositoryRequestListenerUtil repositoryRequestListenerUtil)
{
@@ -177,6 +179,25 @@ public class SvnDAVServlet extends DAVServlet
//~--- get methods --------------------------------------------------------
/**
* Method description
*
*
* @return
*/
@Override
public String getContextPath()
{
String header = getHeader(HEADER_CONTEXTPATH);
if ((header == null) ||!isValidContextPath(header))
{
header = super.getContextPath();
}
return header;
}
/**
* Method description
*
@@ -230,6 +251,32 @@ public class SvnDAVServlet extends DAVServlet
return servletPath;
}
/**
* Method description
*
*
* @param ctx
*
* @return
*/
private boolean isValidContextPath(String ctx)
{
int length = ctx.length();
boolean result = (length == 0)
|| ((length > 1)
&& ctx.startsWith(HttpUtil.SEPARATOR_PATH));
if (!result)
{
logger.warn(
"header {} contains a non valid context path, fallback to default",
HEADER_CONTEXTPATH);
}
return result;
}
//~--- fields -------------------------------------------------------------
/** Field description */