Skip to content

IGNITE-26608 WIP #12429

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

Open
petrov-mg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

IGNITE-26608 WIP #12429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4be167
IGNITE-26608
petrov-mg Oct 6, 2025
98f14f7
IGNITE-26608
petrov-mg Jan 25, 2026
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
6 changes: 3 additions & 3 deletions modules/clients/src/test/java/org/apache/ignite/common/ComputeTaskPermissionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@
import org.apache.ignite.internal.management.cache.VerifyBackupPartitionsTask;
import org.apache.ignite.internal.processors.security.AbstractSecurityTest;
import org.apache.ignite.internal.processors.security.AbstractTestSecurityPluginProvider;
import org.apache.ignite.internal.processors.security.OperationSecurityContext;
import org.apache.ignite.internal.processors.security.PublicAccessJob;
import org.apache.ignite.internal.processors.security.SecurityContext;
import org.apache.ignite.internal.processors.security.compute.ComputePermissionCheckTest;
import org.apache.ignite.internal.processors.security.impl.TestSecurityData;
import org.apache.ignite.internal.processors.security.impl.TestSecurityPluginProvider;
import org.apache.ignite.internal.thread.context.Scope;
import org.apache.ignite.internal.util.lang.ConsumerX;
import org.apache.ignite.internal.util.lang.RunnableX;
import org.apache.ignite.internal.util.lang.gridfunc.AtomicIntegerFactoryCallable;
Expand Down Expand Up @@ -476,7 +476,7 @@ public void testSystemTaskCancel() throws Exception {
SecurityContext initiatorSecCtx = securityContext("no-permissions-login-0");

SupplierX<Future<?>> starter = () -> {
try (OperationSecurityContext ignored1 = grid(0).context().security().withContext(initiatorSecCtx)) {
try (Scope ignored1 = grid(0).context().security().withContext(initiatorSecCtx)) {
return new TestFutureAdapter<>(
grid(0).context().closure().runAsync(
BROADCAST,
Expand Down Expand Up @@ -525,7 +525,7 @@ private void checkTaskCancel(
assertTrue(taskStartedLatch.await(getTestTimeout(), MILLISECONDS));

try (
OperationSecurityContext ignored = initiator == null
Scope ignored = initiator == null
? null
: grid(0).context().security().withContext(initiator)
) {
Expand Down
41 changes: 19 additions & 22 deletions ...rs/security/OperationSecurityContext.java → .../thread/context/AttributeValueHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,29 @@
* limitations under the License.
*/

package org.apache.ignite.internal.processors.security;
package org.apache.ignite.internal.thread.context;

/**
*
*/
public class OperationSecurityContext implements AutoCloseable {
/** Ignite Security. */
private final IgniteSecurity proc;
/** Immutable container that stores an attribute and its corresponding value. */
class AttributeValueHolder<T> {
/** */
private final ContextAttribute<T> attr;

/** Security context. */
private final SecurityContext secCtx;
/** */
private final T val;

/** */
AttributeValueHolder(ContextAttribute<T> attr, T val) {
this.attr = attr;
this.val = val;
}

/**
* @param proc Ignite Security.
* @param secCtx Security context.
*/
OperationSecurityContext(IgniteSecurity proc, SecurityContext secCtx) {
this.proc = proc;
this.secCtx = secCtx;
/** */
ContextAttribute<T> attribute() {
return attr;
}

/** {@inheritDoc} */
@Override public void close() {
if (secCtx == null)
((IgniteSecurityProcessor)proc).restoreDefaultContext();
else
proc.withContext(secCtx);
/** */
T value() {
return val;
}
}
Loading
Loading