oltu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asa...@apache.org
Subject svn commit: r1732429 - in /oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe: ContentEncryptionKey.java JWE.java encryption/ContentEncryptMethod.java encryption/KeyEncryptMethod.java
Date Fri, 26 Feb 2016 07:47:31 GMT
Author: asanso
Date: Fri Feb 26 07:47:31 2016
New Revision: 1732429

URL: http://svn.apache.org/viewvc?rev=1732429&view=rev
Log:
OLTU-80 - Implement JWE support for JWT

Added:
    oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/ContentEncryptionKey.java
Modified:
    oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/JWE.java
    oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/ContentEncryptMethod.java
    oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/KeyEncryptMethod.java

Added: oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/ContentEncryptionKey.java
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/ContentEncryptionKey.java?rev=1732429&view=auto
==============================================================================
--- oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/ContentEncryptionKey.java (added)
+++ oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/ContentEncryptionKey.java Fri
Feb 26 07:47:31 2016
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.oltu.jose.jwe;
+
+public class ContentEncryptionKey {
+    
+    private final byte[] contentEncryptionKey;
+    private final String encryptedKey;
+    
+    public ContentEncryptionKey(byte[] contentEncryptionKey, String encryptedKey) {
+        super();
+        this.contentEncryptionKey = contentEncryptionKey;
+        this.encryptedKey = encryptedKey;
+    }
+
+    public byte[] getContentEncryptionKey() {
+        return contentEncryptionKey;
+    }
+
+    public String getEncryptedKey() {
+        return encryptedKey;
+    }
+}

Modified: oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/JWE.java
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/JWE.java?rev=1732429&r1=1732428&r2=1732429&view=diff
==============================================================================
--- oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/JWE.java (original)
+++ oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/JWE.java Fri Feb 26 07:47:31
2016
@@ -24,38 +24,40 @@ import org.apache.oltu.jose.jwe.encrypti
 import org.apache.oltu.jose.jwe.io.JWEHeaderWriter;
 
 public class JWE {
-    
+
     /**
      * The JWE Header.
      */
     private final Header header;
-    
+
     /**
      * The JWE encryptedKey.
      */
     private final String encryptedKey;
+
     
+    //TODO remove??
     /**
      * The JWE Payload.
      */
     private final String payload;
-    
+
     /**
      * The JWE Content Encryption.
      */
     private final String contentEncryption;
-    
+
     JWE(Header header, String encryptedKey, String payload ,String contentEncryption) {
         this.header = header;
         this.encryptedKey = encryptedKey;
         this.payload = payload;
         this.contentEncryption = contentEncryption;
     }
-    
+
     public Header getHeader() {
         return header;
     }
-    
+
     public String getEncryptedKey() {
         return encryptedKey;
     }
@@ -63,11 +65,11 @@ public class JWE {
     public String getPayload() {
         return payload;
     }
-    
+
     public String getContentEncryption() {
         return contentEncryption;
     }
-    
+
     public <EK extends EncryptingKey, DK extends DecryptingKey> boolean acceptAlgorithm(KeyEncryptMethod<EK,
DK> keyEncryptMethod, ContentEncryptMethod<EK, DK> contentEncryptMethod) {
         if (keyEncryptMethod == null) {
             throw new IllegalArgumentException("An encrypt method is required in order to
decrypt the content encryption key.");
@@ -81,7 +83,7 @@ public class JWE {
 
         return header.getAlgorithm().equalsIgnoreCase(keyEncryptMethod.getAlgorithm()) &&
header.getEncryptionAlgorithm().equalsIgnoreCase(contentEncryptMethod.getAlgorithm());
     }
-    
+
     public <EK extends EncryptingKey, DK extends DecryptingKey> String decrypt(KeyEncryptMethod<EK,
DK> keyEncryptMethod,
             DK decryptingKey, ContentEncryptMethod<EK, DK> contentEncryptMethod) {
       
         if (!acceptAlgorithm(keyEncryptMethod, contentEncryptMethod)) {
@@ -90,7 +92,7 @@ public class JWE {
         if (decryptingKey == null) {
             throw new IllegalArgumentException("A decrypting key is required in order to
decrypt the JWE");
         }
-        
+
         if (encryptedKey == null) {
             throw new IllegalStateException("JWE token must have an encrypted key.");
         }
@@ -98,27 +100,27 @@ public class JWE {
         if (contentEncryption == null) {
             throw new IllegalStateException("JWE token must have a content encryption");
         }
-        
+
         return contentEncryptMethod.decrypt(new JWEHeaderWriter().write(header), contentEncryption,
keyEncryptMethod.decrypt(encryptedKey, decryptingKey));
     }
-    
+
     public static final class Builder extends CustomizableBuilder<JWE> {
-        
+
         /**
          * The {@code alg} JWE Header parameter.
          */
         private String algorithm;
-        
+
         /**
          * The {@code enc} JWE Header parameter.
          */
         private String encryptionAlgorithm;
-        
+
         /**
          * The {@code zip} JWE Header key.
          */
         private String compressionAlgorithm;
-        
+
         /**
          * The {@code jku} JWE Header parameter.
          */
@@ -128,7 +130,7 @@ public class JWE {
          * The {@code jwk} JWE Header parameter.
          */
         private String jsonWebKey;
-        
+
         /**
          * The {@code x5u} JWE Header parameter.
          */
@@ -143,7 +145,7 @@ public class JWE {
          * The {@code x5c} JWE Header parameter.
          */
         private String x509CertificateChain;
-        
+
         /**
          * The {@code kid} JWE Header parameter.
          */
@@ -163,32 +165,32 @@ public class JWE {
          * The {@code crit} JWE Header parameter.
          */
         private String[] critical;
-        
+
         /**
          * The JWE encryptedKey.
          */
         private String encryptedKey;
-        
+
         /**
          * The JWE Payload.
          */
         private String payload;
-        
+
         /**
          * The JWE Content Encryption.
          */
         private String contentEncryption;
-        
+
         public Builder setAlgorithm(String algorithm) {
             this.algorithm = algorithm;
             return this;
         }
-        
+
         public Builder setEncryptionAlgorithm(String encryptionAlgorithm) {
             this.encryptionAlgorithm = encryptionAlgorithm;
             return this;
         }
-        
+
         public Builder setCompressionAlgorithm(String compressionAlgorithm) {
             this.compressionAlgorithm = compressionAlgorithm;
             return this;
@@ -238,7 +240,7 @@ public class JWE {
             this.encryptedKey = encryptedKey;
             return this;
         }
-        
+
         public Builder setCritical(String[] critical) {
             this.critical = critical;
             return this;
@@ -248,12 +250,12 @@ public class JWE {
             this.payload = payload;
             return this;
         }
-        
+
         public Builder setContentEncryption(String contentEncryption) {
             this.contentEncryption = contentEncryption;
             return this;
         }
-        
+
         public <EK extends EncryptingKey, DK extends DecryptingKey> Builder encrypt(KeyEncryptMethod<EK,
DK> keyEncryptMethod,
                 EK encryptingKey, ContentEncryptMethod<EK, DK> contentEncryptMethod)
{
             if (keyEncryptMethod == null) {
@@ -268,10 +270,10 @@ public class JWE {
             if (contentEncryptMethod == null) {
                 throw new IllegalArgumentException("A key encryption method is required in
order to encrypt the payload.");
             }
-            
+
             setAlgorithm(keyEncryptMethod.getAlgorithm());
             setEncryptionAlgorithm(contentEncryptMethod.getAlgorithm());
-            
+
             String header = new JWEHeaderWriter().write(new Header(algorithm,
                     encryptionAlgorithm,
                     compressionAlgorithm,
@@ -283,10 +285,13 @@ public class JWE {
                     keyId, type,
                     contentType,
                     critical,
-                    getCustomFields())); 
-            setEncryptedKey(keyEncryptMethod.encrypt(encryptingKey));
-            //TODO
-            return setContentEncryption(contentEncryptMethod.encrypt(header, payload, null));
+                    getCustomFields()));
+
+            ContentEncryptionKey cek = keyEncryptMethod.encrypt(encryptingKey);
+
+            setEncryptedKey(cek.getEncryptedKey());
+
+            return setContentEncryption(contentEncryptMethod.encrypt(header, payload,cek.getContentEncryptionKey()));
         }
 
         @Override
@@ -303,10 +308,10 @@ public class JWE {
                     contentType,
                     critical,
                     getCustomFields()),
-         encryptedKey,
-         payload,
-         contentEncryption);
+                    encryptedKey,
+                    payload,
+                    contentEncryption);
         }
-        
+
     }
 }

Modified: oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/ContentEncryptMethod.java
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/ContentEncryptMethod.java?rev=1732429&r1=1732428&r2=1732429&view=diff
==============================================================================
--- oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/ContentEncryptMethod.java
(original)
+++ oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/ContentEncryptMethod.java
Fri Feb 26 07:47:31 2016
@@ -25,9 +25,9 @@ package org.apache.oltu.jose.jwe.encrypt
  */
 public interface ContentEncryptMethod <EK extends EncryptingKey, DK extends DecryptingKey>
 extends EncryptMethod<EncryptingKey, DecryptingKey>{
     
-    String encrypt(String header, String payload, EK encryptingKey);
+    String encrypt(String header, String payload, byte[] encryptingKey);
     
-    String decrypt(String header, String contentEncryption, DK decryptingKey);
+    String decrypt(String header, String contentEncryption, byte[] decryptingKey);
     
     //TODO add validation??
 }

Modified: oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/KeyEncryptMethod.java
URL: http://svn.apache.org/viewvc/oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/KeyEncryptMethod.java?rev=1732429&r1=1732428&r2=1732429&view=diff
==============================================================================
--- oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/KeyEncryptMethod.java
(original)
+++ oltu/trunk/jose/jwe/src/main/java/org/apache/oltu/jose/jwe/encryption/KeyEncryptMethod.java
Fri Feb 26 07:47:31 2016
@@ -16,6 +16,8 @@
  */
 package org.apache.oltu.jose.jwe.encryption;
 
+import org.apache.oltu.jose.jwe.ContentEncryptionKey;
+
 /**
  * Common definition of OAuth key encryption method algorithm.
  *
@@ -25,13 +27,13 @@ package org.apache.oltu.jose.jwe.encrypt
 public interface KeyEncryptMethod  <EK extends EncryptingKey, DK extends DecryptingKey>
 extends EncryptMethod<EncryptingKey, DecryptingKey> {
 
     //TODO change to wrap?
-    String encrypt(byte [] cek, EK encryptingKey);
+    ContentEncryptionKey encrypt(byte [] cek, EK encryptingKey);
 
-    String encrypt(EK encryptingKey);
+    ContentEncryptionKey encrypt(EK encryptingKey);
 
-    DK decrypt(String encryptedKey, DK decryptingKey);
+    byte[] decrypt(String encryptedKey, DK decryptingKey);
 
-    DK decrypt(String encryptedKey);
+    byte[] decrypt(String encryptedKey);
 
     //TODO add validation??
 



Mime
View raw message