Skip to content

Commit 04b6e8e

Browse files
committed
Revert "Entitlements reporting mode"
This reverts commit 443ca76.
1 parent ef539d0 commit 04b6e8e

File tree

5 files changed

+3
-17
lines changed

5 files changed

+3
-17
lines changed

libs/entitlement/qa/entitled-plugin/src/main/java/org/elasticsearch/entitlement/qa/entitled/EntitledPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class EntitledPlugin extends Plugin implements ExtensiblePlugin {
2727
*/
2828
public static void selfTest() {
2929
selfTestEntitled();
30-
// selfTestNotEntitled();
30+
selfTestNotEntitled();
3131
}
3232

3333
private static void selfTestEntitled() {

libs/entitlement/qa/src/javaRestTest/java/org/elasticsearch/entitlement/qa/EntitlementsDeniedIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414

1515
import org.elasticsearch.entitlement.qa.test.RestEntitlementsCheckAction;
1616
import org.junit.ClassRule;
17-
import org.junit.Ignore;
1817

19-
@Ignore
2018
public class EntitlementsDeniedIT extends AbstractEntitlementsIT {
2119

2220
@ClassRule

libs/entitlement/qa/src/javaRestTest/java/org/elasticsearch/entitlement/qa/EntitlementsDeniedNonModularIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414

1515
import org.elasticsearch.entitlement.qa.test.RestEntitlementsCheckAction;
1616
import org.junit.ClassRule;
17-
import org.junit.Ignore;
1817

19-
@Ignore
2018
public class EntitlementsDeniedNonModularIT extends AbstractEntitlementsIT {
2119

2220
@ClassRule

libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static void bootstrap(
8484
EntitlementBootstrap.bootstrapArgs = new BootstrapArgs(pluginPolicies, pluginResolver, dataDirs, configDir, tempDir);
8585
exportInitializationToAgent();
8686
loadAgent(findAgentJar());
87-
// selfTest();
87+
selfTest();
8888
}
8989

9090
@SuppressForbidden(reason = "The VirtualMachine API is the only way to attach a java agent dynamically")

libs/entitlement/src/main/java/org/elasticsearch/entitlement/runtime/policy/PolicyManager.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import java.util.stream.Stream;
4444

4545
import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE;
46-
import static java.util.Collections.newSetFromMap;
4746
import static java.util.Objects.requireNonNull;
4847
import static java.util.function.Predicate.not;
4948
import static java.util.stream.Collectors.groupingBy;
@@ -377,19 +376,10 @@ public void checkWriteProperty(Class<?> callerClass, String property) {
377376
);
378377
}
379378

380-
@SuppressForbidden(reason = "I'll print to stderr and you can't stop me")
381379
private static void notEntitled(String message) {
382-
if (true) {
383-
if (ALREADY_REPORTED.add(message)) {
384-
System.err.println(message);
385-
}
386-
} else {
387-
throw new NotEntitledException(message);
388-
}
380+
throw new NotEntitledException(message);
389381
}
390382

391-
private static final Set<String> ALREADY_REPORTED = newSetFromMap(new ConcurrentHashMap<>());
392-
393383
public void checkManageThreadsEntitlement(Class<?> callerClass) {
394384
checkEntitlementPresent(callerClass, ManageThreadsEntitlement.class);
395385
}

0 commit comments

Comments
 (0)