You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@inuus.com on 2010/04/24 00:01:17 UTC

Shindig SecurityTokenDecoder -> SecurityTokenCodec - part 1 (issue975043)

Reviewers: beaton, zhoresh, chirag,

Message:
Hi,

here's a patch that adds a new method to the securitytokendecoder
interface.  Once this is place we can rename these classes to xxxxCodec
instead of xxxxDecoder.

The rationale here is to allow for a simple way for shindig to generate
the security tokens on a metadata call for a given HttpServletRequest
(more on that in a later patch..)




Please review this at http://codereview.appspot.com/975043/show

Affected files:
   M  
java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
   M  
java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
   M  
java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
   M  
java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java


Index:  
java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
diff --git  
a/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java  
b/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
index  
5fc8058ae59c89405455e27d7acf464f998e40e3..63fe9370f646b9f0646ffc5a983a60a855cf2686  
100644
---  
a/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
+++  
b/java/common/src/main/java/org/apache/shindig/auth/BlobCrypterSecurityTokenDecoder.java
@@ -117,4 +117,13 @@ public class BlobCrypterSecurityTokenDecoder  
implements SecurityTokenDecoder {
        throw new SecurityTokenException(e);
      }
    }
+
+  public String encodeToken(SecurityToken token) throws  
SecurityTokenException {
+    BlobCrypterSecurityToken t = (BlobCrypterSecurityToken)token;
+    try {
+      return t.encrypt();
+    } catch (BlobCrypterException e) {
+      return null;
+    }
+  }
  }
Index:  
java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
diff --git  
a/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java  
b/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
index  
22e1c8d40a23bef375a220af95b38d61bd5cc8f6..ed31e74253b6776e21b097092f035fe48ff500ed  
100644
---  
a/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
+++  
b/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
@@ -66,4 +66,7 @@ public class DefaultSecurityTokenDecoder implements  
SecurityTokenDecoder {
      return decoder.createToken(tokenParameters);
    }

+  public String encodeToken(SecurityToken token) throws  
SecurityTokenException {
+    return decoder.encodeToken(token);
+  }
  }
Index:  
java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
diff --git  
a/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java  
b/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
index  
a0849e83f32ac49458a9767d5796d4fab8726878..bc643b52d6d5080ca4c0cb7c4bfc2adf2b211db8  
100644
---  
a/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
+++  
b/java/common/src/main/java/org/apache/shindig/auth/SecurityTokenDecoder.java
@@ -49,4 +49,6 @@ public interface SecurityTokenDecoder {
     */
    SecurityToken createToken(Map<String, String> tokenParameters)
        throws SecurityTokenException;
+
+  String encodeToken(SecurityToken token) throws SecurityTokenException;
  }
Index:  
java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
diff --git  
a/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java  
b/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
index  
11f3583ae87cbdbacd6ebc24765e6fca2472f1b6..4fe8595465d362f7d5ec55ec75ab1c1dd06e65f2  
100644
---  
a/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
+++  
b/java/common/src/test/java/org/apache/shindig/common/testing/FakeGadgetToken.java
@@ -23,6 +23,7 @@ import org.apache.shindig.auth.SecurityToken;
  import org.apache.shindig.auth.SecurityTokenDecoder;

  import com.google.common.collect.Maps;
+import org.apache.shindig.auth.SecurityTokenException;

  import java.util.Map;

@@ -208,5 +209,9 @@ public class FakeGadgetToken implements SecurityToken {
      public SecurityToken createToken(Map<String, String> tokenParameters)   
{
        return FakeGadgetToken.createToken(tokenParameters);
      }
+
+    public String encodeToken(SecurityToken token) throws  
SecurityTokenException {
+      return null; // NOT USED
+    }
    }
  }