v1.2.2 RC
This commit is contained in:
shimingxy
@@ -17,23 +17,23 @@ package org.maxkey.authz.oauth2.common;
|
||||
*/
|
||||
public enum AuthenticationScheme {
|
||||
|
||||
/**
|
||||
* Send an Authorization header.
|
||||
*/
|
||||
header,
|
||||
/**
|
||||
* Send an Authorization header.
|
||||
*/
|
||||
header,
|
||||
|
||||
/**
|
||||
* Send a query parameter in the URI.
|
||||
*/
|
||||
query,
|
||||
/**
|
||||
* Send a query parameter in the URI.
|
||||
*/
|
||||
query,
|
||||
|
||||
/**
|
||||
* Send in the form body.
|
||||
*/
|
||||
form,
|
||||
/**
|
||||
* Send in the form body.
|
||||
*/
|
||||
form,
|
||||
|
||||
/**
|
||||
* Do not send at all.
|
||||
*/
|
||||
none
|
||||
/**
|
||||
* Do not send at all.
|
||||
*/
|
||||
none
|
||||
}
|
||||
@@ -18,222 +18,227 @@ import java.util.TreeSet;
|
||||
*/
|
||||
public class DefaultOAuth2AccessToken implements Serializable, OAuth2AccessToken {
|
||||
|
||||
private static final long serialVersionUID = 914967629530462926L;
|
||||
private static final long serialVersionUID = 914967629530462926L;
|
||||
|
||||
private String value;
|
||||
private String value;
|
||||
|
||||
private Date expiration;
|
||||
private Date expiration;
|
||||
|
||||
private String tokenType = BEARER_TYPE.toLowerCase();
|
||||
private String tokenType = BEARER_TYPE.toLowerCase();
|
||||
|
||||
private OAuth2RefreshToken refreshToken;
|
||||
private OAuth2RefreshToken refreshToken;
|
||||
|
||||
private Set<String> scope;
|
||||
private Set<String> scope;
|
||||
|
||||
private Map<String, Object> additionalInformation = Collections.emptyMap();
|
||||
private Map<String, Object> additionalInformation = Collections.emptyMap();
|
||||
|
||||
/**
|
||||
* Create an access token from the value provided.
|
||||
*/
|
||||
public DefaultOAuth2AccessToken(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
/**
|
||||
* Create an access token from the value provided.
|
||||
*/
|
||||
public DefaultOAuth2AccessToken(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Private constructor for JPA and other serialization tools.
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
private DefaultOAuth2AccessToken() {
|
||||
this((String) null);
|
||||
}
|
||||
/**
|
||||
* Private constructor for JPA and other serialization tools.
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
private DefaultOAuth2AccessToken() {
|
||||
this((String) null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy constructor for access token.
|
||||
*
|
||||
* @param accessToken
|
||||
*/
|
||||
public DefaultOAuth2AccessToken(OAuth2AccessToken accessToken) {
|
||||
this(accessToken.getValue());
|
||||
setAdditionalInformation(accessToken.getAdditionalInformation());
|
||||
setRefreshToken(accessToken.getRefreshToken());
|
||||
setExpiration(accessToken.getExpiration());
|
||||
setScope(accessToken.getScope());
|
||||
setTokenType(accessToken.getTokenType());
|
||||
}
|
||||
/**
|
||||
* Copy constructor for access token.
|
||||
*
|
||||
* @param accessToken
|
||||
*/
|
||||
public DefaultOAuth2AccessToken(OAuth2AccessToken accessToken) {
|
||||
this(accessToken.getValue());
|
||||
setAdditionalInformation(accessToken.getAdditionalInformation());
|
||||
setRefreshToken(accessToken.getRefreshToken());
|
||||
setExpiration(accessToken.getExpiration());
|
||||
setScope(accessToken.getScope());
|
||||
setTokenType(accessToken.getTokenType());
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
public void setValue(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* The token value.
|
||||
*
|
||||
* @return The token value.
|
||||
*/
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
/**
|
||||
* The token value.
|
||||
*
|
||||
* @return The token value.
|
||||
*/
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
public int getExpiresIn() {
|
||||
return expiration != null ? Long.valueOf((expiration.getTime() - System.currentTimeMillis()) / 1000L)
|
||||
.intValue() : 0;
|
||||
}
|
||||
public int getExpiresIn() {
|
||||
return expiration != null ? Long.valueOf((expiration.getTime() - System.currentTimeMillis()) / 1000L).intValue()
|
||||
: 0;
|
||||
}
|
||||
|
||||
protected void setExpiresIn(int delta) {
|
||||
setExpiration(new Date(System.currentTimeMillis() + delta));
|
||||
}
|
||||
protected void setExpiresIn(int delta) {
|
||||
setExpiration(new Date(System.currentTimeMillis() + delta));
|
||||
}
|
||||
|
||||
/**
|
||||
* The instant the token expires.
|
||||
*
|
||||
* @return The instant the token expires.
|
||||
*/
|
||||
public Date getExpiration() {
|
||||
return expiration;
|
||||
}
|
||||
/**
|
||||
* The instant the token expires.
|
||||
*
|
||||
* @return The instant the token expires.
|
||||
*/
|
||||
public Date getExpiration() {
|
||||
return expiration;
|
||||
}
|
||||
|
||||
/**
|
||||
* The instant the token expires.
|
||||
*
|
||||
* @param expiration The instant the token expires.
|
||||
*/
|
||||
public void setExpiration(Date expiration) {
|
||||
this.expiration = expiration;
|
||||
}
|
||||
/**
|
||||
* The instant the token expires.
|
||||
*
|
||||
* @param expiration The instant the token expires.
|
||||
*/
|
||||
public void setExpiration(Date expiration) {
|
||||
this.expiration = expiration;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convenience method for checking expiration
|
||||
*
|
||||
* @return true if the expiration is befor ethe current time
|
||||
*/
|
||||
public boolean isExpired() {
|
||||
return expiration != null && expiration.before(new Date());
|
||||
}
|
||||
/**
|
||||
* Convenience method for checking expiration
|
||||
*
|
||||
* @return true if the expiration is befor ethe current time
|
||||
*/
|
||||
public boolean isExpired() {
|
||||
return expiration != null && expiration.before(new Date());
|
||||
}
|
||||
|
||||
/**
|
||||
* The token type, as introduced in draft 11 of the OAuth 2 spec. The spec doesn't define (yet) that the valid token
|
||||
* types are, but says it's required so the default will just be "undefined".
|
||||
*
|
||||
* @return The token type, as introduced in draft 11 of the OAuth 2 spec.
|
||||
*/
|
||||
public String getTokenType() {
|
||||
return tokenType;
|
||||
}
|
||||
/**
|
||||
* The token type, as introduced in draft 11 of the OAuth 2 spec. The spec
|
||||
* doesn't define (yet) that the valid token types are, but says it's required
|
||||
* so the default will just be "undefined".
|
||||
*
|
||||
* @return The token type, as introduced in draft 11 of the OAuth 2 spec.
|
||||
*/
|
||||
public String getTokenType() {
|
||||
return tokenType;
|
||||
}
|
||||
|
||||
/**
|
||||
* The token type, as introduced in draft 11 of the OAuth 2 spec.
|
||||
*
|
||||
* @param tokenType The token type, as introduced in draft 11 of the OAuth 2 spec.
|
||||
*/
|
||||
public void setTokenType(String tokenType) {
|
||||
this.tokenType = tokenType;
|
||||
}
|
||||
/**
|
||||
* The token type, as introduced in draft 11 of the OAuth 2 spec.
|
||||
*
|
||||
* @param tokenType The token type, as introduced in draft 11 of the OAuth 2
|
||||
* spec.
|
||||
*/
|
||||
public void setTokenType(String tokenType) {
|
||||
this.tokenType = tokenType;
|
||||
}
|
||||
|
||||
/**
|
||||
* The refresh token associated with the access token, if any.
|
||||
*
|
||||
* @return The refresh token associated with the access token, if any.
|
||||
*/
|
||||
public OAuth2RefreshToken getRefreshToken() {
|
||||
return refreshToken;
|
||||
}
|
||||
/**
|
||||
* The refresh token associated with the access token, if any.
|
||||
*
|
||||
* @return The refresh token associated with the access token, if any.
|
||||
*/
|
||||
public OAuth2RefreshToken getRefreshToken() {
|
||||
return refreshToken;
|
||||
}
|
||||
|
||||
/**
|
||||
* The refresh token associated with the access token, if any.
|
||||
*
|
||||
* @param refreshToken The refresh token associated with the access token, if any.
|
||||
*/
|
||||
public void setRefreshToken(OAuth2RefreshToken refreshToken) {
|
||||
this.refreshToken = refreshToken;
|
||||
}
|
||||
/**
|
||||
* The refresh token associated with the access token, if any.
|
||||
*
|
||||
* @param refreshToken The refresh token associated with the access token, if
|
||||
* any.
|
||||
*/
|
||||
public void setRefreshToken(OAuth2RefreshToken refreshToken) {
|
||||
this.refreshToken = refreshToken;
|
||||
}
|
||||
|
||||
/**
|
||||
* The scope of the token.
|
||||
*
|
||||
* @return The scope of the token.
|
||||
*/
|
||||
public Set<String> getScope() {
|
||||
return scope;
|
||||
}
|
||||
/**
|
||||
* The scope of the token.
|
||||
*
|
||||
* @return The scope of the token.
|
||||
*/
|
||||
public Set<String> getScope() {
|
||||
return scope;
|
||||
}
|
||||
|
||||
/**
|
||||
* The scope of the token.
|
||||
*
|
||||
* @param scope The scope of the token.
|
||||
*/
|
||||
public void setScope(Set<String> scope) {
|
||||
this.scope = scope;
|
||||
}
|
||||
/**
|
||||
* The scope of the token.
|
||||
*
|
||||
* @param scope The scope of the token.
|
||||
*/
|
||||
public void setScope(Set<String> scope) {
|
||||
this.scope = scope;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
return obj != null && toString().equals(obj.toString());
|
||||
}
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
return obj != null && toString().equals(obj.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return toString().hashCode();
|
||||
}
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return toString().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.valueOf(getValue());
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.valueOf(getValue());
|
||||
}
|
||||
|
||||
public static OAuth2AccessToken valueOf(Map<String, String> tokenParams) {
|
||||
DefaultOAuth2AccessToken token = new DefaultOAuth2AccessToken(tokenParams.get(ACCESS_TOKEN));
|
||||
public static OAuth2AccessToken valueOf(Map<String, String> tokenParams) {
|
||||
DefaultOAuth2AccessToken token = new DefaultOAuth2AccessToken(tokenParams.get(ACCESS_TOKEN));
|
||||
|
||||
if (tokenParams.containsKey(EXPIRES_IN)) {
|
||||
long expiration = 0;
|
||||
try {
|
||||
expiration = Long.parseLong(String.valueOf(tokenParams.get(EXPIRES_IN)));
|
||||
}
|
||||
catch (NumberFormatException e) {
|
||||
// fall through...
|
||||
}
|
||||
token.setExpiration(new Date(System.currentTimeMillis() + (expiration * 1000L)));
|
||||
}
|
||||
if (tokenParams.containsKey(EXPIRES_IN)) {
|
||||
long expiration = 0;
|
||||
try {
|
||||
expiration = Long.parseLong(String.valueOf(tokenParams.get(EXPIRES_IN)));
|
||||
} catch (NumberFormatException e) {
|
||||
// fall through...
|
||||
}
|
||||
token.setExpiration(new Date(System.currentTimeMillis() + (expiration * 1000L)));
|
||||
}
|
||||
|
||||
if (tokenParams.containsKey(REFRESH_TOKEN)) {
|
||||
String refresh = tokenParams.get(REFRESH_TOKEN);
|
||||
DefaultOAuth2RefreshToken refreshToken = new DefaultOAuth2RefreshToken(refresh);
|
||||
token.setRefreshToken(refreshToken);
|
||||
}
|
||||
if (tokenParams.containsKey(REFRESH_TOKEN)) {
|
||||
String refresh = tokenParams.get(REFRESH_TOKEN);
|
||||
DefaultOAuth2RefreshToken refreshToken = new DefaultOAuth2RefreshToken(refresh);
|
||||
token.setRefreshToken(refreshToken);
|
||||
}
|
||||
|
||||
if (tokenParams.containsKey(SCOPE)) {
|
||||
Set<String> scope = new TreeSet<String>();
|
||||
for (StringTokenizer tokenizer = new StringTokenizer(tokenParams.get(SCOPE), " ,"); tokenizer
|
||||
.hasMoreTokens();) {
|
||||
scope.add(tokenizer.nextToken());
|
||||
}
|
||||
token.setScope(scope);
|
||||
}
|
||||
if (tokenParams.containsKey(SCOPE)) {
|
||||
Set<String> scope = new TreeSet<String>();
|
||||
for (StringTokenizer tokenizer = new StringTokenizer(tokenParams.get(SCOPE), " ,"); tokenizer
|
||||
.hasMoreTokens();) {
|
||||
scope.add(tokenizer.nextToken());
|
||||
}
|
||||
token.setScope(scope);
|
||||
}
|
||||
|
||||
if (tokenParams.containsKey(TOKEN_TYPE)) {
|
||||
token.setTokenType(tokenParams.get(TOKEN_TYPE));
|
||||
}
|
||||
if (tokenParams.containsKey(TOKEN_TYPE)) {
|
||||
token.setTokenType(tokenParams.get(TOKEN_TYPE));
|
||||
}
|
||||
|
||||
return token;
|
||||
}
|
||||
return token;
|
||||
}
|
||||
|
||||
/**
|
||||
* Additional information that token granters would like to add to the token, e.g. to support new token types.
|
||||
*
|
||||
* @return the additional information (default empty)
|
||||
*/
|
||||
public Map<String, Object> getAdditionalInformation() {
|
||||
return additionalInformation;
|
||||
}
|
||||
/**
|
||||
* Additional information that token granters would like to add to the token,
|
||||
* e.g. to support new token types.
|
||||
*
|
||||
* @return the additional information (default empty)
|
||||
*/
|
||||
public Map<String, Object> getAdditionalInformation() {
|
||||
return additionalInformation;
|
||||
}
|
||||
|
||||
/**
|
||||
* Additional information that token granters would like to add to the token, e.g. to support new token types. If
|
||||
* the values in the map are primitive then remote communication is going to always work. It should also be safe to
|
||||
* use maps (nested if desired), or something that is explicitly serializable by Jackson.
|
||||
*
|
||||
* @param additionalInformation the additional information to set
|
||||
*/
|
||||
public void setAdditionalInformation(Map<String, Object> additionalInformation) {
|
||||
this.additionalInformation = new LinkedHashMap<String, Object>(additionalInformation);
|
||||
}
|
||||
/**
|
||||
* Additional information that token granters would like to add to the token,
|
||||
* e.g. to support new token types. If the values in the map are primitive then
|
||||
* remote communication is going to always work. It should also be safe to use
|
||||
* maps (nested if desired), or something that is explicitly serializable by
|
||||
* Jackson.
|
||||
*
|
||||
* @param additionalInformation the additional information to set
|
||||
*/
|
||||
public void setAdditionalInformation(Map<String, Object> additionalInformation) {
|
||||
this.additionalInformation = new LinkedHashMap<String, Object>(additionalInformation);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
package org.maxkey.authz.oauth2.common;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* An OAuth 2 refresh token.
|
||||
@@ -14,59 +12,59 @@ import com.fasterxml.jackson.annotation.JsonValue;
|
||||
*/
|
||||
public class DefaultOAuth2RefreshToken implements Serializable, OAuth2RefreshToken {
|
||||
|
||||
private static final long serialVersionUID = 8349970621900575838L;
|
||||
private static final long serialVersionUID = 8349970621900575838L;
|
||||
|
||||
private String value;
|
||||
private String value;
|
||||
|
||||
/**
|
||||
* Create a new refresh token.
|
||||
*/
|
||||
@JsonCreator
|
||||
public DefaultOAuth2RefreshToken(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Default constructor for JPA and other serialization tools.
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
private DefaultOAuth2RefreshToken() {
|
||||
this(null);
|
||||
}
|
||||
/**
|
||||
* Create a new refresh token.
|
||||
*/
|
||||
@JsonCreator
|
||||
public DefaultOAuth2RefreshToken(String value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Default constructor for JPA and other serialization tools.
|
||||
*/
|
||||
@SuppressWarnings("unused")
|
||||
private DefaultOAuth2RefreshToken() {
|
||||
this(null);
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.security.oauth2.common.IFOO#getValue()
|
||||
*/
|
||||
@JsonValue
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
/* (non-Javadoc)
|
||||
* @see org.springframework.security.oauth2.common.IFOO#getValue()
|
||||
*/
|
||||
@JsonValue
|
||||
public String getValue() {
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getValue();
|
||||
}
|
||||
@Override
|
||||
public String toString() {
|
||||
return getValue();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (!(o instanceof DefaultOAuth2RefreshToken)) {
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
public boolean equals(Object o) {
|
||||
if (this == o) {
|
||||
return true;
|
||||
}
|
||||
if (!(o instanceof DefaultOAuth2RefreshToken)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
DefaultOAuth2RefreshToken that = (DefaultOAuth2RefreshToken) o;
|
||||
DefaultOAuth2RefreshToken that = (DefaultOAuth2RefreshToken) o;
|
||||
|
||||
if (value != null ? !value.equals(that.value) : that.value != null) {
|
||||
return false;
|
||||
}
|
||||
if (value != null ? !value.equals(that.value) : that.value != null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return value != null ? value.hashCode() : 0;
|
||||
}
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return value != null ? value.hashCode() : 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user