-
Notifications
You must be signed in to change notification settings - Fork 26
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
Feature/generate user data #140
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8266b94
derive user data from login name
ostrya 1a5f71b
remove deprecated library calls
ostrya 467ba00
allow generating user data via TokenConfig
ostrya 93749b7
fix javadoc location
ostrya f1b51b5
verify signature when parsing refresh token
ostrya 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
This file contains 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
This file contains 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 |
---|---|---|
@@ -1,9 +1,7 @@ | ||
package com.tngtech.keycloakmock.impl; | ||
|
||
import com.tngtech.keycloakmock.api.TokenConfig; | ||
import io.jsonwebtoken.Claims; | ||
import io.jsonwebtoken.Header; | ||
import io.jsonwebtoken.Jwt; | ||
import com.tngtech.keycloakmock.impl.session.UserData; | ||
import io.jsonwebtoken.JwtBuilder; | ||
import io.jsonwebtoken.JwtParser; | ||
import io.jsonwebtoken.Jwts; | ||
|
@@ -13,6 +11,7 @@ | |
import java.util.Date; | ||
import java.util.Map; | ||
import java.util.Objects; | ||
import java.util.Optional; | ||
import javax.annotation.Nonnull; | ||
import javax.annotation.Nullable; | ||
import javax.inject.Inject; | ||
|
@@ -56,12 +55,41 @@ public String getToken( | |
.claim("scope", tokenConfig.getScope()) | ||
.claim("typ", "Bearer") | ||
.claim("azp", tokenConfig.getAuthorizedParty()); | ||
Optional<UserData> generatedUserData; | ||
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. Could use ternary 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. Hm, yes. But it's not significantly shorter, and the google formatting looks weird:
|
||
if (tokenConfig.isGenerateUserDataFromSubject()) { | ||
generatedUserData = | ||
Optional.of( | ||
UserData.fromUsernameAndHostname( | ||
tokenConfig.getSubject(), requestConfiguration.getHostname())); | ||
} else { | ||
generatedUserData = Optional.empty(); | ||
} | ||
setClaimIfPresent(builder, "nbf", tokenConfig.getNotBefore()); | ||
setClaimIfPresent(builder, "name", tokenConfig.getName()); | ||
setClaimIfPresent(builder, "given_name", tokenConfig.getGivenName()); | ||
setClaimIfPresent(builder, "family_name", tokenConfig.getFamilyName()); | ||
setClaimIfPresent(builder, "email", tokenConfig.getEmail()); | ||
setClaimIfPresent(builder, "preferred_username", tokenConfig.getPreferredUsername()); | ||
setClaimIfPresent( | ||
builder, | ||
"name", | ||
tokenConfig.getName(), | ||
generatedUserData.map(UserData::getName).orElse(null)); | ||
setClaimIfPresent( | ||
builder, | ||
"given_name", | ||
tokenConfig.getGivenName(), | ||
generatedUserData.map(UserData::getGivenName).orElse(null)); | ||
setClaimIfPresent( | ||
builder, | ||
"family_name", | ||
tokenConfig.getFamilyName(), | ||
generatedUserData.map(UserData::getFamilyName).orElse(null)); | ||
setClaimIfPresent( | ||
builder, | ||
"email", | ||
tokenConfig.getEmail(), | ||
generatedUserData.map(UserData::getEmail).orElse(null)); | ||
setClaimIfPresent( | ||
builder, | ||
"preferred_username", | ||
tokenConfig.getPreferredUsername(), | ||
generatedUserData.map(UserData::getPreferredUsername).orElse(null)); | ||
setClaimIfPresent(builder, "acr", tokenConfig.getAuthenticationContextClassReference()); | ||
return builder | ||
.claim("realm_access", tokenConfig.getRealmAccess()) | ||
|
@@ -71,10 +99,9 @@ public String getToken( | |
.compact(); | ||
} | ||
|
||
@SuppressWarnings("unchecked") | ||
public Map<String, Object> parseToken(String token) { | ||
JwtParser parser = Jwts.parserBuilder().setSigningKey(privateKey).build(); | ||
return ((Jwt<Header<?>, Claims>) parser.parse(token)).getBody(); | ||
return parser.parseClaimsJws(token).getBody(); | ||
} | ||
|
||
private void setClaimIfPresent( | ||
|
@@ -84,6 +111,18 @@ private void setClaimIfPresent( | |
} | ||
} | ||
|
||
private void setClaimIfPresent( | ||
@Nonnull final JwtBuilder builder, | ||
@Nonnull final String claim, | ||
@Nullable String value, | ||
@Nullable String alternative) { | ||
if (value != null) { | ||
Objects.requireNonNull(builder).claim(claim, value); | ||
} else if (alternative != null) { | ||
Objects.requireNonNull(builder).claim(claim, alternative); | ||
} | ||
} | ||
|
||
private void setClaimIfPresent( | ||
@Nonnull final JwtBuilder builder, @Nonnull final String claim, @Nullable Instant value) { | ||
if (value != null) { | ||
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
was this not broken?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not quite sure what you mean. If you're talking about the missing quotation mark: yes, that was broken.