Skip to content

Check in additional oauth tests #823

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

Merged
merged 1 commit into from
Feb 23, 2015
Merged

Check in additional oauth tests #823

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
20 changes: 18 additions & 2 deletions api/src/main/java/org/asynchttpclient/oauth/OAuthSignatureCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ public class OAuthSignatureCalculator implements SignatureCalculator {

protected final RequestToken userAuth;

protected final Long testTimestamp;

protected final String testNonce;

/**
* @param consumerAuth Consumer key to use for signature calculation
* @param userAuth Request/access token to use for signature calculation
Expand All @@ -79,14 +83,26 @@ public OAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth)
mac = new ThreadSafeHMAC(consumerAuth, userAuth);
this.consumerAuth = consumerAuth;
this.userAuth = userAuth;
this.testTimestamp = 0L;
this.testNonce = null;
random = new Random(System.identityHashCode(this) + System.currentTimeMillis());
}

OAuthSignatureCalculator(ConsumerKey consumerAuth, RequestToken userAuth, Long testTimestamp, String testNonce) {
mac = new ThreadSafeHMAC(consumerAuth, userAuth);
this.consumerAuth = consumerAuth;
this.userAuth = userAuth;
this.testTimestamp = testTimestamp;
this.testNonce = testNonce;
random = new Random(System.identityHashCode(this) + System.currentTimeMillis());
}


//@Override // silly 1.5; doesn't allow this for interfaces

public void calculateAndAddSignature(Request request, RequestBuilderBase<?> requestBuilder) {
String nonce = generateNonce();
long timestamp = System.currentTimeMillis() / 1000L;
String nonce = (this.testNonce != null) ? this.testNonce : generateNonce();
long timestamp = (this.testTimestamp > 0L) ? this.testTimestamp : System.currentTimeMillis() / 1000L;
String signature = calculateSignature(request.getMethod(), request.getUri(), timestamp, nonce, request.getFormParams(), request.getQueryParams());
String headerValue = constructAuthHeader(signature, nonce, timestamp);
requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);
Expand Down
94 changes: 93 additions & 1 deletion api/src/test/java/org/asynchttpclient/oauth/TestSignatureCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,30 @@
package org.asynchttpclient.oauth;

import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.fail;

import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.asynchttpclient.FluentCaseInsensitiveStringsMap;
import org.asynchttpclient.Param;
import org.asynchttpclient.Request;
import org.asynchttpclient.RequestBuilder;
import org.asynchttpclient.uri.Uri;
import org.testng.annotations.Test;

/**
* Tests the OAuth signature behavior.
*
* See <a href="https://oauth.googlecode.com/svn/code/javascript/example/signature.html">Signature Tester</a> for an
* online oauth signature checker.
*
*/
public class TestSignatureCalculator {
private static final String CONSUMER_KEY = "dpf43f3p2l4k3l03";

Expand All @@ -40,7 +56,7 @@ public class TestSignatureCalculator {
// based on the reference test case from
// http://oauth.pbwiki.com/TestCases
@Test(groups = "fast")
public void test() {
public void testGetCalculateSignature() {
ConsumerKey consumer = new ConsumerKey(CONSUMER_KEY, CONSUMER_SECRET);
RequestToken user = new RequestToken(TOKEN_KEY, TOKEN_SECRET);
OAuthSignatureCalculator calc = new OAuthSignatureCalculator(consumer, user);
Expand All @@ -52,4 +68,80 @@ public void test() {

assertEquals(sig, "tR3+Ty81lMeYAr/Fid0kMTYa/WM=");
}

@Test(groups = "fast")
public void testPostCalculateSignature() {
ConsumerKey consumer = new ConsumerKey(CONSUMER_KEY, CONSUMER_SECRET);
RequestToken user = new RequestToken(TOKEN_KEY, TOKEN_SECRET);
OAuthSignatureCalculator calc = new OAuthSignatureCalculator(consumer, user, TIMESTAMP, NONCE);

List<Param> formParams = new ArrayList<Param>();
formParams.add(new Param("file", "vacation.jpg"));
formParams.add(new Param("size", "original"));
String url = "http://photos.example.net/photos";
final Request req = new RequestBuilder("POST")
.setUri(Uri.create(url))
.setFormParams(formParams)
.setSignatureCalculator(calc).build();

// From the signature tester, POST should look like:
// normalized parameters: file=vacation.jpg&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_nonce=kllo9940pd9333jh&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1191242096&oauth_token=nnch734d00sl2jdk&oauth_version=1.0&size=original
// signature base string: POST&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal
// signature: wPkvxykrw+BTdCcGqKr+3I+PsiM=
// header: OAuth realm="",oauth_version="1.0",oauth_consumer_key="dpf43f3p2l4k3l03",oauth_token="nnch734d00sl2jdk",oauth_timestamp="1191242096",oauth_nonce="kllo9940pd9333jh",oauth_signature_method="HMAC-SHA1",oauth_signature="wPkvxykrw%2BBTdCcGqKr%2B3I%2BPsiM%3D"

String authHeader = req.getHeaders().get("Authorization").get(0);
Matcher m = Pattern.compile("oauth_signature=\"(.+?)\"").matcher(authHeader);
assertEquals(m.find(), true);
String encodedSig = m.group(1);
String sig = null;
try {
sig = URLDecoder.decode(encodedSig, "UTF-8");
} catch (UnsupportedEncodingException e) {
fail("bad encoding", e);
}

assertEquals(sig, "wPkvxykrw+BTdCcGqKr+3I+PsiM=");
}

@Test(groups = "fast")
public void testGetWithRequestBuilder() {
ConsumerKey consumer = new ConsumerKey(CONSUMER_KEY, CONSUMER_SECRET);
RequestToken user = new RequestToken(TOKEN_KEY, TOKEN_SECRET);
OAuthSignatureCalculator calc = new OAuthSignatureCalculator(consumer, user, TIMESTAMP, NONCE);

List<Param> queryParams = new ArrayList<Param>();
queryParams.add(new Param("file", "vacation.jpg"));
queryParams.add(new Param("size", "original"));
String url = "http://photos.example.net/photos";

final Request req = new RequestBuilder("GET")
.setUri(Uri.create(url))
.setQueryParams(queryParams)
.setSignatureCalculator(calc).build();

final List<Param> params = req.getQueryParams();
assertEquals(params.size(), 2);

// From the signature tester, the URL should look like:
//normalized parameters: file=vacation.jpg&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_nonce=kllo9940pd9333jh&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1191242096&oauth_token=nnch734d00sl2jdk&oauth_version=1.0&size=original
//signature base string: GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal
//signature: tR3+Ty81lMeYAr/Fid0kMTYa/WM=
//Authorization header: OAuth realm="",oauth_version="1.0",oauth_consumer_key="dpf43f3p2l4k3l03",oauth_token="nnch734d00sl2jdk",oauth_timestamp="1191242096",oauth_nonce="kllo9940pd9333jh",oauth_signature_method="HMAC-SHA1",oauth_signature="tR3%2BTy81lMeYAr%2FFid0kMTYa%2FWM%3D"

String authHeader = req.getHeaders().get("Authorization").get(0);
Matcher m = Pattern.compile("oauth_signature=\"(.+?)\"").matcher(authHeader);
assertEquals(m.find(), true);
String encodedSig = m.group(1);
String sig = null;
try {
sig = URLDecoder.decode(encodedSig, "UTF-8");
} catch (UnsupportedEncodingException e) {
fail("bad encoding", e);
}

assertEquals(sig, "tR3+Ty81lMeYAr/Fid0kMTYa/WM=");

}

}