Skip to content

Commit 9285414

Browse files
authored
IGNITE-21832 Remove permissions check to obtain cluster tag and id via Control Utility (#11287)
1 parent 4365f71 commit 9285414

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/SecurityCommandHandlerPermissionsTest.java

+20
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Collection;
2424
import java.util.Collections;
2525
import java.util.List;
26+
import java.util.UUID;
2627
import org.apache.ignite.Ignite;
2728
import org.apache.ignite.configuration.IgniteConfiguration;
2829
import org.apache.ignite.internal.IgniteEx;
@@ -82,6 +83,25 @@ public static List<String> commandHandlers() {
8283
stopAllGrids();
8384
}
8485

86+
/** */
87+
@Test
88+
public void testClusterTag() throws Exception {
89+
Ignite ignite = startGrid(0, userData(TEST_NO_PERMISSIONS_LOGIN, NO_PERMISSIONS));
90+
91+
assertEquals(
92+
EXIT_CODE_OK,
93+
execute(enrichWithConnectionArguments(Collections.singleton("--state"), TEST_NO_PERMISSIONS_LOGIN))
94+
);
95+
96+
String out = testOut.toString();
97+
98+
UUID clId = ignite.cluster().id();
99+
String clTag = ignite.cluster().tag();
100+
101+
assertTrue(out.contains("Cluster ID: " + clId));
102+
assertTrue(out.contains("Cluster tag: " + clTag));
103+
}
104+
85105
/** */
86106
@Test
87107
public void testCacheScan() throws Exception {

modules/core/src/main/java/org/apache/ignite/internal/visor/misc/VisorIdAndTagViewTask.java

+8
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@
2222
import org.apache.ignite.internal.processors.task.GridInternal;
2323
import org.apache.ignite.internal.visor.VisorJob;
2424
import org.apache.ignite.internal.visor.VisorOneNodeTask;
25+
import org.apache.ignite.plugin.security.SecurityPermissionSet;
2526
import org.jetbrains.annotations.Nullable;
2627

28+
import static org.apache.ignite.plugin.security.SecurityPermissionSetBuilder.NO_PERMISSIONS;
29+
2730
/**
2831
*
2932
*/
@@ -63,5 +66,10 @@ private VisorIdAndTagViewTaskResult view() {
6366

6467
return new VisorIdAndTagViewTaskResult(cl.id(), cl.tag());
6568
}
69+
70+
/** {@inheritDoc} */
71+
@Override public SecurityPermissionSet requiredPermissions() {
72+
return NO_PERMISSIONS;
73+
}
6674
}
6775
}

0 commit comments

Comments
 (0)