svn commit: r1578323 - in /cayenne/main/trunk/cayenne-crypto/src: main/java/org/apache/cayenne/crypto/ test/java/org/apache/cayenne/crypto/ test/java/org/apache/cayenne/crypto/unit/

[aa...@apache.org]

Author: aadamchik
Date: Mon Mar 17 11:49:09 2014
New Revision: 1578323

URL: http://svn.apache.org/r1578323
Log:
CAY-1916 cayenne-crypto module that enables data encryption for certain model attributes

Added:
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandler.java
      - copied, changed from r1578322, cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CipherService.java
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandlerTest.java
Removed:
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CipherService.java
Modified:
    cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
    cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java

Modified: cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java?rev=1578323&r1=1578322&r2=1578323&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoModuleBuilder.java Mon Mar 17 11:49:09 2014
@@ -36,6 +36,8 @@ import org.apache.cayenne.di.Module;
 public class CryptoModuleBuilder {
 
     private Class<? extends CryptoHandler> cryptoHandlerType;
+
+    private ColumnMapper columnMapper;
     private Class<? extends ColumnMapper> columnMapperType;
 
     public CryptoModuleBuilder cryptoHandler(Class<? extends CryptoHandler> cryptoHandlerType) {
@@ -43,6 +45,18 @@ public class CryptoModuleBuilder {
         return this;
     }
 
+    public CryptoModuleBuilder columnMapper(Class<? extends ColumnMapper> columnMapperType) {
+        this.columnMapperType = columnMapperType;
+        this.columnMapper = null;
+        return this;
+    }
+
+    public CryptoModuleBuilder columnMapper(ColumnMapper columnMapper) {
+        this.columnMapperType = null;
+        this.columnMapper = columnMapper;
+        return this;
+    }
+
     /**
      * Produces a module that can be used to start Cayenne runtime.
      */
@@ -52,7 +66,7 @@ public class CryptoModuleBuilder {
             throw new IllegalStateException("'CryptoHandler' is not initialized");
         }
 
-        if (columnMapperType == null) {
+        if (columnMapperType == null && columnMapper == null) {
             throw new IllegalStateException("'ColumnMapper' is not initialized");
         }
 
@@ -61,7 +75,13 @@ public class CryptoModuleBuilder {
             @Override
             public void configure(Binder binder) {
                 binder.bind(CryptoHandler.class).to(cryptoHandlerType);
-                binder.bind(ColumnMapper.class).to(columnMapperType);
+
+                if (columnMapperType != null) {
+                    binder.bind(ColumnMapper.class).to(columnMapperType);
+                } else {
+                    binder.bind(ColumnMapper.class).toInstance(columnMapper);
+                }
+                
                 binder.decorate(BatchTranslatorFactory.class).after(CryptoBatchTranslatorFactoryDecorator.class);
             }
         };

Modified: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java?rev=1578323&r1=1578322&r2=1578323&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/Crypto_InRuntime_Test.java Mon Mar 17 11:49:09 2014
@@ -28,7 +28,8 @@ import junit.framework.TestCase;
 import org.apache.cayenne.ObjectContext;
 import org.apache.cayenne.configuration.server.ServerRuntime;
 import org.apache.cayenne.crypto.db.Table1;
-import org.apache.cayenne.crypto.unit.Rot13CipherService;
+import org.apache.cayenne.crypto.map.PatternColumnMapper;
+import org.apache.cayenne.crypto.unit.Rot13CryptoHandler;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.test.jdbc.DBHelper;
 import org.apache.cayenne.test.jdbc.TableHelper;
@@ -42,7 +43,8 @@ public class Crypto_InRuntime_Test exten
     @Override
     protected void setUp() throws Exception {
 
-        Module crypto = new CryptoModuleBuilder().cryptoHandler(Rot13CipherService.class).build();
+        Module crypto = new CryptoModuleBuilder().cryptoHandler(Rot13CryptoHandler.class)
+                .columnMapper(new PatternColumnMapper("^CRYPTO_")).build();
 
         this.runtime = new ServerRuntime("cayenne-crypto.xml", crypto);
 
@@ -64,7 +66,7 @@ public class Crypto_InRuntime_Test exten
 
         Object[] data = table1.select();
         assertEquals("plain_1", data[1]);
-        assertEquals(Rot13CipherService.rotate("crypto_1"), data[2]);
+        assertEquals(Rot13CryptoHandler.rotate("crypto_1"), data[2]);
     }
 
     public void testInsert_MultipleObjects() throws SQLException {
@@ -89,8 +91,8 @@ public class Crypto_InRuntime_Test exten
             cipherByPlain.put(r[1], r[2]);
         }
 
-        assertEquals(Rot13CipherService.rotate("crypto_1"), cipherByPlain.get("a"));
-        assertEquals(Rot13CipherService.rotate("crypto_2"), cipherByPlain.get("b"));
+        assertEquals(Rot13CryptoHandler.rotate("crypto_1"), cipherByPlain.get("a"));
+        assertEquals(Rot13CryptoHandler.rotate("crypto_2"), cipherByPlain.get("b"));
     }
 
 }

Copied: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandler.java (from r1578322, cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CipherService.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandler.java?p2=cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandler.java&p1=cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CipherService.java&r1=1578322&r2=1578323&rev=1578323&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CipherService.java (original)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandler.java Mon Mar 17 11:49:09 2014
@@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingExcept
 
 import org.apache.cayenne.crypto.cipher.CryptoHandler;
 
-public class Rot13CipherService implements CryptoHandler {
+public class Rot13CryptoHandler implements CryptoHandler {
 
     public static String rotate(String value) {
         if (value == null) {
@@ -65,7 +65,7 @@ public class Rot13CipherService implemen
 
     @Override
     public Object encrypt(Object plaintext, int jdbcType) {
-        return rotate(plaintext.toString().getBytes());
+        return rotate(plaintext.toString());
     }
 
 }

Added: cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandlerTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandlerTest.java?rev=1578323&view=auto
==============================================================================
--- cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandlerTest.java (added)
+++ cayenne/main/trunk/cayenne-crypto/src/test/java/org/apache/cayenne/crypto/unit/Rot13CryptoHandlerTest.java Mon Mar 17 11:49:09 2014
@@ -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.cayenne.crypto.unit;
+
+import java.sql.Types;
+
+import junit.framework.TestCase;
+
+public class Rot13CryptoHandlerTest extends TestCase {
+
+    public void testEncrypt() {
+        Rot13CryptoHandler handler = new Rot13CryptoHandler();
+        assertEquals("nop", handler.encrypt("abc", Types.VARCHAR));
+    }
+    
+    public void testDecrypt() {
+        Rot13CryptoHandler handler = new Rot13CryptoHandler();
+        assertEquals("nop", handler.decrypt("abc", Types.VARCHAR));
+    }
+
+}