Author: mreutegg
Date: Mon Jun 22 07:19:51 2015
New Revision: 1686780
URL: http://svn.apache.org/r1686780
Log:
OAK-2747: Admin cannot create versions on a locked page by itself
Applied patch from Robert Munteanu
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java?rev=1686780&r1=1686779&r2=1686780&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/lock/LockManagerImpl.java
Mon Jun 22 07:19:51 2015
@@ -174,7 +174,7 @@ public class LockManagerImpl implements
protected void performVoid(@Nonnull 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);
@@ -183,20 +183,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/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java?rev=1686780&r1=1686779&r2=1686780&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/WorkspaceImpl.java
Mon Jun 22 07:19:51 2015
@@ -199,7 +199,7 @@ public class WorkspaceImpl implements Ja
}
@Override
- public LockManager getLockManager() {
+ public LockManagerImpl getLockManager() {
return new LockManagerImpl(sessionContext);
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java?rev=1686780&r1=1686779&r2=1686780&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/version/VersionManagerImpl.java
Mon Jun 22 07:19:51 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;
@@ -373,8 +376,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/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java?rev=1686780&r1=1686779&r2=1686780&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/authorization/VersionManagementTest.java
Mon Jun 22 07:19:51 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);
+ }
}
