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

Jump to bottom

Update security deprecation message #82128

Merged
merged 11 commits into from
Jan 18, 2022
Merged

Update security deprecation message #82128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f660698
Update security deprecation message
bytebilly Dec 29, 2021
6d1c24f
Fix copying
bytebilly Dec 29, 2021
3b7385d
Fix style
bytebilly Dec 29, 2021
896868d
Fix tests
bytebilly Dec 29, 2021
1416ef9
Fix style
bytebilly Dec 29, 2021
3ba2d8a
Update deprecation link
bytebilly Jan 17, 2022
b891912
Update tests
bytebilly Jan 17, 2022
6e4769e
Fix link
bytebilly Jan 17, 2022
e7c4847
Fix link
bytebilly Jan 17, 2022
32e0d48
Fix link
bytebilly Jan 17, 2022
475cd12
Merge branch '7.17' into update-security-deprecation-message
elasticmachine Jan 17, 2022
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
9 changes: 5 additions & 4 deletions .../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,13 @@ static DeprecationIssue checkImplicitlyDisabledSecurityOnBasicAndTrial(
if (XPackSettings.SECURITY_ENABLED.exists(settings) == false
&& (licenseState.getOperationMode().equals(License.OperationMode.BASIC)
|| licenseState.getOperationMode().equals(License.OperationMode.TRIAL))) {
String details = "Security will no longer be disabled by default for Trial licenses in 8.0. The [xpack.security.enabled] "
+ "setting will always default to \"true\". See https://ela.st/es-deprecation-7-security-minimal-setup to secure your "
+ "cluster. To explicitly disable security, set [xpack.security.enabled] to \"false\" (not recommended).";
String details = "In Elasticsearch 8.0 the [xpack.security.enabled] setting will always default to true. "
+ "In your environment, the value is not set and you need to set it before upgrading, along with other required "
+ "security settings. See https://ela.st/es-deprecation-7-implicitly-disabled-security to secure your cluster. "
+ "To explicitly disable security, set [xpack.security.enabled] to \"false\" (not recommended).";
return new DeprecationIssue(
DeprecationIssue.Level.CRITICAL,
"Security is enabled by default for all licenses",
"Security features are enabled by default for all licenses in versions 8.0 and later",
"https://ela.st/es-deprecation-7-implicitly-disabled-security",
details,
false,
Expand Down
4 changes: 2 additions & 2 deletions ...ecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,9 +1045,9 @@ public void testImplicitlyDisabledSecurityWarning() {
new XPackLicenseState(Settings.EMPTY, () -> 0)
);
assertThat(issue.getLevel(), equalTo(DeprecationIssue.Level.CRITICAL));
assertThat(issue.getMessage(), equalTo("Security is enabled by default for all licenses"));
assertThat(issue.getMessage(), equalTo("Security features are enabled by default for all licenses in versions 8.0 and later"));
assertNotNull(issue.getDetails());
assertThat(issue.getDetails(), containsString("Security will no longer be disabled by default"));
assertThat(issue.getDetails(), containsString("In Elasticsearch 8.0 the [xpack.security.enabled] setting will always "));
assertThat(issue.getUrl(), equalTo("https://ela.st/es-deprecation-7-implicitly-disabled-security"));
}

Expand Down