Commit eb654c54 authored by Brian Long's avatar Brian Long
Browse files

added logging and param trimming

parent d29ccbef

pom.xml

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ 
			<artifactId>jackson-datatype-jsr310</artifactId>

			<version>${jackson.version}</version>

		</dependency>

		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>

			<version>3.14.0</version>

		</dependency>

		<dependency>

			<groupId>org.slf4j</groupId>

			<artifactId>slf4j-api</artifactId>

src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java

+4 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import java.util.Base64; 
import javax.ws.rs.client.ClientRequestContext;

import javax.ws.rs.core.HttpHeaders;



import org.apache.commons.lang3.StringUtils;



/**

 * This class implements a simple 2-credential (username &amp; password) based

 * authorization filter.
@@ -36,8 +38,8 @@ public class BasicAuthorizationFilter implements AuthorizationFilter { 
	 * @param password A password or secret key.

	 */

	public BasicAuthorizationFilter(String username, String password) {

		this.username = username;

		this.password = password;

		this.username = StringUtils.trimToNull(username);

		this.password = StringUtils.trimToNull(password);

	}

	

	/**

src/main/java/com/inteligr8/rs/ClientEnforcementAuthorizationFilter.java

+4 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ package com.inteligr8.rs; 


import javax.ws.rs.client.ClientRequestContext;



import org.apache.commons.lang3.StringUtils;



/**

 * This class is the base for implementations of client authorization similar

 * to OAuth-based flows.
@@ -45,8 +47,8 @@ public class ClientEnforcementAuthorizationFilter implements AuthorizationFilter 
	 * @param clientSecret A secret corresponding to the client ID.

	 */

	public ClientEnforcementAuthorizationFilter(String clientId, String clientSecret) {

		this.clientId = clientId;

		this.clientSecret = clientSecret;

		this.clientId = StringUtils.trimToNull(clientId);

		this.clientSecret = StringUtils.trimToNull(clientSecret);

	}



	/**

src/main/java/com/inteligr8/rs/OAuthAuthorizationCodeAuthorizationFilter.java

+8 −1
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ import java.net.URI; 


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

 * filter.
@@ -26,6 +30,8 @@ import javax.ws.rs.core.Form; 
 */

public class OAuthAuthorizationCodeAuthorizationFilter extends OAuthAuthorizationFilter {

    

    private final Logger logger = LoggerFactory.getLogger(this.getClass());

	

	private final String code;

	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) {

		super(tokenUrl, clientId, clientSecret);

		

		this.code = code;

		this.code = StringUtils.trimToNull(code);

		this.redirectUri = redirectUri;

	}

	

	@Override

	protected Form createForm() {

        this.logger.debug("Using OAuth grant_type 'authorization_code'");

		Form form = new Form().param("grant_type", "authorization_code");

		if (this.redirectUri != null)

			form.param("redirect_uri", this.redirectUri.toString());

src/main/java/com/inteligr8/rs/OAuthAuthorizationFilter.java

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import javax.ws.rs.core.HttpHeaders; 
import javax.ws.rs.core.Response;

import javax.ws.rs.core.Response.Status.Family;



import org.apache.commons.lang3.StringUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;
@@ -88,9 +89,9 @@ public abstract class OAuthAuthorizationFilter implements AuthorizationFilter { 
	 */

	public OAuthAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String scope) {

		this.tokenUrl = tokenUrl;

		this.clientId = clientId;

		this.clientSecret = clientSecret;

		this.scope = scope;

		this.clientId = StringUtils.trimToNull(clientId);

		this.clientSecret = StringUtils.trimToNull(clientSecret);

		this.scope = StringUtils.trimToNull(scope);

	}



	/**