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

Fix ALF-10402: PUB: Access tokens are not being stored in encrypted properties

Browse Source 
- NOTE: this fix means that any existing publishing channels in the repo will cease to work and will cause the publishing generally to have problems. If you have publishing channels in your repo then you must remove them following this fix. This can be done by either cleaning your repo out completely or deleting the node underneath "Data Dictionary/Publishing Root" (it has a UUID as its name).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Brian Remmington
2011-09-20 13:49:36 +00:00
parent d8b5f09911
commit 10abd069bc
26 changed files with 419 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,21 @@
/*
* 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.repo.node.encryption;
import java.io.Serializable;
@@ -12,7 +30,6 @@ import javax.crypto.SealedObject;
import org.alfresco.encryption.FallbackEncryptor;
import org.alfresco.encryption.KeyProvider;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -53,21 +70,8 @@ public class MetadataEncryptor
this.encryptor = encryptor;
}
/**
* @throws AuthenticationException if the thread is not running as 'system'
*/
private final void checkAuthentication()
{
if (!AuthenticationUtil.isRunAsUserTheSystemUser())
{
throw new AuthenticationException("Metadata decryption can only be done by the system user.");
}
}
/**
* Encrypt a properties if the data definition (model-specific) requires it.
* <p/>
* This method has no specific authentication requirements.
*
* @param propertyQName the property qualified name
* @param inbound the property to encrypt
@@ -91,8 +95,6 @@ public class MetadataEncryptor
/**
* Decrypt a property if the data definition (model-specific) requires it.
* <p/>
* This method can only be called by the 'system' user.
*
* @param propertyQName the property qualified name
* @param inbound the property to decrypt
@@ -124,8 +126,6 @@ public class MetadataEncryptor
/**
* Encrypt properties if their data definition (model-specific) requires it.
* The values provided can be mixed; values will be encrypted only if required.
* <p/>
* This method has no specific authentication requirements.
*
* @param inbound the properties to encrypt
* @return a new map of values if some encryption occured
@@ -170,8 +170,6 @@ public class MetadataEncryptor
/**
* Decrypt properties if they are decryptable. The values provided can be mixed;
* encrypted values will be sought out and decrypted.
* <p/>
* This method can only be called by the 'system' user.
*
* @param inbound the properties to decrypt
* @return a new map of values if some decryption occured
@@ -179,8 +177,6 @@ public class MetadataEncryptor
*/
public Map<QName, Serializable> decrypt(Map<QName, Serializable> inbound)
{
checkAuthentication();
Set<QName> encryptedProperties = new HashSet<QName>(5);
for (Map.Entry<QName, Serializable> entry : inbound.entrySet())
{