cxf git commit: Adding more rs-security tests

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 0430e7756 -> f456dd41b


Adding more rs-security tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f456dd41
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f456dd41
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f456dd41

Branch: refs/heads/master
Commit: f456dd41b6352dd55404272d351b1580b53558f7
Parents: 0430e77
Author: Colm O hEigeartaigh 
Authored: Thu Oct 15 17:33:50 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 15 17:34:07 2015 +0100

--
 .../systest/jaxrs/security/jwt/BookStore.java   |  8 ++
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 11 +++
 .../jaxrs/security/jwt/JAXRSJwsJsonTest.java| 30 +++-
 .../security/certs/jwkModifiedPrivateSet.txt| 13 +
 .../jaxrs/security/secret.jwk.bad.properties| 21 ++
 5 files changed, 82 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f456dd41/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
index b56ce36..dcbeb28 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
@@ -49,6 +49,14 @@ public class BookStore {
 return book;
 }
 
+@POST
+@Path("/books")
+@Produces("application/xml")
+@Consumes("application/xml")
+public Book echoBook2(Book book) {
+return book;
+}
+
 }
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/f456dd41/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
index 3d558d5..79f418e 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
@@ -419,6 +419,17 @@ public class JAXRSJweJwsTest extends 
AbstractBusClientServerTestBase {
 assertEquals("book", text);
 }
 
+// Test signing and encrypting an XML payload
+@Test
+public void testJweRsaJwsRsaXML() throws Exception {
+String address = "https://localhost:; + PORT + "/jwejwsrsa";
+BookStore bs = createJweJwsBookStore(address, null, null);
+Book book = new Book();
+book.setName("book");
+book = bs.echoBook2(book);
+assertEquals("book", book.getName());
+}
+
 private static class PrivateKeyPasswordProviderImpl implements 
PrivateKeyPasswordProvider {
 private String password = "password";
 PrivateKeyPasswordProviderImpl() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/f456dd41/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
index 33f55737..1eded3c 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.crypto.Cipher;
+import javax.ws.rs.BadRequestException;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
@@ -128,10 +129,37 @@ public class JAXRSJwsJsonTest extends 
AbstractBusClientServerTestBase {
 List properties = new ArrayList();
 
properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac2.properties");
 BookStore bs = createBookStore(address, properties, null);
-Book book = bs.echoBook(new Book("book", 123L));
+Book book = bs.echoBook2(new Book("book", 123L));
 assertEquals("book", book.getName());
 assertEquals(123L, book.getId());
 }
+
+// Test signing an XML payload
+@Test
+public void 

[2/2] cxf git commit: Adding more rs-security tests

[coheigea]

Adding more rs-security tests


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5e7d0210
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5e7d0210
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5e7d0210

Branch: refs/heads/3.0.x-fixes
Commit: 5e7d0210744661ca3d9225fa972f6754f94d90aa
Parents: 9800ee0
Author: Colm O hEigeartaigh 
Authored: Thu Oct 15 17:33:50 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 15 17:35:52 2015 +0100

--
 .../systest/jaxrs/security/jwt/BookStore.java   |  8 ++
 .../jaxrs/security/jwt/JAXRSJweJwsTest.java | 11 +++
 .../jaxrs/security/jwt/JAXRSJwsJsonTest.java| 30 +++-
 .../security/certs/jwkModifiedPrivateSet.txt| 13 +
 .../jaxrs/security/secret.jwk.bad.properties| 21 ++
 5 files changed, 82 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5e7d0210/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
index b56ce36..dcbeb28 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/BookStore.java
@@ -49,6 +49,14 @@ public class BookStore {
 return book;
 }
 
+@POST
+@Path("/books")
+@Produces("application/xml")
+@Consumes("application/xml")
+public Book echoBook2(Book book) {
+return book;
+}
+
 }
 
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/5e7d0210/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
index e69191b..e770b3f 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java
@@ -449,6 +449,17 @@ public class JAXRSJweJwsTest extends 
AbstractBusClientServerTestBase {
 assertEquals("book", text);
 }
 
+// Test signing and encrypting an XML payload
+@Test
+public void testJweRsaJwsRsaXML() throws Exception {
+String address = "https://localhost:; + PORT + "/jwejwsrsa";
+BookStore bs = createJweJwsBookStore(address, null, null);
+Book book = new Book();
+book.setName("book");
+book = bs.echoBook2(book);
+assertEquals("book", book.getName());
+}
+
 private static class PrivateKeyPasswordProviderImpl implements 
PrivateKeyPasswordProvider {
 private String password = "password";
 public PrivateKeyPasswordProviderImpl() {

http://git-wip-us.apache.org/repos/asf/cxf/blob/5e7d0210/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
--
diff --git 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
index 91cc064..a72c6f9 100644
--- 
a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
+++ 
b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java
@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 
 import javax.crypto.Cipher;
+import javax.ws.rs.BadRequestException;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
@@ -136,10 +137,37 @@ public class JAXRSJwsJsonTest extends 
AbstractBusClientServerTestBase {
 List properties = new ArrayList();
 
properties.add("org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac2.properties");
 BookStore bs = createBookStore(address, properties, null);
-Book book = bs.echoBook(new Book("book", 123L));
+Book book = bs.echoBook2(new Book("book", 123L));
 assertEquals("book", book.getName());
 assertEquals(123L, book.getId());
 }
+
+// Test signing an XML payload
+@Test
+public void testJwsJsonPlainTextHmacXML() throws Exception {
+String address =