Skip to content

Commit d33ad07

Browse files
committed
8334493: Remove SecurityManager Permissions infrastructure from DiagnosticCommands
Reviewed-by: lmesnik, alanb, coleenp
1 parent 56f1e4e commit d33ad07

File tree

17 files changed

+16
-396
lines changed

17 files changed

+16
-396
lines changed

src/hotspot/os/linux/mallocInfoDcmd.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -41,10 +41,6 @@ class MallocInfoDcmd : public DCmd {
4141
static const char* impact() {
4242
return "Low";
4343
}
44-
static const JavaPermission permission() {
45-
JavaPermission p = { "java.lang.management.ManagementPermission", "monitor", nullptr };
46-
return p;
47-
}
4844
void execute(DCmdSource source, TRAPS) override;
4945
};
5046

src/hotspot/os/linux/trimCHeapDCmd.hpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright (c) 2021 SAP SE. All rights reserved.
3-
* Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
66
* This code is free software; you can redistribute it and/or modify it
@@ -42,10 +42,6 @@ class TrimCLibcHeapDCmd : public DCmd {
4242
static const char* impact() {
4343
return "Low";
4444
}
45-
static const JavaPermission permission() {
46-
JavaPermission p = { "java.lang.management.ManagementPermission", "control", nullptr };
47-
return p;
48-
}
4945
virtual void execute(DCmdSource source, TRAPS);
5046
};
5147

src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2018 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -46,11 +46,6 @@ class ClassLoaderHierarchyDCmd: public DCmdWithParser {
4646
static const char* impact() {
4747
return "Medium: Depends on number of class loaders and classes loaded.";
4848
}
49-
static const JavaPermission permission() {
50-
JavaPermission p = {"java.lang.management.ManagementPermission",
51-
"monitor", nullptr};
52-
return p;
53-
}
5449
static int num_arguments() { return 3; }
5550
virtual void execute(DCmdSource source, TRAPS);
5651

src/hotspot/share/classfile/classLoaderStats.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,6 @@ class ClassLoaderStatsDCmd : public DCmd {
5858
static int num_arguments() {
5959
return 0;
6060
}
61-
62-
static const JavaPermission permission() {
63-
JavaPermission p = {"java.lang.management.ManagementPermission",
64-
"monitor", nullptr};
65-
return p;
66-
}
6761
};
6862

6963

src/hotspot/share/jfr/dcmd/jfrDcmds.hpp

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -59,10 +59,6 @@ class JfrStartFlightRecordingDCmd : public JfrDCmd {
5959
static const char* impact() {
6060
return "Medium: Depending on the settings for a recording, the impact can range from low to high.";
6161
}
62-
static const JavaPermission permission() {
63-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
64-
return p;
65-
}
6662
virtual const char* javaClass() const {
6763
return "jdk/jfr/internal/dcmd/DCmdStart";
6864
}
@@ -84,10 +80,6 @@ class JfrDumpFlightRecordingDCmd : public JfrDCmd {
8480
static const char* impact() {
8581
return "Low";
8682
}
87-
static const JavaPermission permission() {
88-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
89-
return p;
90-
}
9183
virtual const char* javaClass() const {
9284
return "jdk/jfr/internal/dcmd/DCmdDump";
9385
}
@@ -109,10 +101,6 @@ class JfrCheckFlightRecordingDCmd : public JfrDCmd {
109101
static const char* impact() {
110102
return "Low";
111103
}
112-
static const JavaPermission permission() {
113-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
114-
return p;
115-
}
116104
virtual const char* javaClass() const {
117105
return "jdk/jfr/internal/dcmd/DCmdCheck";
118106
}
@@ -134,10 +122,6 @@ class JfrStopFlightRecordingDCmd : public JfrDCmd {
134122
static const char* impact() {
135123
return "Low";
136124
}
137-
static const JavaPermission permission() {
138-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
139-
return p;
140-
}
141125
virtual const char* javaClass() const {
142126
return "jdk/jfr/internal/dcmd/DCmdStop";
143127
}
@@ -159,10 +143,6 @@ class JfrViewFlightRecordingDCmd : public JfrDCmd {
159143
static const char* impact() {
160144
return "Medium";
161145
}
162-
static const JavaPermission permission() {
163-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
164-
return p;
165-
}
166146
virtual const char* javaClass() const {
167147
return "jdk/jfr/internal/dcmd/DCmdView";
168148
}
@@ -184,10 +164,6 @@ class JfrQueryFlightRecordingDCmd : public JfrDCmd {
184164
static const char* impact() {
185165
return "Medium";
186166
}
187-
static const JavaPermission permission() {
188-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
189-
return p;
190-
}
191167
virtual const char* javaClass() const {
192168
return "jdk/jfr/internal/dcmd/DCmdQuery";
193169
}
@@ -225,10 +201,6 @@ class JfrConfigureFlightRecorderDCmd : public DCmdWithParser {
225201
static const char* impact() {
226202
return "Low";
227203
}
228-
static const JavaPermission permission() {
229-
JavaPermission p = {"java.lang.management.ManagementPermission", "monitor", nullptr};
230-
return p;
231-
}
232204
static int num_arguments() { return 10; }
233205
virtual void execute(DCmdSource source, TRAPS);
234206
virtual void print_help(const char* name) const;

src/hotspot/share/logging/logDiagnosticCommand.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ class LogDiagnosticCommand : public DCmdWithParser {
5858
static const char* description() {
5959
return "Lists current log configuration, enables/disables/configures a log output, or rotates all logs.";
6060
}
61-
62-
static const JavaPermission permission() {
63-
JavaPermission p = {"java.lang.management.ManagementPermission", "control", nullptr};
64-
return p;
65-
}
6661
};
6762

6863
#endif // SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP

src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
33
* Copyright (c) 2018, 2020 SAP SE. All rights reserved.
44
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
*
@@ -52,11 +52,6 @@ class MetaspaceDCmd : public DCmdWithParser {
5252
static const char* impact() {
5353
return "Medium: Depends on number of classes loaded.";
5454
}
55-
static const JavaPermission permission() {
56-
JavaPermission p = {"java.lang.management.ManagementPermission",
57-
"monitor", nullptr};
58-
return p;
59-
}
6055
static int num_arguments() { return 8; }
6156
virtual void execute(DCmdSource source, TRAPS);
6257
};

src/hotspot/share/nmt/nmtDCmd.hpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -53,11 +53,6 @@ class NMTDCmd: public DCmdWithParser {
5353
static const char* impact() {
5454
return "Medium";
5555
}
56-
static const JavaPermission permission() {
57-
JavaPermission p = {"java.lang.management.ManagementPermission",
58-
"monitor", nullptr};
59-
return p;
60-
}
6156
virtual void execute(DCmdSource source, TRAPS);
6257

6358
private:

src/hotspot/share/services/diagnosticCommand.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ void DCmd::register_dcmds(){
151151
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CompilationMemoryStatisticDCmd>(full_export, true, false));
152152

153153
// Enhanced JMX Agent Support
154-
// These commands won't be exported via the DiagnosticCommandMBean until an
155-
// appropriate permission is created for them
154+
// These commands not currently exported via the DiagnosticCommandMBean
156155
uint32_t jmx_agent_export_flags = DCmd_Source_Internal | DCmd_Source_AttachAPI;
157156
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(jmx_agent_export_flags, true,false));
158157
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartLocalDCmd>(jmx_agent_export_flags, true,false));

0 commit comments

Comments
 (0)