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

ACE-3195 "Master key removal leads to Document Library and Dashboards errors"

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89115 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2014-10-24 14:05:03 +00:00
parent 613db46e5f
commit 5018316faf
4 changed files with 140 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
source/java/org/alfresco/repo/domain/contentdata/ContentUrlKeyEntity.java
View File

@@ -79,15 +79,34 @@ public class ContentUrlKeyEntity implements Serializable
return encryptedKeyAsBytes;
}
public void updateEncryptedKey(EncryptedKey encryptedKey)
public void setEncryptedKey(EncryptedKey encryptedKey)
{
byte[] encryptedKeyAsBytes = new byte[encryptedKey.getByteBuffer().remaining()];
encryptedKey.getByteBuffer().get(encryptedKeyAsBytes);
this.encryptedKeyAsBytes = encryptedKeyAsBytes;
setKeySize(encryptedKeyAsBytes.length*8);
setAlgorithm(encryptedKey.getAlgorithm());
setMasterKeyAlias(encryptedKey.getMasterKeyAlias());
setMasterKeystoreId(encryptedKey.getMasterKeystoreId());
this.keySize = encryptedKeyAsBytes.length*8;
this.algorithm = encryptedKey.getAlgorithm();
this.masterKeyAlias = encryptedKey.getMasterKeyAlias();
this.masterKeystoreId = encryptedKey.getMasterKeystoreId();
}
public static ContentUrlKeyEntity setEncryptedKey(ContentUrlKeyEntity existing, EncryptedKey encryptedKey)
{
ContentUrlKeyEntity newContentUrlKeyEntity = new ContentUrlKeyEntity();
byte[] encryptedKeyAsBytes = new byte[encryptedKey.getByteBuffer().remaining()];
encryptedKey.getByteBuffer().get(encryptedKeyAsBytes);
newContentUrlKeyEntity.setEncryptedKeyAsBytes(encryptedKeyAsBytes);
newContentUrlKeyEntity.setKeySize(encryptedKeyAsBytes.length*8);
newContentUrlKeyEntity.setAlgorithm(encryptedKey.getAlgorithm());
newContentUrlKeyEntity.setMasterKeyAlias(encryptedKey.getMasterKeyAlias());
newContentUrlKeyEntity.setMasterKeystoreId(encryptedKey.getMasterKeystoreId());
newContentUrlKeyEntity.setContentUrlId(existing.getContentUrlId());
newContentUrlKeyEntity.setUnencryptedFileSize(existing.getUnencryptedFileSize());
newContentUrlKeyEntity.setId(existing.getId());
return newContentUrlKeyEntity;
}
public Long getId()
@@ -157,6 +176,55 @@ public class ContentUrlKeyEntity implements Serializable
this.masterKeyAlias = masterKeyAlias;
}
@Override
public int hashCode()
{
final int prime = 31;
int result = 1;
result = prime * result
+ ((algorithm == null) ? 0 : algorithm.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result
+ ((masterKeyAlias == null) ? 0 : masterKeyAlias.hashCode());
result = prime
* result
+ ((masterKeystoreId == null) ? 0 : masterKeystoreId.hashCode());
return result;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ContentUrlKeyEntity other = (ContentUrlKeyEntity) obj;
if (algorithm == null) {
if (other.algorithm != null)
return false;
} else if (!algorithm.equals(other.algorithm))
return false;
if (id == null) {
if (other.id != null)
return false;
} else if (!id.equals(other.id))
return false;
if (masterKeyAlias == null) {
if (other.masterKeyAlias != null)
return false;
} else if (!masterKeyAlias.equals(other.masterKeyAlias))
return false;
if (masterKeystoreId == null) {
if (other.masterKeystoreId != null)
return false;
} else if (!masterKeystoreId.equals(other.masterKeystoreId))
return false;
return true;
}
@Override
public String toString()
{