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

Merged V3.1 to HEAD

Browse Source 
12994: Merged V3.0 to V3.1
      12931: Merged V2.2 to V3.0
         12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
         12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
         12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
         12759: AVM - build/test fix - follow-on to r12742
         12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
      12932: Merged V2.2 to V3.0   
         12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
         12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
         12809: Test fixes after r 12782
         12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
      12933: Merged V2.2 to V3.0
         12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
      12934: Merged V2.2 to V3.0
         12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
      12935: Merged V2.2 to V3.0
         12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
         12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
      12936: Merged V2.2 to V3.0
         12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
      12937: Merged V2.2 to V3.0
         12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
         12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
         12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
         12850: ETWOTWO-975 - Show Conflicts in Modified Items List
         12938: Fix merge typo (follow on from r12931)
         12941: Fix merge typo (follow on from r12931)
   12998: Cleaned up svn:mergeinfo entries
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
      Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
      Merged /alfresco/BRANCHES/V3.1:r12994,12998


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 02:50:32 +00:00
parent 37d3c2e25e
commit 6eb1963971
34 changed files with 972 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
source/java/org/alfresco/repo/avm/AVMStoreImpl.java
View File

@@ -337,7 +337,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -454,7 +454,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -496,7 +496,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -563,7 +563,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + dstPath + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.ADD_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + dstPath);
}
@@ -645,7 +645,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.READ_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.READ_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -668,7 +668,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.READ_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.READ_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -715,7 +715,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.READ_CHILDREN))
if (!fAVMRepository.can(this, dir, PermissionService.READ_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -747,14 +747,18 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(this, dir, PermissionService.DELETE_CHILDREN))
{
throw new AVMNotFoundException("Not allowed to write: " + path);
}
if (dir.lookupChild(lPath, name, false) == null)
Pair<AVMNode, Boolean> temp = dir.lookupChild(lPath, name, false);
AVMNode child = (temp == null) ? null : temp.getFirst();
if (child == null)
{
throw new AVMNotFoundException("Does not exist: " + name);
}
if (!fAVMRepository.can(this, child, PermissionService.DELETE_NODE, false))
{
throw new AVMNotFoundException("Not allowed to delete in store : " + getName() +" at " + path);
}
dir.removeChild(lPath, name);
//dir.updateModTime();
}
@@ -766,19 +770,25 @@ public class AVMStoreImpl implements AVMStore, Serializable
*/
public void uncover(String dirPath, String name)
{
Lookup lPath = lookup(-1, dirPath, true, false);
Lookup lPath = lookupDirectory(-1, dirPath, true);
if (lPath == null)
{
throw new AVMNotFoundException("Path " + dirPath + " not found.");
throw new AVMNotFoundException("Directory path " + dirPath + " not found.");
}
AVMNode node = lPath.getCurrentNode();
DirectoryNode node = (DirectoryNode)lPath.getCurrentNode();
if (node.getType() != AVMNodeType.LAYERED_DIRECTORY)
{
throw new AVMWrongTypeException("Not a layered directory: " + dirPath);
}
if (!fAVMRepository.can(this, node, PermissionService.DELETE_CHILDREN))
Pair<AVMNode, Boolean> temp = node.lookupChild(lPath, name, true);
AVMNode child = (temp == null) ? null : temp.getFirst();
if(child == null)
{
throw new AccessDeniedException("Not allowed to write: " + dirPath);
throw new AVMNotFoundException("No child to recover at "+dirPath+" called "+name);
}
if (!fAVMRepository.can(this, child, PermissionService.DELETE_NODE, false))
{
throw new AccessDeniedException("Not allowed to uncover: " + dirPath + " -> "+name);
}
((LayeredDirectoryNode)node).uncover(lPath, name);
node.updateModTime();
@@ -875,7 +885,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
root = AVMDAOs.Instance().fAVMNodeDAO.getAVMStoreRoot(this, version);
}
if (!fAVMRepository.can(this, root, PermissionService.READ_CHILDREN))
if (!fAVMRepository.can(this, root, PermissionService.READ_CHILDREN, true))
{
throw new AccessDeniedException("Not allowed to read: " + fName + "@" + version);
}
@@ -924,7 +934,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
return null;
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -957,7 +967,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMException("Not in a layered context: " + path);
}
if (!fAVMRepository.can(this, dir, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, dir, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -982,7 +992,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMException("Not in a layered context: " + path);
}
if (!fAVMRepository.can(this, dir, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, dir, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1138,7 +1148,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
}
AVMDAOs.Instance().fVersionLayeredNodeEntryDAO.delete(vRoot);
AVMNode root = vRoot.getRoot();
if (!fAVMRepository.can(null, root, PermissionService.DELETE_CHILDREN))
if (!fAVMRepository.can(null, root, PermissionService.DELETE_CHILDREN, true))
{
throw new AccessDeniedException("Not allowed to purge: " + fName + "@" + version);
}
@@ -1191,7 +1201,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMWrongTypeException("Not a LayeredDirectoryNode.");
}
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1214,7 +1224,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1237,7 +1247,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1271,7 +1281,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -1304,7 +1314,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -1329,7 +1339,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1360,7 +1370,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1458,7 +1468,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMWrongTypeException("File Expected.");
}
if (!fAVMRepository.can(this, node, PermissionService.READ_CONTENT))
if (!fAVMRepository.can(this, node, PermissionService.READ_CONTENT, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read: " + path);
}
@@ -1485,7 +1495,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMWrongTypeException("File Expected.");
}
if (!fAVMRepository.can(this, node, PermissionService.WRITE_CONTENT))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_CONTENT, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write content: " + path);
}
@@ -1534,7 +1544,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path not found: " + path);
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write properties: " + path);
}
@@ -1555,7 +1565,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write: " + path);
}
@@ -1581,7 +1591,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read properties: " + path);
}
@@ -1604,7 +1614,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write properties: " + path);
}
@@ -1642,7 +1652,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.READ_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read properties: " + path);
}
@@ -1672,7 +1682,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.CHANGE_PERMISSIONS))
if (!fAVMRepository.can(this, node, PermissionService.CHANGE_PERMISSIONS, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to change permissions: " + path);
}
@@ -1693,7 +1703,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMNotFoundException("Path " + path + " not found.");
}
if (!fAVMRepository.can(this, lPath.getCurrentNode(), PermissionService.READ_PERMISSIONS))
if (!fAVMRepository.can(this, lPath.getCurrentNode(), PermissionService.READ_PERMISSIONS, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to read permissions: " + path + " in "+getName());
}
@@ -1714,7 +1724,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + parentPath + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(null, dir, PermissionService.ADD_CHILDREN))
if (!fAVMRepository.can(null, dir, PermissionService.ADD_CHILDREN, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to add children: " + parentPath);
}
@@ -1737,17 +1747,17 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path " + path + " not found.");
}
DirectoryNode dir = (DirectoryNode)lPath.getCurrentNode();
if (!fAVMRepository.can(null, dir, PermissionService.DELETE_CHILDREN) ||
!fAVMRepository.can(null, dir, PermissionService.ADD_CHILDREN))
{
throw new AccessDeniedException("Not allowed to revert: " + path);
}
Pair<AVMNode, Boolean> temp = dir.lookupChild(lPath, name, true);
AVMNode child = (temp == null) ? null : temp.getFirst();
if (child == null)
{
throw new AVMNotFoundException("Node not found: " + name);
}
if (!fAVMRepository.can(null, child, PermissionService.WRITE, false))
{
throw new AccessDeniedException("Not allowed to revert: " + path);
}
AVMNode revertNode = AVMDAOs.Instance().fAVMNodeDAO.getByID(toRevertTo.getId());
if (revertNode == null)
{
@@ -1778,7 +1788,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
throw new AVMNotFoundException("Path not found: " + path);
}
AVMNode node = lPath.getCurrentNode();
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write properties: " + path);
}
@@ -1800,7 +1810,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMWrongTypeException("Not a File: " + path);
}
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write properties: " + path);
}
@@ -1823,7 +1833,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
{
throw new AVMWrongTypeException("Not a File: " + path);
}
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES))
if (!fAVMRepository.can(this, node, PermissionService.WRITE_PROPERTIES, lPath.getDirectlyContained()))
{
throw new AccessDeniedException("Not allowed to write properties: " + path);
}