From b5ff4fe45ccdd0d2f41235893b4cc8872da6ebe5 Mon Sep 17 00:00:00 2001 From: quebim Date: Tue, 15 Oct 2024 11:16:05 -0300 Subject: [PATCH 01/11] Add precommit hook definition to perform basic formatting using spotless on indexer plugins --- plugins/command-manager/gradle/formatting.gradle | 14 ++++++++++++++ plugins/setup/gradle/formatting.gradle | 14 ++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 plugins/command-manager/gradle/formatting.gradle create mode 100644 plugins/setup/gradle/formatting.gradle diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle new file mode 100644 index 0000000..036ac4a --- /dev/null +++ b/plugins/command-manager/gradle/formatting.gradle @@ -0,0 +1,14 @@ +import org.opensearch.gradle.BuildPlugin + +allprojects { + plugins.withType(BuildPlugin).whenPluginAdded { + project.apply plugin: "com.diffplug.spotless" + + spotless { + target 'src/**/*.java' + removeUnusedImports() + trimTrailingWhitespace() + } + precommit.dependsOn 'spotlessJavaCheck' + } +} diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle new file mode 100644 index 0000000..036ac4a --- /dev/null +++ b/plugins/setup/gradle/formatting.gradle @@ -0,0 +1,14 @@ +import org.opensearch.gradle.BuildPlugin + +allprojects { + plugins.withType(BuildPlugin).whenPluginAdded { + project.apply plugin: "com.diffplug.spotless" + + spotless { + target 'src/**/*.java' + removeUnusedImports() + trimTrailingWhitespace() + } + precommit.dependsOn 'spotlessJavaCheck' + } +} From 6f1d258d08aa4cb59477e77bf93287fc128cd6ea Mon Sep 17 00:00:00 2001 From: quebim Date: Tue, 15 Oct 2024 16:05:08 -0300 Subject: [PATCH 02/11] Add formatter configuration file for spotless tool --- .../buildSrc/formatterConfig.xml | 362 ++++++++++++++++++ .../command-manager/gradle/formatting.gradle | 14 +- 2 files changed, 370 insertions(+), 6 deletions(-) create mode 100644 plugins/command-manager/buildSrc/formatterConfig.xml diff --git a/plugins/command-manager/buildSrc/formatterConfig.xml b/plugins/command-manager/buildSrc/formatterConfig.xml new file mode 100644 index 0000000..713e552 --- /dev/null +++ b/plugins/command-manager/buildSrc/formatterConfig.xml @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle index 036ac4a..837622a 100644 --- a/plugins/command-manager/gradle/formatting.gradle +++ b/plugins/command-manager/gradle/formatting.gradle @@ -1,14 +1,16 @@ -import org.opensearch.gradle.BuildPlugin +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ allprojects { - plugins.withType(BuildPlugin).whenPluginAdded { - project.apply plugin: "com.diffplug.spotless" - - spotless { + project.apply plugin: "com.diffplug.spotless" + spotless { + java { target 'src/**/*.java' removeUnusedImports() + eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml') trimTrailingWhitespace() } - precommit.dependsOn 'spotlessJavaCheck' } } From b781a96d4f96e2794365288cbaa32782181beb28 Mon Sep 17 00:00:00 2001 From: quebim Date: Tue, 15 Oct 2024 16:05:34 -0300 Subject: [PATCH 03/11] Update command-manager's build.gradle to use the spotless tool --- plugins/command-manager/build.gradle | 58 +++++++++++++++++----------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/plugins/command-manager/build.gradle b/plugins/command-manager/build.gradle index 3c6ab2c..95ff3a5 100644 --- a/plugins/command-manager/build.gradle +++ b/plugins/command-manager/build.gradle @@ -1,8 +1,38 @@ import org.opensearch.gradle.test.RestIntegTestTask -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: 'eclipse' +buildscript { + ext { + opensearch_version = System.getProperty("opensearch.version", "2.16.0") + wazuh_version = System.getProperty("version", "5.0.0") + revision = System.getProperty("revision", "0") + } + + repositories { + mavenLocal() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } + } + + dependencies { + classpath "org.opensearch.gradle:build-tools:${opensearch_version}" + configurations.all { + resolutionStrategy { + force("org.eclipse.platform:org.eclipse.core.runtime:4.29.0") // CVE for < 4.29 + force("org.eclipse.platform:org.eclipse.core.resources:4.20.0") // CVE for < 4.20 + } + } + } +} + +plugins { + id 'java-library' + id 'java-test-fixtures' + id 'idea' + id "com.diffplug.spotless" version "6.25.0" apply false +} + +apply from: 'gradle/formatting.gradle' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.yaml-rest-test' apply plugin: 'opensearch.pluginzip' @@ -68,6 +98,9 @@ dependencies { api "org.conscrypt:conscrypt-openjdk-uber:${versions.conscrypt}" } +// Add the spotlessCheck to gradle check +check.dependsOn spotlessCheck + // This requires an additional Jar not published as part of build-tools loggerUsageCheck.enabled = false @@ -80,25 +113,6 @@ thirdPartyAudit.enabled = false //Skip checking for third party licenses dependencyLicenses.enabled = false -buildscript { - ext { - opensearch_version = System.getProperty("opensearch.version", "2.16.0") - wazuh_version = System.getProperty("version", "5.0.0") - revision = System.getProperty("revision", "0") - } - - repositories { - mavenLocal() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } - mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } - } - - dependencies { - classpath "org.opensearch.gradle:build-tools:${opensearch_version}" - } -} - repositories { mavenLocal() maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } From b56d7a8006b529aa8615a8a9b121342ade4a26b1 Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 09:30:57 -0300 Subject: [PATCH 04/11] Update spotless implementation on setup plugin - Order build.gradle blocks - Add spotless plugin to build.gradle - Update formatting.gradle for both plugins --- plugins/command-manager/build.gradle | 10 ++-- .../command-manager/gradle/formatting.gradle | 2 + plugins/setup/build.gradle | 46 +++++++++++-------- plugins/setup/gradle/formatting.gradle | 16 ++++--- 4 files changed, 43 insertions(+), 31 deletions(-) diff --git a/plugins/command-manager/build.gradle b/plugins/command-manager/build.gradle index 95ff3a5..58d2610 100644 --- a/plugins/command-manager/build.gradle +++ b/plugins/command-manager/build.gradle @@ -26,16 +26,16 @@ buildscript { } plugins { - id 'java-library' - id 'java-test-fixtures' - id 'idea' - id "com.diffplug.spotless" version "6.25.0" apply false + id "com.diffplug.spotless" version "6.25.0" } -apply from: 'gradle/formatting.gradle' +apply plugin: 'java' +apply plugin: 'idea' +apply plugin: 'eclipse' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.yaml-rest-test' apply plugin: 'opensearch.pluginzip' +apply from: 'gradle/formatting.gradle' def pluginName = 'wazuh-indexer-command-manager' def pluginDescription = 'The Command Manager plugin handles and distributes commands across your Wazuh environment.' diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle index 837622a..ca00cfd 100644 --- a/plugins/command-manager/gradle/formatting.gradle +++ b/plugins/command-manager/gradle/formatting.gradle @@ -11,6 +11,8 @@ allprojects { removeUnusedImports() eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml') trimTrailingWhitespace() + endWithNewline() } } + precommit.dependsOn 'spotlessJavaCheck' } diff --git a/plugins/setup/build.gradle b/plugins/setup/build.gradle index 11feca5..221ba9c 100644 --- a/plugins/setup/build.gradle +++ b/plugins/setup/build.gradle @@ -1,5 +1,28 @@ import org.opensearch.gradle.test.RestIntegTestTask +buildscript { + ext { + opensearch_version = System.getProperty("opensearch.version", "2.16.0") + wazuh_version = System.getProperty("version", "5.0.0") + revision = System.getProperty("revision", "0") + } + + repositories { + mavenLocal() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } + mavenCentral() + maven { url "https://plugins.gradle.org/m2/" } + } + + dependencies { + classpath "org.opensearch.gradle:build-tools:${opensearch_version}" + } +} + +plugins { + id "com.diffplug.spotless" version "6.25.0" +} + apply plugin: 'java' apply plugin: 'idea' apply plugin: 'eclipse' @@ -13,7 +36,6 @@ def projectPath = 'com.wazuh' def pathToPlugin = 'setup' def pluginClassName = 'SetupPlugin' - publishing { publications { pluginZip(MavenPublication) { publication -> @@ -52,31 +74,15 @@ opensearchplugin { noticeFile rootProject.file('NOTICE.txt') } +// Add the spotlessCheck to gradle check +check.dependsOn spotlessCheck + // This requires an additional Jar not published as part of build-tools loggerUsageCheck.enabled = false // No need to validate pom, as we do not upload to maven/sonatype validateNebulaPom.enabled = false -buildscript { - ext { - opensearch_version = System.getProperty("opensearch.version", "2.16.0") - wazuh_version = System.getProperty("version", "5.0.0") - revision = System.getProperty("revision", "0") - } - - repositories { - mavenLocal() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } - mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } - } - - dependencies { - classpath "org.opensearch.gradle:build-tools:${opensearch_version}" - } -} - repositories { mavenLocal() maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle index 036ac4a..ca00cfd 100644 --- a/plugins/setup/gradle/formatting.gradle +++ b/plugins/setup/gradle/formatting.gradle @@ -1,14 +1,18 @@ -import org.opensearch.gradle.BuildPlugin +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + */ allprojects { - plugins.withType(BuildPlugin).whenPluginAdded { - project.apply plugin: "com.diffplug.spotless" - - spotless { + project.apply plugin: "com.diffplug.spotless" + spotless { + java { target 'src/**/*.java' removeUnusedImports() + eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml') trimTrailingWhitespace() + endWithNewline() } - precommit.dependsOn 'spotlessJavaCheck' } + precommit.dependsOn 'spotlessJavaCheck' } From 7bb8298ac04bc7a4521ff31571acd072e2796d28 Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 09:37:36 -0300 Subject: [PATCH 05/11] Add formatter config for spotless on setup plugin --- plugins/setup/buildSrc/formatterConfig.xml | 362 +++++++++++++++++++++ 1 file changed, 362 insertions(+) create mode 100644 plugins/setup/buildSrc/formatterConfig.xml diff --git a/plugins/setup/buildSrc/formatterConfig.xml b/plugins/setup/buildSrc/formatterConfig.xml new file mode 100644 index 0000000..713e552 --- /dev/null +++ b/plugins/setup/buildSrc/formatterConfig.xml @@ -0,0 +1,362 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e878e3bde13ae25b203d8d123d9d8e87b99dd3ff Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 14:27:08 -0300 Subject: [PATCH 06/11] Add license header validation on java files - Add license-header.txt file with the expected content of the headers - Update formatting.gradle on both plugins to validate the license header - Rename buildSrc directory to formatter --- .../{buildSrc => formatter}/formatterConfig.xml | 0 .../command-manager/formatter/license-header.txt | 8 ++++++++ plugins/command-manager/gradle/formatting.gradle | 15 +++++++++++---- plugins/setup/build.gradle | 1 + .../{buildSrc => formatter}/formatterConfig.xml | 0 plugins/setup/formatter/license-header.txt | 8 ++++++++ plugins/setup/gradle/formatting.gradle | 15 +++++++++++---- 7 files changed, 39 insertions(+), 8 deletions(-) rename plugins/command-manager/{buildSrc => formatter}/formatterConfig.xml (100%) create mode 100644 plugins/command-manager/formatter/license-header.txt rename plugins/setup/{buildSrc => formatter}/formatterConfig.xml (100%) create mode 100644 plugins/setup/formatter/license-header.txt diff --git a/plugins/command-manager/buildSrc/formatterConfig.xml b/plugins/command-manager/formatter/formatterConfig.xml similarity index 100% rename from plugins/command-manager/buildSrc/formatterConfig.xml rename to plugins/command-manager/formatter/formatterConfig.xml diff --git a/plugins/command-manager/formatter/license-header.txt b/plugins/command-manager/formatter/license-header.txt new file mode 100644 index 0000000..cf0a068 --- /dev/null +++ b/plugins/command-manager/formatter/license-header.txt @@ -0,0 +1,8 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle index ca00cfd..fd3f607 100644 --- a/plugins/command-manager/gradle/formatting.gradle +++ b/plugins/command-manager/gradle/formatting.gradle @@ -1,6 +1,10 @@ /* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. */ allprojects { @@ -9,10 +13,13 @@ allprojects { java { target 'src/**/*.java' removeUnusedImports() - eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml') + eclipse().configFile rootProject.file('formatter/formatterConfig.xml') trimTrailingWhitespace() endWithNewline() } + format("license", { + licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package "); + target("src/*/java/**/*.java") + }) } - precommit.dependsOn 'spotlessJavaCheck' } diff --git a/plugins/setup/build.gradle b/plugins/setup/build.gradle index 221ba9c..8311db7 100644 --- a/plugins/setup/build.gradle +++ b/plugins/setup/build.gradle @@ -29,6 +29,7 @@ apply plugin: 'eclipse' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.yaml-rest-test' apply plugin: 'opensearch.pluginzip' +apply from: 'gradle/formatting.gradle' def pluginName = 'wazuh-indexer-setup' def pluginDescription = 'Wazuh Indexer setup plugin' diff --git a/plugins/setup/buildSrc/formatterConfig.xml b/plugins/setup/formatter/formatterConfig.xml similarity index 100% rename from plugins/setup/buildSrc/formatterConfig.xml rename to plugins/setup/formatter/formatterConfig.xml diff --git a/plugins/setup/formatter/license-header.txt b/plugins/setup/formatter/license-header.txt new file mode 100644 index 0000000..cf0a068 --- /dev/null +++ b/plugins/setup/formatter/license-header.txt @@ -0,0 +1,8 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle index ca00cfd..fd3f607 100644 --- a/plugins/setup/gradle/formatting.gradle +++ b/plugins/setup/gradle/formatting.gradle @@ -1,6 +1,10 @@ /* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. */ allprojects { @@ -9,10 +13,13 @@ allprojects { java { target 'src/**/*.java' removeUnusedImports() - eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml') + eclipse().configFile rootProject.file('formatter/formatterConfig.xml') trimTrailingWhitespace() endWithNewline() } + format("license", { + licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package "); + target("src/*/java/**/*.java") + }) } - precommit.dependsOn 'spotlessJavaCheck' } From 96a5773b1886132422da6bc4c6fd06996fa5334f Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 14:57:53 -0300 Subject: [PATCH 07/11] Update formatter settings --- plugins/command-manager/build.gradle | 6 ------ plugins/command-manager/gradle/formatting.gradle | 12 ++++++------ plugins/setup/gradle/formatting.gradle | 12 ++++++------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/plugins/command-manager/build.gradle b/plugins/command-manager/build.gradle index 58d2610..2c44b65 100644 --- a/plugins/command-manager/build.gradle +++ b/plugins/command-manager/build.gradle @@ -16,12 +16,6 @@ buildscript { dependencies { classpath "org.opensearch.gradle:build-tools:${opensearch_version}" - configurations.all { - resolutionStrategy { - force("org.eclipse.platform:org.eclipse.core.runtime:4.29.0") // CVE for < 4.29 - force("org.eclipse.platform:org.eclipse.core.resources:4.20.0") // CVE for < 4.20 - } - } } } diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle index fd3f607..5b8a0e3 100644 --- a/plugins/command-manager/gradle/formatting.gradle +++ b/plugins/command-manager/gradle/formatting.gradle @@ -11,15 +11,15 @@ allprojects { project.apply plugin: "com.diffplug.spotless" spotless { java { - target 'src/**/*.java' + licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}") + googleJavaFormat().aosp() + importOrder() removeUnusedImports() - eclipse().configFile rootProject.file('formatter/formatterConfig.xml') trimTrailingWhitespace() endWithNewline() + + // add support for spotless:off and spotless:on tags to exclude sections of code + toggleOffOn() } - format("license", { - licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package "); - target("src/*/java/**/*.java") - }) } } diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle index fd3f607..5b8a0e3 100644 --- a/plugins/setup/gradle/formatting.gradle +++ b/plugins/setup/gradle/formatting.gradle @@ -11,15 +11,15 @@ allprojects { project.apply plugin: "com.diffplug.spotless" spotless { java { - target 'src/**/*.java' + licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}") + googleJavaFormat().aosp() + importOrder() removeUnusedImports() - eclipse().configFile rootProject.file('formatter/formatterConfig.xml') trimTrailingWhitespace() endWithNewline() + + // add support for spotless:off and spotless:on tags to exclude sections of code + toggleOffOn() } - format("license", { - licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package "); - target("src/*/java/**/*.java") - }) } } From 1f439d16b7e1202d56b34fcc7273f62117aa36ae Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 15:20:49 -0300 Subject: [PATCH 08/11] Implement custom import order based on wazuh-indexer defined convention --- .../formatter/formatterConfig.xml | 362 ------------------ .../command-manager/gradle/formatting.gradle | 16 +- plugins/setup/formatter/formatterConfig.xml | 362 ------------------ plugins/setup/gradle/formatting.gradle | 16 +- 4 files changed, 30 insertions(+), 726 deletions(-) delete mode 100644 plugins/command-manager/formatter/formatterConfig.xml delete mode 100644 plugins/setup/formatter/formatterConfig.xml diff --git a/plugins/command-manager/formatter/formatterConfig.xml b/plugins/command-manager/formatter/formatterConfig.xml deleted file mode 100644 index 713e552..0000000 --- a/plugins/command-manager/formatter/formatterConfig.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle index 5b8a0e3..157e065 100644 --- a/plugins/command-manager/gradle/formatting.gradle +++ b/plugins/command-manager/gradle/formatting.gradle @@ -13,8 +13,22 @@ allprojects { java { licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}") googleJavaFormat().aosp() - importOrder() removeUnusedImports() + importOrder( + 'de.thetaphi', + 'com.carrotsearch', + 'com.fasterxml', + 'com.avast', + 'com.sun', + 'com.maxmind|com.github|com.networknt|groovy|nebula', + 'org.antlr', + 'software.amazon', + 'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit', + 'javax', + 'java', + '', + '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#' + ) trimTrailingWhitespace() endWithNewline() diff --git a/plugins/setup/formatter/formatterConfig.xml b/plugins/setup/formatter/formatterConfig.xml deleted file mode 100644 index 713e552..0000000 --- a/plugins/setup/formatter/formatterConfig.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle index 5b8a0e3..157e065 100644 --- a/plugins/setup/gradle/formatting.gradle +++ b/plugins/setup/gradle/formatting.gradle @@ -13,8 +13,22 @@ allprojects { java { licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}") googleJavaFormat().aosp() - importOrder() removeUnusedImports() + importOrder( + 'de.thetaphi', + 'com.carrotsearch', + 'com.fasterxml', + 'com.avast', + 'com.sun', + 'com.maxmind|com.github|com.networknt|groovy|nebula', + 'org.antlr', + 'software.amazon', + 'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit', + 'javax', + 'java', + '', + '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#' + ) trimTrailingWhitespace() endWithNewline() From 5a308e82755892d8faa4a4236574d801305771a3 Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 15:25:29 -0300 Subject: [PATCH 09/11] Apply format-related changes requested by spotless formatter --- .../commandmanager/CommandManagerPlugin.java | 23 ++-- .../commandmanager/index/CommandIndex.java | 85 +++++++------ .../wazuh/commandmanager/model/Action.java | 24 ++-- .../com/wazuh/commandmanager/model/Agent.java | 9 +- .../wazuh/commandmanager/model/Command.java | 55 +++++---- .../wazuh/commandmanager/model/Document.java | 10 +- .../wazuh/commandmanager/model/Status.java | 1 + .../wazuh/commandmanager/model/Target.java | 12 +- .../rest/action/RestPostCommandAction.java | 70 +++++------ .../utils/IndexTemplateUtils.java | 46 +++---- .../httpclient/HttpResponseCallback.java | 14 +-- .../utils/httpclient/HttpRestClient.java | 51 ++++---- .../utils/httpclient/HttpRestClientDemo.java | 33 +++-- .../CommandManagerPluginIT.java | 2 + .../commandmanager/CommandManagerTests.java | 53 ++++---- .../CommandManagerClientYamlTestSuiteIT.java | 6 +- .../java/com/wazuh/setup/SetupPlugin.java | 19 ++- .../com/wazuh/setup/index/WazuhIndices.java | 61 ++++------ .../wazuh/setup/utils/IndexTemplateUtils.java | 45 +++---- .../java/com/wazuh/setup/SetupPluginIT.java | 67 +++++------ .../com/wazuh/setup/SetupPluginTests.java | 113 ++++++++++-------- .../wazuh/setup/index/WazuhIndicesTests.java | 68 +++++------ .../SetupPluginClientYamlTestSuiteIT.java | 3 +- 23 files changed, 417 insertions(+), 453 deletions(-) diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java index 073216c..8f218df 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,10 +8,6 @@ */ package com.wazuh.commandmanager; -import com.wazuh.commandmanager.index.CommandIndex; -import com.wazuh.commandmanager.rest.action.RestPostCommandAction; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClientDemo; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; @@ -38,11 +35,15 @@ import java.util.List; import java.util.function.Supplier; +import com.wazuh.commandmanager.index.CommandIndex; +import com.wazuh.commandmanager.rest.action.RestPostCommandAction; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClientDemo; + /** - * The Command Manager plugin exposes an HTTP API with a single endpoint to - * receive raw commands from the Wazuh Server. These commands are processed, - * indexed and sent back to the Server for its delivery to, in most cases, the - * Agents. + * The Command Manager plugin exposes an HTTP API with a single endpoint to receive raw commands + * from the Wazuh Server. These commands are processed, indexed and sent back to the Server for its + * delivery to, in most cases, the Agents. */ public class CommandManagerPlugin extends Plugin implements ActionPlugin { public static final String COMMAND_MANAGER_BASE_URI = "/_plugins/_commandmanager"; @@ -63,8 +64,7 @@ public Collection createComponents( NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, - Supplier repositoriesServiceSupplier - ) { + Supplier repositoriesServiceSupplier) { this.commandIndex = new CommandIndex(client, clusterService, threadPool); // HttpRestClient stuff @@ -81,8 +81,7 @@ public List getRestHandlers( IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, - Supplier nodesInCluster - ) { + Supplier nodesInCluster) { return Collections.singletonList(new RestPostCommandAction(this.commandIndex)); } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java index d0138da..63394f0 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,9 +8,6 @@ */ package com.wazuh.commandmanager.index; -import com.wazuh.commandmanager.CommandManagerPlugin; -import com.wazuh.commandmanager.model.Document; -import com.wazuh.commandmanager.utils.IndexTemplateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; @@ -31,9 +29,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; -/** - * Class to manage the Command Manager index and index template. - */ +import com.wazuh.commandmanager.CommandManagerPlugin; +import com.wazuh.commandmanager.model.Document; +import com.wazuh.commandmanager.utils.IndexTemplateUtils; + +/** Class to manage the Command Manager index and index template. */ public class CommandIndex implements IndexingOperationListener { private static final Logger logger = LogManager.getLogger(CommandIndex.class); @@ -45,9 +45,9 @@ public class CommandIndex implements IndexingOperationListener { /** * Default constructor * - * @param client OpenSearch client. + * @param client OpenSearch client. * @param clusterService OpenSearch cluster service. - * @param threadPool An OpenSearch ThreadPool. + * @param threadPool An OpenSearch ThreadPool. */ public CommandIndex(Client client, ClusterService clusterService, ThreadPool threadPool) { this.client = client; @@ -69,30 +69,31 @@ public CompletableFuture asyncCreate(Document document) { } else { logger.info( "Index template {} already exists. Skipping creation.", - CommandManagerPlugin.COMMAND_MANAGER_INDEX_TEMPLATE_NAME - ); + CommandManagerPlugin.COMMAND_MANAGER_INDEX_TEMPLATE_NAME); } logger.debug("Indexing command {}", document); try { - IndexRequest request = new IndexRequest() - .index(CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME) - .source(document.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) - .id(document.getId()) - .create(true); + IndexRequest request = + new IndexRequest() + .index(CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME) + .source( + document.toXContent( + XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) + .id(document.getId()) + .create(true); executor.submit( () -> { - try (ThreadContext.StoredContext ignored = this.threadPool.getThreadContext().stashContext()) { + try (ThreadContext.StoredContext ignored = + this.threadPool.getThreadContext().stashContext()) { RestStatus restStatus = client.index(request).actionGet().status(); future.complete(restStatus); } catch (Exception e) { future.completeExceptionally(e); } - } - ); + }); } catch (IOException e) { - logger.error( - "Failed to index command with ID {}: {}", document.getId(), e); + logger.error("Failed to index command with ID {}: {}", document.getId(), e); } return future; } @@ -104,10 +105,8 @@ public CompletableFuture asyncCreate(Document document) { * @return whether the index template exists. */ public boolean indexTemplateExists(String template_name) { - Map templates = this.clusterService - .state() - .metadata() - .templates(); + Map templates = + this.clusterService.state().metadata().templates(); logger.debug("Existing index templates: {} ", templates); return templates.containsKey(template_name); @@ -124,25 +123,25 @@ public void putIndexTemplate(String templateName) { // @throws IOException Map template = IndexTemplateUtils.fromFile(templateName + ".json"); - PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest() - .mapping(IndexTemplateUtils.get(template, "mappings")) - .settings(IndexTemplateUtils.get(template, "settings")) - .name(templateName) - .patterns((List) template.get("index_patterns")); - - executor.submit(() -> { - AcknowledgedResponse acknowledgedResponse = this.client - .admin() - .indices() - .putTemplate(putIndexTemplateRequest) - .actionGet(); - if (acknowledgedResponse.isAcknowledged()) { - logger.info( - "Index template created successfully: {}", - templateName - ); - } - }); + PutIndexTemplateRequest putIndexTemplateRequest = + new PutIndexTemplateRequest() + .mapping(IndexTemplateUtils.get(template, "mappings")) + .settings(IndexTemplateUtils.get(template, "settings")) + .name(templateName) + .patterns((List) template.get("index_patterns")); + + executor.submit( + () -> { + AcknowledgedResponse acknowledgedResponse = + this.client + .admin() + .indices() + .putTemplate(putIndexTemplateRequest) + .actionGet(); + if (acknowledgedResponse.isAcknowledged()) { + logger.info("Index template created successfully: {}", templateName); + } + }); } catch (IOException e) { logger.error("Error reading index template from filesystem {}", templateName); diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Action.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Action.java index 71cd038..560c8f5 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Action.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Action.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -14,9 +15,7 @@ import java.io.IOException; import java.util.List; -/** - * Command's action fields. - */ +/** Command's action fields. */ public class Action implements ToXContentObject { public static final String ACTION = "action"; public static final String NAME = "name"; @@ -29,8 +28,8 @@ public class Action implements ToXContentObject { /** * Default constructor. * - * @param name action to be executed on the target, - * @param args actual command. + * @param name action to be executed on the target, + * @param args actual command. * @param version version of the action. */ public Action(String name, List args, String version) { @@ -84,10 +83,15 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return "Action{" + - "name='" + name + '\'' + - ", args=" + args + - ", version='" + version + '\'' + - '}'; + return "Action{" + + "name='" + + name + + '\'' + + ", args=" + + args + + ", version='" + + version + + '\'' + + '}'; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Agent.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Agent.java index 77971cf..4d85e3d 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Agent.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Agent.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -14,9 +15,7 @@ import java.io.IOException; import java.util.List; -/** - * Command's agent fields. - */ +/** Command's agent fields. */ public class Agent implements ToXContentObject { public static final String AGENT = "agent"; public static final String GROUPS = "groups"; @@ -63,8 +62,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return "Agent{" + - "groups=" + groups + - '}'; + return "Agent{" + "groups=" + groups + '}'; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java index 93d39e9..04e6e49 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -12,10 +13,11 @@ import org.opensearch.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; -import reactor.util.annotation.NonNull; import java.io.IOException; +import reactor.util.annotation.NonNull; + public class Command implements ToXContentObject { public static final String COMMAND = "command"; public static final String ORDER_ID = "order_id"; @@ -36,19 +38,18 @@ public class Command implements ToXContentObject { /** * Default constructor * - * @param source origin of the request. - * @param target {@link Target} + * @param source origin of the request. + * @param target {@link Target} * @param timeout time window in which the command has to be sent to its target. - * @param user the user that originated the request - * @param action {@link Action} + * @param user the user that originated the request + * @param action {@link Action} */ public Command( @NonNull String source, @NonNull Target target, @NonNull Integer timeout, @NonNull String user, - @NonNull Action action - ) { + @NonNull Action action) { this.requestId = UUIDs.base64UUID(); this.orderId = UUIDs.base64UUID(); this.source = source; @@ -100,13 +101,7 @@ public static Command parse(XContentParser parser) throws IOException { } // TODO add proper validation - return new Command( - source, - target, - timeout, - user, - action - ); + return new Command(source, target, timeout, user, action); } @Override @@ -126,15 +121,27 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return "Command{" + - "orderId='" + orderId + '\'' + - ", requestId='" + requestId + '\'' + - ", source='" + source + '\'' + - ", target=" + target + - ", timeout=" + timeout + - ", user='" + user + '\'' + - ", status=" + status + - ", action=" + action + - '}'; + return "Command{" + + "orderId='" + + orderId + + '\'' + + ", requestId='" + + requestId + + '\'' + + ", source='" + + source + + '\'' + + ", target=" + + target + + ", timeout=" + + timeout + + ", user='" + + user + + '\'' + + ", status=" + + status + + ", action=" + + action + + '}'; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Document.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Document.java index 28ec263..b9ec385 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Document.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Document.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -15,9 +16,7 @@ import java.io.IOException; import java.util.List; -/** - * Command's target fields. - */ +/** Command's target fields. */ public class Document implements ToXContentObject { private final Agent agent; private final Command command; @@ -74,9 +73,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return "Document{" + - "agent=" + agent + - ", command=" + command + - '}'; + return "Document{" + "agent=" + agent + ", command=" + command + '}'; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Status.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Status.java index 65b0c38..80c4dbe 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Status.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Status.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Target.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Target.java index 3a7bb82..6e592bd 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Target.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Target.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -13,9 +14,7 @@ import java.io.IOException; -/** - * Command's target fields. - */ +/** Command's target fields. */ public class Target implements ToXContentObject { public static final String TARGET = "target"; public static final String TYPE = "type"; @@ -27,7 +26,7 @@ public class Target implements ToXContentObject { * Default constructor. * * @param type The destination type. One of [`group`, `agent`, `server`] - * @param id Unique identifier of the destination to send the command to. + * @param id Unique identifier of the destination to send the command to. */ public Target(String type, String id) { this.type = type; @@ -72,9 +71,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return "Target{" + - "type='" + type + '\'' + - ", id='" + id + '\'' + - '}'; + return "Target{" + "type='" + type + '\'' + ", id='" + id + '\'' + '}'; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/action/RestPostCommandAction.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/action/RestPostCommandAction.java index c27257d..8521595 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/action/RestPostCommandAction.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/action/RestPostCommandAction.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,9 +8,6 @@ */ package com.wazuh.commandmanager.rest.action; -import com.wazuh.commandmanager.CommandManagerPlugin; -import com.wazuh.commandmanager.index.CommandIndex; -import com.wazuh.commandmanager.model.Document; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.client.node.NodeClient; @@ -25,17 +23,21 @@ import java.util.List; import java.util.Locale; +import com.wazuh.commandmanager.CommandManagerPlugin; +import com.wazuh.commandmanager.index.CommandIndex; +import com.wazuh.commandmanager.model.Document; + import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.rest.RestRequest.Method.POST; /** - * Handles HTTP requests to the POST - * {@value com.wazuh.commandmanager.CommandManagerPlugin#COMMAND_MANAGER_BASE_URI} - * endpoint. + * Handles HTTP requests to the POST {@value + * com.wazuh.commandmanager.CommandManagerPlugin#COMMAND_MANAGER_BASE_URI} endpoint. */ public class RestPostCommandAction extends BaseRestHandler { - public static final String POST_COMMAND_ACTION_REQUEST_DETAILS = "post_command_action_request_details"; + public static final String POST_COMMAND_ACTION_REQUEST_DETAILS = + "post_command_action_request_details"; private static final Logger logger = LogManager.getLogger(RestPostCommandAction.class); private final CommandIndex commandIndex; @@ -46,7 +48,6 @@ public class RestPostCommandAction extends BaseRestHandler { */ public RestPostCommandAction(CommandIndex commandIndex) { this.commandIndex = commandIndex; - } public String getName() { @@ -59,19 +60,12 @@ public List routes() { new Route( POST, String.format( - Locale.ROOT, - "%s", - CommandManagerPlugin.COMMAND_MANAGER_BASE_URI - ) - ) - ); + Locale.ROOT, "%s", CommandManagerPlugin.COMMAND_MANAGER_BASE_URI))); } @Override protected RestChannelConsumer prepareRequest( - final RestRequest restRequest, - final NodeClient client - ) throws IOException { + final RestRequest restRequest, final NodeClient client) throws IOException { // Get request details XContentParser parser = restRequest.contentParser(); ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser); @@ -80,23 +74,31 @@ protected RestChannelConsumer prepareRequest( // Send response return channel -> { - this.commandIndex.asyncCreate(document) - .thenAccept(restStatus -> { - try (XContentBuilder builder = channel.newBuilder()) { - builder.startObject(); - builder.field("_index", CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME); - builder.field("_id", document.getId()); - builder.field("result", restStatus.name()); - builder.endObject(); - channel.sendResponse(new BytesRestResponse(restStatus, builder)); - } catch (Exception e) { - logger.error("Error indexing command: ", e); - } - }).exceptionally(e -> { - channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, e.getMessage())); - return null; - }); - + this.commandIndex + .asyncCreate(document) + .thenAccept( + restStatus -> { + try (XContentBuilder builder = channel.newBuilder()) { + builder.startObject(); + builder.field( + "_index", + CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME); + builder.field("_id", document.getId()); + builder.field("result", restStatus.name()); + builder.endObject(); + channel.sendResponse( + new BytesRestResponse(restStatus, builder)); + } catch (Exception e) { + logger.error("Error indexing command: ", e); + } + }) + .exceptionally( + e -> { + channel.sendResponse( + new BytesRestResponse( + RestStatus.INTERNAL_SERVER_ERROR, e.getMessage())); + return null; + }); }; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/IndexTemplateUtils.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/IndexTemplateUtils.java index bed3434..409b133 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/IndexTemplateUtils.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/IndexTemplateUtils.java @@ -1,43 +1,37 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ - package com.wazuh.commandmanager.utils; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.core.xcontent.DeprecationHandler; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.core.xcontent.XContentParser; -import reactor.util.annotation.NonNull; import java.io.IOException; import java.io.InputStream; import java.util.Map; -/** - * Util functions to parse and manage index templates files. - */ +import reactor.util.annotation.NonNull; + +/** Util functions to parse and manage index templates files. */ public class IndexTemplateUtils { - /** - * Default constructor - */ - public IndexTemplateUtils() { - } + /** Default constructor */ + public IndexTemplateUtils() {} /** - * Read index template file from the resources folder and returns its JSON - * content as a map. + * Read index template file from the resources folder and returns its JSON content as a map. * * @param filename name of the index template to read from the resources folder * @return the JSON index template as a map * @throws IOException file not found or could not be read */ - public static Map fromFile(@NonNull String filename) throws IOException { InputStream is = IndexTemplateUtils.class.getClassLoader().getResourceAsStream(filename); return IndexTemplateUtils.toMap(is); @@ -45,29 +39,29 @@ public static Map fromFile(@NonNull String filename) throws IOEx /** * Convert from a JSON InputStream into a String, Object map. - *

- * Used to convert the JSON index templates to the required format. - *

+ * + *

Used to convert the JSON index templates to the required format. * * @param is: the JSON formatted InputStream * @return a map with the json string contents. - * @throws IOException thrown by {@link JsonXContent#createParser(NamedXContentRegistry, DeprecationHandler, InputStream)} + * @throws IOException thrown by {@link JsonXContent#createParser(NamedXContentRegistry, + * DeprecationHandler, InputStream)} */ public static Map toMap(InputStream is) throws IOException { - XContentParser parser = JsonXContent.jsonXContent.createParser( - NamedXContentRegistry.EMPTY, - DeprecationHandler.THROW_UNSUPPORTED_OPERATION, - is); + XContentParser parser = + JsonXContent.jsonXContent.createParser( + NamedXContentRegistry.EMPTY, + DeprecationHandler.THROW_UNSUPPORTED_OPERATION, + is); parser.nextToken(); return parser.map(); } /** * Cast map's element to a String, Object map. - *

- * Used to retrieve the settings and mappings from the index templates, - * which are a JSON object themselves. - *

+ * + *

Used to retrieve the settings and mappings from the index templates, which are a JSON + * object themselves. * * @param map the index template as a map. * @param key the element's key to retrieve and cast. @@ -76,6 +70,4 @@ public static Map toMap(InputStream is) throws IOException { public static Map get(Map map, String key) { return (Map) map.get(key); } - } - diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpResponseCallback.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpResponseCallback.java index eaf357d..c5f249a 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpResponseCallback.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpResponseCallback.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -18,18 +19,13 @@ public class HttpResponseCallback implements FutureCallback private static final Logger log = LogManager.getLogger(HttpResponseCallback.class); - /** - * The Http get request. - */ + /** The Http get request. */ SimpleHttpRequest httpRequest; - /** - * The Error message. - */ + /** The Error message. */ String errorMessage; - public HttpResponseCallback(SimpleHttpRequest httpRequest, - String errorMessage) { + public HttpResponseCallback(SimpleHttpRequest httpRequest, String errorMessage) { this.httpRequest = httpRequest; this.errorMessage = errorMessage; } @@ -43,7 +39,7 @@ public void completed(SimpleHttpResponse response) { @Override public void failed(Exception ex) { log.error("{}->{}", httpRequest, ex); -// throw new HttpException(errorMessage, ex); + // throw new HttpException(errorMessage, ex); } @Override diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java index f21cd58..41960e0 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -24,19 +25,14 @@ import java.net.URI; import java.util.concurrent.Future; -/** - * HTTP Rest client. Currently used to perform - * POST requests against the Wazuh Server. - */ +/** HTTP Rest client. Currently used to perform POST requests against the Wazuh Server. */ public class HttpRestClient { private static final Logger log = LogManager.getLogger(HttpRestClient.class); private static HttpRestClient instance; private CloseableHttpAsyncClient httpClient; - /** - * Private default constructor - */ + /** Private default constructor */ private HttpRestClient() { startHttpAsyncClient(); } @@ -53,23 +49,21 @@ public static HttpRestClient getInstance() { return HttpRestClient.instance; } - /** - * Starts http async client. - */ + /** Starts http async client. */ private void startHttpAsyncClient() { if (this.httpClient == null) { try { PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder.create().build(); - IOReactorConfig ioReactorConfig = IOReactorConfig.custom() - .setSoTimeout(Timeout.ofSeconds(5)) - .build(); + IOReactorConfig ioReactorConfig = + IOReactorConfig.custom().setSoTimeout(Timeout.ofSeconds(5)).build(); - httpClient = HttpAsyncClients.custom() - .setIOReactorConfig(ioReactorConfig) - .setConnectionManager(cm) - .build(); + httpClient = + HttpAsyncClients.custom() + .setIOReactorConfig(ioReactorConfig) + .setConnectionManager(cm) + .build(); httpClient.start(); } catch (Exception e) { @@ -79,9 +73,7 @@ private void startHttpAsyncClient() { } } - /** - * Stop http async client. - */ + /** Stop http async client. */ public void stopHttpAsyncClient() { if (this.httpClient != null) { log.info("Shutting down."); @@ -93,7 +85,7 @@ public void stopHttpAsyncClient() { /** * Sends a POST request. * - * @param uri Well-formed URI + * @param uri Well-formed URI * @param payload data to send * @return HTTP response */ @@ -104,12 +96,12 @@ public SimpleHttpResponse post(URI uri, String payload) { // Create request HttpHost httpHost = HttpHost.create(uri.getHost()); - SimpleHttpRequest httpPostRequest = SimpleRequestBuilder - .post() - .setHttpHost(httpHost) - .setPath(uri.getPath()) - .setBody(payload, ContentType.APPLICATION_JSON) - .build(); + SimpleHttpRequest httpPostRequest = + SimpleRequestBuilder.post() + .setHttpHost(httpHost) + .setPath(uri.getPath()) + .setBody(payload, ContentType.APPLICATION_JSON) + .build(); // log request Future future = @@ -117,10 +109,7 @@ public SimpleHttpResponse post(URI uri, String payload) { SimpleRequestProducer.create(httpPostRequest), SimpleResponseConsumer.create(), new HttpResponseCallback( - httpPostRequest, - "Failed to send data for ID: " + id - ) - ); + httpPostRequest, "Failed to send data for ID: " + id)); return future.get(); } catch (Exception e) { diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java index 448ece4..ceda59d 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -17,9 +18,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; -/** - * Demo class to test the {@link HttpRestClient} class. - */ +/** Demo class to test the {@link HttpRestClient} class. */ public class HttpRestClientDemo { private static final Logger log = LogManager.getLogger(HttpRestClientDemo.class); @@ -28,23 +27,23 @@ public class HttpRestClientDemo { * Demo method to test the {@link HttpRestClient} class. * * @param endpoint POST's requests endpoint as a well-formed URI - * @param body POST's request body as a JSON string. + * @param body POST's request body as a JSON string. */ public static void run(String endpoint, String body) { log.info("Executing POST request"); AccessController.doPrivileged( - (PrivilegedAction) () -> { - HttpRestClient httpClient = HttpRestClient.getInstance(); - URI host; - try { - host = new URIBuilder(endpoint).build(); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - SimpleHttpResponse postResponse = httpClient.post(host, body); - log.info(postResponse.getBodyText()); - return postResponse; - } - ); + (PrivilegedAction) + () -> { + HttpRestClient httpClient = HttpRestClient.getInstance(); + URI host; + try { + host = new URIBuilder(endpoint).build(); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + SimpleHttpResponse postResponse = httpClient.post(host, body); + log.info(postResponse.getBodyText()); + return postResponse; + }); } } diff --git a/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerPluginIT.java b/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerPluginIT.java index 0bbf232..ee13d97 100644 --- a/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerPluginIT.java +++ b/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerPluginIT.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -8,6 +9,7 @@ package com.wazuh.commandmanager; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; + import org.apache.http.ParseException; import org.apache.http.util.EntityUtils; import org.opensearch.client.Request; diff --git a/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java b/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java index eacd0b1..759c3c4 100644 --- a/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java +++ b/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,16 +8,17 @@ */ package com.wazuh.commandmanager; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; -import org.junit.Assert; import org.opensearch.test.OpenSearchTestCase; +import org.junit.Assert; import java.net.URI; import java.net.URISyntaxException; import java.security.AccessController; import java.security.PrivilegedAction; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; + public class CommandManagerTests extends OpenSearchTestCase { // Add unit tests for your plugin @@ -25,26 +27,27 @@ public class CommandManagerTests extends OpenSearchTestCase { public void testPost_success() { try { AccessController.doPrivileged( - (PrivilegedAction) () -> { - this.httpClient = HttpRestClient.getInstance(); - URI uri = null; - try { - uri = new URI("https://httpbin.org/post"); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - String payload = "{\"message\": \"Hello world!\"}"; - SimpleHttpResponse postResponse = this.httpClient.post(uri, payload); - - String responseText = postResponse.getBodyText(); - assertNotEquals(null, postResponse); - assertNotEquals(null, responseText); - assertEquals(200, postResponse.getCode()); - assertNotEquals(0, responseText.length()); - assertTrue(responseText.contains("Hello world!")); - return postResponse; - } - ); + (PrivilegedAction) + () -> { + this.httpClient = HttpRestClient.getInstance(); + URI uri = null; + try { + uri = new URI("https://httpbin.org/post"); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + String payload = "{\"message\": \"Hello world!\"}"; + SimpleHttpResponse postResponse = + this.httpClient.post(uri, payload); + + String responseText = postResponse.getBodyText(); + assertNotEquals(null, postResponse); + assertNotEquals(null, responseText); + assertEquals(200, postResponse.getCode()); + assertNotEquals(0, responseText.length()); + assertTrue(responseText.contains("Hello world!")); + return postResponse; + }); } catch (Exception e) { Assert.fail("Failed to execute HTTP request: " + e); } finally { @@ -52,9 +55,7 @@ public void testPost_success() { } } - public void testPost_badUri() { - } + public void testPost_badUri() {} - public void testPost_badPayload() { - } + public void testPost_badPayload() {} } diff --git a/plugins/command-manager/src/yamlRestTest/java/com/wazuh/commandmanager/CommandManagerClientYamlTestSuiteIT.java b/plugins/command-manager/src/yamlRestTest/java/com/wazuh/commandmanager/CommandManagerClientYamlTestSuiteIT.java index 4a53723..3921d9c 100644 --- a/plugins/command-manager/src/yamlRestTest/java/com/wazuh/commandmanager/CommandManagerClientYamlTestSuiteIT.java +++ b/plugins/command-manager/src/yamlRestTest/java/com/wazuh/commandmanager/CommandManagerClientYamlTestSuiteIT.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -9,13 +10,14 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; + import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; - public class CommandManagerClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { - public CommandManagerClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { + public CommandManagerClientYamlTestSuiteIT( + @Name("yaml") ClientYamlTestCandidate testCandidate) { super(testCandidate); } diff --git a/plugins/setup/src/main/java/com/wazuh/setup/SetupPlugin.java b/plugins/setup/src/main/java/com/wazuh/setup/SetupPlugin.java index 77d95c3..69577ef 100644 --- a/plugins/setup/src/main/java/com/wazuh/setup/SetupPlugin.java +++ b/plugins/setup/src/main/java/com/wazuh/setup/SetupPlugin.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,7 +8,6 @@ */ package com.wazuh.setup; -import com.wazuh.setup.index.WazuhIndices; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNode; @@ -27,20 +27,18 @@ import java.util.List; import java.util.function.Supplier; +import com.wazuh.setup.index.WazuhIndices; + /** - * Main class of the Indexer Setup plugin. This plugin is responsible for - * the creation of the index templates and indices required by Wazuh to - * work properly. + * Main class of the Indexer Setup plugin. This plugin is responsible for the creation of the index + * templates and indices required by Wazuh to work properly. */ public class SetupPlugin extends Plugin implements ClusterPlugin { private WazuhIndices indices; - /** - * Default constructor - */ - public SetupPlugin() { - } + /** Default constructor */ + public SetupPlugin() {} @Override public Collection createComponents( @@ -54,8 +52,7 @@ public Collection createComponents( NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, - Supplier repositoriesServiceSupplier - ) { + Supplier repositoriesServiceSupplier) { this.indices = new WazuhIndices(client, clusterService); return List.of(this.indices); } diff --git a/plugins/setup/src/main/java/com/wazuh/setup/index/WazuhIndices.java b/plugins/setup/src/main/java/com/wazuh/setup/index/WazuhIndices.java index 12411c6..860f538 100644 --- a/plugins/setup/src/main/java/com/wazuh/setup/index/WazuhIndices.java +++ b/plugins/setup/src/main/java/com/wazuh/setup/index/WazuhIndices.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,7 +8,6 @@ */ package com.wazuh.setup.index; -import com.wazuh.setup.utils.IndexTemplateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.indices.create.CreateIndexRequest; @@ -22,25 +22,24 @@ import java.util.List; import java.util.Map; +import com.wazuh.setup.utils.IndexTemplateUtils; + /** - * This class contains the logic to create the index templates and the indices - * required by Wazuh. + * This class contains the logic to create the index templates and the indices required by Wazuh. */ public class WazuhIndices { private static final Logger log = LogManager.getLogger(WazuhIndices.class); - /** - * | Key | value | - * | ------------------- | ---------- | - * | Index template name | index name | - */ + + /** | Key | value | | ------------------- | ---------- | | Index template name | index name | */ public final Map indexTemplates = new HashMap<>(); + private final Client client; private final ClusterService clusterService; /** * Constructor * - * @param client Client + * @param client Client * @param clusterService ClusterService */ public WazuhIndices(Client client, ClusterService clusterService) { @@ -67,23 +66,20 @@ public void putTemplate(String templateName) { // @throws IOException Map template = IndexTemplateUtils.fromFile(templateName + ".json"); - PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest() - .mapping(IndexTemplateUtils.get(template, "mappings")) - .settings(IndexTemplateUtils.get(template, "settings")) - .name(templateName) - .patterns((List) template.get("index_patterns")); + PutIndexTemplateRequest putIndexTemplateRequest = + new PutIndexTemplateRequest() + .mapping(IndexTemplateUtils.get(template, "mappings")) + .settings(IndexTemplateUtils.get(template, "settings")) + .name(templateName) + .patterns((List) template.get("index_patterns")); - AcknowledgedResponse createIndexTemplateResponse = this.client - .admin() - .indices() - .putTemplate(putIndexTemplateRequest) - .actionGet(); + AcknowledgedResponse createIndexTemplateResponse = + this.client.admin().indices().putTemplate(putIndexTemplateRequest).actionGet(); log.info( "Index template created successfully: {} {}", templateName, - createIndexTemplateResponse.isAcknowledged() - ); + createIndexTemplateResponse.isAcknowledged()); } catch (IOException e) { log.error("Error reading index template from filesystem {}", templateName); @@ -98,16 +94,12 @@ public void putTemplate(String templateName) { public void putIndex(String indexName) { if (!indexExists(indexName)) { CreateIndexRequest request = new CreateIndexRequest(indexName); - CreateIndexResponse createIndexResponse = this.client - .admin() - .indices() - .create(request) - .actionGet(); + CreateIndexResponse createIndexResponse = + this.client.admin().indices().create(request).actionGet(); log.info( "Index created successfully: {} {}", createIndexResponse.index(), - createIndexResponse.isAcknowledged() - ); + createIndexResponse.isAcknowledged()); } } @@ -121,16 +113,15 @@ public boolean indexExists(String indexName) { return this.clusterService.state().getRoutingTable().hasIndex(indexName); } - /** - * Creates each index template and index in {@link #indexTemplates}. - */ + /** Creates each index template and index in {@link #indexTemplates}. */ public void initialize() { // 1. Read index templates from files // 2. Upsert index template // 3. Create index - this.indexTemplates.forEach((k, v) -> { - this.putTemplate(k); - this.putIndex(v); - }); + this.indexTemplates.forEach( + (k, v) -> { + this.putTemplate(k); + this.putIndex(v); + }); } } diff --git a/plugins/setup/src/main/java/com/wazuh/setup/utils/IndexTemplateUtils.java b/plugins/setup/src/main/java/com/wazuh/setup/utils/IndexTemplateUtils.java index 3811bba..47f7712 100644 --- a/plugins/setup/src/main/java/com/wazuh/setup/utils/IndexTemplateUtils.java +++ b/plugins/setup/src/main/java/com/wazuh/setup/utils/IndexTemplateUtils.java @@ -1,43 +1,37 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to * this file be licensed under the Apache-2.0 license or a * compatible open source license. */ - package com.wazuh.setup.utils; import org.opensearch.common.xcontent.json.JsonXContent; import org.opensearch.core.xcontent.DeprecationHandler; import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.core.xcontent.XContentParser; -import reactor.util.annotation.NonNull; import java.io.IOException; import java.io.InputStream; import java.util.Map; -/** - * Util functions to parse and manage index templates files. - */ +import reactor.util.annotation.NonNull; + +/** Util functions to parse and manage index templates files. */ public class IndexTemplateUtils { - /** - * Default constructor - */ - public IndexTemplateUtils() { - } + /** Default constructor */ + public IndexTemplateUtils() {} /** - * Read index template file from the resources folder and returns its JSON - * content as a map. + * Read index template file from the resources folder and returns its JSON content as a map. * * @param filename name of the index template to read from the resources folder * @return the JSON index template as a map * @throws IOException file not found or could not be read */ - public static Map fromFile(@NonNull String filename) throws IOException { InputStream is = IndexTemplateUtils.class.getClassLoader().getResourceAsStream(filename); return IndexTemplateUtils.toMap(is); @@ -45,29 +39,29 @@ public static Map fromFile(@NonNull String filename) throws IOEx /** * Convert from a JSON InputStream into a String, Object map. - *

- * Used to convert the JSON index templates to the required format. - *

+ * + *

Used to convert the JSON index templates to the required format. * * @param is: the JSON formatted InputStream * @return a map with the json string contents. - * @throws IOException thrown by {@link JsonXContent#createParser(NamedXContentRegistry, DeprecationHandler, InputStream)} + * @throws IOException thrown by {@link JsonXContent#createParser(NamedXContentRegistry, + * DeprecationHandler, InputStream)} */ public static Map toMap(InputStream is) throws IOException { - XContentParser parser = JsonXContent.jsonXContent.createParser( - NamedXContentRegistry.EMPTY, - DeprecationHandler.THROW_UNSUPPORTED_OPERATION, - is); + XContentParser parser = + JsonXContent.jsonXContent.createParser( + NamedXContentRegistry.EMPTY, + DeprecationHandler.THROW_UNSUPPORTED_OPERATION, + is); parser.nextToken(); return parser.map(); } /** * Cast map's element to a String, Object map. - *

- * Used to retrieve the settings and mappings from the index templates, - * which are a JSON object themselves. - *

+ * + *

Used to retrieve the settings and mappings from the index templates, which are a JSON + * object themselves. * * @param map the index template as a map. * @param key the element's key to retrieve and cast. @@ -76,5 +70,4 @@ public static Map toMap(InputStream is) throws IOException { public static Map get(Map map, String key) { return (Map) map.get(key); } - } diff --git a/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginIT.java b/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginIT.java index 9c83dcc..5c2946a 100644 --- a/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginIT.java +++ b/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginIT.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -8,28 +9,27 @@ package com.wazuh.setup; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope; + import org.apache.http.ParseException; import org.apache.http.util.EntityUtils; -import org.opensearch.client.Request; -import org.opensearch.client.Response; -import org.opensearch.plugins.Plugin; -import org.opensearch.test.OpenSearchIntegTestCase; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; - -import org.junit.Assert; import org.opensearch.action.admin.cluster.health.ClusterHealthRequest; import org.opensearch.action.admin.cluster.health.ClusterHealthResponse; import org.opensearch.action.admin.cluster.node.info.NodeInfo; import org.opensearch.action.admin.cluster.node.info.NodesInfoRequest; import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse; import org.opensearch.action.admin.cluster.node.info.PluginsAndModules; +import org.opensearch.client.Request; +import org.opensearch.client.Response; import org.opensearch.cluster.health.ClusterHealthStatus; +import org.opensearch.plugins.Plugin; import org.opensearch.plugins.PluginInfo; +import org.opensearch.test.OpenSearchIntegTestCase; +import org.junit.Assert; -import java.util.Collections; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; @@ -54,36 +54,33 @@ public void testPluginInstalled() throws IOException, ParseException { assertThat(body, containsString("wazuh-indexer-setup")); } - public void testPluginsAreInstalled() { ClusterHealthRequest request = new ClusterHealthRequest(); - ClusterHealthResponse response = OpenSearchIntegTestCase - .client() - .admin(). - cluster() - .health(request) - .actionGet(); + ClusterHealthResponse response = + OpenSearchIntegTestCase.client().admin().cluster().health(request).actionGet(); Assert.assertEquals(ClusterHealthStatus.GREEN, response.getStatus()); NodesInfoRequest nodesInfoRequest = new NodesInfoRequest(); nodesInfoRequest.addMetric(NodesInfoRequest.Metric.PLUGINS.metricName()); - NodesInfoResponse nodesInfoResponse = OpenSearchIntegTestCase - .client() - .admin() - .cluster(). - nodesInfo(nodesInfoRequest) - .actionGet(); - List pluginInfos = nodesInfoResponse.getNodes() - .stream() - .flatMap((Function>) nodeInfo -> - nodeInfo - .getInfo(PluginsAndModules.class) - .getPluginInfos() - .stream() - ) - .collect(Collectors.toList()); - Assert.assertTrue(pluginInfos.stream().anyMatch( - pluginInfo -> pluginInfo.getName().equals("wazuh-indexer-setup")) - ); + NodesInfoResponse nodesInfoResponse = + OpenSearchIntegTestCase.client() + .admin() + .cluster() + .nodesInfo(nodesInfoRequest) + .actionGet(); + List pluginInfos = + nodesInfoResponse.getNodes().stream() + .flatMap( + (Function>) + nodeInfo -> + nodeInfo + .getInfo(PluginsAndModules.class) + .getPluginInfos() + .stream()) + .collect(Collectors.toList()); + Assert.assertTrue( + pluginInfos.stream() + .anyMatch( + pluginInfo -> pluginInfo.getName().equals("wazuh-indexer-setup"))); } } diff --git a/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginTests.java b/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginTests.java index 3ca708b..65a03c4 100644 --- a/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginTests.java +++ b/plugins/setup/src/test/java/com/wazuh/setup/SetupPluginTests.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,9 +8,6 @@ */ package com.wazuh.setup; -import com.wazuh.setup.index.WazuhIndices; -import org.junit.After; -import org.junit.Before; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; @@ -24,9 +22,13 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.TestThreadPool; import org.opensearch.threadpool.ThreadPool; +import org.junit.After; +import org.junit.Before; + +import com.wazuh.setup.index.WazuhIndices; -import static org.mockito.Mockito.*; import static org.opensearch.test.ClusterServiceUtils.createClusterService; +import static org.mockito.Mockito.*; public class SetupPluginTests extends OpenSearchTestCase { @@ -36,9 +38,7 @@ public class SetupPluginTests extends OpenSearchTestCase { private ThreadPool threadPool; private Client mockClient; - /** - * Creates the necessary mocks and spies - */ + /** Creates the necessary mocks and spies */ @Before public void setUp() throws Exception { try { @@ -53,18 +53,14 @@ public void setUp() throws Exception { } } - /** - * Shuts the test cluster down properly after tests are done - */ + /** Shuts the test cluster down properly after tests are done */ @After public void testTearDown() { this.threadPool.shutdownNow(); this.clusterService.close(); } - /** - * Tests the putTemplate method - */ + /** Tests the putTemplate method */ @AwaitsFix(bugUrl = "") public void testPutTemplate() { String mockTemplateName = "anIndexTemplateName"; @@ -74,11 +70,15 @@ public void testPutTemplate() { when(this.mockClient.admin()).thenReturn(mockAdminClient); when(mockAdminClient.indices()).thenReturn(mockIndicesAdminClient); - doAnswer(invocation -> { - ActionListener listener = invocation.getArgument(1); - listener.onResponse(new AcknowledgedResponse(true)); - return null; - }).when(mockIndicesAdminClient).putTemplate(any(PutIndexTemplateRequest.class), any(ActionListener.class)); + doAnswer( + invocation -> { + ActionListener listener = + invocation.getArgument(1); + listener.onResponse(new AcknowledgedResponse(true)); + return null; + }) + .when(mockIndicesAdminClient) + .putTemplate(any(PutIndexTemplateRequest.class), any(ActionListener.class)); try { this.wazuhIndices.putTemplate(mockTemplateName); @@ -86,11 +86,15 @@ public void testPutTemplate() { fail(e.toString()); } - doAnswer(invocation -> { - ActionListener listener = invocation.getArgument(1); - listener.onFailure(new Exception("Mock exception on putTemplate")); - return null; - }).when(mockIndicesAdminClient).putTemplate(any(PutIndexTemplateRequest.class), any(ActionListener.class)); + doAnswer( + invocation -> { + ActionListener listener = + invocation.getArgument(1); + listener.onFailure(new Exception("Mock exception on putTemplate")); + return null; + }) + .when(mockIndicesAdminClient) + .putTemplate(any(PutIndexTemplateRequest.class), any(ActionListener.class)); try { this.wazuhIndices.putTemplate(mockTemplateName); @@ -99,9 +103,7 @@ public void testPutTemplate() { } } - /** - * Tests creating an index - */ + /** Tests creating an index */ @AwaitsFix(bugUrl = "") public void testCreate() { AdminClient mockAdminClient = mock(AdminClient.class); @@ -109,24 +111,29 @@ public void testCreate() { when(this.mockClient.admin()).thenReturn(mockAdminClient); when(mockAdminClient.indices()).thenReturn(mockIndicesAdminClient); - doAnswer(invocation -> { - ActionListener listener = invocation.getArgument(1); - listener.onResponse(new CreateIndexResponse(true, true, INDEX_NAME)); - return null; - }).when(mockIndicesAdminClient).create(any(CreateIndexRequest.class), any(ActionListener.class)); - - ActionListener actionListener = new ActionListener<>() { - @Override - public void onResponse(CreateIndexResponse createIndexResponse) { - logger.info("Mock successful index creation"); - assertTrue(createIndexResponse.isAcknowledged()); - } - - @Override - public void onFailure(Exception e) { - logger.error("Mock error creating index: {}", e.toString()); - } - }; + doAnswer( + invocation -> { + ActionListener listener = + invocation.getArgument(1); + listener.onResponse(new CreateIndexResponse(true, true, INDEX_NAME)); + return null; + }) + .when(mockIndicesAdminClient) + .create(any(CreateIndexRequest.class), any(ActionListener.class)); + + ActionListener actionListener = + new ActionListener<>() { + @Override + public void onResponse(CreateIndexResponse createIndexResponse) { + logger.info("Mock successful index creation"); + assertTrue(createIndexResponse.isAcknowledged()); + } + + @Override + public void onFailure(Exception e) { + logger.error("Mock error creating index: {}", e.toString()); + } + }; try { this.wazuhIndices.putIndex(INDEX_NAME); @@ -134,11 +141,15 @@ public void onFailure(Exception e) { fail(e.toString()); } - doAnswer(invocation -> { - ActionListener listener = invocation.getArgument(1); - listener.onFailure(new Exception("Mock Exception")); - return null; - }).when(mockIndicesAdminClient).create(any(CreateIndexRequest.class), any(ActionListener.class)); + doAnswer( + invocation -> { + ActionListener listener = + invocation.getArgument(1); + listener.onFailure(new Exception("Mock Exception")); + return null; + }) + .when(mockIndicesAdminClient) + .create(any(CreateIndexRequest.class), any(ActionListener.class)); try { this.wazuhIndices.putIndex(INDEX_NAME); @@ -147,9 +158,7 @@ public void onFailure(Exception e) { } } - /** - * Tests the indexExists() method - */ + /** Tests the indexExists() method */ public void testIndexExists() { ClusterState mockClusterState = mock(ClusterState.class); RoutingTable mockRoutingTable = mock(RoutingTable.class); diff --git a/plugins/setup/src/test/java/com/wazuh/setup/index/WazuhIndicesTests.java b/plugins/setup/src/test/java/com/wazuh/setup/index/WazuhIndicesTests.java index 980f20b..90ed211 100644 --- a/plugins/setup/src/test/java/com/wazuh/setup/index/WazuhIndicesTests.java +++ b/plugins/setup/src/test/java/com/wazuh/setup/index/WazuhIndicesTests.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,9 +8,6 @@ */ package com.wazuh.setup.index; -import com.wazuh.setup.utils.IndexTemplateUtils; -import org.junit.Before; -import org.mockito.*; import org.opensearch.action.admin.indices.create.CreateIndexRequest; import org.opensearch.action.admin.indices.create.CreateIndexResponse; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; @@ -21,43 +19,38 @@ import org.opensearch.cluster.routing.RoutingTable; import org.opensearch.cluster.service.ClusterService; import org.opensearch.test.OpenSearchTestCase; +import org.junit.Before; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import com.wazuh.setup.utils.IndexTemplateUtils; +import org.mockito.*; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; public class WazuhIndicesTests extends OpenSearchTestCase { - @Mock - private Client client; + @Mock private Client client; - @Mock - private ClusterService clusterService; + @Mock private ClusterService clusterService; - @Mock - private AdminClient adminClient; + @Mock private AdminClient adminClient; - @Mock - private IndicesAdminClient indicesAdminClient; + @Mock private IndicesAdminClient indicesAdminClient; - @Mock - private ClusterState clusterState; + @Mock private ClusterState clusterState; - @Mock - private RoutingTable routingTable; + @Mock private RoutingTable routingTable; - @InjectMocks - private WazuhIndices wazuhIndices; + @InjectMocks private WazuhIndices wazuhIndices; - @Captor - private ArgumentCaptor putIndexTemplateRequestCaptor; + @Captor private ArgumentCaptor putIndexTemplateRequestCaptor; - @Captor - private ArgumentCaptor createIndexRequestCaptor; + @Captor private ArgumentCaptor createIndexRequestCaptor; @Before public void setup() { @@ -76,7 +69,8 @@ public void setup() { this.wazuhIndices = new WazuhIndices(this.client, this.clusterService); } - // FIXME The used MockMaker SubclassByteBuddyMockMaker does not support the creation of static mocks + // FIXME The used MockMaker SubclassByteBuddyMockMaker does not support the creation of static + // mocks // adding mockito-inline seems to have no effect @AwaitsFix(bugUrl = "") public void testPutTemplate_Successful() { @@ -88,8 +82,11 @@ public void testPutTemplate_Successful() { template.put("index_patterns", new HashMap<>()); // Mock the static method call - try (MockedStatic mockedStatic = Mockito.mockStatic(IndexTemplateUtils.class)) { - mockedStatic.when(() -> IndexTemplateUtils.fromFile(eq(templateName + ".json"))).thenReturn(template); + try (MockedStatic mockedStatic = + Mockito.mockStatic(IndexTemplateUtils.class)) { + mockedStatic + .when(() -> IndexTemplateUtils.fromFile(eq(templateName + ".json"))) + .thenReturn(template); when(indicesAdminClient.putTemplate(any(PutIndexTemplateRequest.class)).actionGet()) .thenReturn(mock(AcknowledgedResponse.class)); @@ -107,7 +104,8 @@ public void testPutTemplate_Successful() { } } - // FIXME The used MockMaker SubclassByteBuddyMockMaker does not support the creation of static mocks + // FIXME The used MockMaker SubclassByteBuddyMockMaker does not support the creation of static + // mocks // adding mockito-inline seems to have no effect @AwaitsFix(bugUrl = "") public void testPutTemplate_IOException() { @@ -115,8 +113,11 @@ public void testPutTemplate_IOException() { String templateName = "index-template-agent"; // Mock the static method to throw IOException - try (MockedStatic mockedStatic = Mockito.mockStatic(IndexTemplateUtils.class)) { - mockedStatic.when(() -> IndexTemplateUtils.fromFile(eq(templateName + ".json"))).thenThrow(IOException.class); + try (MockedStatic mockedStatic = + Mockito.mockStatic(IndexTemplateUtils.class)) { + mockedStatic + .when(() -> IndexTemplateUtils.fromFile(eq(templateName + ".json"))) + .thenThrow(IOException.class); // Act wazuhIndices.putTemplate(templateName); @@ -126,16 +127,13 @@ public void testPutTemplate_IOException() { } } - // FIXME the return value of "org.opensearch.client.IndicesAdminClient.create(org.opensearch.action.admin.indices.create.CreateIndexRequest)" is null + // FIXME the return value of + // "org.opensearch.client.IndicesAdminClient.create(org.opensearch.action.admin.indices.create.CreateIndexRequest)" is null @AwaitsFix(bugUrl = "") public void testPutIndex_IndexDoesNotExist() { // Arrange String indexName = ".agents"; - CreateIndexResponse createIndexResponse = new CreateIndexResponse( - true, - true, - indexName - ); + CreateIndexResponse createIndexResponse = new CreateIndexResponse(true, true, indexName); when(routingTable.hasIndex(indexName)).thenReturn(false); when(indicesAdminClient.create(any(CreateIndexRequest.class)).actionGet()) @@ -151,7 +149,6 @@ public void testPutIndex_IndexDoesNotExist() { assertEquals(indexName, capturedRequest.index()); } - public void testPutIndex_IndexExists() { // Arrange String indexName = ".agents"; @@ -164,7 +161,6 @@ public void testPutIndex_IndexExists() { verify(indicesAdminClient, never()).create(any(CreateIndexRequest.class)); } - public void testIndexExists() { // Arrange String indexName = ".agents"; @@ -177,7 +173,6 @@ public void testIndexExists() { assertTrue(exists); } - @AwaitsFix(bugUrl = "") public void testInitialize() throws IOException { // Arrange @@ -204,4 +199,3 @@ public void testInitialize() throws IOException { verify(indicesAdminClient).create(any(CreateIndexRequest.class)); } } - diff --git a/plugins/setup/src/yamlRestTest/java/com/wazuh/setup/SetupPluginClientYamlTestSuiteIT.java b/plugins/setup/src/yamlRestTest/java/com/wazuh/setup/SetupPluginClientYamlTestSuiteIT.java index e80e110..c3608d4 100644 --- a/plugins/setup/src/yamlRestTest/java/com/wazuh/setup/SetupPluginClientYamlTestSuiteIT.java +++ b/plugins/setup/src/yamlRestTest/java/com/wazuh/setup/SetupPluginClientYamlTestSuiteIT.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -9,10 +10,10 @@ import com.carrotsearch.randomizedtesting.annotations.Name; import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; + import org.opensearch.test.rest.yaml.ClientYamlTestCandidate; import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase; - public class SetupPluginClientYamlTestSuiteIT extends OpenSearchClientYamlSuiteTestCase { public SetupPluginClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) { From 4b77d8b05d4409d1c2687846a883eeafa4271171 Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 17:33:44 -0300 Subject: [PATCH 10/11] Initialize a gradle base project to handle generic processes for the subprojects - Move spotless-related configuration to main project directory - Add pre-commit hook script to run spotlessCheck - Add block on build.gradle to automatically apply pre-commit script into local .git dir - Remove duplicated spotless-related code --- .gitignore | 8 + NOTICE.txt | 4 + build.gradle | 25 ++ .../license-header.txt | 0 .../gradle => gradle}/formatting.gradle | 0 gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ plugins/command-manager/build.gradle | 8 - plugins/setup/build.gradle | 8 - plugins/setup/formatter/license-header.txt | 8 - plugins/setup/gradle/formatting.gradle | 39 --- scripts/pre-commit | 21 ++ settings.gradle | 14 + 15 files changed, 425 insertions(+), 63 deletions(-) create mode 100644 .gitignore create mode 100644 NOTICE.txt create mode 100644 build.gradle rename {plugins/command-manager/formatter => formatter}/license-header.txt (100%) rename {plugins/command-manager/gradle => gradle}/formatting.gradle (100%) create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 plugins/setup/formatter/license-header.txt delete mode 100644 plugins/setup/gradle/formatting.gradle create mode 100644 scripts/pre-commit create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..02284aa --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build + +# Ignore Idea IDE directory +.idea/ diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..86c9787 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,4 @@ +OpenSearch (https://opensearch.org/) +Copyright OpenSearch Contributors +Wazuh (https://wazuh.com/) +Copyright Wazuh Contributors \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..99d98ae --- /dev/null +++ b/build.gradle @@ -0,0 +1,25 @@ +/* + * Copyright OpenSearch Contributors + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ +plugins { id "com.diffplug.spotless" version "6.25.0" } +repositories { mavenCentral() } + +apply plugin: 'java' +apply from: 'gradle/formatting.gradle' + +task installLocalGitHook(type: Copy){ + from new File(rootProject.rootDir, 'scripts/pre-commit') + into { new File(rootProject.rootDir, '.git/hooks')} + fileMode 0775 +} + +// Install git pre-commit hook on the project. +build.dependsOn installLocalGitHook + +// Add the spotlessCheck to gradle check +check.dependsOn spotlessCheck diff --git a/plugins/command-manager/formatter/license-header.txt b/formatter/license-header.txt similarity index 100% rename from plugins/command-manager/formatter/license-header.txt rename to formatter/license-header.txt diff --git a/plugins/command-manager/gradle/formatting.gradle b/gradle/formatting.gradle similarity index 100% rename from plugins/command-manager/gradle/formatting.gradle rename to gradle/formatting.gradle diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugins/command-manager/build.gradle b/plugins/command-manager/build.gradle index 2c44b65..2f540f2 100644 --- a/plugins/command-manager/build.gradle +++ b/plugins/command-manager/build.gradle @@ -19,17 +19,12 @@ buildscript { } } -plugins { - id "com.diffplug.spotless" version "6.25.0" -} - apply plugin: 'java' apply plugin: 'idea' apply plugin: 'eclipse' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.yaml-rest-test' apply plugin: 'opensearch.pluginzip' -apply from: 'gradle/formatting.gradle' def pluginName = 'wazuh-indexer-command-manager' def pluginDescription = 'The Command Manager plugin handles and distributes commands across your Wazuh environment.' @@ -92,9 +87,6 @@ dependencies { api "org.conscrypt:conscrypt-openjdk-uber:${versions.conscrypt}" } -// Add the spotlessCheck to gradle check -check.dependsOn spotlessCheck - // This requires an additional Jar not published as part of build-tools loggerUsageCheck.enabled = false diff --git a/plugins/setup/build.gradle b/plugins/setup/build.gradle index 8311db7..c5b6b6d 100644 --- a/plugins/setup/build.gradle +++ b/plugins/setup/build.gradle @@ -19,17 +19,12 @@ buildscript { } } -plugins { - id "com.diffplug.spotless" version "6.25.0" -} - apply plugin: 'java' apply plugin: 'idea' apply plugin: 'eclipse' apply plugin: 'opensearch.opensearchplugin' apply plugin: 'opensearch.yaml-rest-test' apply plugin: 'opensearch.pluginzip' -apply from: 'gradle/formatting.gradle' def pluginName = 'wazuh-indexer-setup' def pluginDescription = 'Wazuh Indexer setup plugin' @@ -75,9 +70,6 @@ opensearchplugin { noticeFile rootProject.file('NOTICE.txt') } -// Add the spotlessCheck to gradle check -check.dependsOn spotlessCheck - // This requires an additional Jar not published as part of build-tools loggerUsageCheck.enabled = false diff --git a/plugins/setup/formatter/license-header.txt b/plugins/setup/formatter/license-header.txt deleted file mode 100644 index cf0a068..0000000 --- a/plugins/setup/formatter/license-header.txt +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle deleted file mode 100644 index 157e065..0000000 --- a/plugins/setup/gradle/formatting.gradle +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ - -allprojects { - project.apply plugin: "com.diffplug.spotless" - spotless { - java { - licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}") - googleJavaFormat().aosp() - removeUnusedImports() - importOrder( - 'de.thetaphi', - 'com.carrotsearch', - 'com.fasterxml', - 'com.avast', - 'com.sun', - 'com.maxmind|com.github|com.networknt|groovy|nebula', - 'org.antlr', - 'software.amazon', - 'com.azure|com.microsoft|com.ibm|com.google|joptsimple|org.apache|org.bouncycastle|org.codehaus|org.opensearch|org.objectweb|org.joda|org.hamcrest|org.openjdk|org.gradle|org.junit', - 'javax', - 'java', - '', - '\\#java|\\#org.opensearch|\\#org.hamcrest|\\#' - ) - trimTrailingWhitespace() - endWithNewline() - - // add support for spotless:off and spotless:on tags to exclude sections of code - toggleOffOn() - } - } -} diff --git a/scripts/pre-commit b/scripts/pre-commit new file mode 100644 index 0000000..09ba63a --- /dev/null +++ b/scripts/pre-commit @@ -0,0 +1,21 @@ +#!/bin/bash + +# Navigate to the root of the repository +cd "$(git rev-parse --show-toplevel)" + +# Run spotlessCheck +./gradlew spotlessCheck + +# Capture the exit code +EXIT_CODE=$? + +if [ $EXIT_CODE -ne 0 ]; then + echo "======================================================================================" + echo "Spotless found some formatting issues. Please run ./gradlew spotlessApply to fix them." + echo "======================================================================================" + exit 1 +else + echo "===================================" + echo "Spotless check passed successfully!" + echo "===================================" +fi diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..51c63f7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.10.2/userguide/multi_project_builds.html in the Gradle documentation. + */ + +rootProject.name = "wazuh-indexer-plugins" + +include(":setup") +project(":setup").projectDir = "plugins/setup/" as File + +include(":command-manager") +project(":command-manager").projectDir = "plugins/command-manager/" as File From 301cd26d88f5ee4c171ca615ad6811e17c6681da Mon Sep 17 00:00:00 2001 From: quebim Date: Wed, 16 Oct 2024 17:39:51 -0300 Subject: [PATCH 11/11] Apply spotless formatting to command-manager classes --- .../commandmanager/CommandManagerPlugin.java | 23 ++-- .../commandmanager/index/CommandIndex.java | 85 +++++++------- .../wazuh/commandmanager/model/Command.java | 60 +++++----- .../rest/RestPostCommandAction.java | 108 +++++++++--------- .../utils/httpclient/HttpRestClient.java | 60 ++++------ .../utils/httpclient/HttpRestClientDemo.java | 40 ++++--- .../commandmanager/CommandManagerTests.java | 53 ++++----- 7 files changed, 213 insertions(+), 216 deletions(-) diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java index 34781f4..fe11b1d 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/CommandManagerPlugin.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,10 +8,6 @@ */ package com.wazuh.commandmanager; -import com.wazuh.commandmanager.index.CommandIndex; -import com.wazuh.commandmanager.rest.RestPostCommandAction; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClientDemo; import org.opensearch.client.Client; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.node.DiscoveryNodes; @@ -38,11 +35,15 @@ import java.util.List; import java.util.function.Supplier; +import com.wazuh.commandmanager.index.CommandIndex; +import com.wazuh.commandmanager.rest.RestPostCommandAction; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClientDemo; + /** - * The Command Manager plugin exposes an HTTP API with a single endpoint to - * receive raw commands from the Wazuh Server. These commands are processed, - * indexed and sent back to the Server for its delivery to, in most cases, the - * Agents. + * The Command Manager plugin exposes an HTTP API with a single endpoint to receive raw commands + * from the Wazuh Server. These commands are processed, indexed and sent back to the Server for its + * delivery to, in most cases, the Agents. */ public class CommandManagerPlugin extends Plugin implements ActionPlugin { public static final String COMMAND_MANAGER_BASE_URI = "/_plugins/_command_manager"; @@ -64,8 +65,7 @@ public Collection createComponents( NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry, IndexNameExpressionResolver indexNameExpressionResolver, - Supplier repositoriesServiceSupplier - ) { + Supplier repositoriesServiceSupplier) { this.commandIndex = new CommandIndex(client, clusterService, threadPool); // HttpRestClient stuff @@ -82,8 +82,7 @@ public List getRestHandlers( IndexScopedSettings indexScopedSettings, SettingsFilter settingsFilter, IndexNameExpressionResolver indexNameExpressionResolver, - Supplier nodesInCluster - ) { + Supplier nodesInCluster) { return Collections.singletonList(new RestPostCommandAction(this.commandIndex)); } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java index c9cf80a..ea8f2c2 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,9 +8,6 @@ */ package com.wazuh.commandmanager.index; -import com.wazuh.commandmanager.CommandManagerPlugin; -import com.wazuh.commandmanager.model.Document; -import com.wazuh.commandmanager.utils.IndexTemplateUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.opensearch.action.admin.indices.template.put.PutIndexTemplateRequest; @@ -31,9 +29,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; -/** - * Class to manage the Command Manager index and index template. - */ +import com.wazuh.commandmanager.CommandManagerPlugin; +import com.wazuh.commandmanager.model.Document; +import com.wazuh.commandmanager.utils.IndexTemplateUtils; + +/** Class to manage the Command Manager index and index template. */ public class CommandIndex implements IndexingOperationListener { private static final Logger log = LogManager.getLogger(CommandIndex.class); @@ -45,9 +45,9 @@ public class CommandIndex implements IndexingOperationListener { /** * Default constructor * - * @param client OpenSearch client. + * @param client OpenSearch client. * @param clusterService OpenSearch cluster service. - * @param threadPool An OpenSearch ThreadPool. + * @param threadPool An OpenSearch ThreadPool. */ public CommandIndex(Client client, ClusterService clusterService, ThreadPool threadPool) { this.client = client; @@ -69,30 +69,31 @@ public CompletableFuture asyncCreate(Document document) { } else { log.info( "Index template {} already exists. Skipping creation.", - CommandManagerPlugin.COMMAND_MANAGER_INDEX_TEMPLATE_NAME - ); + CommandManagerPlugin.COMMAND_MANAGER_INDEX_TEMPLATE_NAME); } log.info("Indexing command with id [{}]", document.getId()); try { - IndexRequest request = new IndexRequest() - .index(CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME) - .source(document.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) - .id(document.getId()) - .create(true); + IndexRequest request = + new IndexRequest() + .index(CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME) + .source( + document.toXContent( + XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS)) + .id(document.getId()) + .create(true); executor.submit( () -> { - try (ThreadContext.StoredContext ignored = this.threadPool.getThreadContext().stashContext()) { + try (ThreadContext.StoredContext ignored = + this.threadPool.getThreadContext().stashContext()) { RestStatus restStatus = client.index(request).actionGet().status(); future.complete(restStatus); } catch (Exception e) { future.completeExceptionally(e); } - } - ); + }); } catch (IOException e) { - log.error( - "Error indexing command with id [{}] due to {}", document.getId(), e); + log.error("Error indexing command with id [{}] due to {}", document.getId(), e); } return future; } @@ -104,10 +105,8 @@ public CompletableFuture asyncCreate(Document document) { * @return whether the index template exists. */ public boolean indexTemplateExists(String template_name) { - Map templates = this.clusterService - .state() - .metadata() - .templates(); + Map templates = + this.clusterService.state().metadata().templates(); log.debug("Existing index templates: {} ", templates); return templates.containsKey(template_name); @@ -124,25 +123,25 @@ public void putIndexTemplate(String templateName) { // @throws IOException Map template = IndexTemplateUtils.fromFile(templateName + ".json"); - PutIndexTemplateRequest putIndexTemplateRequest = new PutIndexTemplateRequest() - .mapping(IndexTemplateUtils.get(template, "mappings")) - .settings(IndexTemplateUtils.get(template, "settings")) - .name(templateName) - .patterns((List) template.get("index_patterns")); - - executor.submit(() -> { - AcknowledgedResponse acknowledgedResponse = this.client - .admin() - .indices() - .putTemplate(putIndexTemplateRequest) - .actionGet(); - if (acknowledgedResponse.isAcknowledged()) { - log.info( - "Index template [{}] created successfully", - templateName - ); - } - }); + PutIndexTemplateRequest putIndexTemplateRequest = + new PutIndexTemplateRequest() + .mapping(IndexTemplateUtils.get(template, "mappings")) + .settings(IndexTemplateUtils.get(template, "settings")) + .name(templateName) + .patterns((List) template.get("index_patterns")); + + executor.submit( + () -> { + AcknowledgedResponse acknowledgedResponse = + this.client + .admin() + .indices() + .putTemplate(putIndexTemplateRequest) + .actionGet(); + if (acknowledgedResponse.isAcknowledged()) { + log.info("Index template [{}] created successfully", templateName); + } + }); } catch (IOException e) { log.error("Error reading index template [{}] from filesystem", templateName); diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java index 60993f8..57b7ec5 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Command.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -12,11 +13,12 @@ import org.opensearch.core.xcontent.ToXContentObject; import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.core.xcontent.XContentParser; -import reactor.util.annotation.NonNull; import java.io.IOException; import java.util.ArrayList; +import reactor.util.annotation.NonNull; + public class Command implements ToXContentObject { public static final String COMMAND = "command"; public static final String ORDER_ID = "order_id"; @@ -37,19 +39,18 @@ public class Command implements ToXContentObject { /** * Default constructor * - * @param source origin of the request. - * @param target {@link Target} + * @param source origin of the request. + * @param target {@link Target} * @param timeout time window in which the command has to be sent to its target. - * @param user the user that originated the request - * @param action {@link Action} + * @param user the user that originated the request + * @param action {@link Action} */ public Command( @NonNull String source, @NonNull Target target, @NonNull Integer timeout, @NonNull String user, - @NonNull Action action - ) { + @NonNull Action action) { this.requestId = UUIDs.base64UUID(); this.orderId = UUIDs.base64UUID(); this.source = source; @@ -65,10 +66,11 @@ public Command( * * @param parser XContentParser from the Rest Request * @return instance of Command - * @throws IOException error parsing request content + * @throws IOException error parsing request content * @throws IllegalArgumentException missing arguments */ - public static Command parse(XContentParser parser) throws IOException, IllegalArgumentException { + public static Command parse(XContentParser parser) + throws IOException, IllegalArgumentException { String source = null; Target target = null; Integer timeout = null; @@ -121,13 +123,7 @@ public static Command parse(XContentParser parser) throws IOException, IllegalAr if (!nullArguments.isEmpty()) { throw new IllegalArgumentException("Missing arguments: " + nullArguments); } else { - return new Command( - source, - target, - timeout, - user, - action - ); + return new Command(source, target, timeout, user, action); } } @@ -148,15 +144,27 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws @Override public String toString() { - return "Command{" + - "orderId='" + orderId + '\'' + - ", requestId='" + requestId + '\'' + - ", source='" + source + '\'' + - ", target=" + target + - ", timeout=" + timeout + - ", user='" + user + '\'' + - ", status=" + status + - ", action=" + action + - '}'; + return "Command{" + + "orderId='" + + orderId + + '\'' + + ", requestId='" + + requestId + + '\'' + + ", source='" + + source + + '\'' + + ", target=" + + target + + ", timeout=" + + timeout + + ", user='" + + user + + '\'' + + ", status=" + + status + + ", action=" + + action + + '}'; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/RestPostCommandAction.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/RestPostCommandAction.java index f7f88c5..ef7884c 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/RestPostCommandAction.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/rest/RestPostCommandAction.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,12 +8,6 @@ */ package com.wazuh.commandmanager.rest; -import com.wazuh.commandmanager.CommandManagerPlugin; -import com.wazuh.commandmanager.index.CommandIndex; -import com.wazuh.commandmanager.model.Agent; -import com.wazuh.commandmanager.model.Command; -import com.wazuh.commandmanager.model.Document; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; import org.apache.hc.core5.net.URIBuilder; import org.apache.logging.log4j.LogManager; @@ -34,17 +29,24 @@ import java.util.List; import java.util.Locale; +import com.wazuh.commandmanager.CommandManagerPlugin; +import com.wazuh.commandmanager.index.CommandIndex; +import com.wazuh.commandmanager.model.Agent; +import com.wazuh.commandmanager.model.Command; +import com.wazuh.commandmanager.model.Document; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; + import static org.opensearch.core.xcontent.XContentParserUtils.ensureExpectedToken; import static org.opensearch.rest.RestRequest.Method.POST; /** - * Handles HTTP requests to the POST - * {@value com.wazuh.commandmanager.CommandManagerPlugin#COMMANDS_URI} - * endpoint. + * Handles HTTP requests to the POST {@value + * com.wazuh.commandmanager.CommandManagerPlugin#COMMANDS_URI} endpoint. */ public class RestPostCommandAction extends BaseRestHandler { - public static final String POST_COMMAND_ACTION_REQUEST_DETAILS = "post_command_action_request_details"; + public static final String POST_COMMAND_ACTION_REQUEST_DETAILS = + "post_command_action_request_details"; private static final Logger log = LogManager.getLogger(RestPostCommandAction.class); private final CommandIndex commandIndex; @@ -55,7 +57,6 @@ public class RestPostCommandAction extends BaseRestHandler { */ public RestPostCommandAction(CommandIndex commandIndex) { this.commandIndex = commandIndex; - } public String getName() { @@ -66,21 +67,12 @@ public String getName() { public List routes() { return Collections.singletonList( new Route( - POST, - String.format( - Locale.ROOT, - "%s", - CommandManagerPlugin.COMMANDS_URI - ) - ) - ); + POST, String.format(Locale.ROOT, "%s", CommandManagerPlugin.COMMANDS_URI))); } @Override - protected RestChannelConsumer prepareRequest( - final RestRequest request, - final NodeClient client - ) throws IOException { + protected RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) + throws IOException { switch (request.method()) { case POST: return handlePost(request); @@ -103,27 +95,27 @@ private RestChannelConsumer handlePost(RestRequest request) throws IOException { request.method().name(), request.uri(), request.getRequestId(), - request.header("Host") - ); + request.header("Host")); // Get request details XContentParser parser = request.contentParser(); ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser); Command command = Command.parse(parser); - Document document = new Document( - new Agent(List.of("groups000")), // TODO read agent from .agents index - command - ); + Document document = + new Document( + new Agent(List.of("groups000")), // TODO read agent from .agents index + command); // Commands delivery to the Management API. // Note: needs to be decoupled from the Rest handler (job scheduler task). HttpRestClient httpClient = HttpRestClient.getInstance(); try { String uri = "https://httpbin.org/post"; -// String uri = "https://127.0.0.1:5000"; - URI receiverURI = new URIBuilder(uri) - .build(); - String payload = document.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS).toString(); + // String uri = "https://127.0.0.1:5000"; + URI receiverURI = new URIBuilder(uri).build(); + String payload = + document.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS) + .toString(); SimpleHttpResponse response = httpClient.post(receiverURI, payload, document.getId()); log.info("Received response to POST request with code [{}]", response.getCode()); log.info("Raw response:\n{}", response.getBodyText()); @@ -135,27 +127,35 @@ private RestChannelConsumer handlePost(RestRequest request) throws IOException { // Send response return channel -> { - this.commandIndex.asyncCreate(document) - .thenAccept(restStatus -> { - try (XContentBuilder builder = channel.newBuilder()) { - builder.startObject(); - builder.field("_index", CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME); - builder.field("_id", document.getId()); - builder.field("result", restStatus.name()); - builder.endObject(); - channel.sendResponse(new BytesRestResponse(restStatus, builder)); - } catch (IOException e) { - log.error("Error preparing response to [{}] request with id [{}] due to {}", - request.method().name(), - request.getRequestId(), - e.getMessage() - ); - } - }).exceptionally(e -> { - channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR, e.getMessage())); - return null; - }); - + this.commandIndex + .asyncCreate(document) + .thenAccept( + restStatus -> { + try (XContentBuilder builder = channel.newBuilder()) { + builder.startObject(); + builder.field( + "_index", + CommandManagerPlugin.COMMAND_MANAGER_INDEX_NAME); + builder.field("_id", document.getId()); + builder.field("result", restStatus.name()); + builder.endObject(); + channel.sendResponse( + new BytesRestResponse(restStatus, builder)); + } catch (IOException e) { + log.error( + "Error preparing response to [{}] request with id [{}] due to {}", + request.method().name(), + request.getRequestId(), + e.getMessage()); + } + }) + .exceptionally( + e -> { + channel.sendResponse( + new BytesRestResponse( + RestStatus.INTERNAL_SERVER_ERROR, e.getMessage())); + return null; + }); }; } } diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java index 679bd72..9e70783 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClient.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -26,10 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -/** - * HTTP Rest client. Currently used to perform - * POST requests against the Wazuh Server. - */ +/** HTTP Rest client. Currently used to perform POST requests against the Wazuh Server. */ public class HttpRestClient { public static final long TIMEOUT = 4; @@ -38,9 +36,7 @@ public class HttpRestClient { private static HttpRestClient instance; private CloseableHttpAsyncClient httpClient; - /** - * Private default constructor - */ + /** Private default constructor */ private HttpRestClient() { startHttpAsyncClient(); } @@ -57,23 +53,21 @@ public static HttpRestClient getInstance() { return HttpRestClient.instance; } - /** - * Starts http async client. - */ + /** Starts http async client. */ private void startHttpAsyncClient() { if (this.httpClient == null) { try { PoolingAsyncClientConnectionManager cm = PoolingAsyncClientConnectionManagerBuilder.create().build(); - IOReactorConfig ioReactorConfig = IOReactorConfig.custom() - .setSoTimeout(Timeout.ofSeconds(5)) - .build(); + IOReactorConfig ioReactorConfig = + IOReactorConfig.custom().setSoTimeout(Timeout.ofSeconds(5)).build(); - httpClient = HttpAsyncClients.custom() - .setIOReactorConfig(ioReactorConfig) - .setConnectionManager(cm) - .build(); + httpClient = + HttpAsyncClients.custom() + .setIOReactorConfig(ioReactorConfig) + .setConnectionManager(cm) + .build(); httpClient.start(); } catch (Exception e) { @@ -83,9 +77,7 @@ private void startHttpAsyncClient() { } } - /** - * Stop http async client. - */ + /** Stop http async client. */ public void stopHttpAsyncClient() { if (this.httpClient != null) { log.info("Shutting down."); @@ -98,26 +90,22 @@ public void stopHttpAsyncClient() { * Sends a POST request. * * @param receiverURI Well-formed URI - * @param payload data to send - * @param payloadId payload ID + * @param payload data to send + * @param payloadId payload ID * @return SimpleHttpResponse response */ public SimpleHttpResponse post(URI receiverURI, String payload, String payloadId) { try { HttpHost httpHost = HttpHost.create(receiverURI); - log.info( - "Sending payload with id [{}] to [{}]", - payloadId, - receiverURI - ); + log.info("Sending payload with id [{}] to [{}]", payloadId, receiverURI); - SimpleHttpRequest httpPostRequest = SimpleRequestBuilder - .post() - .setHttpHost(httpHost) - .setPath(receiverURI.getPath()) - .setBody(payload, ContentType.APPLICATION_JSON) - .build(); + SimpleHttpRequest httpPostRequest = + SimpleRequestBuilder.post() + .setHttpHost(httpHost) + .setPath(receiverURI.getPath()) + .setBody(payload, ContentType.APPLICATION_JSON) + .build(); Future future = this.httpClient.execute( @@ -125,9 +113,9 @@ public SimpleHttpResponse post(URI receiverURI, String payload, String payloadId SimpleResponseConsumer.create(), new HttpResponseCallback( httpPostRequest, - "Failed to execute outgoing POST request with payload id [" + payloadId + "]" - ) - ); + "Failed to execute outgoing POST request with payload id [" + + payloadId + + "]")); return future.get(TIMEOUT, TIME_UNIT); } catch (InterruptedException e) { diff --git a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java index d11e423..2fff5c6 100644 --- a/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java +++ b/plugins/command-manager/src/main/java/com/wazuh/commandmanager/utils/httpclient/HttpRestClientDemo.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -17,9 +18,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; -/** - * Demo class to test the {@link HttpRestClient} class. - */ +/** Demo class to test the {@link HttpRestClient} class. */ public class HttpRestClientDemo { private static final Logger log = LogManager.getLogger(HttpRestClientDemo.class); @@ -28,25 +27,28 @@ public class HttpRestClientDemo { * Demo method to test the {@link HttpRestClient} class. * * @param endpoint POST's requests endpoint as a well-formed URI - * @param body POST's request body as a JSON string. + * @param body POST's request body as a JSON string. */ public static void run(String endpoint, String body) { log.info("Executing POST request"); AccessController.doPrivileged( - (PrivilegedAction) () -> { - HttpRestClient httpClient = HttpRestClient.getInstance(); - try { - URI host = new URIBuilder(endpoint).build(); - SimpleHttpResponse response = httpClient.post(host, body, "randomId"); - log.info("Received response to POST request with code {}", response.getCode()); - log.info("Raw response:\n{}", response.getBodyText()); - } catch (URISyntaxException e) { - log.error("Bad URI:{}", e.getMessage()); - } catch (Exception e) { - log.error("Error reading response: {}", e.getMessage()); - } - return null; - } - ); + (PrivilegedAction) + () -> { + HttpRestClient httpClient = HttpRestClient.getInstance(); + try { + URI host = new URIBuilder(endpoint).build(); + SimpleHttpResponse response = + httpClient.post(host, body, "randomId"); + log.info( + "Received response to POST request with code {}", + response.getCode()); + log.info("Raw response:\n{}", response.getBodyText()); + } catch (URISyntaxException e) { + log.error("Bad URI:{}", e.getMessage()); + } catch (Exception e) { + log.error("Error reading response: {}", e.getMessage()); + } + return null; + }); } } diff --git a/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java b/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java index 6c09f88..ea5bf95 100644 --- a/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java +++ b/plugins/command-manager/src/test/java/com/wazuh/commandmanager/CommandManagerTests.java @@ -1,4 +1,5 @@ /* + * Copyright OpenSearch Contributors * SPDX-License-Identifier: Apache-2.0 * * The OpenSearch Contributors require contributions made to @@ -7,16 +8,17 @@ */ package com.wazuh.commandmanager; -import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; -import org.junit.Assert; import org.opensearch.test.OpenSearchTestCase; +import org.junit.Assert; import java.net.URI; import java.net.URISyntaxException; import java.security.AccessController; import java.security.PrivilegedAction; +import com.wazuh.commandmanager.utils.httpclient.HttpRestClient; + public class CommandManagerTests extends OpenSearchTestCase { // Add unit tests for your plugin @@ -25,26 +27,27 @@ public class CommandManagerTests extends OpenSearchTestCase { public void testPost_success() { try { AccessController.doPrivileged( - (PrivilegedAction) () -> { - this.httpClient = HttpRestClient.getInstance(); - URI uri; - try { - uri = new URI("https://httpbin.org/post"); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } - String payload = "{\"message\": \"Hello world!\"}"; - SimpleHttpResponse postResponse = this.httpClient.post(uri, payload, "randomId"); - - String responseText = postResponse.getBodyText(); - assertNotEquals(null, postResponse); - assertNotEquals(null, responseText); - assertEquals(200, postResponse.getCode()); - assertNotEquals(0, responseText.length()); - assertTrue(responseText.contains("Hello world!")); - return postResponse; - } - ); + (PrivilegedAction) + () -> { + this.httpClient = HttpRestClient.getInstance(); + URI uri; + try { + uri = new URI("https://httpbin.org/post"); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + String payload = "{\"message\": \"Hello world!\"}"; + SimpleHttpResponse postResponse = + this.httpClient.post(uri, payload, "randomId"); + + String responseText = postResponse.getBodyText(); + assertNotEquals(null, postResponse); + assertNotEquals(null, responseText); + assertEquals(200, postResponse.getCode()); + assertNotEquals(0, responseText.length()); + assertTrue(responseText.contains("Hello world!")); + return postResponse; + }); } catch (Exception e) { Assert.fail("Failed to execute HTTP request: " + e); } finally { @@ -52,9 +55,7 @@ public void testPost_success() { } } - public void testPost_badUri() { - } + public void testPost_badUri() {} - public void testPost_badPayload() { - } + public void testPost_badPayload() {} }