You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2015/06/22 09:42:21 UTC
svn commit: r1686788 - in /jackrabbit/oak/branches/1.2: ./
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/ oak-jcr/src/t...
Author: mreutegg
Date: Mon Jun 22 07:42:21 2015
New Revision: 1686788
URL: http://svn.apache.org/r1686788
Log:
OAK-2747: Admin cannot create versions on a locked page by itself
Merged revision 1686780 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 22 07:42:21 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686229,1686234,1686253,1686414
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679958,1679961,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684868,1685023,1685370,1685552,1685589,1685840,1685999,1686097,1686229,1686234,1686253,1686414,1686780
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java?rev=1686788&r1=1686787&r2=1686788&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java Mon Jun 22 07:42:21 2015
@@ -172,7 +172,7 @@ public class LockManagerImpl implements
protected Void perform(NodeDelegate node)
throws RepositoryException {
String path = node.getPath();
- if (canUnlock(path, node)) {
+ if (canUnlock(node)) {
node.unlock();
sessionContext.getSessionScopedLocks().remove(path);
sessionContext.getOpenScopedLocks().remove(path);
@@ -182,19 +182,28 @@ public class LockManagerImpl implements
throw new LockException("Not an owner of the lock " + path);
}
}
- private boolean canUnlock(String path, NodeDelegate node) {
- if (sessionContext.getSessionScopedLocks().contains(path)
- || sessionContext.getOpenScopedLocks().contains(path)) {
- return true;
- } else if (sessionContext.getAttributes().get(RELAXED_LOCKING) == TRUE) {
- String user = sessionContext.getSessionDelegate().getAuthInfo().getUserID();
- return node.isLockOwner(user) || isAdmin(sessionContext, user);
- } else {
- return false;
- }
- }
});
}
+
+ /**
+ * Verifies if the current <tt>sessionContext</tt> can unlock the specified <tt>node</tt>
+ *
+ * @param node the node state to check
+ *
+ * @return true if the current <tt>sessionContext</tt> can unlock the specified <tt>node</tt>
+ */
+ public boolean canUnlock(NodeDelegate node) {
+ String path = node.getPath();
+ if (sessionContext.getSessionScopedLocks().contains(path)
+ || sessionContext.getOpenScopedLocks().contains(path)) {
+ return true;
+ } else if (sessionContext.getAttributes().get(RELAXED_LOCKING) == TRUE) {
+ String user = sessionContext.getSessionDelegate().getAuthInfo().getUserID();
+ return node.isLockOwner(user) || isAdmin(sessionContext, user);
+ } else {
+ return false;
+ }
+ }
private boolean isAdmin(SessionContext sessionContext, String user) {
try {
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java?rev=1686788&r1=1686787&r2=1686788&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java Mon Jun 22 07:42:21 2015
@@ -200,7 +200,7 @@ public class WorkspaceImpl implements Ja
}
@Override
- public LockManager getLockManager() {
+ public LockManagerImpl getLockManager() {
return new LockManagerImpl(sessionContext);
}
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1686788&r1=1686787&r2=1686788&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java Mon Jun 22 07:42:21 2015
@@ -32,7 +32,9 @@ import javax.jcr.PathNotFoundException;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.lock.Lock;
import javax.jcr.lock.LockException;
+import javax.jcr.lock.LockManager;
import javax.jcr.nodetype.NodeType;
import javax.jcr.util.TraversingItemVisitor;
import javax.jcr.version.Version;
@@ -47,6 +49,7 @@ import org.apache.jackrabbit.oak.jcr.del
import org.apache.jackrabbit.oak.jcr.delegate.VersionDelegate;
import org.apache.jackrabbit.oak.jcr.delegate.VersionHistoryDelegate;
import org.apache.jackrabbit.oak.jcr.delegate.VersionManagerDelegate;
+import org.apache.jackrabbit.oak.jcr.lock.LockManagerImpl;
import org.apache.jackrabbit.oak.jcr.session.SessionContext;
import org.apache.jackrabbit.oak.jcr.session.operation.SessionOperation;
@@ -374,8 +377,12 @@ public class VersionManagerImpl implemen
private void checkNotLocked(String absPath) throws RepositoryException {
// TODO: avoid nested calls
- if (sessionContext.getWorkspace().getLockManager().isLocked(absPath)) {
- throw new LockException("Node at " + absPath + " is locked");
+ LockManagerImpl lockManager = sessionContext.getWorkspace().getLockManager();
+ if (lockManager.isLocked(absPath)) {
+ NodeDelegate node = sessionContext.getSessionDelegate().getNode(absPath);
+ if (!lockManager.canUnlock(node)) {
+ throw new LockException("Node at " + absPath + " is locked");
+ }
}
}
Modified: jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java?rev=1686788&r1=1686787&r2=1686788&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java Mon Jun 22 07:42:21 2015
@@ -21,6 +21,7 @@ import javax.jcr.ItemNotFoundException;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
import javax.jcr.Property;
+import javax.jcr.lock.LockManager;
import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.Privilege;
@@ -403,4 +404,25 @@ public class VersionManagementTest exten
Property versionablePath = vh.getProperty(superuser.getWorkspace().getName());
assertEquals(testNode.getPath(), versionablePath.getString());
}
+
+ @Test
+ public void testCheckInCheckoutLocked() throws Exception {
+
+ LockManager lockManager = superuser.getWorkspace().getLockManager();
+ VersionManager versionManager = superuser.getWorkspace().getVersionManager();
+
+ // create a versionable and lockable node
+ Node n = createVersionableNode(superuser.getNode(path));
+ n.addMixin(mixLockable);
+ superuser.save();
+
+ String nodePath = n.getPath();
+
+ // lock
+ lockManager.lock(nodePath, true, false, 0, superuser.getUserID());
+
+ // create version
+ versionManager.checkin(nodePath);
+ versionManager.checkout(nodePath);
+ }
}