Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
import org.apache.ignite.internal.processors.query.calcite.schema.IgniteIndex;
import org.apache.ignite.internal.processors.query.calcite.schema.IgniteTable;
import org.apache.ignite.internal.processors.query.calcite.util.Commons;
import org.apache.ignite.internal.processors.security.OperationSecurityContext;
import org.apache.ignite.internal.processors.security.SecurityContext;
import org.apache.ignite.internal.thread.context.Scope;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
Expand Down Expand Up @@ -236,7 +236,7 @@ protected List<List<?>> sql(String sql, Object... params) {
protected List<List<?>> sqlAsRoot(IgniteEx ignite, String sql) throws Exception {
SecurityContext secCtx = authenticate(grid(0), DFAULT_USER_NAME, "ignite");

try (OperationSecurityContext ignored = ignite.context().security().withContext(secCtx)) {
try (Scope ignored = ignite.context().security().withContext(secCtx)) {
return sql(ignite, sql);
}
}
Expand Down
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
Loading
Loading