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

Refactor license checking #52118

Merged
merged 10 commits into from
Feb 21, 2020
Merged

Refactor license checking #52118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8eabbf1
Continue refactor license checking
ywangd Feb 10, 2020
f1c931b
Fix checkstyle
ywangd Feb 10, 2020
9d1164c
Fix fips license test
ywangd Feb 10, 2020
4a20a97
More refactoring
ywangd Feb 10, 2020
9c9afb0
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd Feb 10, 2020
e1da109
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd Feb 14, 2020
95877fc
Address feedback
ywangd Feb 14, 2020
a34e3ca
Revert accidental change
ywangd Feb 14, 2020
88a3e62
Merge remote-tracking branch 'origin/master' into es-51081-enterprise…
ywangd Feb 21, 2020
e1eca99
Remove low value comments
ywangd Feb 21, 2020
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
4 changes: 1 addition & 3 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,7 @@ && isProductionMode(settings, clusterService.localNode())) {
throw new IllegalStateException("Cannot install a [" + newLicense.operationMode() +
"] license unless TLS is configured or security is disabled");
} else if (XPackSettings.FIPS_MODE_ENABLED.get(settings)
&& newLicense.operationMode() != License.OperationMode.PLATINUM
&& newLicense.operationMode() != License.OperationMode.ENTERPRISE
&& newLicense.operationMode() != License.OperationMode.TRIAL) {
&& false == XPackLicenseState.isFipsAllowedForOperationMode(newLicense.operationMode())) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Address feedback #51864 (comment)

throw new IllegalStateException("Cannot install a [" + newLicense.operationMode() +
"] license unless FIPS mode is disabled");
}
Expand Down
Loading