remm 01/07/25 10:58:26
Modified: src/share/org/apache/slide/content ContentImpl.java
Log:
- Resolving links makes permission checking incorrect.
Submitted by Christopher Lenz.
Revision Changes Path
1.28 +26 -17
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ContentImpl.java 2001/05/16 12:04:24 1.27
+++ ContentImpl.java 2001/07/25 17:58:26 1.28
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.27
2001/05/16 12:04:24 juergen Exp $
- * $Revision: 1.27 $
- * $Date: 2001/05/16 12:04:24 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.28
2001/07/25 17:58:26 remm Exp $
+ * $Revision: 1.28 $
+ * $Date: 2001/07/25 17:58:26 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Implementation of the content interface.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public final class ContentImpl implements Content {
@@ -160,7 +160,8 @@
throws ObjectNotFoundException, AccessDeniedException,
LinkedObjectNotFoundException, ServiceAccessException,
ObjectLockedException {
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Checking security and locking
securityHelper.checkCredentials
@@ -239,8 +240,8 @@
LinkedObjectNotFoundException, ServiceAccessException,
RevisionDescriptorNotFoundException, ObjectLockedException {
- ObjectNode associatedObject = structureHelper
- .retrieve(token, revisionDescriptors.getUri());
+ ObjectNode associatedObject = structureHelper.retrieve
+ (token, revisionDescriptors.getUri(), false);
// Checking security and locking
securityHelper.checkCredentials
@@ -319,7 +320,8 @@
RevisionNotFoundException, RevisionContentNotFoundException,
ObjectLockedException {
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Checking security and locking
securityHelper.checkCredentials
@@ -354,7 +356,8 @@
ObjectLockedException {
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -399,7 +402,8 @@
ServiceAccessException, ObjectLockedException {
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -672,7 +676,8 @@
return;
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -795,7 +800,8 @@
RevisionAlreadyExistException {
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -886,7 +892,8 @@
RevisionNotFoundException {
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -954,8 +961,8 @@
RevisionDescriptorNotFoundException, ObjectLockedException {
// Retrieve the associated object
- ObjectNode associatedObject =
- structureHelper.retrieve(token, revisionDescriptors.getUri());
+ ObjectNode associatedObject = structureHelper.retrieve
+ (token, revisionDescriptors.getUri(), false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -1007,7 +1014,8 @@
RevisionDescriptorNotFoundException, ObjectLockedException {
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
@@ -1058,7 +1066,8 @@
ObjectLockedException, NodeNotVersionedException {
// Retrieve the associated object
- ObjectNode associatedObject = structureHelper.retrieve(token, strUri);
+ ObjectNode associatedObject =
+ structureHelper.retrieve(token, strUri, false);
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
