Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1145] RSS tests do not correctly check responses

This commit is contained in:
Olivier Lamy 2014-10-14 15:02:22 +11:00
parent 951b9f8ef1
commit 84d5a61c80
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
View File

@ -115,11 +115,14 @@ public class RssFeedServlet
public void doGet( HttpServletRequest req, HttpServletResponse res )
throws ServletException, IOException
{
String repoId = null;
String groupId = null;
String artifactId = null;
String url = StringUtils.removeEnd( req.getRequestURL().toString(), "/" );
if ( StringUtils.countMatches( StringUtils.substringAfter( url, "feeds/" ), "/" ) > 0 )
{
artifactId = StringUtils.substringAfterLast( url, "/" );
@ -128,6 +131,12 @@ public class RssFeedServlet
}
else if ( StringUtils.countMatches( StringUtils.substringAfter( url, "feeds/" ), "/" ) == 0 )
{
// we receive feeds?babla=ded which is not correct
if ( StringUtils.countMatches( url, "feeds?" ) > 0 )
{
res.sendError( HttpServletResponse.SC_BAD_REQUEST, "Invalid request url." );
return;
}
repoId = StringUtils.substringAfterLast( url, "/" );
}
else

4
archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
View File

@ -430,12 +430,10 @@ public class RssFeedServletTest
mockHttpServletResponse.getStatus() );
}
@Ignore
@Test
public void testInvalidRequest()
throws Exception
{
//RssFeedServlet servlet =
// (RssFeedServlet) client.newInvocation( "http://localhost/feeds?invalid_param=xxx" ).getServlet();
MockHttpServletRequest request = new MockHttpServletRequest();
request.setRequestURI( "/feeds?invalid_param=xxx" );
request.addHeader( "User-Agent", "Apache Archiva unit test" );