Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.7] Fix incorrect log warning when exporting monitoring via HTTP without authentication #57279

Merged
merged 1 commit into from
May 28, 2020
Merged

[7.7] Fix incorrect log warning when exporting monitoring via HTTP without authentication #57279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...nitoring/src/main/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,9 +763,15 @@ public static List<String> loadSettings(Settings settings) {
* @throws SettingsException if the username is missing, but a password is supplied
*/
@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());

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 SecureString securePassword = SECURE_AUTH_PASSWORDS.get(config.name());
final String password;
Expand Down
12 changes: 12 additions & 0 deletions ...ing/src/test/java/org/elasticsearch/xpack/monitoring/exporter/http/HttpExporterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*/
package org.elasticsearch.xpack.monitoring.exporter.http;

import org.apache.http.client.CredentialsProvider;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.nio.conn.ssl.SSLIOSessionStrategy;
Expand Down Expand Up @@ -356,6 +357,17 @@ public void testCreateRestClient() throws IOException {
}
}

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() {
final Config config = createConfig(Settings.EMPTY);
final RestClient client = mock(RestClient.class);
Expand Down