You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2011/07/01 00:51:22 UTC
svn commit: r1141745 - in /jackrabbit/branches/2.2: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java
jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java
Author: mreutegg
Date: Thu Jun 30 22:51:22 2011
New Revision: 1141745
URL: http://svn.apache.org/viewvc?rev=1141745&view=rev
Log:
JCR-3007: setProperty access control evaluation does not properly cope with XA transactions
Modified:
jackrabbit/branches/2.2/ (props changed)
jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java
jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java
Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 30 22:51:22 2011
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100286,1104027,1128175,1130192,1130228,113
2993,1136353,1136360,1138511,1141717
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100286,1104027,1128175,1130192,1130228,113
2993,1136353,1136360,1138511,1141141,1141717
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java?rev=1141745&r1=1141744&r2=1141745&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java Thu Jun 30 22:51:22 2011
@@ -258,7 +258,7 @@ public class PropertyImpl extends ItemIm
throws ValueFormatException, VersionException,
LockException, ConstraintViolationException,
RepositoryException {
- NodeImpl parent = (NodeImpl) getParent();
+ NodeImpl parent = (NodeImpl) getParent(false);
// check multi-value flag
if (multipleValues != isMultiple()) {
String msg = (multipleValues) ?
@@ -327,6 +327,10 @@ public class PropertyImpl extends ItemIm
thisState.setType(type);
}
+ protected Node getParent(boolean checkPermission) throws RepositoryException {
+ return (Node) itemMgr.getItem(getPropertyState().getParentId(), checkPermission);
+ }
+
/**
* Same as <code>{@link Property#setValue(String)}</code> except that
* this method takes a <code>Name</code> instead of a <code>String</code>
@@ -893,7 +897,7 @@ public class PropertyImpl extends ItemIm
* {@inheritDoc}
*/
public Node getParent() throws RepositoryException {
- return (Node) itemMgr.getItem(getPropertyState().getParentId());
+ return getParent(true);
}
//--------------------------------------------------------------< Object >
Modified: jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java?rev=1141745&r1=1141744&r2=1141745&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/security/authorization/AbstractWriteTest.java Thu Jun 30 22:51:22 2011
@@ -1278,6 +1278,11 @@ public abstract class AbstractWriteTest
n2 = n.addNode(nodeName1);
s.save();
+ // set a property on a child node of an uncommited parent
+ n2.setProperty(propertyName1, "testSetProperty");
+ s.save(); // -> used to fail because PropertyImpl#getParent called from PropertyImpl#checkSetValue
+ // was checking read permission on the not yet commited parent
+
// commit
utx.commit();
}
@@ -1295,4 +1300,4 @@ public abstract class AbstractWriteTest
}
return policyNode;
}
-}
\ No newline at end of file
+}