-
Notifications
You must be signed in to change notification settings - Fork 25.2k
OpenID Connect Realm base functionality #37009
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
jkakavas
merged 22 commits into
elastic:feature-oidc-realm
from
jkakavas:oidc-realm-base
Jan 18, 2019
Merged
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
5af56b9
Add REST and Transport actions for oidc authentication
jkakavas c4154f6
support state
jkakavas 8149339
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas 8d54c7c
track current changes
jkakavas cc68f5a
Ongoing oidc work
jkakavas 72a2dd4
Add functionality for building Authentication Requests
jkakavas 69fb95c
Fix formatting
jkakavas 12dd9c0
Fix formatting
jkakavas 6a4cac6
Fix settings
jkakavas aeacfc5
Correct javadoc
jkakavas 845dc36
Add serialiazion and tests for the AuthenticateRequest
jkakavas 687c109
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas 06c26dc
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas 4bde32f
address feedback
jkakavas 08be032
address feedback
jkakavas 8ead2e5
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas dcf46fa
Address feedback
jkakavas cb35d6e
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas 8d9dcf6
address further feedback
jkakavas e97097e
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas da98413
Merge remote-tracking branch 'origin/master' into oidc-realm-base
jkakavas 03d2db5
Merge remote-tracking branch 'origin/master' into oidc-realm-base
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; | ||
} | ||
} |
95 changes: 95 additions & 0 deletions
95
...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,95 @@ | ||
/* | ||
* 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.io.stream.StreamInput; | ||
import org.elasticsearch.common.io.stream.StreamOutput; | ||
|
||
import java.io.IOException; | ||
|
||
/** | ||
* 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 either we or the facilitator generated for this specific flow and that was stored at the user's session with | ||
* the facilitator | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These java docs ("the faciliator generated") are no longer true. |
||
*/ | ||
private String state; | ||
|
||
/** | ||
* The nonce value that the facilitator generated for this specific flow and that was 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.readOptionalString(); | ||
} | ||
|
||
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() { | ||
return null; | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
super.writeTo(out); | ||
out.writeString(redirectUri); | ||
out.writeString(state); | ||
out.writeOptionalString(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
...asticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationAction.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 OpenIdConnectPrepareAuthenticationAction extends Action<OpenIdConnectPrepareAuthenticationResponse> { | ||
|
||
public static final OpenIdConnectPrepareAuthenticationAction INSTANCE = new OpenIdConnectPrepareAuthenticationAction(); | ||
public static final String NAME = "cluster:admin/xpack/security/oidc/prepare"; | ||
|
||
private OpenIdConnectPrepareAuthenticationAction() { | ||
super(NAME); | ||
} | ||
|
||
@Override | ||
public OpenIdConnectPrepareAuthenticationResponse newResponse() { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
@Override | ||
public Writeable.Reader<OpenIdConnectPrepareAuthenticationResponse> getResponseReader() { | ||
return OpenIdConnectPrepareAuthenticationResponse::new; | ||
} | ||
} |
65 changes: 65 additions & 0 deletions
65
...sticsearch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationRequest.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.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 to prepare an OAuth 2.0 authorization request | ||
*/ | ||
public class OpenIdConnectPrepareAuthenticationRequest extends ActionRequest { | ||
|
||
private String realmName; | ||
|
||
public String getRealmName() { | ||
return realmName; | ||
} | ||
|
||
public void setRealmName(String realmName) { | ||
this.realmName = realmName; | ||
} | ||
|
||
public OpenIdConnectPrepareAuthenticationRequest() { | ||
} | ||
|
||
public OpenIdConnectPrepareAuthenticationRequest(StreamInput in) throws IOException { | ||
super.readFrom(in); | ||
realmName = in.readString(); | ||
} | ||
|
||
@Override | ||
public ActionRequestValidationException validate() { | ||
ActionRequestValidationException validationException = null; | ||
if (Strings.hasText(realmName) == false) { | ||
validationException = addValidationError("realm name must be provided", null); | ||
} | ||
return validationException; | ||
} | ||
|
||
@Override | ||
public void writeTo(StreamOutput out) throws IOException { | ||
super.writeTo(out); | ||
out.writeString(realmName); | ||
} | ||
|
||
@Override | ||
public void readFrom(StreamInput in) { | ||
throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable"); | ||
} | ||
|
||
public String toString() { | ||
return "{realmName=" + realmName + "}"; | ||
} | ||
|
||
} |
25 changes: 25 additions & 0 deletions
25
...rch/xpack/core/security/action/oidc/OpenIdConnectPrepareAuthenticationRequestBuilder.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,25 @@ | ||
/* | ||
* 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 OpenIdConnectPrepareAuthenticationRequest} | ||
*/ | ||
public class OpenIdConnectPrepareAuthenticationRequestBuilder | ||
extends ActionRequestBuilder<OpenIdConnectPrepareAuthenticationRequest, OpenIdConnectPrepareAuthenticationResponse> { | ||
|
||
public OpenIdConnectPrepareAuthenticationRequestBuilder(ElasticsearchClient client) { | ||
super(client, OpenIdConnectPrepareAuthenticationAction.INSTANCE, new OpenIdConnectPrepareAuthenticationRequest()); | ||
} | ||
|
||
public OpenIdConnectPrepareAuthenticationRequestBuilder realmName(String name) { | ||
request.setRealmName(name); | ||
return this; | ||
} | ||
} |
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.