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

REPO-1357: HotFix: MNT-16889: With encryption enabled alf_content_url_encryption not set using ContentService getWriter(null,,false)

Browse Source 
- Fixed creation of the content URL so that the key is not lost.
   - Added a test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alex Mukha
2016-10-06 16:28:14 +00:00
parent 5efe89b616
commit 395ff422c5
3 changed files with 214 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
View File

@@ -197,8 +197,9 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
/** /**
* Internally update a URL or create a new one if it does not exist * Internally update a URL or create a new one if it does not exist
*/ */
private void updateContentUrl(ContentUrlEntity contentUrl) private boolean updateContentUrl(ContentUrlEntity contentUrl)
{ {
int result = 0;
if (contentUrl == null) if (contentUrl == null)
{ {
throw new IllegalArgumentException("Cannot look up ContentData by null ID."); throw new IllegalArgumentException("Cannot look up ContentData by null ID.");
@@ -206,13 +207,14 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
Pair<Long, ContentUrlEntity> pair = contentUrlCache.getByValue(contentUrl); Pair<Long, ContentUrlEntity> pair = contentUrlCache.getByValue(contentUrl);
if(pair != null) if(pair != null)
{ {
contentUrlCache.updateValue(pair.getFirst(), contentUrl); result = contentUrlCache.updateValue(pair.getFirst(), contentUrl);
} }
else else
{ {
pair = contentUrlCache.getOrCreateByValue(contentUrl); pair = contentUrlCache.getOrCreateByValue(contentUrl);
contentUrlCache.updateValue(pair.getFirst(), contentUrl); result = contentUrlCache.updateValue(pair.getFirst(), contentUrl);
} }
return result == 1 ? true : false;
} }
@Override @Override
@@ -558,24 +560,13 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
@Override @Override
public boolean updateContentUrlKey(String contentUrl, ContentUrlKeyEntity contentUrlKey) public boolean updateContentUrlKey(String contentUrl, ContentUrlKeyEntity contentUrlKey)
{ {
boolean success = true;
ContentUrlEntity existing = getContentUrl(contentUrl); ContentUrlEntity existing = getContentUrl(contentUrl);
if(existing != null) if (existing == null)
{ {
existing = getOrCreateContentUrl(contentUrl, contentUrlKey.getUnencryptedFileSize());
}
ContentUrlEntity entity = ContentUrlEntity.setContentUrlKey(existing, contentUrlKey); ContentUrlEntity entity = ContentUrlEntity.setContentUrlKey(existing, contentUrlKey);
updateContentUrl(entity); return updateContentUrl(entity);
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("No content url, not updating symmetric key");
}
success = false;
}
return success;
} }
@Override @Override
@@ -613,6 +604,19 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
return contentUrlEntity; return contentUrlEntity;
} }
@Override
public ContentUrlEntity getOrCreateContentUrl(String contentUrl, long size)
{
ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
contentUrlEntity.setContentUrl(contentUrl);
contentUrlEntity.setSize(size);
Pair<Long, ContentUrlEntity> pair = contentUrlCache.getOrCreateByValue(contentUrlEntity);
Long newContentUrlId = pair.getFirst();
contentUrlEntity.setId(newContentUrlId);
// Done
return contentUrlEntity;
}
/** /**
* @param contentUrl the content URL to create or search for * @param contentUrl the content URL to create or search for
*/ */

7
source/java/org/alfresco/repo/domain/contentdata/ContentDataDAO.java
View File

@@ -167,6 +167,13 @@ public interface ContentDataDAO
*/ */
ContentUrlEntity getOrCreateContentUrl(String contentUrl); ContentUrlEntity getOrCreateContentUrl(String contentUrl);
/**
* Get a content URL or create one if it does not exist
*
* @since 5.1
*/
ContentUrlEntity getOrCreateContentUrl(String contentUrl, long size);
/** /**
* Updates the content key for the given content url * Updates the content key for the given content url
* *

10
source/test-java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
View File

@@ -245,6 +245,16 @@ public class ContentDataDAOTest extends TestCase
contentUrlEntity = contentDataDAO.getContentUrl(contentUrlEntity.getContentUrl()); contentUrlEntity = contentDataDAO.getContentUrl(contentUrlEntity.getContentUrl());
assertNotNull(contentUrlEntity); assertNotNull(contentUrlEntity);
assertNotNull(contentDataDAO.getContentUrl(contentUrlEntity.getId())); assertNotNull(contentDataDAO.getContentUrl(contentUrlEntity.getId()));
// test with size
long size = 100l;
String url = "store://" + GUID.generate();
contentUrlEntity = contentDataDAO.getOrCreateContentUrl(url, size);
contentUrlEntity = contentDataDAO.getContentUrl(contentUrlEntity.getContentUrl());
assertNotNull(contentUrlEntity);
assertNotNull(contentDataDAO.getContentUrl(contentUrlEntity.getId()));
assertEquals("The size does not match.", size, contentUrlEntity.getSize());
assertEquals("The content URL does not match.", url, contentUrlEntity.getContentUrl());
} }
/** /**