Skip to content

Commit d86a2fc

Browse files
authored
Add populate_user_metadata in OIDC realm (#48357) (#48439)
Make populate_user_metadata configuration parameter available in the OpenID Connect authentication realm Resolves: #48217
1 parent f45b12f commit d86a2fc

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/oidc/OpenIdConnectRealmSettings.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ public static Set<Setting.AffixSetting<?>> getSettings() {
150150
final Set<Setting.AffixSetting<?>> set = Sets.newHashSet(
151151
RP_CLIENT_ID, RP_REDIRECT_URI, RP_RESPONSE_TYPE, RP_REQUESTED_SCOPES, RP_CLIENT_SECRET, RP_SIGNATURE_ALGORITHM,
152152
RP_POST_LOGOUT_REDIRECT_URI, OP_AUTHORIZATION_ENDPOINT, OP_TOKEN_ENDPOINT, OP_USERINFO_ENDPOINT,
153-
OP_ENDSESSION_ENDPOINT, OP_ISSUER, OP_JWKSET_PATH, HTTP_CONNECT_TIMEOUT, HTTP_CONNECTION_READ_TIMEOUT, HTTP_SOCKET_TIMEOUT,
154-
HTTP_MAX_CONNECTIONS, HTTP_MAX_ENDPOINT_CONNECTIONS, ALLOWED_CLOCK_SKEW);
153+
OP_ENDSESSION_ENDPOINT, OP_ISSUER, OP_JWKSET_PATH, POPULATE_USER_METADATA, HTTP_CONNECT_TIMEOUT, HTTP_CONNECTION_READ_TIMEOUT,
154+
HTTP_SOCKET_TIMEOUT, HTTP_MAX_CONNECTIONS, HTTP_MAX_ENDPOINT_CONNECTIONS, ALLOWED_CLOCK_SKEW);
155155
set.addAll(DelegatedAuthorizationSettings.getSettings(TYPE));
156156
set.addAll(RealmSettings.getStandardSettings(TYPE));
157157
set.addAll(SSLConfigurationSettings.getRealmSettings(TYPE));

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/oidc/OpenIdConnectRealmTests.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.xpack.core.security.authc.Realm;
2424
import org.elasticsearch.xpack.core.security.authc.RealmConfig;
2525
import org.elasticsearch.xpack.core.security.authc.oidc.OpenIdConnectRealmSettings;
26-
import org.elasticsearch.xpack.core.security.authc.saml.SamlRealmSettings;
2726
import org.elasticsearch.xpack.core.security.authc.support.DelegatedAuthorizationSettings;
2827
import org.elasticsearch.xpack.core.security.user.User;
2928
import org.elasticsearch.xpack.security.authc.support.MockLookupRealm;
@@ -87,7 +86,9 @@ public void testAuthentication() throws Exception {
8786
assertThat(result.getUser().email(), equalTo("[email protected]"));
8887
assertThat(result.getUser().fullName(), equalTo("Clinton Barton"));
8988
assertThat(result.getUser().roles(), arrayContainingInAnyOrder("kibana_user", "role1"));
90-
if (notPopulateMetadata == false) {
89+
if (notPopulateMetadata) {
90+
assertThat(result.getUser().metadata().size(), equalTo(0));
91+
} else {
9192
assertThat(result.getUser().metadata().get("oidc(iss)"), equalTo("https://op.company.org"));
9293
assertThat(result.getUser().metadata().get("oidc(name)"), equalTo("Clinton Barton"));
9394
}
@@ -308,7 +309,7 @@ private AuthenticationResult authenticateWithOidc(String principal, UserRoleMapp
308309

309310
final Settings.Builder builder = getBasicRealmSettings();
310311
if (notPopulateMetadata) {
311-
builder.put(getFullSettingKey(REALM_NAME, SamlRealmSettings.POPULATE_USER_METADATA),
312+
builder.put(getFullSettingKey(REALM_NAME, OpenIdConnectRealmSettings.POPULATE_USER_METADATA),
312313
false);
313314
}
314315
if (useAuthorizingRealm) {

0 commit comments

Comments
 (0)