github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix(tests, interactive setup): switch interactive setup tests config to non-deprecated secure_password setting (#205208)

Browse source 
## Summary

Switch interactive setup tests config to non-deprecated
`secure_password` setting as was flagged in
https://github.com/elastic/kibana-team/issues/1173#issuecomment-2545077579
This commit is contained in:
Aleh Zasypkin 2024-12-27 17:51:43 +01:00 • committed by GitHub
parent 2a630639b3
commit 5e8b61fb06
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/kbn-es/src/settings.test.ts
View file

@ -14,6 +14,7 @@ const mockSettings = [
'xpack.security.authc.realms.oidc.oidc1.rp.client_secret=secret',
'xpack.security.authc.realms.oidc.oidc1.rp.client_id=client id',
'xpack.security.authc.realms.jwt.jwt1.client_authentication.shared_secret=jwt_secret',
'xpack.security.http.ssl.keystore.secure_password=some_password',
'discovery.type=single-node',
];
@ -23,6 +24,7 @@ test('`parseSettings` parses and returns all settings by default', () => {
['xpack.security.authc.realms.oidc.oidc1.rp.client_secret', 'secret'],
['xpack.security.authc.realms.oidc.oidc1.rp.client_id', 'client id'],
['xpack.security.authc.realms.jwt.jwt1.client_authentication.shared_secret', 'jwt_secret'],
['xpack.security.http.ssl.keystore.secure_password', 'some_password'],
['discovery.type', 'single-node'],
]);
});
@ -33,6 +35,7 @@ test('`parseSettings` parses and returns all settings with `SettingsFilter.All`
['xpack.security.authc.realms.oidc.oidc1.rp.client_secret', 'secret'],
['xpack.security.authc.realms.oidc.oidc1.rp.client_id', 'client id'],
['xpack.security.authc.realms.jwt.jwt1.client_authentication.shared_secret', 'jwt_secret'],
['xpack.security.http.ssl.keystore.secure_password', 'some_password'],
['discovery.type', 'single-node'],
]);
});
@ -41,6 +44,7 @@ test('`parseSettings` parses and returns only secure settings with `SettingsFilt
expect(parseSettings(mockSettings, { filter: SettingsFilter.SecureOnly })).toEqual([
['xpack.security.authc.realms.oidc.oidc1.rp.client_secret', 'secret'],
['xpack.security.authc.realms.jwt.jwt1.client_authentication.shared_secret', 'jwt_secret'],
['xpack.security.http.ssl.keystore.secure_password', 'some_password'],
]);
});

1
packages/kbn-es/src/settings.ts
View file

@ -13,6 +13,7 @@
const SECURE_SETTINGS_LIST = [
/^xpack\.security\.authc\.realms\.oidc\.[a-zA-Z0-9_]+\.rp\.client_secret$/,
/^xpack\.security\.authc\.realms\.jwt\.[a-zA-Z0-9_]+\.client_authentication\.shared_secret$/,
/^xpack\.security\.http\.ssl\.keystore\.secure_password$/,
];
function isSecureSetting(settingName: string) {

2
test/interactive_setup_api_integration/enrollment_flow.config.ts
View file

@ -38,7 +38,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
...manualConfigurationFlowTestsConfig.get('esTestCluster.serverArgs'),
'xpack.security.enrollment.enabled=true',
`xpack.security.http.ssl.keystore.path=${caPath}`,
'xpack.security.http.ssl.keystore.password=storepass',
'xpack.security.http.ssl.keystore.secure_password=storepass',
],
},

2
test/interactive_setup_functional/enrollment_token.config.ts
View file

@ -41,7 +41,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
...manualConfigurationConfig.get('esTestCluster.serverArgs'),
'xpack.security.enrollment.enabled=true',
`xpack.security.http.ssl.keystore.path=${caPath}`,
'xpack.security.http.ssl.keystore.password=storepass',
'xpack.security.http.ssl.keystore.secure_password=storepass',
],
},