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

ALF-9510 checkin. Also some fixes for ALF-8702.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2011-08-25 16:22:33 +00:00
parent 98947fda5c
commit b8d0df0c95
26 changed files with 969 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco-global.properties.sample
View File

@@ -6,6 +6,7 @@
# Sample custom content and index data location # Sample custom content and index data location
# #
#dir.root=/srv/alfresco/alf_data #dir.root=/srv/alfresco/alf_data
#dir.keystore=${dir.root}/keystore
# #
# Sample database connection properties # Sample database connection properties

12
config/alfresco/bootstrap-context.xml
View File

@@ -168,18 +168,17 @@
</property> </property>
</bean> </bean>
<bean id="keyStoreChecker" class="org.alfresco.encryption.KeyStoreChecker">
<property name="transactionService" ref="transactionService"/>
<property name="attributeService" ref="attributeService"/>
<property name="encryptor" ref="encryptor"/>
</bean>
<bean id="encryptionChecker" class="org.alfresco.encryption.EncryptionChecker"> <bean id="encryptionChecker" class="org.alfresco.encryption.EncryptionChecker">
<property name="keyStoreParameters" ref="keyStoreParameters"/> <property name="keyStoreParameters" ref="keyStoreParameters"/>
<property name="keyResourceLoader" ref="springKeyResourceLoader"/> <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
<property name="keyStoreChecker" ref="keyStoreChecker"/> <property name="keyStoreChecker" ref="keyStoreChecker"/>
</bean> </bean>
<bean id="bootstrapReEncryptor" class="org.alfresco.encryption.BootstrapReEncryptor">
<property name="enabled" value="${encryption.bootstrap.reencrypt}"/>
<property name="reEncryptor" ref="reEncryptor"/>
</bean>
<!-- node indexing for ADM --> <!-- node indexing for ADM -->
<bean id="nodeIndexer" class="org.alfresco.repo.node.index.NodeIndexer"> <bean id="nodeIndexer" class="org.alfresco.repo.node.index.NodeIndexer">
<property name="disabled"> <property name="disabled">
@@ -811,5 +810,4 @@
<ref bean="transactionService"/> <ref bean="transactionService"/>
</property> </property>
</bean> </bean>
</beans> </beans>

4
config/alfresco/core-services-context.xml
View File

@@ -1019,11 +1019,15 @@
<property name="keyResourceLoader" ref="springKeyResourceLoader"/> <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
<property name="keyStoreParameters" ref="keyStoreParameters"/> <property name="keyStoreParameters" ref="keyStoreParameters"/>
<property name="encryptionParameters" ref="md5EncryptionParameters"/> <property name="encryptionParameters" ref="md5EncryptionParameters"/>
<property name="host" value="${solr.host}"/>
<property name="port" value="${solr.port}"/>
<property name="sslPort" value="${solr.port.ssl}"/>
</bean> </bean>
<bean id="solrAdminClient" class="org.alfresco.repo.solr.SOLRAdminClient" init-method="init" destroy-method="shutdown"> <bean id="solrAdminClient" class="org.alfresco.repo.solr.SOLRAdminClient" init-method="init" destroy-method="shutdown">
<property name="solrHost" value="${solr.host}"/> <property name="solrHost" value="${solr.host}"/>
<property name="solrPort" value="${solr.port}"/> <property name="solrPort" value="${solr.port}"/>
<property name="solrsslPort" value="${solr.port.ssl}"/>
<property name="solrUser" value="${solr.solrUser}"/> <property name="solrUser" value="${solr.solrUser}"/>
<property name="solrPassword" value="${solr.solrPassword}"/> <property name="solrPassword" value="${solr.solrPassword}"/>
<property name="solrPingCronExpression" value="${solr.solrPingCronExpression}"/> <property name="solrPingCronExpression" value="${solr.solrPingCronExpression}"/>

47
config/alfresco/encryption-context.xml
View File

@@ -46,6 +46,13 @@
<property name="keyMetaDataFileLocation" value="${encryption.keystore.keyMetaData.location}"/> <property name="keyMetaDataFileLocation" value="${encryption.keystore.keyMetaData.location}"/>
</bean> </bean>
<bean id="backupKeyStoreParameters" class="org.alfresco.encryption.KeyStoreParameters">
<property name="location" value="${encryption.keystore.backup.location}"/>
<property name="provider" value="${encryption.keystore.backup.provider}"/>
<property name="type" value="${encryption.keystore.backup.type}"/>
<property name="keyMetaDataFileLocation" value="${encryption.keystore.backup.keyMetaData.location}"/>
</bean>
<bean id="keyProvider" class="org.alfresco.encryption.KeystoreKeyProvider" init-method="init"> <bean id="keyProvider" class="org.alfresco.encryption.KeystoreKeyProvider" init-method="init">
<property name="keyStoreParameters" ref="keyStoreParameters"/> <property name="keyStoreParameters" ref="keyStoreParameters"/>
<property name="keyResourceLoader" ref="springKeyResourceLoader"/> <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
@@ -55,35 +62,27 @@
<property name="keyProvider" ref="keyProvider"/> <property name="keyProvider" ref="keyProvider"/>
<property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}" /> <property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}" />
</bean> </bean>
<!--
<bean id="reEncryptor" class="org.alfresco.encryption.ReEncryptor" init-method="init"> <bean id="reEncryptor" class="org.alfresco.encryption.ReEncryptor">
<property name="backupKeyStoreParameters" ref="backupKeyStoreParameters"/>
<property name="keyProvider" ref="keyProvider"/> <property name="keyProvider" ref="keyProvider"/>
<property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}" />
</bean>
-->
<!-- Fallback encryptor - used by the re-encryptor -->
<!--
<bean id="backupKeyStoreParameters" class="org.alfresco.encryption.KeyStoreParameters">
<property name="location" value="${encryption.keystore.fallback.location}"/>
<property name="provider" value="${encryption.keystore.fallback.provider}"/>
<property name="type" value="${encryption.keystore.fallback.type}"/>
<property name="keyMetaDataFileLocation" value="${encryption.keystore.fallback.keyMetaData.location}"/>
</bean>
<bean id="backupKeyProvider" class="org.alfresco.encryption.KeystoreKeyProvider" init-method="init">
<property name="keyStoreParameters" ref="backupKeyStoreParameters"/>
<property name="keyResourceLoader" ref="springKeyResourceLoader"/> <property name="keyResourceLoader" ref="springKeyResourceLoader"/>
<property name="transactionService" ref="transactionService"/>
<property name="dictionaryService" ref="dictionaryService"/>
<property name="nodeDAO" ref="nodeDAO"/>
<property name="dictionaryDAO" ref="dictionaryDAO"/>
<property name="qnameDAO" ref="qnameDAO"/>
<property name="cipherAlgorithm" value="${encryption.cipherAlgorithm}"/>
</bean> </bean>
<bean id="backupEncryptor" class="org.alfresco.encryption.DefaultEncryptor" init-method="init"> <bean id="encryptionKeysRegistry" class="org.alfresco.encryption.EncryptionKeysRegistryImpl">
<property name="keyProvider" ref="backupKeyProvider"/> <property name="transactionService" ref="transactionService"/>
<property name="cipherAlgorithm" value="${encryption.encryption.cipherAlgorithm}" /> <property name="attributeService" ref="attributeService"/>
<property name="encryptor" ref="encryptor"/>
</bean> </bean>
<bean id="fallbackEncryptor" class="org.alfresco.encryption.DefaultFallbackEncryptor"> <bean id="keyStoreChecker" class="org.alfresco.encryption.KeyStoreChecker">
<property name="fallback" ref="backupEncryptor"/> <property name="transactionService" ref="transactionService"/>
<property name="main" ref="encryptor" /> <property name="encryptionKeysRegistry" ref="encryptionKeysRegistry"/>
</bean> </bean>
-->
</beans> </beans>

14
config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
View File

@@ -763,13 +763,25 @@
</where> </where>
</select> </select>
<select id="select_PropertiesByTypes" parameterType="Ids" resultMap="result_NodeProperty">
<include refid="alfresco.node.select_NodeProperty_Results"/>
from
alf_node_properties prop
<where>
qname_id in
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</where>
</select>
<sql id="select_NodeAspects_Results"> <sql id="select_NodeAspects_Results">
select select
aspects.node_id as node_id, aspects.node_id as node_id,
aspects.qname_id as qname_id aspects.qname_id as qname_id
</sql> </sql>
<select id="select_NodeAspects" parameterType="NodeAspects" resultMap="result_NodeAspects"> <select id="select_NodeAspects" parameterType="Ids" resultMap="result_NodeAspects">
<include refid="alfresco.node.select_NodeAspects_Results"/> <include refid="alfresco.node.select_NodeAspects_Results"/>
from from
alf_node_aspects aspects alf_node_aspects aspects

6
config/alfresco/keystore-passwords.properties
View File

@@ -1,6 +0,0 @@
# The password protecting the keystore entries
keystore=mp6yc0UD9e
# The password protecting the alias: metadata
metadata=oKIWzVdEdA
# The password protecting the alias: solr
solr=TxHTtOnrwQ

21
config/alfresco/keystore/keystore-passwords.properties
View File

@@ -1,20 +1,11 @@
keystore.password=mp6yc0UD9e aliases=metadata
aliases=metadata,solr
# The password protecting the keystore entries # The password protecting the keystore entries
keystore.password=mp6yc0UD9e keystore.password=mp6yc0UD9e
# The password protecting the alias: metadata # The password protecting the alias: metadata
metadata.seed= metadata.keyData=
metadata.algorithm=PBEWithMD5AndDES metadata.algorithm=DESede
metadata.password=oKIWzVdEdA metadata.password=oKIWzVdEdA
# The password protecting the alias: solr # The password protecting the alias: solr
solr.seed= #solr.keyData=
solr.algorithm=PBEWithMD5AndDES #solr.algorithm=DESede
solr.password=TxHTtOnrwQ #solr.password=TxHTtOnrwQ
# The password protecting the keystore entries
#keystore=mp6yc0UD9e
# The password protecting the alias: metadata
#metadata=oKIWzVdEdA
# The password protecting the alias: solr
#solr=TxHTtOnrwQ

26
config/alfresco/repository.properties
View File

@@ -681,22 +681,29 @@ deployment.filesystem.default.metadatadir=${deployment.filesystem.metadatadir}/d
# Encryption properties # Encryption properties
# #
#dir.keystore=${dir.root}/keystore #dir.keystore=${dir.root}/keystore
# default keystores location
dir.keystore=classpath:alfresco/keystore dir.keystore=classpath:alfresco/keystore
encryption.keySpec.class=org.alfresco.encryption.DESEDEKeyGenerator
encryption.keyAlgorithm=DESede
encryption.cipherAlgorithm=DESede/CBC/PKCS5Padding encryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
# secret key keystore configuration
encryption.keystore.location=${dir.keystore}/keystore encryption.keystore.location=${dir.keystore}/keystore
encryption.keystore.keyMetaData.location=${dir.keystore}/keystore-passwords.properties encryption.keystore.keyMetaData.location=${dir.keystore}/keystore-passwords.properties
encryption.keystore.provider= encryption.keystore.provider=
encryption.keystore.type=JCEKS encryption.keystore.type=JCEKS
#encryption.keystore.keyAlgorithm=PBEWithMD5AndDES
encryption.keystore.keyAlgorithm=DESede
encryption.keystore.keyAliases=metadata, solr
encryption.keystore.fallback.location=${dir.keystore}/fallback-keystore # backup keystore (if configured)
encryption.keystore.fallback.keyMetaData.location=${dir.keystore}/fallback-keystore-passwords.properties encryption.keystore.backup.location=
encryption.keystore.fallback.provider= encryption.keystore.backup.keyMetaData.location=
encryption.keystore.fallback.type=JCEKS encryption.keystore.backup.provider=
encryption.keystore.backup.type=
# mac # Should encryptable properties be re-encrypted with new encryption keys on botstrap?
encryption.bootstrap.reencrypt=false
# mac/md5 encryption
encryption.mac.messageTimeout=30000 encryption.mac.messageTimeout=30000
encryption.mac.algorithm=HmacSHA1 encryption.mac.algorithm=HmacSHA1
@@ -712,7 +719,8 @@ encryption.ssl.truststore.keyMetaData.location=${dir.keystore}/ssl-truststore-pa
# SOLR connection details (e.g. for JMX) # SOLR connection details (e.g. for JMX)
solr.host=localhost solr.host=localhost
solr.port=8443 solr.port=8080
solr.port.ssl=8443
solr.solrUser=solr solr.solrUser=solr
solr.solrPassword=solr solr.solrPassword=solr
# none, https # none, https

28
config/alfresco/subsystems/Search/solr/solr-search-context.xml
View File

@@ -30,35 +30,7 @@
</bean> </bean>
<bean id="search.solrQueryHTTPCLient" class="org.alfresco.repo.search.impl.solr.SolrQueryHTTPClient" init-method="init"> <bean id="search.solrQueryHTTPCLient" class="org.alfresco.repo.search.impl.solr.SolrQueryHTTPClient" init-method="init">
<property name="solrHost">
<value>${solr.host}</value>
</property>
<property name="solrPort">
<value>${solr.port}</value>
</property>
<property name="httpClientFactory" ref="solrHttpClientFactory"/> <property name="httpClientFactory" ref="solrHttpClientFactory"/>
<!--
<property name="baseUrl">
<value>${solr.base.url}</value>
</property>
-->
<!--
<property name="keyStoreLocation">
<value>${encryption.ssl.keystore.location}</value>
</property>
<property name="keyStoreType">
<value>${encryption.ssl.keystore.type}</value>
</property>
<property name="trustStoreLocation">
<value>${encryption.ssl.truststore.location}</value>
</property>
<property name="trustStoreType">
<value>${encryption.ssl.truststore.type}</value>
</property>
<property name="passwordFileLocation">
<value>${solr.ssl.passwordsFile.location}</value>
</property>
-->
<property name="nodeDAO"> <property name="nodeDAO">
<ref bean="nodeDAO" /> <ref bean="nodeDAO" />
</property> </property>

4
config/alfresco/subsystems/Search/solr/solr-search.properties
View File

@@ -1 +1,3 @@
solr.base.url=http://localhost:8080/solr solr.host=localhost
solr.port=8080
solr.port.ssl=8443

32
source/java/org/alfresco/encryption/BootstrapReEncryptor.java
View File

@@ -18,6 +18,9 @@
*/ */
package org.alfresco.encryption; package org.alfresco.encryption;
import org.alfresco.error.AlfrescoRuntimeException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.extensions.surf.util.AbstractLifecycleBean;
@@ -28,9 +31,10 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean;
*/ */
public class BootstrapReEncryptor extends AbstractLifecycleBean public class BootstrapReEncryptor extends AbstractLifecycleBean
{ {
private static Log logger = LogFactory.getLog(BootstrapReEncryptor.class);
private boolean enabled; private boolean enabled;
private ReEncryptor reEncryptor; private ReEncryptor reEncryptor;
private KeyStoreParameters oldKeyStoreParameters;
public void setEnabled(boolean enabled) public void setEnabled(boolean enabled)
{ {
@@ -42,14 +46,20 @@ public class BootstrapReEncryptor extends AbstractLifecycleBean
this.reEncryptor = reEncryptor; this.reEncryptor = reEncryptor;
} }
public void setOldKeyStoreParameters(KeyStoreParameters oldKeyStoreParameters) public int reEncrypt()
{ {
this.oldKeyStoreParameters = oldKeyStoreParameters; try
{
return reEncryptor.reEncrypt();
} }
catch(MissingKeyException e)
public void reEncrypt()
{ {
reEncryptor.execute(oldKeyStoreParameters); throw new AlfrescoRuntimeException("Bootstrap re-encryption failed", e);
}
catch(MissingKeyStoreException e)
{
throw new AlfrescoRuntimeException("Bootstrap re-encryption failed", e);
}
} }
@Override @Override
@@ -57,7 +67,15 @@ public class BootstrapReEncryptor extends AbstractLifecycleBean
{ {
if(enabled) if(enabled)
{ {
reEncrypt(); if(logger.isDebugEnabled())
{
logger.debug("Re-encrypting encryptable properties...");
}
int propertiesReEncrypted = reEncrypt();
if(logger.isDebugEnabled())
{
logger.debug("...done, re-encrypted " + propertiesReEncrypted + " properties.");
}
} }
} }

2
source/java/org/alfresco/encryption/EncryptionChecker.java
View File

@@ -60,7 +60,7 @@ public class EncryptionChecker extends AbstractLifecycleBean
@Override @Override
protected void onBootstrap(ApplicationEvent event) protected void onBootstrap(ApplicationEvent event)
{ {
AlfrescoKeyStore mainKeyStore = new CachingKeyStore(keyStoreParameters, keyResourceLoader); AlfrescoKeyStore mainKeyStore = new AlfrescoKeyStoreImpl(keyStoreParameters, keyResourceLoader);
keyStoreChecker.checkKeyStore(mainKeyStore); keyStoreChecker.checkKeyStore(mainKeyStore);
} }

204
source/java/org/alfresco/encryption/EncryptionKeysRegistryImpl.java Normal file
View File

@@ -0,0 +1,204 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.encryption;
import java.io.Serializable;
import java.security.InvalidKeyException;
import java.util.ArrayList;
import java.util.List;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.attributes.AttributeService;
import org.alfresco.service.cmr.attributes.AttributeService.AttributeQueryCallback;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.GUID;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
*
* @since 4.0
*
*/
// TODO caching? This will probably not be used extensively.
public class EncryptionKeysRegistryImpl implements EncryptionKeysRegistry
{
public static String TOP_LEVEL_KEY = "keyCheck";
private static final Log logger = LogFactory.getLog(EncryptionKeysRegistryImpl.class);
private TransactionService transactionService;
private AttributeService attributeService;
private Encryptor encryptor;
public void setAttributeService(AttributeService attributeService)
{
this.attributeService = attributeService;
}
public void setEncryptor(Encryptor encryptor)
{
this.encryptor = encryptor;
}
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
public void registerKey(String keyAlias)
{
// register the key by creating an attribute that stores a guid and its encrypted value
String guid = GUID.generate();
Serializable encrypted = encryptor.sealObject(keyAlias, null, guid);
KeyCheck keyCheck = new KeyCheck(guid, encrypted);
attributeService.createAttribute(keyCheck, TOP_LEVEL_KEY, keyAlias);
logger.info("Registered key " + keyAlias);
}
public KeysReport getKeysReport()
{
final List<String> registeredKeys = new ArrayList<String>();
if(attributeService.exists(TOP_LEVEL_KEY))
{
attributeService.getAttributes(new AttributeQueryCallback()
{
public boolean handleAttribute(Long id, Serializable value,
Serializable[] keys)
{
registeredKeys.add((String)value);
return true;
}
},
TOP_LEVEL_KEY);
}
List<String> keyAliasesChanged = new ArrayList<String>();
List<String> keyAliasesUnchanged = new ArrayList<String>();
for(String keyAlias : registeredKeys)
{
KEY_STATUS keyStatus = checkKey(keyAlias);
if(keyStatus == KEY_STATUS.CHANGED)
{
keyAliasesChanged.add(keyAlias);
}
else
{
keyAliasesUnchanged.add(keyAlias);
}
}
return new KeysReport(keyAliasesChanged, keyAliasesUnchanged);
}
public KEY_STATUS checkKey(String keyAlias)
{
if(attributeService.exists(TOP_LEVEL_KEY, keyAlias))
{
try
{
// check that the key has not changed by decrypting the encrypted guid attribute
// comparing against the guid
KeyCheck keyCheck = (KeyCheck)attributeService.getAttribute(TOP_LEVEL_KEY, keyAlias);
Serializable storedGUID = encryptor.unsealObject(keyAlias, keyCheck.getEncrypted());
return EqualsHelper.nullSafeEquals(storedGUID, keyCheck.getGuid()) ? KEY_STATUS.OK : KEY_STATUS.CHANGED;
}
catch(InvalidKeyException e)
{
// key exception indicates that the key has changed - it can't decrypt the
// previously-encrypted data
return KEY_STATUS.CHANGED;
}
}
else
{
return KEY_STATUS.MISSING;
}
}
// note that this removes _all_ keys in the keystore. Use with care.
public void removeRegisteredKeys(final AlfrescoKeyStore keyStore)
{
RetryingTransactionHelper retryingTransactionHelper = transactionService.getRetryingTransactionHelper();
final RetryingTransactionCallback<Void> removeKeysCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
for(String keyAlias : keyStore.getKeyAliases())
{
attributeService.removeAttribute(TOP_LEVEL_KEY, keyAlias);
}
return null;
}
};
retryingTransactionHelper.doInTransaction(removeKeysCallback, false);
}
/**
* A KeyCheck object stores a well-known guid and it's encrypted value.
*
* @since 4.0
*
*/
private static class KeyCheck implements Serializable
{
private static final long serialVersionUID = 4514315444977162903L;
private String guid;
private Serializable encrypted;
public KeyCheck(String guid, Serializable encrypted)
{
super();
this.guid = guid;
this.encrypted = encrypted;
}
public String getGuid()
{
return guid;
}
public Serializable getEncrypted()
{
return encrypted;
}
public boolean equals(Object other)
{
if(this == other)
{
return true;
}
if(!(other instanceof KeyCheck))
{
return false;
}
KeyCheck keyCheck = (KeyCheck)other;
return EqualsHelper.nullSafeEquals(keyCheck.getGuid(), getGuid()) &&
EqualsHelper.nullSafeEquals(keyCheck.getEncrypted(), getEncrypted());
}
}
}

303
source/java/org/alfresco/encryption/EncryptionTests.java Normal file
View File

@@ -0,0 +1,303 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.encryption;
import java.io.File;
import java.io.Serializable;
import java.security.InvalidKeyException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.crypto.SecretKey;
import javax.crypto.SecretKeyFactory;
import javax.crypto.spec.DESedeKeySpec;
import javax.transaction.UserTransaction;
import junit.framework.TestCase;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.dictionary.DictionaryBootstrap;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.node.encryption.MetadataEncryptor;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.dictionary.DictionaryService;
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.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.springframework.context.ApplicationContext;
public class EncryptionTests extends TestCase
{
private static final String TEST_MODEL = "org/alfresco/encryption/reencryption_model.xml";
// private static final String TEST_BUNDLE = "org/alfresco/encryption/encryptiontest_model";
private static int NUM_PROPERTIES = 500;
private static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private static QName NODE_TYPE = QName.createQName("http://www.alfresco.org/test/reencryption_test/1.0", "base");
private static QName PROP = QName.createQName("http://www.alfresco.org/test/reencryption_test/1.0", "prop1");
private NodeRef rootNodeRef;
private TransactionService transactionService;
private DictionaryService dictionaryService;
private NodeService nodeService;
private MetadataEncryptor metadataEncryptor;
private ReEncryptor reEncryptor;
private String cipherAlgorithm = "DESede/CBC/PKCS5Padding";
private KeyStoreParameters keyStoreParameters;
private KeyStoreParameters backupKeyStoreParameters;
private KeyResourceLoader keyResourceLoader;
private EncryptionKeysRegistryImpl encryptionKeysRegistry;
private KeyStoreChecker keyStoreChecker;
private AuthenticationComponent authenticationComponent;
private DictionaryDAO dictionaryDAO;
private TenantService tenantService;
private String keyAlgorithm;
private Map<String, Key> newKeys = new HashMap<String, Key>();
private List<NodeRef> before = new ArrayList<NodeRef>();
private List<NodeRef> after = new ArrayList<NodeRef>();
private UserTransaction tx;
public void setUp() throws Exception
{
dictionaryService = (DictionaryService)ctx.getBean("dictionaryService");
nodeService = (NodeService)ctx.getBean("nodeService");
transactionService = (TransactionService)ctx.getBean("transactionService");
tenantService = (TenantService)ctx.getBean("tenantService");
dictionaryDAO = (DictionaryDAO)ctx.getBean("dictionaryDAO");
metadataEncryptor = (MetadataEncryptor)ctx.getBean("metadataEncryptor");
authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");
keyResourceLoader = (KeyResourceLoader)ctx.getBean("springKeyResourceLoader");
reEncryptor = (ReEncryptor)ctx.getBean("reEncryptor");
backupKeyStoreParameters = (KeyStoreParameters)ctx.getBean("backupKeyStoreParameters");
keyStoreChecker = (KeyStoreChecker)ctx.getBean("keyStoreChecker");
keyStoreParameters = (KeyStoreParameters)ctx.getBean("keyStoreParameters");
encryptionKeysRegistry = (EncryptionKeysRegistryImpl)ctx.getBean("encryptionKeysRegistry");
// reencrypt in one txn (since we don't commit the model, the qnames won't be available across transactions)
reEncryptor.setSplitTxns(false);
this.authenticationComponent.setSystemUserAsCurrentUser();
tx = transactionService.getUserTransaction();
tx.begin();
StoreRef storeRef = nodeService.createStore(
StoreRef.PROTOCOL_WORKSPACE,
"ReEncryptor_" + System.currentTimeMillis());
rootNodeRef = nodeService.getRootNode(storeRef);
keyAlgorithm = "DESede";
newKeys.put(KeyProvider.ALIAS_METADATA, generateSecretKey(keyAlgorithm));
// Load models
DictionaryBootstrap bootstrap = new DictionaryBootstrap();
List<String> bootstrapModels = new ArrayList<String>();
bootstrapModels.add(TEST_MODEL);
// List<String> labels = new ArrayList<String>();
// labels.add(TEST_BUNDLE);
bootstrap.setModels(bootstrapModels);
// bootstrap.setLabels(labels);
bootstrap.setDictionaryDAO(dictionaryDAO);
bootstrap.setTenantService(tenantService);
bootstrap.bootstrap();
}
protected KeyProvider getKeyProvider(KeyStoreParameters keyStoreParameters)
{
KeyProvider backupKeyProvider = new KeystoreKeyProvider(keyStoreParameters, keyResourceLoader);
return backupKeyProvider;
}
public void setBackupKeyStoreParameters(KeyStoreParameters backupKeyStoreParameters)
{
this.backupKeyStoreParameters = backupKeyStoreParameters;
}
@Override
protected void tearDown() throws Exception
{
authenticationComponent.clearCurrentSecurityContext();
tx.rollback();
super.tearDown();
}
protected KeyProvider getKeyProvider(final Map<String, Key> keys)
{
KeyProvider keyProvider = new KeyProvider()
{
@Override
public Key getKey(String keyAlias)
{
return keys.get(keyAlias);
}
};
return keyProvider;
}
protected Encryptor getEncryptor(KeyProvider keyProvider)
{
DefaultEncryptor encryptor = new DefaultEncryptor();
encryptor.setCipherAlgorithm(cipherAlgorithm);
encryptor.setCipherProvider(null);
encryptor.setKeyProvider(keyProvider);
return encryptor;
}
protected MetadataEncryptor getMetadataEncryptor(Encryptor encryptor)
{
MetadataEncryptor metadataEncryptor = new MetadataEncryptor();
metadataEncryptor.setDictionaryService(dictionaryService);
metadataEncryptor.setEncryptor(encryptor);
return metadataEncryptor;
}
protected void createEncryptedProperties(List<NodeRef> nodes, MetadataEncryptor metadataEncryptor)
{
for(int i = 0; i < NUM_PROPERTIES; i++)
{
NodeRef nodeRef = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("assoc1"), NODE_TYPE).getChildRef();
nodes.add(nodeRef);
Map<QName, Serializable> props = new HashMap<QName, Serializable>();
props.put(PROP, nodeRef.toString());
props = metadataEncryptor.encrypt(props);
nodeService.setProperties(nodeRef, props);
}
}
public byte[] generateKeyData() throws NoSuchAlgorithmException
{
SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
random.setSeed(System.currentTimeMillis());
byte bytes[] = new byte[DESedeKeySpec.DES_EDE_KEY_LEN];
random.nextBytes(bytes);
return bytes;
}
protected Key generateSecretKey(String keyAlgorithm) throws InvalidKeyException, NoSuchAlgorithmException, InvalidKeySpecException
{
DESedeKeySpec keySpec = new DESedeKeySpec(generateKeyData());
SecretKeyFactory kf = SecretKeyFactory.getInstance(keyAlgorithm);
SecretKey secretKey = kf.generateSecret(keySpec);
return secretKey;
}
public void testReEncrypt()
{
try
{
// Create encrypted properties using the configured encryptor and key provider
createEncryptedProperties(before, metadataEncryptor);
// Create encrypted properties using the new encryptor and key provider
KeyProvider newKeyProvider = getKeyProvider(newKeys);
Encryptor newEncryptor = getEncryptor(newKeyProvider);
MetadataEncryptor newMetadataEncryptor = getMetadataEncryptor(newEncryptor);
createEncryptedProperties(after, newMetadataEncryptor);
// re-encrypt
long start = System.currentTimeMillis();
reEncryptor.reEncrypt(newKeyProvider);
System.out.println("Re-encrypted " + NUM_PROPERTIES*2 + " properties in " + (System.currentTimeMillis() - start) + "ms");
// check that the nodes have been re-encrypted properly i.e. check that the properties
// decrypted using the new keys match the expected values.
for(NodeRef nodeRef : before)
{
Map<QName, Serializable> props = nodeService.getProperties(nodeRef);
props = newMetadataEncryptor.decrypt(props);
assertNotNull("", props.get(PROP));
assertEquals("", nodeRef.toString(), props.get(PROP));
}
for(NodeRef nodeRef : after)
{
Map<QName, Serializable> props = nodeService.getProperties(nodeRef);
props = newMetadataEncryptor.decrypt(props);
assertNotNull("", props.get(PROP));
assertEquals("", nodeRef.toString(), props.get(PROP));
}
}
catch(AlfrescoRuntimeException e)
{
if(e.getCause() instanceof InvalidKeyException)
{
e.printStackTrace();
fail();
}
}
}
public void testBootstrapReEncrypt()
{
try
{
reEncryptor.reEncrypt();
fail("Should have caught missing backup key store");
}
catch(MissingKeyException e)
{
fail("");
}
catch(MissingKeyStoreException e)
{
}
}
public void testKeyStoreCreation()
{
String keyStoreLocation = System.getProperty("user.dir") + File.separator + "encryption-tests.keystore";
File keyStoreFile = new File(keyStoreLocation);
if(keyStoreFile.exists())
{
assertTrue("", keyStoreFile.delete());
}
KeyStoreParameters keyStoreParameters = new KeyStoreParameters();
keyStoreParameters.setLocation(keyStoreLocation);
keyStoreParameters.setKeyMetaDataFileLocation("classpath:org/alfresco/encryption/keystore-parameters.properties");
keyStoreParameters.setType("JCEKS");
AlfrescoKeyStore keyStore = new AlfrescoKeyStoreImpl(keyStoreParameters, keyResourceLoader);
encryptionKeysRegistry.removeRegisteredKeys(keyStore);
keyStoreChecker.checkKeyStore(keyStore);
assertNotNull("", keyStore.getKey("test"));
}
}

14
source/java/org/alfresco/encryption/EncryptorTest.java
View File

@@ -85,15 +85,15 @@ public class EncryptorTest extends TestCase
Serializable testObject = " This is a string, but will be serialized "; Serializable testObject = " This is a string, but will be serialized ";
Serializable sealedObject = encryptor.sealObject("mykey2", null, testObject); Serializable sealedObject = encryptor.sealObject("mykey2", null, testObject);
try // try
{ // {
Object output = encryptor.unsealObject("mykey2", sealedObject); Object output = encryptor.unsealObject("mykey2", sealedObject);
assertEquals("Encryption round trip failed. ", testObject, output); assertEquals("Encryption round trip failed. ", testObject, output);
} // }
catch(KeyException e) // catch(KeyException e)
{ // {
throw new AlfrescoRuntimeException("", e) // throw new AlfrescoRuntimeException("", e)
; } //; }
} }
} }

269
source/java/org/alfresco/encryption/KeyStoreChecker.java
View File

@@ -18,56 +18,36 @@
*/ */
package org.alfresco.encryption; package org.alfresco.encryption;
import java.io.FileOutputStream;
import java.io.Serializable;
import java.security.InvalidKeyException;
import java.security.Key;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.attributes.AttributeService;
import org.alfresco.service.cmr.attributes.AttributeService.AttributeQueryCallback;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.EqualsHelper;
import org.alfresco.util.GUID;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
/** /**
* Validates an Alfresco keystore by ensuring that it's registered keys have not changed. * Validates an Alfresco keystore by ensuring that it's registered keys have not changed.
* *
* The keys are registered using the AttributeService and are stored in one level under TOP_LEVEL_KEY
* (so key aliases must be unique across however many keystores are being used).
*
* @since 4.0 * @since 4.0
* *
*/ */
public class KeyStoreChecker public class KeyStoreChecker
{ {
public static String TOP_LEVEL_KEY = "keyCheck";
private static final Log logger = LogFactory.getLog(KeyStoreChecker.class); private static final Log logger = LogFactory.getLog(KeyStoreChecker.class);
private static enum KEY_STATUS
{
OK, CHANGED, MISSING;
};
private AttributeService attributeService;
private Encryptor encryptor;
private TransactionService transactionService; private TransactionService transactionService;
private EncryptionKeysRegistryImpl encryptionKeysRegistry;
public KeyStoreChecker() public KeyStoreChecker()
{ {
} }
public void setAttributeService(AttributeService attributeService) public void setEncryptionKeysRegistry(EncryptionKeysRegistryImpl encryptionKeysRegistry)
{ {
this.attributeService = attributeService; this.encryptionKeysRegistry = encryptionKeysRegistry;
}
public void setEncryptor(Encryptor encryptor)
{
this.encryptor = encryptor;
} }
public void setTransactionService(TransactionService transactionService) public void setTransactionService(TransactionService transactionService)
@@ -75,99 +55,37 @@ public class KeyStoreChecker
this.transactionService = transactionService; this.transactionService = transactionService;
} }
public KeyStoreChecker(AttributeService attributeService, Encryptor encryptor, TransactionService transactionService) public KeyStoreChecker(EncryptionKeysRegistryImpl encryptionKeysRegistry)
{ {
this.attributeService = attributeService; this.encryptionKeysRegistry = encryptionKeysRegistry;
this.transactionService = transactionService;
this.encryptor = encryptor;
} }
private KEY_STATUS checkKey(AlfrescoKeyStore keyStore, String keyAlias) protected void createKeyStore(AlfrescoKeyStore keyStore)
{ {
if(attributeService.exists(TOP_LEVEL_KEY, keyStore.getLocation(), keyAlias)) keyStore.create();
{
try
{
// check that the key has not changed by decrypting the encrypted guid attribute
// comparing against the guid
KeyCheck keyCheck = (KeyCheck)attributeService.getAttribute(TOP_LEVEL_KEY, keyStore.getLocation(), keyAlias);
Serializable storedGUID = encryptor.unsealObject(keyAlias, keyCheck.getEncrypted());
return EqualsHelper.nullSafeEquals(storedGUID, keyCheck.getGuid()) ? KEY_STATUS.OK : KEY_STATUS.CHANGED;
}
catch(InvalidKeyException e)
{
// key exception indicates that the key has changed - it can't decrypt the
// previously-encrypted data
return KEY_STATUS.CHANGED;
}
}
else
{
return KEY_STATUS.MISSING;
}
}
private void registerKey(AlfrescoKeyStore keyStore, String keyAlias) // Register the key store keys
for(String keyAlias : keyStore.getKeyAliases())
{ {
// register the key by creating an attribute that stores a guid and its encrypted value encryptionKeysRegistry.registerKey(keyAlias);
String guid = GUID.generate();
Serializable encrypted = encryptor.sealObject(keyAlias, null, guid);
KeyCheck keyCheck = new KeyCheck(guid, encrypted);
attributeService.createAttribute(keyCheck, TOP_LEVEL_KEY, keyStore.getLocation(), keyAlias);
logger.info("Registered key " + keyAlias);
} }
protected KeysReport getKeysReport(AlfrescoKeyStore keyStore)
{
final List<String> registeredKeys = new ArrayList<String>();
if(attributeService.exists(TOP_LEVEL_KEY, keyStore.getLocation()))
{
attributeService.getAttributes(new AttributeQueryCallback()
{
public boolean handleAttribute(Long id, Serializable value,
Serializable[] keys)
{
registeredKeys.add((String)value);
return true;
}
},
TOP_LEVEL_KEY, keyStore.getLocation());
}
List<String> keyAliasesChanged = new ArrayList<String>();
List<String> keyAliasesUnchanged = new ArrayList<String>();
for(String keyAlias : registeredKeys)
{
KEY_STATUS keyStatus = checkKey(keyStore, keyAlias);
if(keyStatus == KEY_STATUS.CHANGED)
{
keyAliasesChanged.add(keyAlias);
}
else
{
keyAliasesUnchanged.add(keyAlias);
}
}
return new KeysReport(keyAliasesChanged, keyAliasesUnchanged);
} }
public void checkKeyStore(final AlfrescoKeyStore keyStore) public void checkKeyStore(final AlfrescoKeyStore keyStore)
{ {
// TODO check that, if keystore exists, keys are registered
RetryingTransactionHelper retryingTransactionHelper = transactionService.getRetryingTransactionHelper(); RetryingTransactionHelper retryingTransactionHelper = transactionService.getRetryingTransactionHelper();
final RetryingTransactionCallback<Void> checkKeysCallback = new RetryingTransactionCallback<Void>() final RetryingTransactionCallback<Void> checkKeysCallback = new RetryingTransactionCallback<Void>()
{ {
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
KeysReport keysReport = getKeysReport(keyStore); KeysReport keysReport = encryptionKeysRegistry.getKeysReport();
// Check for the existence of a key store first // Check for the existence of a key store first
if(keyStore.exists()) if(keyStore.exists())
{ {
// The keystore exists - check whether any keys have been changed // The keystore exists - check whether any keys have been changed
// find out which registered keys have changed
if(keysReport.getKeysChanged().size() > 0) if(keysReport.getKeysChanged().size() > 0)
{ {
// Note: this will halt the application bootstrap. // Note: this will halt the application bootstrap.
@@ -183,8 +101,6 @@ public class KeyStoreChecker
throw new AlfrescoRuntimeException("Keys have already been registered, re-instate the previous keystore"); throw new AlfrescoRuntimeException("Keys have already been registered, re-instate the previous keystore");
} }
// no keys found, create a new keystore
// TODO
if(logger.isDebugEnabled()) if(logger.isDebugEnabled())
{ {
logger.debug("Keystore not found, creating..."); logger.debug("Keystore not found, creating...");
@@ -197,157 +113,4 @@ public class KeyStoreChecker
}; };
retryingTransactionHelper.doInTransaction(checkKeysCallback, false); retryingTransactionHelper.doInTransaction(checkKeysCallback, false);
} }
protected void createKeyStore(AlfrescoKeyStore keyStore)
{
new CreatingKeyStore(keyStore).create();
}
public static class KeysReport
{
private List<String> keysChanged;
private List<String> keysUnchanged;
public KeysReport(List<String> keysChanged, List<String> keysUnchanged)
{
super();
this.keysChanged = keysChanged;
this.keysUnchanged = keysUnchanged;
}
public List<String> getKeysChanged()
{
return keysChanged;
}
public List<String> getKeysUnchanged()
{
return keysUnchanged;
}
}
/**
* A KeyCheck object stores a well-known guid and it's encrypted value.
*
* @since 4.0
*
*/
private static class KeyCheck implements Serializable
{
private static final long serialVersionUID = 4514315444977162903L;
private String guid;
private Serializable encrypted;
public KeyCheck(String guid, Serializable encrypted)
{
super();
this.guid = guid;
this.encrypted = encrypted;
}
public String getGuid()
{
return guid;
}
public Serializable getEncrypted()
{
return encrypted;
}
public boolean equals(Object other)
{
if(this == other)
{
return true;
}
if(!(other instanceof KeyCheck))
{
return false;
}
KeyCheck keyCheck = (KeyCheck)other;
return EqualsHelper.nullSafeEquals(keyCheck.getGuid(), getGuid()) &&
EqualsHelper.nullSafeEquals(keyCheck.getEncrypted(), getEncrypted());
}
}
public void removeRegisteredKeys(final AlfrescoKeyStore keyStore)
{
RetryingTransactionHelper retryingTransactionHelper = transactionService.getRetryingTransactionHelper();
final RetryingTransactionCallback<Void> removeKeysCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
attributeService.removeAttributes(TOP_LEVEL_KEY, keyStore.getLocation());
return null;
}
};
retryingTransactionHelper.doInTransaction(removeKeysCallback, false);
}
private class CreatingKeyStore extends CachingKeyStore
{
CreatingKeyStore(AlfrescoKeyStore keyStore)
{
super(keyStore.getkeyStoreParameters(), keyStore.getKeyResourceLoader());
}
public void create()
{
KeyInfoManager keyInfoManager = null;
try
{
keyInfoManager = getKeyInfoManager();
ks.load(null, null);
String keyStorePassword = keyInfoManager.getKeyStorePassword();
if(keyStorePassword == null)
{
throw new AlfrescoRuntimeException("Key store password is null for keystore at location " + getLocation()
+ ", key store meta data location" + getKeyMetaDataFileLocation());
}
// Add keys from the passwords file to the keystore
for(Map.Entry<String, CachingKeyStore.KeyInformation> keyEntry : keyInfoManager.getKeyInfo().entrySet())
{
KeyInformation keyInfo = keyInfoManager.getKeyInformation(keyEntry.getKey());
String keyPassword = keyInfo.getPassword();
if(keyPassword == null)
{
throw new AlfrescoRuntimeException("No password found for encryption key " + keyEntry.getKey());
}
Key key = generateSecretKey(keyEntry.getValue());
ks.setKeyEntry(keyInfo.getAlias(), key, keyInfo.getPassword().toCharArray(), null);
}
ks.store(new FileOutputStream(getLocation()), keyStorePassword.toCharArray());
// Register the key store keys
for(Map.Entry<String, CachingKeyStore.KeyInformation> keyEntry : keyInfoManager.getKeyInfo().entrySet())
{
registerKey(this, keyEntry.getKey());
}
}
catch(Throwable e)
{
throw new AlfrescoRuntimeException(
"Failed to create keystore: \n" +
" Location: " + getLocation() + "\n" +
" Provider: " + getProvider() + "\n" +
" Type: " + getType(),
e);
}
finally
{
if(keyInfoManager != null)
{
keyInfoManager.clear();
}
}
}
}
} }

41
source/java/org/alfresco/encryption/MissingKeyException.java Normal file
View File

@@ -0,0 +1,41 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.encryption;
/**
*
* @since 4.0
*
*/
public class MissingKeyException extends Exception
{
private static final long serialVersionUID = -7843412242954504581L;
private String keyAlias;
public MissingKeyException(String keyAlias)
{
this.keyAlias = keyAlias;
}
public String getKeyAlias()
{
return keyAlias;
}
}

35
source/java/org/alfresco/encryption/MissingKeyStoreException.java Normal file
View File

@@ -0,0 +1,35 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.encryption;
/**
*
* @since 4.0
*
*/
public class MissingKeyStoreException extends Exception
{
private static final long serialVersionUID = -6484290539637378020L;
public MissingKeyStoreException(String message)
{
super(message);
}
}

226
source/java/org/alfresco/encryption/ReEncryptor.java
View File

@@ -19,26 +19,30 @@
package org.alfresco.encryption; package org.alfresco.encryption;
import java.io.Serializable; import java.io.Serializable;
import java.security.Key;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.crypto.SealedObject; import javax.crypto.SealedObject;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.batch.BatchProcessWorkProvider; import org.alfresco.repo.batch.BatchProcessWorkProvider;
import org.alfresco.repo.batch.BatchProcessor; import org.alfresco.repo.batch.BatchProcessor;
import org.alfresco.repo.dictionary.DictionaryDAO; import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.NamespaceDAO;
import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.domain.node.NodePropertyEntity; import org.alfresco.repo.domain.node.NodePropertyEntity;
import org.alfresco.repo.domain.node.NodePropertyKey; import org.alfresco.repo.domain.node.NodePropertyKey;
import org.alfresco.repo.domain.node.NodePropertyValue;
import org.alfresco.repo.domain.qname.QNameDAO; import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.node.encryption.MetadataEncryptor; import org.alfresco.repo.node.encryption.MetadataEncryptor;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition; import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -65,17 +69,22 @@ public class ReEncryptor implements ApplicationContextAware
private static Log logger = LogFactory.getLog(ReEncryptor.class); private static Log logger = LogFactory.getLog(ReEncryptor.class);
private NodeDAO nodeDAO; private NodeDAO nodeDAO;
private NamespaceDAO namespaceDAO;
private DictionaryDAO dictionaryDAO; private DictionaryDAO dictionaryDAO;
private DictionaryService dictionaryService; private DictionaryService dictionaryService;
private TransactionService transactionService;
private QNameDAO qnameDAO; private QNameDAO qnameDAO;
private MetadataEncryptor metadataEncryptor; private KeyStoreParameters backupKeyStoreParameters;
private KeyProvider keyProvider;
private KeyResourceLoader keyResourceLoader;
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
private TransactionService transactionService;
private RetryingTransactionHelper transactionHelper; private RetryingTransactionHelper transactionHelper;
private String cipherAlgorithm;
// TODO propertize
private int chunkSize = 50;
private boolean splitTxns = true;
/** /**
* Set the transaction provider so that each execution can be performed within a transaction * Set the transaction provider so that each execution can be performed within a transaction
@@ -87,39 +96,92 @@ public class ReEncryptor implements ApplicationContextAware
this.transactionHelper.setForceWritable(true); this.transactionHelper.setForceWritable(true);
} }
// protected MetadataEncryptor getMetadataEncryptor(EncryptionParameters encryptionParameters) public void setSplitTxns(boolean splitTxns)
// {
// DefaultEncryptor encryptor = new DefaultEncryptor();
// encryptor.setCipherAlgorithm(encryptionParameters.getCipherAlgorithm());
// encryptor.setCipherProvider(null);
// KeystoreKeyProvider keyProvider = new KeystoreKeyProvider();
// keyProvider.setLocation(encryptionParameters.getKeyStoreLocation());
// keyProvider.setPasswordsFileLocation(encryptionParameters.getPasswordFileLocation());
// keyProvider.setType(encryptionParameters.getKeyStoreType());
// keyProvider.setKeyResourceLoader(new SpringKeyResourceLoader());
// keyProvider.setProvider(encryptionParameters.getKeyStoreProvider()
// );
//
// encryptor.setKeyProvider(keyProvider);
//
// MetadataEncryptor metadataEncryptor = new MetadataEncryptor();
// metadataEncryptor.setEncryptor(encryptor);
// metadataEncryptor.setDictionaryService(dictionaryService);
//
// return metadataEncryptor;
// }
public void setMetadataEncryptor(MetadataEncryptor metadataEncryptor)
{ {
this.metadataEncryptor = metadataEncryptor; this.splitTxns = splitTxns;
} }
public void init() public void setNodeDAO(NodeDAO nodeDAO)
{ {
this.nodeDAO = nodeDAO;
} }
public void reencrypt(final KeyStoreParameters newEncryptionParameters, final List<NodePropertyEntity> properties) public void setDictionaryDAO(DictionaryDAO dictionaryDAO)
{ {
this.dictionaryDAO = dictionaryDAO;
}
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
public void setQnameDAO(QNameDAO qnameDAO)
{
this.qnameDAO = qnameDAO;
}
public void setCipherAlgorithm(String cipherAlgorithm)
{
this.cipherAlgorithm = cipherAlgorithm;
}
public void setBackupKeyStoreParameters(KeyStoreParameters backupKeyStoreParameters)
{
this.backupKeyStoreParameters = backupKeyStoreParameters;
}
protected KeyProvider getKeyProvider(KeyStoreParameters keyStoreParameters)
{
KeyProvider keyProvider = new KeystoreKeyProvider(keyStoreParameters, keyResourceLoader);
return keyProvider;
}
public void setKeyProvider(KeyProvider keyProvider)
{
this.keyProvider = keyProvider;
}
public void setKeyResourceLoader(KeyResourceLoader keyResourceLoader)
{
this.keyResourceLoader = keyResourceLoader;
}
public MetadataEncryptor getMetadataEncryptor(KeyProvider backupKeyProvider, KeyProvider newKeyProvider)
{
DefaultEncryptor backupEncryptor = new DefaultEncryptor();
backupEncryptor.setCipherProvider(null); // TODO parameterize
backupEncryptor.setCipherAlgorithm(cipherAlgorithm);
backupEncryptor.setKeyProvider(backupKeyProvider);
DefaultEncryptor encryptor = new DefaultEncryptor();
encryptor.setCipherProvider(null); // TODO parameterize
encryptor.setCipherAlgorithm(cipherAlgorithm);
encryptor.setKeyProvider(newKeyProvider);
DefaultFallbackEncryptor fallbackEncryptor = new DefaultFallbackEncryptor(encryptor, backupEncryptor);
MetadataEncryptor metadataEncryptor = new MetadataEncryptor();
metadataEncryptor.setEncryptor(fallbackEncryptor);
metadataEncryptor.setDictionaryService(dictionaryService);
return metadataEncryptor;
}
protected KeyProvider getKeyProvider(final Map<String, Key> keys)
{
KeyProvider keyProvider = new KeyProvider()
{
@Override
public Key getKey(String keyAlias)
{
return keys.get(keyAlias);
}
};
return keyProvider;
}
protected void reencrypt(final MetadataEncryptor metadataEncryptor, final List<NodePropertyEntity> properties)
{
final Iterator<NodePropertyEntity> it = properties.iterator();
BatchProcessor.BatchProcessWorker<NodePropertyEntity> worker = new BatchProcessor.BatchProcessWorker<NodePropertyEntity>() BatchProcessor.BatchProcessWorker<NodePropertyEntity> worker = new BatchProcessor.BatchProcessWorker<NodePropertyEntity>()
{ {
public String getIdentifier(NodePropertyEntity entity) public String getIdentifier(NodePropertyEntity entity)
@@ -135,22 +197,22 @@ public class ReEncryptor implements ApplicationContextAware
{ {
} }
public void process(NodePropertyEntity entity) throws Throwable public void process(final NodePropertyEntity entity) throws Throwable
{ {
Object value = entity.getValue(); NodePropertyValue nodePropValue = entity.getValue();
// TODO check that we have the correct type i.e. can be cast to Serializable
Serializable value = nodePropValue.getSerializableValue();
if(value instanceof SealedObject) if(value instanceof SealedObject)
{ {
SealedObject sealed = (SealedObject)value; SealedObject sealed = (SealedObject)value;
NodePropertyKey nodeKey = entity.getKey(); NodePropertyKey propertyKey = entity.getKey();
QName propertyQName = qnameDAO.getQName(nodeKey.getQnameId()).getSecond(); QName propertyQName = qnameDAO.getQName(propertyKey.getQnameId()).getSecond();
// metadataEncryptor uses a fallback encryptor; decryption will try the // decrypt...
// default (new) keys first (which will fail for properties created before the
// change in keys), followed by the backup keys.
Serializable decrypted = metadataEncryptor.decrypt(propertyQName, sealed); Serializable decrypted = metadataEncryptor.decrypt(propertyQName, sealed);
// Re-encrypt. The new keys will be used. // ...and then re-encrypt. The new keys will be used.
Serializable resealed = metadataEncryptor.encrypt(propertyQName, decrypted); Serializable resealed = metadataEncryptor.encrypt(propertyQName, decrypted);
// TODO update resealed using batch update? // TODO update resealed using batch update?
@@ -159,15 +221,16 @@ public class ReEncryptor implements ApplicationContextAware
} }
else else
{ {
// TODO NodePropertyKey nodeKey = entity.getKey();
QName propertyQName = qnameDAO.getQName(nodeKey.getQnameId()).getSecond();
logger.warn("Encountered an encrypted property that is not a SealedObject, for node id " +
entity.getNodeId() + ", property " + propertyQName);
} }
} }
}; };
BatchProcessWorkProvider<NodePropertyEntity> provider = new BatchProcessWorkProvider<NodePropertyEntity>() BatchProcessWorkProvider<NodePropertyEntity> provider = new BatchProcessWorkProvider<NodePropertyEntity>()
{ {
private int start = 0;
@Override @Override
public int getTotalEstimatedWorkSize() public int getTotalEstimatedWorkSize()
{ {
@@ -177,46 +240,87 @@ public class ReEncryptor implements ApplicationContextAware
@Override @Override
public Collection<NodePropertyEntity> getNextWork() public Collection<NodePropertyEntity> getNextWork()
{ {
int end = start + 20; int count = 0;
if(end > properties.size()) List<NodePropertyEntity> sublist = new ArrayList<NodePropertyEntity>(chunkSize);
while(it.hasNext() && count < chunkSize)
{ {
end = properties.size(); sublist.add(it.next());
count++;
} }
List<NodePropertyEntity> sublist = properties.subList(start, end);
start += 20;
return sublist; return sublist;
} }
}; };
// Migrate using 2 threads, 20 authorities per transaction. Log every 100 entries. // TODO, "propertize" these numbers
// TODO, propertize these numbers
new BatchProcessor<NodePropertyEntity>( new BatchProcessor<NodePropertyEntity>(
I18NUtil.getMessage(""), I18NUtil.getMessage(""),
transactionHelper, transactionHelper,
provider, provider,
2, 20, 2, 20,
applicationContext, applicationContext,
logger, 100).process(worker, true); logger, 20).process(worker, splitTxns);
} }
public void execute(KeyStoreParameters newEncryptionParameters) /**
* Re-encrypt using the configured backup keystore to decrypt and the main keystore to encrypt
*/
public int reEncrypt() throws MissingKeyException, MissingKeyStoreException
{ {
// Proceed only if fallback is available i.e. the systems has both old and new keys if(!backupKeyStoreParameters.isDefined())
if(metadataEncryptor.isFallbackAvailable())
{ {
QName model = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, namespaceDAO); throw new MissingKeyStoreException("Backup key store is not defined");
}
KeyProvider backupKeyProvider = getKeyProvider(backupKeyStoreParameters);
if(backupKeyProvider.getKey(KeyProvider.ALIAS_METADATA) == null)
{
throw new MissingKeyException("Unable to find the metadata key in backup key store. Does the backup key store exist?");
}
MetadataEncryptor metadataEncryptor = getMetadataEncryptor(backupKeyProvider, keyProvider);
return reEncrypt(metadataEncryptor);
}
/**
* Re-encrypt by decrypting using the configured keystore and encrypting using a keystore configured using the provided new key store parameters.
* Called from e.g. JMX.
*
* Note: it is the responsibility of the end user to ensure that the keystore configured by newKeyStoreParameters is
* placed in the repository keystore directory. This can be done while the repository is running and it will be picked
* up automatically the next time the repository restarts.
*/
public int reEncrypt(KeyStoreParameters parameters)
{
KeyProvider newKeyProvider = getKeyProvider(parameters);
return reEncrypt(newKeyProvider);
}
public int reEncrypt(KeyProvider newKeyProvider)
{
MetadataEncryptor metadataEncryptor = getMetadataEncryptor(keyProvider, newKeyProvider);
return reEncrypt(metadataEncryptor);
}
protected int reEncrypt(MetadataEncryptor metadataEncryptor)
{
// get properties that are encrypted // get properties that are encrypted
Collection<PropertyDefinition> propertyDefs = dictionaryDAO.getProperties(model, DataTypeDefinition.ENCRYPTED); Collection<PropertyDefinition> propertyDefs = dictionaryDAO.getPropertiesOfDataType(DataTypeDefinition.ENCRYPTED);
List<NodePropertyEntity> properties = nodeDAO.getProperties(propertyDefs); // TODO use callback mechanism
List<NodePropertyEntity> properties = nodeDAO.selectProperties(propertyDefs);
if(logger.isDebugEnabled())
{
logger.debug("Found " + properties.size() + " properties to re-encrypt...");
}
// reencrypt these properties // reencrypt these properties
reencrypt(newEncryptionParameters, properties); reencrypt(metadataEncryptor, properties);
}
else if(logger.isDebugEnabled())
{ {
// TODO logger.debug("...done re-encrypting.");
} }
return properties.size();
} }
@Override @Override

5
source/java/org/alfresco/encryption/keystore-parameters.properties Normal file
View File

@@ -0,0 +1,5 @@
keystore.password=mp6yc0UD9e
aliases=test
test.password=abc
test.keyData=lhfDmkonev3wRI3RnxFuVcUOh2bSnB2Y
test.algorithm=DESede

48
source/java/org/alfresco/encryption/reencryption_model.xml Normal file
View File

@@ -0,0 +1,48 @@
<model name="test:dictionarydaotest" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>Alfresco Content Model</description>
<author>Alfresco</author>
<published>2011-08-24</published>
<version>1.0</version>
<imports>
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
</imports>
<namespaces>
<namespace uri="http://www.alfresco.org/test/reencryption_test/1.0" prefix="test"/>
</namespaces>
<data-types>
</data-types>
<constraints>
</constraints>
<types>
<type name="test:base">
<title>Base</title>
<description>The Base Type</description>
<parent></parent>
<properties>
<property name="test:prop1">
<type>d:encrypted</type>
<mandatory>false</mandatory>
<constraints>
</constraints>
</property>
</properties>
<associations>
</associations>
<mandatory-aspects>
</mandatory-aspects>
</type>
</types>
<aspects>
</aspects>
</model>

8
source/java/org/alfresco/repo/domain/node/NodeDAO.java
View File

@@ -671,5 +671,11 @@ public interface NodeDAO extends NodeBulkLoader
*/ */
public void setNodeDefiningAclId(Long nodeId, long id); public void setNodeDefiningAclId(Long nodeId, long id);
public List<NodePropertyEntity> getProperties(Collection<PropertyDefinition> propertyDefs); /**
* Used by the re-encryptor to re-encrypt encryptable properties with a new encryption key.
*
* @param propertyDefs
* @return
*/
public List<NodePropertyEntity> selectProperties(Collection<PropertyDefinition> propertyDefs);
} }

13
source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
View File

@@ -91,7 +91,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
private static final String SELECT_NODES_BY_UUIDS = "alfresco.node.select_NodesByUuids"; private static final String SELECT_NODES_BY_UUIDS = "alfresco.node.select_NodesByUuids";
private static final String SELECT_NODES_BY_IDS = "alfresco.node.select_NodesByIds"; private static final String SELECT_NODES_BY_IDS = "alfresco.node.select_NodesByIds";
private static final String SELECT_NODE_PROPERTIES = "alfresco.node.select_NodeProperties"; private static final String SELECT_NODE_PROPERTIES = "alfresco.node.select_NodeProperties";
private static final String SELECT_PROPERTIES_BY_TYPE = "alfresco.node.select_PropertiesByType"; private static final String SELECT_PROPERTIES_BY_TYPES = "alfresco.node.select_PropertiesByTypes";
private static final String SELECT_NODE_ASPECTS = "alfresco.node.select_NodeAspects"; private static final String SELECT_NODE_ASPECTS = "alfresco.node.select_NodeAspects";
private static final String INSERT_NODE_PROPERTY = "alfresco.node.insert.insert_NodeProperty"; private static final String INSERT_NODE_PROPERTY = "alfresco.node.insert.insert_NodeProperty";
private static final String UPDATE_PRIMARY_CHILDREN_SHARED_ACL = "alfresco.node.update.update_PrimaryChildrenSharedAcl"; private static final String UPDATE_PRIMARY_CHILDREN_SHARED_ACL = "alfresco.node.update.update_PrimaryChildrenSharedAcl";
@@ -1521,8 +1521,8 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
} }
} }
// TODO - use a callback approach @Override
public List<NodePropertyEntity> getProperties(Collection<PropertyDefinition> propertyDefs) public List<NodePropertyEntity> selectProperties(Collection<PropertyDefinition> propertyDefs)
{ {
Set<QName> qnames = new HashSet<QName>(); Set<QName> qnames = new HashSet<QName>();
for(PropertyDefinition propDef : propertyDefs) for(PropertyDefinition propDef : propertyDefs)
@@ -1530,11 +1530,16 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
qnames.add(propDef.getName()); qnames.add(propDef.getName());
} }
// TODO use callback approach
final List<NodePropertyEntity> props = new ArrayList<NodePropertyEntity>(); final List<NodePropertyEntity> props = new ArrayList<NodePropertyEntity>();
// qnames of properties that are encrypted // qnames of properties that are encrypted
Set<Long> qnameIds = qnameDAO.convertQNamesToIds(qnames, false); Set<Long> qnameIds = qnameDAO.convertQNamesToIds(qnames, false);
template.select(SELECT_PROPERTIES_BY_TYPE, qnameIds, new ResultHandler() // TODO - use a callback approach
IdsEntity param = new IdsEntity();
param.setIds(new ArrayList<Long>(qnameIds));
template.select(SELECT_PROPERTIES_BY_TYPES, param, new ResultHandler()
{ {
@Override @Override
public void handleResult(ResultContext context) public void handleResult(ResultContext context)

21
source/java/org/alfresco/repo/node/encryption/MetadataEncryptor.java
View File

@@ -1,7 +1,6 @@
package org.alfresco.repo.node.encryption; package org.alfresco.repo.node.encryption;
import java.io.Serializable; import java.io.Serializable;
import java.security.InvalidKeyException;
import java.security.KeyException; import java.security.KeyException;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -11,7 +10,6 @@ import java.util.Set;
import javax.crypto.SealedObject; import javax.crypto.SealedObject;
import org.alfresco.encryption.Encryptor; import org.alfresco.encryption.Encryptor;
import org.alfresco.encryption.FallbackEncryptor;
import org.alfresco.encryption.KeyProvider; import org.alfresco.encryption.KeyProvider;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.security.authentication.AuthenticationException; import org.alfresco.repo.security.authentication.AuthenticationException;
@@ -223,23 +221,4 @@ public class MetadataEncryptor
// Done // Done
return outbound; return outbound;
} }
public Serializable reencrypt(QName propertyQName, Serializable sealed) throws InvalidKeyException
{
// metadataEncryptor uses a fallback encryptor; decryption will try the
// default (new) keys first (which will fail for properties created before the
// change in keys), followed by the backup keys.
Serializable decrypted = decrypt(propertyQName, sealed);
// Re-encrypt. The new keys will be used.
Serializable resealed = encrypt(propertyQName, decrypted);
return resealed;
}
public boolean isFallbackAvailable()
{
return false;
// return encryptor.isFallbackAvailable();
}
} }

54
source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
View File

@@ -44,8 +44,11 @@ import org.alfresco.service.cmr.security.PermissionService;
import org.apache.commons.codec.net.URLCodec; import org.apache.commons.codec.net.URLCodec;
import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException; import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
import org.apache.commons.httpclient.methods.PostMethod; import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.params.HttpClientParams;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONArray; import org.json.JSONArray;
@@ -69,8 +72,6 @@ public class SolrQueryHTTPClient
private Map<String, String> storeMappings; private Map<String, String> storeMappings;
private String solrHost;
private int solrPort;
private String baseUrl; private String baseUrl;
private HttpClient httpClient; private HttpClient httpClient;
@@ -83,14 +84,13 @@ public class SolrQueryHTTPClient
public void init() public void init()
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
// sb.append("http://");
// sb.append(solrHost);
// sb.append(":");
// sb.append(solrPort);
sb.append("/solr"); sb.append("/solr");
this.baseUrl = sb.toString(); this.baseUrl = sb.toString();
httpClient = httpClientFactory.getHttpClient(solrHost, solrPort); httpClient = httpClientFactory.getHttpClient();
HttpClientParams params = httpClient.getParams();
params.setBooleanParameter(HttpClientParams.PREEMPTIVE_AUTHENTICATION, true);
httpClient.getState().setCredentials(new AuthScope(AuthScope.ANY_HOST, AuthScope.ANY_PORT), new UsernamePasswordCredentials("admin", "admin"));
} }
public void setHttpClientFactory(HttpClientFactory httpClientFactory) public void setHttpClientFactory(HttpClientFactory httpClientFactory)
@@ -118,46 +118,6 @@ public class SolrQueryHTTPClient
this.storeMappings = storeMappings; this.storeMappings = storeMappings;
} }
public void setSolrHost(String solrHost)
{
this.solrHost = solrHost;
}
public void setSolrPort(int solrPort)
{
this.solrPort = solrPort;
}
// public void setBaseUrl(String baseUrl)
// {
// this.baseUrl = baseUrl;
// }
// public void setKeyStoreLocation(String keyStoreLocation)
// {
// this.keyStoreLocation = keyStoreLocation;
// }
//
// public void setTrustStoreLocation(String trustStoreLocation)
// {
// this.trustStoreLocation = trustStoreLocation;
// }
//
// public void setKeyStoreType(String keyStoreType)
// {
// this.keyStoreType = keyStoreType;
// }
//
// public void setTrustStoreType(String trustStoreType)
// {
// this.trustStoreType = trustStoreType;
// }
//
// public void setPasswordFileLocation(String passwordFileLocation)
// {
// this.passwordFileLocation = passwordFileLocation;
// }
public ResultSet executeQuery(SearchParameters searchParameters, String language) public ResultSet executeQuery(SearchParameters searchParameters, String language)
{ {
try try

30
source/java/org/alfresco/repo/solr/SOLRAdminClient.java
View File

@@ -61,6 +61,7 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
{ {
private String solrHost; private String solrHost;
private int solrPort; private int solrPort;
private int solrSSLPort;
private String solrUrl; private String solrUrl;
private String solrUser; private String solrUser;
private String solrPassword; private String solrPassword;
@@ -87,6 +88,11 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
this.solrPort = Integer.parseInt(solrPort); this.solrPort = Integer.parseInt(solrPort);
} }
public void setSolrsslPort(int solrSSLPort)
{
this.solrSSLPort = solrSSLPort;
}
public void setSolrUser(String solrUser) public void setSolrUser(String solrUser)
{ {
this.solrUser = solrUser; this.solrUser = solrUser;
@@ -118,32 +124,14 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
this.httpClientFactory = httpClientFactory; this.httpClientFactory = httpClientFactory;
} }
// protected HttpClient getHttpClient()
// {
// return httpClientFactory.getHttpClient(solrHost, solrPort);
//// HttpClient httpClient = new HttpClient();
////
//// HttpClientParams params = httpClient.getParams();
//// params.setBooleanParameter("http.tcp.nodelay", true);
//// params.setBooleanParameter("http.connection.stalecheck", false);
////
//// ProtocolSocketFactory socketFactory = new AuthSSLProtocolSocketFactory(
//// keyResourceLoader, encryptionParameters);
//// Protocol myhttps = new Protocol("https", socketFactory, 8843);
//// httpClient.getHostConfiguration().setHost(solrHost, 8080, myhttps);
////
//// return httpClient;
// }
public void init() public void init()
{ {
ParameterCheck.mandatory("solrHost", solrHost); ParameterCheck.mandatory("solrHost", solrHost);
ParameterCheck.mandatory("solrPort", solrPort); ParameterCheck.mandatory("solrPort", solrPort);
ParameterCheck.mandatory("solrUser", solrUser);
ParameterCheck.mandatory("solrPassword", solrPassword); ParameterCheck.mandatory("solrPassword", solrPassword);
ParameterCheck.mandatory("solrPingCronExpression", solrPingCronExpression); ParameterCheck.mandatory("solrPingCronExpression", solrPingCronExpression);
ParameterCheck.mandatory("solrPort", solrPort);
ParameterCheck.mandatory("solrConnectTimeout", solrConnectTimeout); ParameterCheck.mandatory("solrConnectTimeout", solrConnectTimeout);
ParameterCheck.mandatory("solrUser", solrUser);
try try
{ {
@@ -151,10 +139,10 @@ public class SOLRAdminClient implements ApplicationEventPublisherAware
sb.append(httpClientFactory.isSSL() ? "https://" : "http://"); sb.append(httpClientFactory.isSSL() ? "https://" : "http://");
sb.append(solrHost); sb.append(solrHost);
sb.append(":"); sb.append(":");
sb.append(solrPort); sb.append(httpClientFactory.isSSL() ? solrSSLPort: solrPort);
sb.append("/solr"); sb.append("/solr");
this.solrUrl = sb.toString(); this.solrUrl = sb.toString();
HttpClient httpClient = httpClientFactory.getHttpClient(solrHost, solrPort); HttpClient httpClient = httpClientFactory.getHttpClient();
server = new CommonsHttpSolrServer(solrUrl, httpClient); server = new CommonsHttpSolrServer(solrUrl, httpClient);
// TODO remove credentials because we're using SSL? // TODO remove credentials because we're using SSL?