You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/10/14 06:59:11 UTC
[4/4] git commit: [MRM-1145] RSS tests do not correctly check
responses
[MRM-1145] RSS tests do not correctly check responses
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/84d5a61c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/84d5a61c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/84d5a61c
Branch: refs/heads/master
Commit: 84d5a61c80a49222e62f4c65a7eb402e042e9a66
Parents: 951b9f8
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Oct 14 15:02:22 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Oct 14 15:59:00 2014 +1100
----------------------------------------------------------------------
.../java/org/apache/archiva/web/rss/RssFeedServlet.java | 9 +++++++++
.../java/org/apache/archiva/web/rss/RssFeedServletTest.java | 4 +---
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/84d5a61c/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
index 958ad28..a0994cd 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/rss/RssFeedServlet.java
@@ -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
http://git-wip-us.apache.org/repos/asf/archiva/blob/84d5a61c/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
index 54dab14..582a532 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
@@ -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" );