inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed metadata encryption to have a new dictionary type: d:encrypted

Browse Source 
- Properties have to be encrypted and decrypted in code using MetadataEncryptor ('metadataEncryptor')
   - No conversion, encryption or decryption is done by Alfresco
   - Unencrypted values cannot be persisted and get thrown out
   - ALF-8646: RINF 38: Text data encryption
   - ALF-8956: RINF 38: Encryption key password specified by installer
   - ALF-9055: RINF 38: Support encryption against existing data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-06-20 11:50:37 +00:00
parent dc3139bef7
commit 1714397cac
31 changed files with 426 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

177
source/java/org/alfresco/repo/node/db/EncryptedPropertiesTest.java
View File

@@ -1,177 +0,0 @@
package org.alfresco.repo.node.db;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.dictionary.DictionaryBootstrap;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.service.cmr.repository.MLText;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.BaseSpringTest;
public class EncryptedPropertiesTest extends BaseSpringTest
{
private static String NAMESPACE = "http://www.alfresco.org/test/encryptiontest/1.0";
private static QName PROP1_TYPE = QName.createQName(NAMESPACE, "prop1");
private static QName PROP2_TYPE = QName.createQName(NAMESPACE, "prop2");
private static QName ASPECT_PROP1_TYPE = QName.createQName(NAMESPACE, "aspectprop1");
private static QName ASPECT_PROP2_TYPE = QName.createQName(NAMESPACE, "aspectprop2");
private static QName ENCRYPTIONTEST_TYPE = QName.createQName(NAMESPACE, "testtype");
private DictionaryDAO dictionaryDAO;
private NodeService nodeService;
private NodeRef rootNodeRef;
@Override
protected void onSetUpInTransaction() throws Exception
{
super.onSetUpInTransaction();
dictionaryDAO = (DictionaryDAO) applicationContext.getBean("dictionaryDAO");
nodeService = getNodeService();
// Create the test model
createTestModel();
// create a first store directly
StoreRef storeRef = nodeService.createStore(
StoreRef.PROTOCOL_WORKSPACE,
"Test_" + System.currentTimeMillis());
rootNodeRef = nodeService.getRootNode(storeRef);
}
protected NodeService getNodeService()
{
// Force cascading
DbNodeServiceImpl dbNodeServiceImpl = (DbNodeServiceImpl) applicationContext.getBean("dbNodeServiceImpl");
return (NodeService) applicationContext.getBean("dbNodeService");
}
private void createTestModel()
{
// register the test model
List<String> bootstrapModels = new ArrayList<String>();
bootstrapModels.add("org/alfresco/repo/node/db/encrypted_properties_test_model.xml");
DictionaryBootstrap bootstrap = new DictionaryBootstrap();
bootstrap.setModels(bootstrapModels);
bootstrap.setDictionaryDAO(dictionaryDAO);
bootstrap.bootstrap();
}
public void testEncryptedProperties()
{
Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
properties.put(PROP1_TYPE, "test string value");
MLText mlTextProperty = new MLText();
mlTextProperty.addValue(Locale.ENGLISH, "Very good!");
mlTextProperty.addValue(Locale.FRENCH, "Très bon!");
mlTextProperty.addValue(Locale.GERMAN, "Sehr gut!");
properties.put(PROP2_TYPE, mlTextProperty);
NodeRef test1 = nodeService.createNode(
rootNodeRef,
ContentModel.ASSOC_CHILDREN,
QName.createQName(NAMESPACE, "n1"),
ENCRYPTIONTEST_TYPE,
properties).getChildRef();
NodeRef test2 = nodeService.createNode(
rootNodeRef,
ContentModel.ASSOC_CHILDREN,
QName.createQName(NAMESPACE, "n2"),
ContentModel.TYPE_CONTENT,
null).getChildRef();
properties = new HashMap<QName, Serializable>();
properties.put(ASPECT_PROP1_TYPE, "test string value");
mlTextProperty = new MLText();
mlTextProperty.addValue(Locale.ENGLISH, "Very good!");
mlTextProperty.addValue(Locale.FRENCH, "Très bon!");
mlTextProperty.addValue(Locale.GERMAN, "Sehr gut!");
properties.put(ASPECT_PROP2_TYPE, mlTextProperty);
nodeService.addAspect(test2, QName.createQName(NAMESPACE, "testaspect"), properties);
String prop1 = (String)nodeService.getProperty(test1, PROP1_TYPE);
assertEquals("test string value", prop1);
MLText prop2 = (MLText)nodeService.getProperty(test1, PROP2_TYPE);
assertEquals("Very good!", prop2.getValue(Locale.ENGLISH));
assertEquals("Très bon!", prop2.getValue(Locale.FRENCH));
assertEquals("Sehr gut!", prop2.getValue(Locale.GERMAN));
String aspectprop1 = (String)nodeService.getProperty(test2, ASPECT_PROP1_TYPE);
assertEquals("test string value", aspectprop1);
MLText aspectprop2 = (MLText)nodeService.getProperty(test2, ASPECT_PROP2_TYPE);
assertEquals("Very good!", aspectprop2.getValue(Locale.ENGLISH));
assertEquals("Très bon!", aspectprop2.getValue(Locale.FRENCH));
assertEquals("Sehr gut!", aspectprop2.getValue(Locale.GERMAN));
}
// protected void createNodes()
// {
// // create 1000 nodes with a single (non-encrypted) string property
// for(int i = 0; i < 2000; i++)
// {
// Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
// properties.put(ContentModel.PROP_NAME, "encryption test name");
// NodeRef test1 = nodeService.createNode(
// rootNodeRef,
// ContentModel.ASSOC_CHILDREN,
// QName.createQName(NAMESPACE, "n" + i),
// ContentModel.TYPE_CONTENT,
// properties).getChildRef();
//
// }
// }
// protected void createEnryptedPropertyNodes()
// {
// // create 1000 nodes with a single encrypted string attribute
// for(int i = 0; i < 2000; i++)
// {
// Map<QName, Serializable> properties = new HashMap<QName, Serializable>();
// properties.put(PROP1_TYPE, "test string value");
// NodeRef test1 = nodeService.createNode(
// rootNodeRef,
// ContentModel.ASSOC_CHILDREN,
// QName.createQName(NAMESPACE, "n" + i),
// ENCRYPTIONTEST_TYPE,
// properties).getChildRef();
//
// }
// }
// public void testEncryptedPropertiesSpeed()
// {
// // warm up
// createNodes();
// createEnryptedPropertyNodes();
//
// // time
// long start = System.currentTimeMillis();
// createEnryptedPropertyNodes();
// long end = System.currentTimeMillis();
// System.out.println("Encrypted property 1000 nodes in " + (end - start) + "ms");
//
// start = System.currentTimeMillis();
// createNodes();
// end = System.currentTimeMillis();
// System.out.println("Non-encrypted property 1000 nodes in " + (end - start) + "ms");
// }
}

66
source/java/org/alfresco/repo/node/db/encrypted_properties_test_model.xml
View File

@@ -1,66 +0,0 @@
<model name="test:encryptiontestmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>VersionStoreBaseTest model</description>
<author>Alfresco</author>
<published>2005-05-30</published>
<version>1.0</version>
<imports>
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
</imports>
<namespaces>
<namespace uri="http://www.alfresco.org/test/encryptiontest/1.0" prefix="test"/>
</namespaces>
<types>
<type name="test:testtype">
<title>Test type</title>
<description>The test type</description>
<parent>cm:content</parent>
<properties>
<property name="test:prop1">
<type>d:text</type>
<protected>false</protected>
<default></default>
<encrypted>true</encrypted>
</property>
<property name="test:prop2">
<type>d:mltext</type>
<protected>false</protected>
<encrypted>true</encrypted>
</property>
</properties>
<associations>
</associations>
</type>
</types>
<aspects>
<aspect name="test:testaspect">
<title>Test Aspect</title>
<description>The test aspect</description>
<parent></parent>
<properties>
<property name="test:aspectprop1">
<type>d:text</type>
<protected>false</protected>
<default></default>
<encrypted>true</encrypted>
</property>
<property name="test:aspectprop2">
<type>d:mltext</type>
<protected>false</protected>
<encrypted>true</encrypted>
</property>
</properties>
</aspect>
</aspects>
</model>