You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by na...@apache.org on 2024/03/27 15:25:46 UTC
(ignite) branch master updated: IGNITE-21832 Remove permissions check to obtain cluster tag and id via Control Utility (#11287)
This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 92854148304 IGNITE-21832 Remove permissions check to obtain cluster tag and id via Control Utility (#11287)
92854148304 is described below
commit 92854148304c0d0233efd40f95c5de85c90ba049
Author: Anastasia Iakimova <94...@users.noreply.github.com>
AuthorDate: Wed Mar 27 18:25:39 2024 +0300
IGNITE-21832 Remove permissions check to obtain cluster tag and id via Control Utility (#11287)
---
.../SecurityCommandHandlerPermissionsTest.java | 20 ++++++++++++++++++++
.../internal/visor/misc/VisorIdAndTagViewTask.java | 8 ++++++++
2 files changed, 28 insertions(+)
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java
index 48eba72bd38..25c4d2cd71f 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.UUID;
import org.apache.ignite.Ignite;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
@@ -82,6 +83,25 @@ public class SecurityCommandHandlerPermissionsTest extends GridCommandHandlerAbs
stopAllGrids();
}
+ /** */
+ @Test
+ public void testClusterTag() throws Exception {
+ Ignite ignite = startGrid(0, userData(TEST_NO_PERMISSIONS_LOGIN, NO_PERMISSIONS));
+
+ assertEquals(
+ EXIT_CODE_OK,
+ execute(enrichWithConnectionArguments(Collections.singleton("--state"), TEST_NO_PERMISSIONS_LOGIN))
+ );
+
+ String out = testOut.toString();
+
+ UUID clId = ignite.cluster().id();
+ String clTag = ignite.cluster().tag();
+
+ assertTrue(out.contains("Cluster ID: " + clId));
+ assertTrue(out.contains("Cluster tag: " + clTag));
+ }
+
/** */
@Test
public void testCacheScan() throws Exception {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java
index 0fdcc95836f..1a8768d75da 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java
@@ -22,8 +22,11 @@ import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.processors.task.GridInternal;
import org.apache.ignite.internal.visor.VisorJob;
import org.apache.ignite.internal.visor.VisorOneNodeTask;
+import org.apache.ignite.plugin.security.SecurityPermissionSet;
import org.jetbrains.annotations.Nullable;
+import static org.apache.ignite.plugin.security.SecurityPermissionSetBuilder.NO_PERMISSIONS;
+
/**
*
*/
@@ -63,5 +66,10 @@ public class VisorIdAndTagViewTask extends VisorOneNodeTask<Void, VisorIdAndTagV
return new VisorIdAndTagViewTaskResult(cl.id(), cl.tag());
}
+
+ /** {@inheritDoc} */
+ @Override public SecurityPermissionSet requiredPermissions() {
+ return NO_PERMISSIONS;
+ }
}
}