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

[ACS-1160] Handle null Authority (#249)

Browse Source
This commit is contained in:
Nana Insaidoo
2021-01-20 14:57:17 +00:00
committed by GitHub
parent 0543a800f7
commit 358bd704df
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
repository/src/main/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngine.java
View File

@@ -614,6 +614,11 @@ public class DBQueryEngine implements QueryEngine
aclOwnerStopWatch().start(); aclOwnerStopWatch().start();
try try
{ {
if (authority == null)
{
return false;
}
String owner = getOwner(node); String owner = getOwner(node);
if (EqualsHelper.nullSafeEquals(authority.getAuthority(), owner)) if (EqualsHelper.nullSafeEquals(authority.getAuthority(), owner))
{ {

11
repository/src/test/java/org/alfresco/repo/search/impl/querymodel/impl/db/DBQueryEngineTest.java
View File

@@ -26,12 +26,12 @@
package org.alfresco.repo.search.impl.querymodel.impl.db; package org.alfresco.repo.search.impl.querymodel.impl.db;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -39,7 +39,6 @@ import static org.mockito.Mockito.when;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -48,7 +47,6 @@ import org.alfresco.repo.cache.lookup.EntityLookupCache;
import org.alfresco.repo.domain.node.Node; import org.alfresco.repo.domain.node.Node;
import org.alfresco.repo.domain.node.NodeVersionKey; import org.alfresco.repo.domain.node.NodeVersionKey;
import org.alfresco.repo.domain.node.StoreEntity; import org.alfresco.repo.domain.node.StoreEntity;
import org.alfresco.repo.domain.permissions.AuthorityEntity;
import org.alfresco.repo.search.impl.querymodel.QueryOptions; import org.alfresco.repo.search.impl.querymodel.QueryOptions;
import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryEngine.NodePermissionAssessor; import org.alfresco.repo.search.impl.querymodel.impl.db.DBQueryEngine.NodePermissionAssessor;
import org.alfresco.repo.security.permissions.impl.acegi.FilteringResultSet; import org.alfresco.repo.security.permissions.impl.acegi.FilteringResultSet;
@@ -203,6 +201,13 @@ public class DBQueryEngineTest
assertEquals(0, result.length()); assertEquals(0, result.length());
verify(resultContext).stop(); verify(resultContext).stop();
} }
@Test
public void shouldIsOwnerReadingReturnFalseWhenTheAuthorityIsNull()
{
boolean result = engine.isOwnerReading(createNode(1), null);
assertFalse(result);
}
private void prepareTemplate(DBQuery dbQuery, List<Node> nodes) private void prepareTemplate(DBQuery dbQuery, List<Node> nodes)
{ {