Skip to content

Commit 673d593

Browse files
Remove security manager policy files (#127727) (#127769)
Now that security manager is gone, the policy files are no longer needed. This commit removes the server, test and plugin specific policy files Co-authored-by: Elastic Machine <[email protected]>
1 parent b962ca3 commit 673d593

File tree

66 files changed

+3
-713
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3
-713
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/plugin/BasePluginBuildPlugin.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,7 @@ private static CopySpec createBundleSpec(
183183
) {
184184
var bundleSpec = project.copySpec();
185185
bundleSpec.from(buildProperties);
186-
bundleSpec.from(pluginMetadata, copySpec -> {
187-
// metadata (eg custom security policy)
188-
// the codebases properties file is only for tests and not needed in production
189-
copySpec.exclude("plugin-security.codebases");
190-
});
186+
bundleSpec.from(pluginMetadata);
191187
bundleSpec.from(
192188
(Callable<TaskProvider<Task>>) () -> project.getPluginManager().hasPlugin("com.gradleup.shadow")
193189
? project.getTasks().named("shadowJar")

distribution/archives/integ-test-zip/src/javaRestTest/resources/plugin-security.policy

Lines changed: 0 additions & 4 deletions
This file was deleted.

distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ void jarHellCheck(PluginDescriptor candidateInfo, Path candidateDir, Path plugin
922922
private PluginDescriptor installPlugin(InstallablePlugin descriptor, Path tmpRoot, List<Path> deleteOnFailure) throws Exception {
923923
final PluginDescriptor info = loadPluginInfo(tmpRoot);
924924

925-
Path legacyPolicyFile = tmpRoot.resolve(PluginDescriptor.ES_PLUGIN_POLICY);
925+
Path legacyPolicyFile = tmpRoot.resolve("plugin-security.policy");
926926
if (Files.exists(legacyPolicyFile)) {
927927
terminal.errorPrintln(
928928
"WARNING: this plugin contains a legacy Security Policy file. Starting with version 8.18, "

modules/apm/src/main/plugin-metadata/plugin-security.policy

Lines changed: 0 additions & 33 deletions
This file was deleted.

modules/ingest-geoip/src/main/plugin-metadata/plugin-security.policy

Lines changed: 0 additions & 12 deletions
This file was deleted.

modules/lang-expression/src/main/plugin-metadata/plugin-security.policy

Lines changed: 0 additions & 23 deletions
This file was deleted.

modules/lang-painless/src/main/plugin-metadata/plugin-security.policy

Lines changed: 0 additions & 16 deletions
This file was deleted.

modules/reindex/src/main/plugin-metadata/plugin-security.codebases

Lines changed: 0 additions & 2 deletions
This file was deleted.

modules/reindex/src/main/plugin-metadata/plugin-security.policy

Lines changed: 0 additions & 23 deletions
This file was deleted.

modules/repository-azure/src/main/plugin-metadata/plugin-security.policy

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)