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

Remove use of get raw in token/API key settings (#47260) 

These settings were using get raw to fallback to whether or not SSL is
enabled. Yet, we have a formal mechanism for falling back to a
setting. This commit cuts over to that formal mechanism.
This commit is contained in:
Jason Tedor 2019-09-30 06:33:01 -04:00
parent a1d3711b52
commit 2cba323b4e
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackSettings.java
View File

@ -114,12 +114,12 @@ public class XPackSettings {
true, Setting.Property.NodeScope); true, Setting.Property.NodeScope);
/** Setting for enabling or disabling the token service. Defaults to the value of https being enabled */ /** Setting for enabling or disabling the token service. Defaults to the value of https being enabled */
public static final Setting<Boolean> TOKEN_SERVICE_ENABLED_SETTING = Setting.boolSetting("xpack.security.authc.token.enabled", public static final Setting<Boolean> TOKEN_SERVICE_ENABLED_SETTING =
XPackSettings.HTTP_SSL_ENABLED::getRaw, Setting.Property.NodeScope); Setting.boolSetting("xpack.security.authc.token.enabled", XPackSettings.HTTP_SSL_ENABLED, Setting.Property.NodeScope);
/** Setting for enabling or disabling the api key service. Defaults to the value of https being enabled */ /** Setting for enabling or disabling the api key service. Defaults to the value of https being enabled */
public static final Setting<Boolean> API_KEY_SERVICE_ENABLED_SETTING = Setting.boolSetting("xpack.security.authc.api_key.enabled", public static final Setting<Boolean> API_KEY_SERVICE_ENABLED_SETTING =
XPackSettings.HTTP_SSL_ENABLED::getRaw, Setting.Property.NodeScope); Setting.boolSetting("xpack.security.authc.api_key.enabled", XPackSettings.HTTP_SSL_ENABLED, Setting.Property.NodeScope);
/** Setting for enabling or disabling FIPS mode. Defaults to false */ /** Setting for enabling or disabling FIPS mode. Defaults to false */
public static final Setting<Boolean> FIPS_MODE_ENABLED = public static final Setting<Boolean> FIPS_MODE_ENABLED =