added logging and param trimming
This commit is contained in:
parent
d29ccbef79
commit
eb654c5488
5
pom.xml
5
pom.xml
@ -74,6 +74,11 @@
|
|||||||
<artifactId>jackson-datatype-jsr310</artifactId>
|
<artifactId>jackson-datatype-jsr310</artifactId>
|
||||||
<version>${jackson.version}</version>
|
<version>${jackson.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-lang3</artifactId>
|
||||||
|
<version>3.14.0</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
|
@ -20,6 +20,8 @@ import java.util.Base64;
|
|||||||
import javax.ws.rs.client.ClientRequestContext;
|
import javax.ws.rs.client.ClientRequestContext;
|
||||||
import javax.ws.rs.core.HttpHeaders;
|
import javax.ws.rs.core.HttpHeaders;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class implements a simple 2-credential (username & password) based
|
* This class implements a simple 2-credential (username & password) based
|
||||||
* authorization filter.
|
* authorization filter.
|
||||||
@ -36,8 +38,8 @@ public class BasicAuthorizationFilter implements AuthorizationFilter {
|
|||||||
* @param password A password or secret key.
|
* @param password A password or secret key.
|
||||||
*/
|
*/
|
||||||
public BasicAuthorizationFilter(String username, String password) {
|
public BasicAuthorizationFilter(String username, String password) {
|
||||||
this.username = username;
|
this.username = StringUtils.trimToNull(username);
|
||||||
this.password = password;
|
this.password = StringUtils.trimToNull(password);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -16,6 +16,8 @@ package com.inteligr8.rs;
|
|||||||
|
|
||||||
import javax.ws.rs.client.ClientRequestContext;
|
import javax.ws.rs.client.ClientRequestContext;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class is the base for implementations of client authorization similar
|
* This class is the base for implementations of client authorization similar
|
||||||
* to OAuth-based flows.
|
* to OAuth-based flows.
|
||||||
@ -45,8 +47,8 @@ public class ClientEnforcementAuthorizationFilter implements AuthorizationFilter
|
|||||||
* @param clientSecret A secret corresponding to the client ID.
|
* @param clientSecret A secret corresponding to the client ID.
|
||||||
*/
|
*/
|
||||||
public ClientEnforcementAuthorizationFilter(String clientId, String clientSecret) {
|
public ClientEnforcementAuthorizationFilter(String clientId, String clientSecret) {
|
||||||
this.clientId = clientId;
|
this.clientId = StringUtils.trimToNull(clientId);
|
||||||
this.clientSecret = clientSecret;
|
this.clientSecret = StringUtils.trimToNull(clientSecret);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -18,6 +18,10 @@ import java.net.URI;
|
|||||||
|
|
||||||
import javax.ws.rs.core.Form;
|
import javax.ws.rs.core.Form;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class implements the OAuth Authorization Code flow as an authorization
|
* This class implements the OAuth Authorization Code flow as an authorization
|
||||||
* filter.
|
* filter.
|
||||||
@ -25,6 +29,8 @@ import javax.ws.rs.core.Form;
|
|||||||
* @author brian@inteligr8.com
|
* @author brian@inteligr8.com
|
||||||
*/
|
*/
|
||||||
public class OAuthAuthorizationCodeAuthorizationFilter extends OAuthAuthorizationFilter {
|
public class OAuthAuthorizationCodeAuthorizationFilter extends OAuthAuthorizationFilter {
|
||||||
|
|
||||||
|
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||||
|
|
||||||
private final String code;
|
private final String code;
|
||||||
private final URI redirectUri;
|
private final URI redirectUri;
|
||||||
@ -68,12 +74,13 @@ public class OAuthAuthorizationCodeAuthorizationFilter extends OAuthAuthorizatio
|
|||||||
public OAuthAuthorizationCodeAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String code, URI redirectUri) {
|
public OAuthAuthorizationCodeAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String code, URI redirectUri) {
|
||||||
super(tokenUrl, clientId, clientSecret);
|
super(tokenUrl, clientId, clientSecret);
|
||||||
|
|
||||||
this.code = code;
|
this.code = StringUtils.trimToNull(code);
|
||||||
this.redirectUri = redirectUri;
|
this.redirectUri = redirectUri;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Form createForm() {
|
protected Form createForm() {
|
||||||
|
this.logger.debug("Using OAuth grant_type 'authorization_code'");
|
||||||
Form form = new Form().param("grant_type", "authorization_code");
|
Form form = new Form().param("grant_type", "authorization_code");
|
||||||
if (this.redirectUri != null)
|
if (this.redirectUri != null)
|
||||||
form.param("redirect_uri", this.redirectUri.toString());
|
form.param("redirect_uri", this.redirectUri.toString());
|
||||||
|
@ -27,6 +27,7 @@ import javax.ws.rs.core.HttpHeaders;
|
|||||||
import javax.ws.rs.core.Response;
|
import javax.ws.rs.core.Response;
|
||||||
import javax.ws.rs.core.Response.Status.Family;
|
import javax.ws.rs.core.Response.Status.Family;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
@ -88,9 +89,9 @@ public abstract class OAuthAuthorizationFilter implements AuthorizationFilter {
|
|||||||
*/
|
*/
|
||||||
public OAuthAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String scope) {
|
public OAuthAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String scope) {
|
||||||
this.tokenUrl = tokenUrl;
|
this.tokenUrl = tokenUrl;
|
||||||
this.clientId = clientId;
|
this.clientId = StringUtils.trimToNull(clientId);
|
||||||
this.clientSecret = clientSecret;
|
this.clientSecret = StringUtils.trimToNull(clientSecret);
|
||||||
this.scope = scope;
|
this.scope = StringUtils.trimToNull(scope);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -16,6 +16,9 @@ package com.inteligr8.rs;
|
|||||||
|
|
||||||
import javax.ws.rs.core.Form;
|
import javax.ws.rs.core.Form;
|
||||||
|
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class implements the OAuth Client Credential flow as an authorization
|
* This class implements the OAuth Client Credential flow as an authorization
|
||||||
* filter.
|
* filter.
|
||||||
@ -23,6 +26,8 @@ import javax.ws.rs.core.Form;
|
|||||||
* @author brian@inteligr8.com
|
* @author brian@inteligr8.com
|
||||||
*/
|
*/
|
||||||
public class OAuthClientCredentialAuthorizationFilter extends OAuthAuthorizationFilter {
|
public class OAuthClientCredentialAuthorizationFilter extends OAuthAuthorizationFilter {
|
||||||
|
|
||||||
|
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param tokenUrl The URL to the OAuth IdP token service.
|
* @param tokenUrl The URL to the OAuth IdP token service.
|
||||||
@ -35,6 +40,7 @@ public class OAuthClientCredentialAuthorizationFilter extends OAuthAuthorization
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Form createForm() {
|
protected Form createForm() {
|
||||||
|
this.logger.debug("Using OAuth grant_type 'client_credentials'");
|
||||||
return new Form().param("grant_type", "client_credentials");
|
return new Form().param("grant_type", "client_credentials");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,6 +16,10 @@ package com.inteligr8.rs;
|
|||||||
|
|
||||||
import javax.ws.rs.core.Form;
|
import javax.ws.rs.core.Form;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class implements the OAuth Password Grant flow as an authorization
|
* This class implements the OAuth Password Grant flow as an authorization
|
||||||
* filter.
|
* filter.
|
||||||
@ -23,6 +27,8 @@ import javax.ws.rs.core.Form;
|
|||||||
* @author brian@inteligr8.com
|
* @author brian@inteligr8.com
|
||||||
*/
|
*/
|
||||||
public class OAuthPasswordGrantAuthorizationFilter extends OAuthAuthorizationFilter {
|
public class OAuthPasswordGrantAuthorizationFilter extends OAuthAuthorizationFilter {
|
||||||
|
|
||||||
|
private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
||||||
|
|
||||||
private final String username;
|
private final String username;
|
||||||
private final String password;
|
private final String password;
|
||||||
@ -46,12 +52,13 @@ public class OAuthPasswordGrantAuthorizationFilter extends OAuthAuthorizationFil
|
|||||||
*/
|
*/
|
||||||
public OAuthPasswordGrantAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String username, String password) {
|
public OAuthPasswordGrantAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String username, String password) {
|
||||||
super(tokenUrl, clientId, clientSecret);
|
super(tokenUrl, clientId, clientSecret);
|
||||||
this.username = username;
|
this.username = StringUtils.trimToNull(username);
|
||||||
this.password = password;
|
this.password = StringUtils.trimToNull(password);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Form createForm() {
|
protected Form createForm() {
|
||||||
|
this.logger.debug("Using OAuth grant_type 'password': {}", this.username);
|
||||||
return new Form().param("grant_type", "password")
|
return new Form().param("grant_type", "password")
|
||||||
.param("username", this.username);
|
.param("username", this.username);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user