Skip to content

OAK-11845: Avoid race conditions in SecureNodeBuilder#getTreePermissions() #2437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mbaedke wants to merge 2 commits into
base: trunk
Choose a base branch
from
Draft

OAK-11845: Avoid race conditions in SecureNodeBuilder#getTreePermissions() #2437

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a4718
OAK-11845: Make SecureNodeBuilder thread safe
mbaedke Aug 7, 2025
e84e04d
OAK-11845: Avoid race conditions in SecureNodeBuilder#getTreePermissi…
mbaedke Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class SecureNodeBuilder implements NodeBuilder {
*/
private TreePermission rootPermission = null; // initialized lazily

private volatile boolean reevaluatePermissions = true;

/**
* Create the {@code SecureNodeBuilder} for the root node.
*
Expand Down Expand Up @@ -158,8 +160,7 @@ public boolean isReplaced(String name) {

public void baseChanged() {
Validate.checkState(parent == null);
treePermission = null; // trigger re-evaluation
rootPermission = null;
reevaluatePermissions = true;
}

@Override
Expand Down Expand Up @@ -350,8 +351,7 @@ public Blob createBlob(InputStream stream) throws IOException {
*/
@NotNull
private TreePermission getTreePermission() {
if (treePermission == null
|| rootPermission != rootBuilder.treePermission) {
if (isPermissionEvaluationNeeded()) {
NodeState base = builder.getBaseState();
String msg = "see OAK-11790 and OAK-11843";
if (parent == null) {
Expand All @@ -364,10 +364,18 @@ private TreePermission getTreePermission() {
treePermission = Objects.requireNonNull(parentTreePermission.getChildPermission(name, base), msg);
rootPermission = parent.rootPermission;
}
reevaluatePermissions = false;
}
return treePermission;
}

private boolean isPermissionEvaluationNeeded() {
if (rootPermission != rootBuilder.treePermission) {
reevaluatePermissions = true;
}
return reevaluatePermissions;
}

private static boolean isType(@Nullable PropertyState property, Type<?> type) {
Type<?> t = (property == null) ? null : property.getType();
return t == type;
Expand Down