diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java index 0acb6a4f514e9..58cdf27b8a732 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java @@ -60,7 +60,6 @@ public TaskProvider createTask(Project project) { t.copy("forbidden/hppc-signatures.txt"); t.copy("forbidden/http-signatures.txt"); t.copy("forbidden/es-server-signatures.txt"); - t.copy("forbidden/snakeyaml-signatures.txt"); }); project.getExtensions().getByType(SourceSetContainer.class).configureEach(sourceSet -> { diff --git a/build-tools-internal/src/main/resources/forbidden/snakeyaml-signatures.txt b/build-tools-internal/src/main/resources/forbidden/snakeyaml-signatures.txt deleted file mode 100644 index ec9864dbd90e7..0000000000000 --- a/build-tools-internal/src/main/resources/forbidden/snakeyaml-signatures.txt +++ /dev/null @@ -1,6 +0,0 @@ -@defaultMessage Pass SafeConstructor to Yaml -org.yaml.snakeyaml.Yaml#() -org.yaml.snakeyaml.Yaml#(org.yaml.snakeyaml.DumperOptions) -org.yaml.snakeyaml.Yaml#(org.yaml.snakeyaml.LoaderOptions) -org.yaml.snakeyaml.Yaml#(org.yaml.snakeyaml.representer.Representer) -org.yaml.snakeyaml.Yaml#(org.yaml.snakeyaml.representer.Representer, org.yaml.snakeyaml.DumperOptions) diff --git a/distribution/tools/server-cli/build.gradle b/distribution/tools/server-cli/build.gradle index f2f1f2fa804b7..b553154de30db 100644 --- a/distribution/tools/server-cli/build.gradle +++ b/distribution/tools/server-cli/build.gradle @@ -10,14 +10,14 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis apply plugin: 'elasticsearch.build' dependencies { - implementation "org.yaml:snakeyaml:${versions.snakeyaml}" - testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" - testImplementation "junit:junit:${versions.junit}" - testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}" + compileOnly project(":server") + compileOnly project(":libs:elasticsearch-cli") + + testImplementation project(":test:framework") } tasks.withType(CheckForbiddenApis).configureEach { - replaceSignatureFiles 'jdk-signatures', 'snakeyaml-signatures' + replaceSignatureFiles 'jdk-signatures' } tasks.named("testingConventions").configure { diff --git a/distribution/tools/server-cli/licenses/snakeyaml-1.26.jar.sha1 b/distribution/tools/server-cli/licenses/snakeyaml-1.26.jar.sha1 deleted file mode 100644 index fde3aba8edad0..0000000000000 --- a/distribution/tools/server-cli/licenses/snakeyaml-1.26.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a78a8747147d2c5807683e76ec2b633e95c14fe9 \ No newline at end of file diff --git a/distribution/tools/server-cli/licenses/snakeyaml-LICENSE.txt b/distribution/tools/server-cli/licenses/snakeyaml-LICENSE.txt deleted file mode 100644 index d9a10c0d8e868..0000000000000 --- a/distribution/tools/server-cli/licenses/snakeyaml-LICENSE.txt +++ /dev/null @@ -1,176 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS diff --git a/distribution/tools/server-cli/licenses/snakeyaml-NOTICE.txt b/distribution/tools/server-cli/licenses/snakeyaml-NOTICE.txt deleted file mode 100644 index b51464eee1f00..0000000000000 --- a/distribution/tools/server-cli/licenses/snakeyaml-NOTICE.txt +++ /dev/null @@ -1,24 +0,0 @@ -***The art of simplicity is a puzzle of complexity.*** - -## Overview ## -[YAML](http://yaml.org) is a data serialization format designed for human readability and interaction with scripting languages. - -SnakeYAML is a YAML processor for the Java Virtual Machine. - -## SnakeYAML features ## - -* a **complete** [YAML 1.1 processor](http://yaml.org/spec/1.1/current.html). In particular, SnakeYAML can parse all examples from the specification. -* Unicode support including UTF-8/UTF-16 input/output. -* high-level API for serializing and deserializing native Java objects. -* support for all types from the [YAML types repository](http://yaml.org/type/index.html). -* relatively sensible error messages. - -## Info ## - * [Changes](https://bitbucket.org/asomov/snakeyaml/wiki/Changes) - * [Documentation](https://bitbucket.org/asomov/snakeyaml/wiki/Documentation) - -## Contribute ## -* Mercurial DVCS is used to dance with the [source code](https://bitbucket.org/asomov/snakeyaml/src). -* If you find a bug in SnakeYAML, please [file a bug report](https://bitbucket.org/asomov/snakeyaml/issues?status=new&status=open). -* You may discuss SnakeYAML at -[the mailing list](http://groups.google.com/group/snakeyaml-core). \ No newline at end of file diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/MachineDependentHeap.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/MachineDependentHeap.java index bbce072297700..026acf3f0b650 100644 --- a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/MachineDependentHeap.java +++ b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/MachineDependentHeap.java @@ -8,9 +8,10 @@ package org.elasticsearch.server.cli; -import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.constructor.SafeConstructor; -import org.yaml.snakeyaml.error.YAMLException; +import org.elasticsearch.common.ParsingException; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.xcontent.XContentParserConfiguration; +import org.elasticsearch.xcontent.yaml.YamlXContent; import java.io.IOException; import java.io.InputStream; @@ -19,7 +20,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -86,27 +86,23 @@ static class NodeRoleParser { @SuppressWarnings("unchecked") public static MachineNodeRole parse(InputStream config) { - Yaml yaml = new Yaml(new SafeConstructor()); - Map root; + final Settings settings; try { - root = yaml.load(config); - } catch (YAMLException | ClassCastException ex) { + var parser = YamlXContent.yamlXContent.createParser(XContentParserConfiguration.EMPTY, config); + if (parser.currentToken() == null && parser.nextToken() == null) { + settings = null; + } else { + settings = Settings.fromXContent(parser); + } + } catch (IOException | ParsingException ex) { // Strangely formatted config, so just return defaults and let startup settings validation catch the problem return MachineNodeRole.UNKNOWN; } - if (root != null) { - Map map = flatten(root, null); - List roles = null; - try { - if (map.containsKey("node.roles")) { - roles = (List) map.get("node.roles"); - } - } catch (ClassCastException ex) { - return MachineNodeRole.UNKNOWN; - } + if (settings != null && settings.isEmpty() == false) { + List roles = settings.getAsList("node.roles"); - if (roles == null || roles.isEmpty()) { + if (roles.isEmpty()) { // If roles are missing or empty (coordinating node) assume defaults and consider this a data node return MachineNodeRole.DATA; } else if (containsOnly(roles, "master")) { @@ -121,33 +117,6 @@ public static MachineNodeRole parse(InputStream config) { } } - /** - * Flattens a nested configuration structure. This creates a consistent way of referencing settings from a config file that uses - * a mix of object and flat setting notation. The returned map is a single-level deep structure of dot-notation property names - * to values. - * - *

No attempt is made to deterministically deal with duplicate settings, nor are they explicitly disallowed. - * - * @param config nested configuration map - * @param parentPath parent node path or {@code null} if parsing the root node - * @return flattened configuration map - */ - @SuppressWarnings("unchecked") - private static Map flatten(Map config, String parentPath) { - Map flatMap = new HashMap<>(); - String prefix = parentPath != null ? parentPath + "." : ""; - - for (Map.Entry entry : config.entrySet()) { - if (entry.getValue() instanceof Map) { - flatMap.putAll(flatten((Map) entry.getValue(), prefix + entry.getKey())); - } else { - flatMap.put(prefix + entry.getKey(), entry.getValue()); - } - } - - return flatMap; - } - @SuppressWarnings("unchecked") private static boolean containsOnly(Collection collection, T... items) { return Arrays.asList(items).containsAll(collection); diff --git a/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/NodeRoleParserTests.java b/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/NodeRoleParserTests.java index 8b827d27b6362..d470f85e9c750 100644 --- a/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/NodeRoleParserTests.java +++ b/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/NodeRoleParserTests.java @@ -86,7 +86,8 @@ public void testInvalidYaml() throws IOException { public void testInvalidRoleSyntax() throws IOException { MachineDependentHeap.MachineNodeRole nodeRole = parseConfig(sb -> sb.append("node.roles: foo")); - assertThat(nodeRole, equalTo(UNKNOWN)); + // roles we don't know about are considered data, but will fail validation when ES starts up + assertThat(nodeRole, equalTo(DATA)); } private static MachineDependentHeap.MachineNodeRole parseConfig(Consumer action) throws IOException {