honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect log warning when exporting monitoring via HTTP without authentication (#57552)

This commit is contained in:
Dan Hermann 2020-06-02 15:03:55 -05:00 committed by GitHub
parent 79ac69cfa3
commit 97a51272b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x-pack/plugin/monitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java
View File

@ -764,9 +764,15 @@ public class HttpExporter extends Exporter {
* @throws SettingsException if the username is missing, but a password is supplied * @throws SettingsException if the username is missing, but a password is supplied
*/ */
@Nullable @Nullable
private static CredentialsProvider createCredentialsProvider(final Config config) { // visible for testing
static CredentialsProvider createCredentialsProvider(final Config config) {
final String username = AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(config.name()).get(config.settings()); final String username = AUTH_USERNAME_SETTING.getConcreteSettingForNamespace(config.name()).get(config.settings());
if (Strings.isNullOrEmpty(username)) {
// nothing to configure; default situation for most users
return null;
}
final String deprecatedPassword = AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(config.name()).get(config.settings()); final String deprecatedPassword = AUTH_PASSWORD_SETTING.getConcreteSettingForNamespace(config.name()).get(config.settings());
final SecureString securePassword = SECURE_AUTH_PASSWORDS.get(config.name()); final SecureString securePassword = SECURE_AUTH_PASSWORDS.get(config.name());
final String password; final String password;

12
x-pack/plugin/monitoring/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java
View File

@ -5,6 +5,7 @@
*/ */
package org.elasticsearch.xpack.monitoring.exporter.http; package org.elasticsearch.xpack.monitoring.exporter.http;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.entity.ContentType; import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity; import org.apache.http.entity.StringEntity;
import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy; import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy;
@ -356,6 +357,17 @@ public class HttpExporterTests extends ESTestCase {
} }
} }
public void testCreateCredentialsProviderWithoutSecurity() {
final Settings.Builder builder = Settings.builder()
.put("xpack.monitoring.exporters._http.type", "http")
.put("xpack.monitoring.exporters._http.host", "http://localhost:9200");
final Config config = createConfig(builder.build());
CredentialsProvider provider = HttpExporter.createCredentialsProvider(config);
assertNull(provider);
}
public void testCreateSnifferDisabledByDefault() { public void testCreateSnifferDisabledByDefault() {
final Config config = createConfig(Settings.EMPTY); final Config config = createConfig(Settings.EMPTY);
final RestClient client = mock(RestClient.class); final RestClient client = mock(RestClient.class);