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

Remove production from the message about license installation without TLS (elastic/x-pack-elasticsearch#3666) 

This change simply changes the wording of the message that is returned to the user when
installation of a license is attempted with security enabled and TLS disabled. The term
"production" has been removed as it means something different to users.

See elastic/x-pack-elasticsearch#2636

Original commit: elastic/x-pack-elasticsearch@9739c72d66
This commit is contained in:
Jay Modi 2018-01-24 12:44:25 -07:00 committed by GitHub
parent a547049303
commit 3baf6f3a7a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java
View File

@ -216,8 +216,8 @@ public class LicenseService extends AbstractLifecycleComponent implements Cluste
&& XPackSettings.TRANSPORT_SSL_ENABLED.get(settings) == false && XPackSettings.TRANSPORT_SSL_ENABLED.get(settings) == false
&& "single-node".equals(DiscoveryModule.DISCOVERY_TYPE_SETTING.get(settings)) == false) { && "single-node".equals(DiscoveryModule.DISCOVERY_TYPE_SETTING.get(settings)) == false) {
// security is on but TLS is not configured we gonna fail the entire request and throw an exception // security is on but TLS is not configured we gonna fail the entire request and throw an exception
throw new IllegalStateException("Can not upgrade to a production license unless TLS is configured or " + throw new IllegalStateException("Cannot install a [" + newLicense.operationMode() +
"security is disabled"); "] license unless TLS is configured or security is disabled");
// TODO we should really validate that all nodes have xpack installed and are consistently configured but this // TODO we should really validate that all nodes have xpack installed and are consistently configured but this
// should happen on a different level and not in this code // should happen on a different level and not in this code
} else { } else {

2
plugin/core/src/test/java/org/elasticsearch/license/LicensesAcknowledgementTests.java
View File

@ -48,7 +48,7 @@ public class LicensesAcknowledgementTests extends AbstractLicenseServiceTestCase
// ensure acknowledgement message was part of the response // ensure acknowledgement message was part of the response
IllegalStateException ise = expectThrows(IllegalStateException.class, () -> IllegalStateException ise = expectThrows(IllegalStateException.class, () ->
licenseService.registerLicense(putLicenseRequest, new AssertingLicensesUpdateResponse(false, LicensesStatus.VALID, true))); licenseService.registerLicense(putLicenseRequest, new AssertingLicensesUpdateResponse(false, LicensesStatus.VALID, true)));
assertEquals("Can not upgrade to a production license unless TLS is configured or security is disabled", ise.getMessage()); assertEquals("Cannot install a [PLATINUM] license unless TLS is configured or security is disabled", ise.getMessage());
} }
public void testUpgradeToProductionWithoutTLSAndSecurityDisabled() throws Exception { public void testUpgradeToProductionWithoutTLSAndSecurityDisabled() throws Exception {

3
plugin/security/src/test/java/org/elasticsearch/license/LicenseServiceWithSecurityTests.java
View File

@ -11,7 +11,6 @@ import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.SecurityIntegTestCase; import org.elasticsearch.test.SecurityIntegTestCase;
import org.elasticsearch.transport.Netty4Plugin; import org.elasticsearch.transport.Netty4Plugin;
import org.elasticsearch.xpack.security.LocalStateSecurity; import org.elasticsearch.xpack.security.LocalStateSecurity;
import org.elasticsearch.xpack.security.Security;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -39,7 +38,7 @@ public class LicenseServiceWithSecurityTests extends SecurityIntegTestCase {
License license = licensingClient.prepareGetLicense().get().license(); License license = licensingClient.prepareGetLicense().get().license();
License prodLicense = TestUtils.generateSignedLicense("platinum", TimeValue.timeValueHours(24)); License prodLicense = TestUtils.generateSignedLicense("platinum", TimeValue.timeValueHours(24));
IllegalStateException ise = expectThrows(IllegalStateException.class, () -> licensingClient.preparePutLicense(prodLicense).get()); IllegalStateException ise = expectThrows(IllegalStateException.class, () -> licensingClient.preparePutLicense(prodLicense).get());
assertEquals("Can not upgrade to a production license unless TLS is configured or security is disabled", ise.getMessage()); assertEquals("Cannot install a [PLATINUM] license unless TLS is configured or security is disabled", ise.getMessage());
assertThat(licensingClient.prepareGetLicense().get().license(), equalTo(license)); assertThat(licensingClient.prepareGetLicense().get().license(), equalTo(license));
} }