cxf git commit: Adding JweJwt helpers

2014-11-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 7d1f30f76 - 49a78e92b


Adding JweJwt helpers


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

Branch: refs/heads/master
Commit: 49a78e92bf89d82af62a4769b64b4dcbf62f3c27
Parents: 7d1f30f
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Nov 13 15:04:22 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Nov 13 15:04:22 2014 +

--
 .../jose/jaxrs/JweWriterInterceptor.java| 10 ++-
 .../jose/jwe/AbstractJweEncryption.java | 20 +++--
 .../jose/jwe/JweEncryptionProvider.java |  4 +-
 .../jose/jwe/JweJwtCompactConsumer.java | 62 +++
 .../jose/jwe/JweJwtCompactProducer.java | 61 +++
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 80 +++-
 .../cxf/rs/security/jose/jwk/JwkUtils.java  | 11 ++-
 .../security/jose/jws/JwsCompactConsumer.java   |  8 ++
 .../security/jose/jws/JwsCompactProducer.java   | 19 +++--
 .../rs/security/jose/jws/JwsJsonConsumer.java   |  7 ++
 .../rs/security/jose/jws/JwsJsonProducer.java   |  7 ++
 .../jose/jws/JwsJwtCompactProducer.java | 11 +--
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 44 +++
 13 files changed, 314 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/49a78e92/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
index a50c6a5..a80ac67 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.jose.jaxrs;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Collections;
 import java.util.zip.DeflaterOutputStream;
 
 import javax.annotation.Priority;
@@ -41,6 +42,7 @@ import org.apache.cxf.rs.security.jose.JoseHeadersWriter;
 import org.apache.cxf.rs.security.jose.jwe.JweCompactProducer;
 import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
 import org.apache.cxf.rs.security.jose.jwe.JweEncryptionState;
+import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwe.JweOutputStream;
 import org.apache.cxf.rs.security.jose.jwe.JweUtils;
 
@@ -73,7 +75,7 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 }
 
 if (useJweOutputStream) {
-JweEncryptionState encryption = 
theEncryptionProvider.createJweEncryptionState(ctString);
+JweEncryptionState encryption = 
theEncryptionProvider.createJweEncryptionState(toJweHeaders(ctString));
 try {
 JweCompactProducer.startJweContent(actualOs,
encryption.getHeaders(), 
@@ -99,7 +101,7 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 CachedOutputStream cos = new CachedOutputStream(); 
 ctx.setOutputStream(cos);
 ctx.proceed();
-String jweContent = theEncryptionProvider.encrypt(cos.getBytes(), 
ctString);
+String jweContent = theEncryptionProvider.encrypt(cos.getBytes(), 
toJweHeaders(ctString));
 setJoseMediaType(ctx);
 IOUtils.copy(new 
ByteArrayInputStream(StringUtils.toBytesUTF8(jweContent)), 
  actualOs);
@@ -136,5 +138,7 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 public void setEncryptionProvider(JweEncryptionProvider 
encryptionProvider) {
 this.encryptionProvider = encryptionProvider;
 }
-
+private static JweHeaders toJweHeaders(String ct) {
+return new JweHeaders(Collections.String, 
ObjectsingletonMap(JoseConstants.HEADER_CONTENT_TYPE, ct));
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/49a78e92/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index

cxf git commit: Adding JweJwt helpers

2014-11-13 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes b3009df51 - 25e676f2d


Adding JweJwt helpers


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

Branch: refs/heads/3.0.x-fixes
Commit: 25e676f2ddb2d24977db6e2851e34210301482f0
Parents: b3009df
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Thu Nov 13 15:04:22 2014 +
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Thu Nov 13 15:05:41 2014 +

--
 .../jose/jaxrs/JweWriterInterceptor.java| 10 ++-
 .../jose/jwe/AbstractJweEncryption.java | 20 +++--
 .../jose/jwe/JweEncryptionProvider.java |  4 +-
 .../jose/jwe/JweJwtCompactConsumer.java | 62 +++
 .../jose/jwe/JweJwtCompactProducer.java | 61 +++
 .../cxf/rs/security/jose/jwe/JweUtils.java  | 80 +++-
 .../cxf/rs/security/jose/jwk/JwkUtils.java  | 11 ++-
 .../security/jose/jws/JwsCompactConsumer.java   |  8 ++
 .../security/jose/jws/JwsCompactProducer.java   | 19 +++--
 .../rs/security/jose/jws/JwsJsonConsumer.java   |  7 ++
 .../rs/security/jose/jws/JwsJsonProducer.java   |  7 ++
 .../jose/jws/JwsJwtCompactProducer.java | 11 +--
 .../cxf/rs/security/jose/jwt/JwtUtils.java  | 44 +++
 13 files changed, 314 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/25e676f2/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
index a50c6a5..a80ac67 100644
--- 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
+++ 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jaxrs/JweWriterInterceptor.java
@@ -21,6 +21,7 @@ package org.apache.cxf.rs.security.jose.jaxrs;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Collections;
 import java.util.zip.DeflaterOutputStream;
 
 import javax.annotation.Priority;
@@ -41,6 +42,7 @@ import org.apache.cxf.rs.security.jose.JoseHeadersWriter;
 import org.apache.cxf.rs.security.jose.jwe.JweCompactProducer;
 import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
 import org.apache.cxf.rs.security.jose.jwe.JweEncryptionState;
+import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
 import org.apache.cxf.rs.security.jose.jwe.JweOutputStream;
 import org.apache.cxf.rs.security.jose.jwe.JweUtils;
 
@@ -73,7 +75,7 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 }
 
 if (useJweOutputStream) {
-JweEncryptionState encryption = 
theEncryptionProvider.createJweEncryptionState(ctString);
+JweEncryptionState encryption = 
theEncryptionProvider.createJweEncryptionState(toJweHeaders(ctString));
 try {
 JweCompactProducer.startJweContent(actualOs,
encryption.getHeaders(), 
@@ -99,7 +101,7 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 CachedOutputStream cos = new CachedOutputStream(); 
 ctx.setOutputStream(cos);
 ctx.proceed();
-String jweContent = theEncryptionProvider.encrypt(cos.getBytes(), 
ctString);
+String jweContent = theEncryptionProvider.encrypt(cos.getBytes(), 
toJweHeaders(ctString));
 setJoseMediaType(ctx);
 IOUtils.copy(new 
ByteArrayInputStream(StringUtils.toBytesUTF8(jweContent)), 
  actualOs);
@@ -136,5 +138,7 @@ public class JweWriterInterceptor implements 
WriterInterceptor {
 public void setEncryptionProvider(JweEncryptionProvider 
encryptionProvider) {
 this.encryptionProvider = encryptionProvider;
 }
-
+private static JweHeaders toJweHeaders(String ct) {
+return new JweHeaders(Collections.String, 
ObjectsingletonMap(JoseConstants.HEADER_CONTENT_TYPE, ct));
+}
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/25e676f2/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index