Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Issue #94] When the pair client_id/client_secret is not provided in request body, check Authorization header #95

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Issue #94] When the pair client_id/client_secret is not provided in request body, check Authorization header #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions apifest-oauth20/src/main/java/com/apifest/oauth20/TokenRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.codec.binary.Base64;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.jboss.netty.handler.codec.http.HttpHeaders;
import org.jboss.netty.handler.codec.http.HttpRequest;
import org.jboss.netty.handler.codec.http.HttpResponseStatus;
import org.jboss.netty.util.CharsetUtil;
Expand Down Expand Up @@ -73,7 +71,8 @@ public TokenRequest(HttpRequest request) {
this.redirectUri = params.get(REDIRECT_URI);
this.clientId = params.get(CLIENT_ID);
this.clientSecret = params.get(CLIENT_SECRET);
if (this.clientId == null && this.clientSecret == null) {
// if the pair client_id, client_secret is not set, check the Authorization header
if (this.clientId == null || this.clientSecret == null) {
String [] clientCredentials = AuthorizationServer.getBasicAuthorizationClientCredentials(request);
this.clientId = clientCredentials [0];
this.clientSecret = clientCredentials [1];
Expand Down
40 changes: 40 additions & 0 deletions apifest-oauth20/src/test/java/com/apifest/oauth20/TokenRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,4 +321,44 @@ public void when_client_credentials_not_in_request_body_and_invalid_Authorizatio
assertNull(tokenReq.getClientId());
assertNull(tokenReq.getClientSecret());
}

@Test
public void when_client_secret_is_missing_then_get_client_id_and_client_secret_from_auth_basic_header() throws Exception {
// GIVEN
String content = "grant_type=client_credentials&client_id=b9db6d84dc98a895035e68f972e30503d3c724c8";
ChannelBuffer buf = ChannelBuffers.copiedBuffer(content.getBytes(CharsetUtil.UTF_8));
given(req.getContent()).willReturn(buf);
String basicHeader = "Basic YjlkYjZkODRkYzk4YTg5NTAzNWU2OGY5NzJlMzA1MDNkM2M3MjRjODoxMDVlZjkzZTd"
+ "iYjM4NmRhM2EyM2MzMmU4NTYzNDM0ZmFkMDA1ZmQwYTZhODgzMTVmY2RmOTQ2YWE3NjFjODM4";
HttpHeaders headers = new DefaultHttpHeaders();
headers.set(HttpHeaders.Names.AUTHORIZATION, basicHeader);
given(req.headers()).willReturn(headers);

// WHEN
TokenRequest tokenReq = new TokenRequest(req);

// THEN
assertNotNull(tokenReq.getClientId());
assertNotNull(tokenReq.getClientSecret());
}

@Test
public void when_client_id_is_missing_then_get_client_id_and_client_secret_from_auth_basic_header() throws Exception {
// GIVEN
String content = "grant_type=client_credentials&client_secret=105ef93e7bb386da3a23c32e8563434fad005fd0a6a88315fcdf946aa761c838";
ChannelBuffer buf = ChannelBuffers.copiedBuffer(content.getBytes(CharsetUtil.UTF_8));
given(req.getContent()).willReturn(buf);
String basicHeader = "Basic YjlkYjZkODRkYzk4YTg5NTAzNWU2OGY5NzJlMzA1MDNkM2M3MjRjODoxMDVlZjkzZTd"
+ "iYjM4NmRhM2EyM2MzMmU4NTYzNDM0ZmFkMDA1ZmQwYTZhODgzMTVmY2RmOTQ2YWE3NjFjODM4";
HttpHeaders headers = new DefaultHttpHeaders();
headers.set(HttpHeaders.Names.AUTHORIZATION, basicHeader);
given(req.headers()).willReturn(headers);

// WHEN
TokenRequest tokenReq = new TokenRequest(req);

// THEN
assertNotNull(tokenReq.getClientId());
assertNotNull(tokenReq.getClientSecret());
}
}