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:08 UTC
[1/4] git commit: fix osgi warning
Repository: archiva
Updated Branches:
refs/heads/master 951b9f8ef -> a2f7519f2
fix osgi warning
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/a2f7519f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/a2f7519f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/a2f7519f
Branch: refs/heads/master
Commit: a2f7519f28f722cedf3f7f1255c83f00c6498aab
Parents: 655dd53
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Oct 14 15:51:14 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Oct 14 15:59:00 2014 +1100
----------------------------------------------------------------------
archiva-modules/archiva-web/archiva-web-common/pom.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/a2f7519f/archiva-modules/archiva-web/archiva-web-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 755afe0..7cf47e2 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -466,7 +466,6 @@
org.quartz;version="[2,3)",
org.slf4j;resolution:=optional,
org.springframework*;version="[3,4)",
- org.springframework.web*;version="[3,4)",
com.sun.syndication.feed.synd,
com.sun.syndication.io,
org.apache.archiva.metadata.repository,
[3/4] git commit: [MRM-1145] RSS tests do not correctly check
responses
Posted by ol...@apache.org.
[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/655dd53f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/655dd53f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/655dd53f
Branch: refs/heads/master
Commit: 655dd53f580c11e4f82842374b86fbe9ce10ddf3
Parents: 31cc47c
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Oct 14 15:48:05 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Oct 14 15:59:00 2014 +1100
----------------------------------------------------------------------
.../test/java/org/apache/archiva/web/rss/RssFeedServletTest.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/655dd53f/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 194583f..6ad417c 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
@@ -469,7 +469,7 @@ public class RssFeedServletTest
}
- @Ignore
+ @Test
public void testUnauthorizedRequest()
throws Exception
{
@@ -479,8 +479,6 @@ public class RssFeedServletTest
request.addHeader( "User-Agent", "Apache Archiva unit test" );
request.setMethod( "GET" );
- //WebRequest request = new GetMethodWebRequest( "http://localhost/feeds/unauthorized-repo" );
-
Base64 encoder = new Base64( 0, new byte[0] );
String userPass = "user1:password1";
String encodedUserPass = encoder.encodeToString( userPass.getBytes() );
[4/4] git commit: [MRM-1145] RSS tests do not correctly check
responses
Posted by ol...@apache.org.
[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" );
[2/4] git commit: [MRM-1145] RSS tests do not correctly check
responses
Posted by ol...@apache.org.
[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/31cc47c3
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/31cc47c3
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/31cc47c3
Branch: refs/heads/master
Commit: 31cc47c3138e97d896ca435ed086b2e76cbab7fb
Parents: 84d5a61
Author: Olivier Lamy <ol...@apache.org>
Authored: Tue Oct 14 15:45:31 2014 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Tue Oct 14 15:59:00 2014 +1100
----------------------------------------------------------------------
.../java/org/apache/archiva/web/rss/RssFeedServletTest.java | 6 +-----
.../java/org/apache/archiva/web/rss/SecuritySystemStub.java | 4 ++--
.../archiva-web-common/src/test/resources/log4j2-test.xml | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/31cc47c3/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 582a532..194583f 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
@@ -447,14 +447,10 @@ public class RssFeedServletTest
}
- @Ignore
+ @Test
public void testInvalidAuthenticationRequest()
throws Exception
{
- //RssFeedServlet servlet =
- // (RssFeedServlet) client.newInvocation( "http://localhost/feeds/unauthorized-repo" ).getServlet();
-
- //WebRequest request = new GetMethodWebRequest( "http://localhost/feeds/unauthorized-repo" );
MockHttpServletRequest request = new MockHttpServletRequest();
request.setRequestURI( "/feeds/unauthorized-repo" );
http://git-wip-us.apache.org/repos/asf/archiva/blob/31cc47c3/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
index 5a66698..53cfeb5 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
@@ -96,11 +96,11 @@ public class SecuritySystemStub
}
@Override
- public AuthorizationResult authorize( SecuritySession arg0, String arg1, String arg2 )
+ public AuthorizationResult authorize( SecuritySession arg0, String permission, String repositoryId )
throws AuthorizationException
{
- AuthorizationResult result = new AuthorizationResult( true, arg1, null );
+ AuthorizationResult result = new AuthorizationResult( this.repoIds.contains( repositoryId ), permission, null );
return result;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/31cc47c3/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
index 17e6570..b80c0b0 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/log4j2-test.xml
@@ -19,7 +19,7 @@
-->
-<configuration status="debug">
+<configuration> <!-- status="debug"> -->
<appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>