-
Notifications
You must be signed in to change notification settings - Fork 25.3k
Add an OpenID Connect authentication realm #40674
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
8d54639
OpenID Connect Realm base functionality (#37009)
jkakavas 8a66852
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 16985f5
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas cc2549b
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 057b849
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas ca9c7d5
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 443b876
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 78fb134
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 7d89ce3
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas e5859fd
OIDC realm authentication flows (#37787)
jkakavas ebe0f9d
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas d2bddd3
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas ff1f080
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas ed5117d
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 32e96fe
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 53c3061
Support 3rd party initiated login for OpenID Connect (#38474)
jkakavas 4beced5
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 54a0448
Support RP initated single log out (#38475)
jkakavas 1836928
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 05c5377
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 8239b61
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 55f2c09
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 747bc40
Merge remote-tracking branch 'origin/master' into feature-oidc-realm
jkakavas 948aa39
Add OIDC authentication Integration Tests (#40262)
jkakavas ff593bd
Address feedback
jkakavas 82c0332
Remove duplicate LICENSE file
jkakavas 0c4af4c
Use same LICENSE and NOTICE files for asm, project-wide
jkakavas 68e8c0c
add missing realm configuration in SecurityRealmSettingsTests
jkakavas 78474e7
Remove unnecessary filter
jkakavas 0a086a5
Address feedback
jkakavas File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
32 changes: 32 additions & 0 deletions
32
...va/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateAction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.Action; | ||
import org.elasticsearch.common.io.stream.Writeable; | ||
|
||
/** | ||
* Action for initiating an authentication process using OpenID Connect | ||
*/ | ||
public final class OpenIdConnectAuthenticateAction extends Action<OpenIdConnectAuthenticateResponse> { | ||
|
||
public static final OpenIdConnectAuthenticateAction INSTANCE = new OpenIdConnectAuthenticateAction(); | ||
public static final String NAME = "cluster:admin/xpack/security/oidc/authenticate"; | ||
|
||
private OpenIdConnectAuthenticateAction() { | ||
super(NAME); | ||
} | ||
|
||
@Override | ||
public OpenIdConnectAuthenticateResponse newResponse() { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
@Override | ||
public Writeable.Reader<OpenIdConnectAuthenticateResponse> getResponseReader() { | ||
return OpenIdConnectAuthenticateResponse::new; | ||
} | ||
} |
108 changes: 108 additions & 0 deletions
108
...a/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.ActionRequest; | ||
import org.elasticsearch.action.ActionRequestValidationException; | ||
import org.elasticsearch.common.Strings; | ||
import org.elasticsearch.common.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
|
||
import java.io.IOException; | ||
|
||
import static org.elasticsearch.action.ValidateActions.addValidationError; | ||
|
||
/** | ||
* Represents a request for authentication using OpenID Connect | ||
*/ | ||
public class OpenIdConnectAuthenticateRequest extends ActionRequest { | ||
|
||
/** | ||
* The URI where the OP redirected the browser after the authentication attempt. This is passed as is from the | ||
* facilitator entity (i.e. Kibana) | ||
*/ | ||
private String redirectUri; | ||
|
||
/** | ||
* The state value that we generated or the facilitator provided for this specific flow and that should be stored at the user's session | ||
* with the facilitator | ||
*/ | ||
private String state; | ||
|
||
/** | ||
* The nonce value that we generated or the facilitator provided for this specific flow and that should be stored at the user's session | ||
* with the facilitator | ||
*/ | ||
private String nonce; | ||
|
||
public OpenIdConnectAuthenticateRequest() { | ||
|
||
} | ||
|
||
public OpenIdConnectAuthenticateRequest(StreamInput in) throws IOException { | ||
super.readFrom(in); | ||
redirectUri = in.readString(); | ||
state = in.readString(); | ||
nonce = in.readString(); | ||
} | ||
|
||
public String getRedirectUri() { | ||
return redirectUri; | ||
} | ||
|
||
public void setRedirectUri(String redirectUri) { | ||
this.redirectUri = redirectUri; | ||
} | ||
|
||
public String getState() { | ||
return state; | ||
} | ||
|
||
public void setState(String state) { | ||
this.state = state; | ||
} | ||
|
||
public String getNonce() { | ||
return nonce; | ||
} | ||
|
||
public void setNonce(String nonce) { | ||
this.nonce = nonce; | ||
} | ||
|
||
@Override | ||
public ActionRequestValidationException validate() { | ||
ActionRequestValidationException validationException = null; | ||
if (Strings.isNullOrEmpty(state)) { | ||
validationException = addValidationError("state parameter is missing", validationException); | ||
} | ||
if (Strings.isNullOrEmpty(nonce)) { | ||
validationException = addValidationError("nonce parameter is missing", validationException); | ||
} | ||
if (Strings.isNullOrEmpty(redirectUri)) { | ||
validationException = addValidationError("redirect_uri parameter is missing", validationException); | ||
} | ||
return validationException; | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
super.writeTo(out); | ||
out.writeString(redirectUri); | ||
out.writeString(state); | ||
out.writeString(nonce); | ||
} | ||
|
||
@Override | ||
public void readFrom(StreamInput in) { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
public String toString() { | ||
return "{redirectUri=" + redirectUri + ", state=" + state + ", nonce=" + nonce + "}"; | ||
} | ||
} | ||
|
36 changes: 36 additions & 0 deletions
36
...lasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateRequestBuilder.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.ActionRequestBuilder; | ||
import org.elasticsearch.client.ElasticsearchClient; | ||
|
||
/** | ||
* Request builder for populating a {@link OpenIdConnectAuthenticateRequest} | ||
*/ | ||
public class OpenIdConnectAuthenticateRequestBuilder | ||
extends ActionRequestBuilder<OpenIdConnectAuthenticateRequest, OpenIdConnectAuthenticateResponse> { | ||
|
||
public OpenIdConnectAuthenticateRequestBuilder(ElasticsearchClient client) { | ||
super(client, OpenIdConnectAuthenticateAction.INSTANCE, new OpenIdConnectAuthenticateRequest()); | ||
} | ||
|
||
public OpenIdConnectAuthenticateRequestBuilder redirectUri(String redirectUri) { | ||
request.setRedirectUri(redirectUri); | ||
return this; | ||
} | ||
|
||
public OpenIdConnectAuthenticateRequestBuilder state(String state) { | ||
request.setState(state); | ||
return this; | ||
} | ||
|
||
public OpenIdConnectAuthenticateRequestBuilder nonce(String nonce) { | ||
request.setNonce(nonce); | ||
return this; | ||
} | ||
|
||
} |
65 changes: 65 additions & 0 deletions
65
.../org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectAuthenticateResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.ActionResponse; | ||
import org.elasticsearch.common.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
import org.elasticsearch.common.unit.TimeValue; | ||
|
||
import java.io.IOException; | ||
|
||
public class OpenIdConnectAuthenticateResponse extends ActionResponse { | ||
private String principal; | ||
private String accessTokenString; | ||
private String refreshTokenString; | ||
private TimeValue expiresIn; | ||
|
||
public OpenIdConnectAuthenticateResponse(String principal, String accessTokenString, String refreshTokenString, TimeValue expiresIn) { | ||
this.principal = principal; | ||
this.accessTokenString = accessTokenString; | ||
this.refreshTokenString = refreshTokenString; | ||
this.expiresIn = expiresIn; | ||
} | ||
|
||
public OpenIdConnectAuthenticateResponse(StreamInput in) throws IOException { | ||
super.readFrom(in); | ||
principal = in.readString(); | ||
accessTokenString = in.readString(); | ||
refreshTokenString = in.readString(); | ||
expiresIn = in.readTimeValue(); | ||
} | ||
|
||
public String getPrincipal() { | ||
return principal; | ||
} | ||
|
||
public String getAccessTokenString() { | ||
return accessTokenString; | ||
} | ||
|
||
public String getRefreshTokenString() { | ||
return refreshTokenString; | ||
} | ||
|
||
public TimeValue getExpiresIn() { | ||
return expiresIn; | ||
} | ||
|
||
@Override | ||
public void readFrom(StreamInput in) { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
super.writeTo(out); | ||
out.writeString(principal); | ||
out.writeString(accessTokenString); | ||
out.writeString(refreshTokenString); | ||
out.writeTimeValue(expiresIn); | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...ain/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutAction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.Action; | ||
import org.elasticsearch.common.io.stream.Writeable; | ||
|
||
public class OpenIdConnectLogoutAction extends Action<OpenIdConnectLogoutResponse> { | ||
|
||
public static final OpenIdConnectLogoutAction INSTANCE = new OpenIdConnectLogoutAction(); | ||
public static final String NAME = "cluster:admin/xpack/security/oidc/logout"; | ||
|
||
private OpenIdConnectLogoutAction() { | ||
super(NAME); | ||
} | ||
|
||
@Override | ||
public OpenIdConnectLogoutResponse newResponse() { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
@Override | ||
public Writeable.Reader<OpenIdConnectLogoutResponse> getResponseReader() { | ||
return OpenIdConnectLogoutResponse::new; | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
...in/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutRequest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.ActionRequest; | ||
import org.elasticsearch.action.ActionRequestValidationException; | ||
import org.elasticsearch.common.Nullable; | ||
import org.elasticsearch.common.Strings; | ||
import org.elasticsearch.common.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
|
||
import java.io.IOException; | ||
|
||
import static org.elasticsearch.action.ValidateActions.addValidationError; | ||
|
||
public final class OpenIdConnectLogoutRequest extends ActionRequest { | ||
|
||
private String token; | ||
@Nullable | ||
private String refreshToken; | ||
|
||
public OpenIdConnectLogoutRequest() { | ||
|
||
} | ||
|
||
public OpenIdConnectLogoutRequest(StreamInput in) throws IOException { | ||
super.readFrom(in); | ||
token = in.readString(); | ||
refreshToken = in.readOptionalString(); | ||
} | ||
|
||
@Override | ||
public ActionRequestValidationException validate() { | ||
ActionRequestValidationException validationException = null; | ||
if (Strings.isNullOrEmpty(token)) { | ||
validationException = addValidationError("token is missing", validationException); | ||
} | ||
return validationException; | ||
} | ||
|
||
public String getToken() { | ||
return token; | ||
} | ||
|
||
public void setToken(String token) { | ||
this.token = token; | ||
} | ||
|
||
public String getRefreshToken() { | ||
return refreshToken; | ||
} | ||
|
||
public void setRefreshToken(String refreshToken) { | ||
this.refreshToken = refreshToken; | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
super.writeTo(out); | ||
out.writeString(token); | ||
out.writeOptionalString(refreshToken); | ||
} | ||
|
||
@Override | ||
public void readFrom(StreamInput in) { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
...n/java/org/elasticsearch/xpack/core/security/action/oidc/OpenIdConnectLogoutResponse.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
package org.elasticsearch.xpack.core.security.action.oidc; | ||
|
||
import org.elasticsearch.action.ActionResponse; | ||
import org.elasticsearch.common.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
|
||
import java.io.IOException; | ||
|
||
public final class OpenIdConnectLogoutResponse extends ActionResponse { | ||
|
||
private String endSessionUrl; | ||
|
||
public OpenIdConnectLogoutResponse(StreamInput in) throws IOException { | ||
super.readFrom(in); | ||
this.endSessionUrl = in.readString(); | ||
} | ||
|
||
public OpenIdConnectLogoutResponse(String endSessionUrl) { | ||
this.endSessionUrl = endSessionUrl; | ||
} | ||
|
||
@Override | ||
public void readFrom(StreamInput in) { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
super.writeTo(out); | ||
out.writeString(endSessionUrl); | ||
} | ||
|
||
public String toString() { | ||
return "{endSessionUrl=" + endSessionUrl + "}"; | ||
} | ||
|
||
public String getEndSessionUrl() { | ||
return endSessionUrl; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.