You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by be...@apache.org on 2008/09/10 03:50:42 UTC
svn commit: r693675 [4/4] - in /incubator/shindig/trunk: config/
java/common/src/main/java/org/apache/shindig/common/crypto/
java/gadgets/conf/ java/gadgets/src/main/java/org/apache/shindig/gadgets/
java/gadgets/src/main/java/org/apache/shindig/gadgets...
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java?rev=693675&r1=693674&r2=693675&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java Tue Sep 9 18:50:41 2008
@@ -18,68 +18,101 @@
package org.apache.shindig.gadgets.oauth;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import net.oauth.OAuth;
+import net.oauth.OAuth.Parameter;
import org.apache.shindig.auth.BasicSecurityToken;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.cache.DefaultCacheProvider;
import org.apache.shindig.common.crypto.BasicBlobCrypter;
-import org.apache.shindig.common.uri.Uri;
-import org.apache.shindig.common.util.CharsetUtil;
import org.apache.shindig.gadgets.FakeGadgetSpecFactory;
import org.apache.shindig.gadgets.GadgetException;
+import org.apache.shindig.gadgets.RequestSigningException;
import org.apache.shindig.gadgets.http.BasicHttpCache;
-import org.apache.shindig.gadgets.http.HttpFetcher;
-import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.oauth.AccessorInfo.OAuthParamLocation;
+import org.apache.shindig.gadgets.oauth.BasicOAuthStoreConsumerKeyAndSecret.KeyType;
import org.apache.shindig.gadgets.oauth.FakeOAuthServiceProvider.TokenPair;
-import org.apache.shindig.gadgets.oauth.OAuthStore.OAuthParamLocation;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import java.util.List;
import java.util.Map;
/**
- * Primitive test of the main code paths in OAuthFetcher.
- *
- * This is a fairly crappy regression test, so if you find yourself wanting
- * to modify this code, you should probably write additional test cases first.
+ * Tests for signing requests.
*/
public class OAuthFetcherTest {
private OAuthFetcherConfig fetcherConfig;
private FakeOAuthServiceProvider serviceProvider;
+ private BasicOAuthStore base;
public static final String GADGET_URL = "http://www.example.com/gadget.xml";
public static final String GADGET_URL_NO_KEY = "http://www.example.com/nokey.xml";
public static final String GADGET_URL_HEADER = "http://www.example.com/header.xml";
public static final String GADGET_URL_BODY = "http://www.example.com/body.xml";
+
+ private static final String PRIVATE_KEY_TEXT =
+ "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALRiMLAh9iimur8V" +
+ "A7qVvdqxevEuUkW4K+2KdMXmnQbG9Aa7k7eBjK1S+0LYmVjPKlJGNXHDGuy5Fw/d" +
+ "7rjVJ0BLB+ubPK8iA/Tw3hLQgXMRRGRXXCn8ikfuQfjUS1uZSatdLB81mydBETlJ" +
+ "hI6GH4twrbDJCR2Bwy/XWXgqgGRzAgMBAAECgYBYWVtleUzavkbrPjy0T5FMou8H" +
+ "X9u2AC2ry8vD/l7cqedtwMPp9k7TubgNFo+NGvKsl2ynyprOZR1xjQ7WgrgVB+mm" +
+ "uScOM/5HVceFuGRDhYTCObE+y1kxRloNYXnx3ei1zbeYLPCHdhxRYW7T0qcynNmw" +
+ "rn05/KO2RLjgQNalsQJBANeA3Q4Nugqy4QBUCEC09SqylT2K9FrrItqL2QKc9v0Z" +
+ "zO2uwllCbg0dwpVuYPYXYvikNHHg+aCWF+VXsb9rpPsCQQDWR9TT4ORdzoj+Nccn" +
+ "qkMsDmzt0EfNaAOwHOmVJ2RVBspPcxt5iN4HI7HNeG6U5YsFBb+/GZbgfBT3kpNG" +
+ "WPTpAkBI+gFhjfJvRw38n3g/+UeAkwMI2TJQS4n8+hid0uus3/zOjDySH3XHCUno" +
+ "cn1xOJAyZODBo47E+67R4jV1/gzbAkEAklJaspRPXP877NssM5nAZMU0/O/NGCZ+" +
+ "3jPgDUno6WbJn5cqm8MqWhW1xGkImgRk+fkDBquiq4gPiT898jusgQJAd5Zrr6Q8" +
+ "AO/0isr/3aa6O6NLQxISLKcPDk2NOccAfS/xOtfOz4sJYM3+Bs4Io9+dZGSDCA54" +
+ "Lw03eHTNQghS0A==";
+
+ public static final String CERTIFICATE_TEXT =
+ "-----BEGIN CERTIFICATE-----\n" +
+ "MIIBpjCCAQ+gAwIBAgIBATANBgkqhkiG9w0BAQUFADAZMRcwFQYDVQQDDA5UZXN0\n" +
+ "IFByaW5jaXBhbDAeFw03MDAxMDEwODAwMDBaFw0zODEyMzEwODAwMDBaMBkxFzAV\n" +
+ "BgNVBAMMDlRlc3QgUHJpbmNpcGFsMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB\n" +
+ "gQC0YjCwIfYoprq/FQO6lb3asXrxLlJFuCvtinTF5p0GxvQGu5O3gYytUvtC2JlY\n" +
+ "zypSRjVxwxrsuRcP3e641SdASwfrmzyvIgP08N4S0IFzEURkV1wp/IpH7kH41Etb\n" +
+ "mUmrXSwfNZsnQRE5SYSOhh+LcK2wyQkdgcMv11l4KoBkcwIDAQABMA0GCSqGSIb3\n" +
+ "DQEBBQUAA4GBAGZLPEuJ5SiJ2ryq+CmEGOXfvlTtEL2nuGtr9PewxkgnOjZpUy+d\n" +
+ "4TvuXJbNQc8f4AMWL/tO9w0Fk80rWKp9ea8/df4qMq5qlFWlx6yOLQxumNOmECKb\n" +
+ "WpkUQDIDJEoFUzKMVuJf4KO/FJ345+BNLGgbJ6WujreoM1X/gYfdnJ/J\n" +
+ "-----END CERTIFICATE-----";
@Before
public void setUp() throws Exception {
+ base = new BasicOAuthStore();
serviceProvider = new FakeOAuthServiceProvider();
fetcherConfig = new OAuthFetcherConfig(
new BasicBlobCrypter("abcdefghijklmnop".getBytes()),
- getOAuthStore(),
+ getOAuthStore(base),
new BasicHttpCache(new DefaultCacheProvider(),10));
}
/**
* Builds a nicely populated fake token store.
*/
- public static GadgetOAuthTokenStore getOAuthStore() throws GadgetException {
- BasicOAuthStore base = new BasicOAuthStore();
+ public static GadgetOAuthTokenStore getOAuthStore(BasicOAuthStore base) throws GadgetException {
+ if (base == null) {
+ base = new BasicOAuthStore();
+ }
addValidConsumer(base);
addInvalidConsumer(base);
addAuthHeaderConsumer(base);
addBodyConsumer(base);
- BasicGadgetOAuthTokenStore store = new BasicGadgetOAuthTokenStore(base,
- new FakeGadgetSpecFactory());
- store.initFromConfigString("{}");
+ addDefaultKey(base);
+ GadgetOAuthTokenStore store = new GadgetOAuthTokenStore(base, new FakeGadgetSpecFactory());
+ base.initFromConfigString("{}");
return store;
}
@@ -124,15 +157,22 @@
String serviceName,
String consumerKey,
String consumerSecret) {
- OAuthStore.ProviderKey providerKey = new OAuthStore.ProviderKey();
+ BasicOAuthStoreConsumerIndex providerKey = new BasicOAuthStoreConsumerIndex();
providerKey.setGadgetUri(gadgetUrl);
providerKey.setServiceName(serviceName);
- OAuthStore.ConsumerKeyAndSecret kas = new OAuthStore.ConsumerKeyAndSecret(
- consumerKey, consumerSecret, OAuthStore.KeyType.HMAC_SYMMETRIC);
+ BasicOAuthStoreConsumerKeyAndSecret kas = new BasicOAuthStoreConsumerKeyAndSecret(
+ consumerKey, consumerSecret, KeyType.HMAC_SYMMETRIC, null);
- base.setOAuthConsumerKeyAndSecret(providerKey, kas);
+ base.setConsumerKeyAndSecret(providerKey, kas);
}
+
+ private static void addDefaultKey(BasicOAuthStore base) {
+ BasicOAuthStoreConsumerKeyAndSecret defaultKey = new BasicOAuthStoreConsumerKeyAndSecret(
+ "signedfetch", PRIVATE_KEY_TEXT, KeyType.RSA_PRIVATE, "foo");
+ base.setDefaultKey(defaultKey);
+ }
+
/**
* Builds gadget token for testing a service with parameters in the query.
@@ -170,94 +210,83 @@
@After
public void tearDown() throws Exception {
}
-
- @SuppressWarnings("unused")
- public HttpFetcher getFetcher(SecurityToken authToken,
- OAuthArguments params) throws GadgetException {
- OAuthFetcher fetcher = new OAuthFetcher(fetcherConfig, serviceProvider, authToken, params);
- return fetcher;
+
+ private MakeRequestClient makeNonSocialClient(String owner, String viewer, String gadget)
+ throws Exception {
+ SecurityToken securityToken = getSecurityToken(owner, viewer, gadget);
+ return new MakeRequestClient(securityToken, fetcherConfig, serviceProvider,
+ FakeGadgetSpecFactory.SERVICE_NAME);
+ }
+
+ private MakeRequestClient makeSignedFetchClient(String owner, String viewer, String gadget)
+ throws Exception {
+ SecurityToken securityToken = getSecurityToken(owner, viewer, gadget);
+ MakeRequestClient client = new MakeRequestClient(securityToken, fetcherConfig, serviceProvider,
+ null);
+ client.setBaseArgs(client.makeSignedFetchArguments());
+ return client;
}
@Test
public void testOAuthFlow() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
- assertNull(response.getHeader(FakeOAuthServiceProvider.AUTHZ_ECHO_HEADER));
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "somebody else"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
-
- fetcher = getFetcher(
- getNormalSecurityToken("somebody else", "somebody else"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=somebody%20else");
-
- fetcher = getFetcher(
- getNormalSecurityToken("somebody else", "somebody else"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is somebody else", response.getResponseAsString());
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("User data is hello-oauth", response.getResponseAsString());
}
@Test
- public void testParamsInHeader() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
+ public void testOAuthFlow_tokenReused() throws Exception {
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
- serviceProvider.setParamLocation(OAuthParamLocation.AUTH_HEADER);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
- fetcher = getFetcher(
- getHeaderSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getHeaderSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is hello-oauth", response.getResponseAsString());
+ // Check out what happens if the client-side oauth state vanishes.
+ MakeRequestClient client2 = makeNonSocialClient("owner", "owner", GADGET_URL);
+ response = client2.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("User data is hello-oauth", response.getResponseAsString());
+ }
+
+ @Test
+ public void testAccessTokenNotUsedForSocialPage() throws Exception {
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("User data is hello-oauth", response.getResponseAsString());
+
+ MakeRequestClient friend = makeNonSocialClient("owner", "friend", GADGET_URL);
+ try {
+ friend.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ fail("Attempt to use OAuth token on non-social page");
+ } catch (GadgetException e) {
+ // good.
+ }
+ }
+
+ @Test
+ public void testParamsInHeader() throws Exception {
+ serviceProvider.setParamLocation(OAuthParamLocation.AUTH_HEADER);
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL_HEADER);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("User data is hello-oauth", response.getResponseAsString());
+
String aznHeader = response.getHeader(FakeOAuthServiceProvider.AUTHZ_ECHO_HEADER);
assertNotNull(aznHeader);
assertTrue("azn header: " + aznHeader, aznHeader.indexOf("OAuth") != -1);
@@ -265,31 +294,13 @@
@Test
public void testParamsInBody() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
serviceProvider.setParamLocation(OAuthParamLocation.POST_BODY);
-
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setHeader("content-type", "application/x-www-form-urlencoded");
- request.setMethod("POST");
- response = fetcher.fetch(request);
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL_BODY);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "");
assertEquals("User data is hello-oauth", response.getResponseAsString());
String echoedBody = response.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER);
@@ -299,69 +310,32 @@
@Test
public void testParamsInBody_withExtraParams() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
serviceProvider.setParamLocation(OAuthParamLocation.POST_BODY);
-
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setHeader("content-type", "application/x-www-form-urlencoded");
- request.setMethod("POST");
- request.setPostBody(CharsetUtil.getUtf8Bytes("foo=bar&foo=baz"));
- response = fetcher.fetch(request);
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL_BODY);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "foo=bar&foo=baz");
assertEquals("User data is hello-oauth", response.getResponseAsString());
String echoedBody = response.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER);
assertNotNull(echoedBody);
assertTrue("body: " + echoedBody, echoedBody.indexOf("oauth_consumer_key=") != -1);
- assertTrue("body: " + echoedBody, echoedBody.indexOf("foo=bar&foo=baz") != -1);
+ assertTrue("body: " + echoedBody, echoedBody.indexOf("foo=bar&foo=baz") != -1);
}
@Test
public void testParamsInBody_forGetRequest() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- // We're sending a GET request with an auth-header, let the SP look in the header for the authz
- // params.
serviceProvider.setParamLocation(OAuthParamLocation.POST_BODY);
serviceProvider.addParamLocation(OAuthParamLocation.AUTH_HEADER);
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL_BODY);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is hello-oauth", response.getResponseAsString());
String aznHeader = response.getHeader(FakeOAuthServiceProvider.AUTHZ_ECHO_HEADER);
@@ -371,179 +345,74 @@
@Test
public void testParamsInBody_forGetRequestStrictSp() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
serviceProvider.setParamLocation(OAuthParamLocation.POST_BODY);
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getBodySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
-
- // Failed because the SP doesn't accept authz headers
- response = fetcher.fetch(request);
- approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL_BODY);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ assertNotNull(response.getMetadata().get("oauthApprovalUrl"));
}
-
+
@Test
- public void testPlainTextParams() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- serviceProvider.setParamLocation(OAuthParamLocation.AUTH_HEADER);
+ public void testRevokedAccessToken() throws Exception {
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
- fetcher = getFetcher(
- getHeaderSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getHeaderSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
- String aznHeader = response.getHeader(FakeOAuthServiceProvider.AUTHZ_ECHO_HEADER);
- assertNotNull(aznHeader);
- assertTrue("azn header: " + aznHeader, aznHeader.indexOf("OAuth") != -1);
- }
-
- @Test
- public void testRevokedAccessToken() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=1");
assertEquals("User data is hello-oauth", response.getResponseAsString());
serviceProvider.revokeAllAccessTokens();
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=2");
+ assertEquals("", response.getResponseAsString());
+ assertNotNull(response.getMetadata().get("oauthApprovalUrl"));
+
+ client.approveToken("user_data=reapproved");
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
-
- clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=reapproved");
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=3");
assertEquals("User data is reapproved", response.getResponseAsString());
}
-
@Test
public void testError401() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
serviceProvider.setVagueErrors(true);
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=1");
assertEquals("User data is hello-oauth", response.getResponseAsString());
serviceProvider.revokeAllAccessTokens();
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=2");
+ assertEquals("", response.getResponseAsString());
+ assertNotNull(response.getMetadata().get("oauthApprovalUrl"));
+
+ client.approveToken("user_data=reapproved");
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
-
- clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=reapproved");
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=3");
assertEquals("User data is reapproved", response.getResponseAsString());
}
@Test
public void testUnknownConsumerKey() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- fetcher = getFetcher(
- getNokeySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME_NO_KEY, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ SecurityToken securityToken = getSecurityToken("owner", "owner", GADGET_URL_NO_KEY);
+ MakeRequestClient client = new MakeRequestClient(securityToken, fetcherConfig, serviceProvider,
+ FakeGadgetSpecFactory.SERVICE_NAME_NO_KEY);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+
Map<String, String> metadata = response.getMetadata();
assertNotNull(metadata);
assertEquals("consumer_key_unknown", metadata.get("oauthError"));
@@ -554,17 +423,13 @@
@Test
public void testError403() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
serviceProvider.setVagueErrors(true);
-
- fetcher = getFetcher(
- getNokeySecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME_NO_KEY, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ SecurityToken securityToken = getSecurityToken("owner", "owner", GADGET_URL_NO_KEY);
+ MakeRequestClient client = new MakeRequestClient(securityToken, fetcherConfig, serviceProvider,
+ FakeGadgetSpecFactory.SERVICE_NAME_NO_KEY);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
Map<String, String> metadata = response.getMetadata();
assertNotNull(metadata);
assertEquals("403", metadata.get("oauthError"));
@@ -573,53 +438,29 @@
@Test
public void testConsumerThrottled() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
- String clientState;
-
assertEquals(0, serviceProvider.getRequestTokenCount());
assertEquals(0, serviceProvider.getAccessTokenCount());
assertEquals(0, serviceProvider.getResourceAccessCount());
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
- clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(0, serviceProvider.getAccessTokenCount());
assertEquals(0, serviceProvider.getResourceAccessCount());
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
+ client.approveToken("user_data=hello-oauth");
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is hello-oauth", response.getResponseAsString());
- clientState = response.getMetadata().get("oauthState");
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
assertEquals(1, serviceProvider.getResourceAccessCount());
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=1");
assertEquals("User data is hello-oauth", response.getResponseAsString());
- clientState = response.getMetadata().get("oauthState");
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
@@ -627,20 +468,14 @@
serviceProvider.setConsumersThrottled(true);
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null,
- false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=2");
+ assertEquals("", response.getResponseAsString());
Map<String, String> metadata = response.getMetadata();
assertNotNull(metadata);
assertEquals("consumer_key_refused", metadata.get("oauthError"));
assertEquals(
"exceeded quota",
metadata.get("oauthErrorText"));
- clientState = response.getMetadata().get("oauthState");
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
@@ -648,15 +483,7 @@
serviceProvider.setConsumersThrottled(false);
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null,
- clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
- clientState = response.getMetadata().get("oauthState");
-
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=3");
assertEquals("User data is hello-oauth", response.getResponseAsString());
assertEquals(1, serviceProvider.getRequestTokenCount());
@@ -666,71 +493,42 @@
@Test
public void testWrongServiceName() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments("nosuchservice", null, null, false));
- request = new HttpRequest(
- Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
-
+ SecurityToken securityToken = getSecurityToken("owner", "owner", GADGET_URL);
+ MakeRequestClient client = new MakeRequestClient(securityToken, fetcherConfig, serviceProvider,
+ "nosuchservice");
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
Map<String, String> metadata = response.getMetadata();
assertNull(metadata.get("oauthApprovalUrl"));
assertEquals("BAD_OAUTH_CONFIGURATION", metadata.get("oauthError"));
String errorText = metadata.get("oauthErrorText");
- assertEquals(
- 0,
- errorText.indexOf("Spec does not contain OAuth service " +
- "'nosuchservice'. Known services: 'testservice'\n"));
+ assertTrue(errorText, errorText.startsWith(
+ "Spec for gadget http://www.example.com/gadget.xml does not contain OAuth service " +
+ "nosuchservice. Known services: testservice"));
}
@Test
public void testPreapprovedToken() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- assertEquals(0, serviceProvider.getRequestTokenCount());
- assertEquals(0, serviceProvider.getAccessTokenCount());
- assertEquals(0, serviceProvider.getResourceAccessCount());
-
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
TokenPair reqToken = serviceProvider.getPreapprovedToken("preapproved");
+ client.getBaseArgs().setRequestToken(reqToken.token);
+ client.getBaseArgs().setRequestTokenSecret(reqToken.secret);
- OAuthArguments params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, null, false, reqToken.token,
- reqToken.secret);
-
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
-
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNull(approvalUrl);
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is preapproved", response.getResponseAsString());
+
assertEquals(0, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
assertEquals(1, serviceProvider.getResourceAccessCount());
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
-
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=1");
assertEquals("User data is preapproved", response.getResponseAsString());
+
assertEquals(0, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
assertEquals(2, serviceProvider.getResourceAccessCount());
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- request.setIgnoreCache(true);
- response = fetcher.fetch(request);
-
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=2");
assertEquals("User data is preapproved", response.getResponseAsString());
assertEquals(0, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
@@ -739,121 +537,306 @@
@Test
public void testPreapprovedToken_invalid() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+ client.getBaseArgs().setRequestToken("garbage");
+ client.getBaseArgs().setRequestTokenSecret("garbage");
- OAuthArguments params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, null, false, "garbage", "garbage");
-
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ assertEquals(1, serviceProvider.getRequestTokenCount());
+ assertEquals(1, serviceProvider.getAccessTokenCount());
+ assertEquals(0, serviceProvider.getResourceAccessCount());
+
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("User data is hello-oauth", response.getResponseAsString());
+
+ assertEquals(1, serviceProvider.getRequestTokenCount());
+ assertEquals(2, serviceProvider.getAccessTokenCount());
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+ }
+
+ @Test
+ public void testPreapprovedToken_notUsedIfAccessTokenExists() throws Exception {
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+ TokenPair reqToken = serviceProvider.getPreapprovedToken("preapproved");
+ client.getBaseArgs().setRequestToken(reqToken.token);
+ client.getBaseArgs().setRequestTokenSecret(reqToken.secret);
- params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false, "garbage", "garbage");
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("User data is preapproved", response.getResponseAsString());
+
+ assertEquals(0, serviceProvider.getRequestTokenCount());
+ assertEquals(1, serviceProvider.getAccessTokenCount());
+ assertEquals(1, serviceProvider.getResourceAccessCount());
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
- clientState = response.getMetadata().get("oauthState");
+ MakeRequestClient client2 = makeNonSocialClient("owner", "owner", GADGET_URL);
- params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false, "garbage", "garbage");
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
- }
+ response = client2.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?cachebust=1");
+ assertEquals("User data is preapproved", response.getResponseAsString());
- @Test
- public void testPreapprovedToken_invalidWithOutClientState()
- throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
- OAuthArguments params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, null, false, "garbage", "garbage");
-
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false, "garbage", "garbage");
-
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
- clientState = response.getMetadata().get("oauthState");
-
- // Simulates a user leaving the page and then returning
- params = new OAuthArguments(
- FakeGadgetSpecFactory.SERVICE_NAME, null, null, false, "garbage",
- "garbage");
- fetcher = getFetcher(getNormalSecurityToken("owner", "owner"), params);
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- assertEquals("User data is hello-oauth", response.getResponseAsString());
+ assertEquals(0, serviceProvider.getRequestTokenCount());
+ assertEquals(1, serviceProvider.getAccessTokenCount());
+ assertEquals(2, serviceProvider.getResourceAccessCount());
}
@Test
public void testCachedResponse() throws Exception {
- HttpFetcher fetcher;
- HttpRequest request;
- HttpResponse response;
-
assertEquals(0, serviceProvider.getRequestTokenCount());
assertEquals(0, serviceProvider.getAccessTokenCount());
assertEquals(0, serviceProvider.getResourceAccessCount());
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
- String clientState = response.getMetadata().get("oauthState");
- assertNotNull(clientState);
- String approvalUrl = response.getMetadata().get("oauthApprovalUrl");
- assertNotNull(approvalUrl);
-
- serviceProvider.browserVisit(approvalUrl + "&user_data=hello-oauth");
-
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "owner"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, clientState, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ MakeRequestClient client = makeNonSocialClient("owner", "owner", GADGET_URL);
+
+ HttpResponse response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals("", response.getResponseAsString());
+ client.approveToken("user_data=hello-oauth");
+
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is hello-oauth", response.getResponseAsString());
-
+
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
assertEquals(1, serviceProvider.getResourceAccessCount());
- fetcher = getFetcher(
- getNormalSecurityToken("owner", "somebody else"),
- new OAuthArguments(FakeGadgetSpecFactory.SERVICE_NAME, null, null, false));
- request = new HttpRequest(Uri.parse(FakeOAuthServiceProvider.RESOURCE_URL));
- response = fetcher.fetch(request);
+ response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
assertEquals("User data is hello-oauth", response.getResponseAsString());
assertEquals(1, serviceProvider.getRequestTokenCount());
assertEquals(1, serviceProvider.getAccessTokenCount());
assertEquals(1, serviceProvider.getResourceAccessCount());
}
+
+ @Test
+ public void testSignedFetchParametersSet() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+ assertTrue(contains(queryParams, "opensocial_viewer_id", "v"));
+ assertTrue(contains(queryParams, "opensocial_app_id", "app"));
+ assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "signedfetch"));
+ assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ }
+
+ @Test
+ public void testSignedFetch_unnamedConsumerKey() throws Exception {
+ BasicOAuthStoreConsumerKeyAndSecret defaultKey = new BasicOAuthStoreConsumerKeyAndSecret(
+ null, PRIVATE_KEY_TEXT, KeyType.RSA_PRIVATE, "foo");
+ base.setDefaultKey(defaultKey);
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+ assertTrue(contains(queryParams, "opensocial_viewer_id", "v"));
+ assertTrue(contains(queryParams, "opensocial_app_id", "app"));
+ assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "container.com"));
+ assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ }
+
+ @Test
+ public void testSignedFetch_extraQueryParameters() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?foo=bar&foo=baz");
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+ assertTrue(contains(queryParams, "opensocial_viewer_id", "v"));
+ assertTrue(contains(queryParams, "opensocial_app_id", "app"));
+ assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "signedfetch"));
+ assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ }
+
+ @Test
+ public void testNoSignViewer() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.getBaseArgs().setSignViewer(false);
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+ assertFalse(contains(queryParams, "opensocial_viewer_id", "v"));
+ }
+
+ @Test
+ public void testNoSignOwner() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.getBaseArgs().setSignOwner(false);
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertFalse(contains(queryParams, "opensocial_owner_id", "o"));
+ assertTrue(contains(queryParams, "opensocial_viewer_id", "v"));
+ }
+
+ @Test
+ public void testCacheHit() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+
+ client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+ }
+
+ @Test
+ public void testCacheMiss_noOwner() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.getBaseArgs().setSignOwner(false);
+ client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+
+ MakeRequestClient client2 = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client2.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(2, serviceProvider.getResourceAccessCount());
+ }
+
+ @Test
+ public void testCacheHit_ownerOnly() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v1", "http://www.example.com/app");
+ client.getBaseArgs().setSignViewer(false);
+ client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+
+ MakeRequestClient client2 = makeSignedFetchClient("o", "v2", "http://www.example.com/app");
+ client2.getBaseArgs().setSignViewer(false);
+ client2.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+ }
+
+ @Test
+ public void testCacheMiss_bypassCache() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v1", "http://www.example.com/app");
+ client.getBaseArgs().setSignViewer(false);
+ client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(1, serviceProvider.getResourceAccessCount());
+
+ MakeRequestClient client2 = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client2.setIgnoreCache(true);
+ client2.getBaseArgs().setSignViewer(false);
+ client2.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ assertEquals(2, serviceProvider.getResourceAccessCount());
+ }
+
+ @Test(expected = RequestSigningException.class)
+ public void testTrickyParametersInQuery() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ String tricky = "%6fpensocial_owner_id=gotcha";
+ client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?" + tricky);
+ }
+
+ @Test(expected = RequestSigningException.class)
+ public void testTrickyParametersInBody() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ String tricky = "%6fpensocial_owner_id=gotcha";
+ client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, tricky);
+ }
+
+ @Test
+ public void testGetNoQuery() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+ assertTrue(contains(queryParams, "opensocial_viewer_id", "v")); }
+
+ @Test
+ public void testGetWithQuery() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?a=b");
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "a", "b"));
+ }
+
+ @Test
+ public void testGetWithQueryMultiParam() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL + "?a=b&a=c");
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "a", "b"));
+ assertTrue(contains(queryParams, "a", "c"));
+ }
+
+ @Test
+ public void testValidParameterCharacters() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ String weird = "~!@$*()-_[]:,./";
+ HttpResponse resp = client.sendGet(
+ FakeOAuthServiceProvider.RESOURCE_URL + "?" + weird + "=foo");
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, weird, "foo"));
+ }
+
+
+ @Test
+ public void testPostNoQueryNoData() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, null);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+ assertEquals("", resp.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER));
+ }
+
+ @Test
+ public void testPostWithQueryNoData() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendFormPost(
+ FakeOAuthServiceProvider.RESOURCE_URL + "?name=value", null);
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "name", "value"));
+ assertEquals("", resp.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER));
+ }
+
+ @Test
+ public void testPostNoQueryWithData() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendFormPost(
+ FakeOAuthServiceProvider.RESOURCE_URL, "name=value");
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertFalse(contains(queryParams, "name", "value"));
+ assertEquals("name=value", resp.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER));
+ }
+
+ @Test
+ public void testPostWithQueryWithData() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ HttpResponse resp = client.sendFormPost(
+ FakeOAuthServiceProvider.RESOURCE_URL + "?queryName=queryValue", "name=value");
+ List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
+ assertTrue(contains(queryParams, "queryName", "queryValue"));
+ assertEquals("name=value", resp.getHeader(FakeOAuthServiceProvider.BODY_ECHO_HEADER));
+ }
+
+ @Test(expected = RequestSigningException.class)
+ public void testStripOpenSocialParamsFromQuery() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL + "?opensocial_foo=bar", null);
+ }
+
+ @Test(expected = RequestSigningException.class)
+ public void testStripOAuthParamsFromQuery() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL + "?oauth_foo=bar", "name=value");
+ }
+
+ @Test(expected = RequestSigningException.class)
+ public void testStripOpenSocialParamsFromBody() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "opensocial_foo=bar");
+ }
+
+ @Test(expected = RequestSigningException.class)
+ public void testStripOAuthParamsFromBody() throws Exception {
+ MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
+ client.sendFormPost(FakeOAuthServiceProvider.RESOURCE_URL, "oauth_foo=bar");
+ }
+
+ // Checks whether the given parameter list contains the specified
+ // key/value pair
+ private boolean contains(List<Parameter> params, String key, String value) {
+ for (Parameter p : params) {
+ if (p.getKey().equals(key) && p.getValue().equals(value)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=693675&r1=693674&r2=693675&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java Tue Sep 9 18:50:41 2008
@@ -62,7 +62,6 @@
private final IMocksControl control = EasyMock.createNiceControl();
private final ContentFetcherFactory fetchers = control.createMock(ContentFetcherFactory.class);
private final RecordingHttpFetcher plainFetcher = new RecordingHttpFetcher();
- private final RecordingHttpFetcher signedFetcher = new RecordingHttpFetcher();
private final RecordingHttpFetcher oauthFetcher = new RecordingHttpFetcher();
private final GadgetContext context = new GadgetContext() {
@@ -86,10 +85,7 @@
public void setUp() throws Exception {
expect(fetchers.get())
.andReturn(plainFetcher).anyTimes();
- expect(fetchers.getSigningFetcher(isA(SecurityToken.class)))
- .andReturn(signedFetcher).anyTimes();
- expect(fetchers.getOAuthFetcher(isA(SecurityToken.class), isA(OAuthArguments.class)))
- .andReturn(oauthFetcher).anyTimes();
+ expect(fetchers.getOAuthFetcher(isA(HttpRequest.class))).andReturn(oauthFetcher).anyTimes();
control.replay();
}
@@ -138,10 +134,10 @@
PreloadedData data = preloaded.get(PRELOAD_HREF).call();
- HttpRequest request = signedFetcher.requests.get(0);
+ HttpRequest request = oauthFetcher.requests.get(0);
checkRequest(request);
- assertTrue(request.getSignOwner());
- assertFalse(request.getSignViewer());
+ assertTrue(request.getOAuthArguments().getSignOwner());
+ assertFalse(request.getOAuthArguments().getSignViewer());
checkResults((Map<String, String>)data.toJson());
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=693675&r1=693674&r2=693675&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java Tue Sep 9 18:50:41 2008
@@ -18,7 +18,6 @@
*/
package org.apache.shindig.gadgets.servlet;
-import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA;
@@ -34,7 +33,6 @@
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
-import org.apache.shindig.gadgets.oauth.OAuthArguments;
import org.apache.shindig.gadgets.oauth.OAuthFetcher;
import org.apache.shindig.gadgets.oauth.OAuthResponseParams;
import org.apache.shindig.gadgets.spec.GadgetSpec;
@@ -166,7 +164,7 @@
expect(request.getAttribute(AuthInfo.Attribute.SECURITY_TOKEN.getId()))
.andReturn(DUMMY_TOKEN).atLeastOnce();
OAuthFetcher oauthFetcher = mock(OAuthFetcher.class);
- expect(fetcherFactory.getOAuthFetcher(eq(DUMMY_TOKEN), isA(OAuthArguments.class))).
+ expect(fetcherFactory.getOAuthFetcher(isA(HttpRequest.class))).
andReturn(oauthFetcher);
expect(oauthFetcher.fetch(isA(HttpRequest.class))).
@@ -187,7 +185,7 @@
expect(request.getAttribute(AuthInfo.Attribute.SECURITY_TOKEN.getId()))
.andReturn(DUMMY_TOKEN).atLeastOnce();
OAuthFetcher oauthFetcher = mock(OAuthFetcher.class);
- expect(fetcherFactory.getOAuthFetcher(eq(DUMMY_TOKEN), isA(OAuthArguments.class))).
+ expect(fetcherFactory.getOAuthFetcher(isA(HttpRequest.class))).
andReturn(oauthFetcher);
HttpResponse resp = new HttpResponseBuilder()
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=693675&r1=693674&r2=693675&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java Tue Sep 9 18:50:41 2008
@@ -237,7 +237,7 @@
.andReturn(DUMMY_TOKEN).atLeastOnce();
expect(request.getParameter(MakeRequestHandler.AUTHZ_PARAM))
.andReturn(Auth.SIGNED.toString()).atLeastOnce();
- expect(signingFetcher.fetch(isA(HttpRequest.class)))
+ expect(oauthFetcher.fetch(isA(HttpRequest.class)))
.andReturn(new HttpResponse(RESPONSE_BODY));
replay();
@@ -250,7 +250,7 @@
public void testSignedPostRequest() throws Exception {
// Doesn't actually sign since it returns the standard fetcher.
// Signing tests are in SigningFetcherTest
- expectPostAndReturnBody(signingFetcher, REQUEST_BODY, RESPONSE_BODY);
+ expectPostAndReturnBody(oauthFetcher, REQUEST_BODY, RESPONSE_BODY);
expect(request.getAttribute(AuthInfo.Attribute.SECURITY_TOKEN.getId()))
.andReturn(DUMMY_TOKEN).atLeastOnce();
expect(request.getParameter(MakeRequestHandler.AUTHZ_PARAM))
@@ -268,7 +268,7 @@
public void testChangeSecurityToken() throws Exception {
// Doesn't actually sign since it returns the standard fetcher.
// Signing tests are in SigningFetcherTest
- expectGetAndReturnBody(signingFetcher, RESPONSE_BODY);
+ expectGetAndReturnBody(oauthFetcher, RESPONSE_BODY);
FakeGadgetToken authToken = new FakeGadgetToken().setUpdatedToken("updated");
expect(request.getAttribute(AuthInfo.Attribute.SECURITY_TOKEN.getId()))
.andReturn(authToken).atLeastOnce();
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=693675&r1=693674&r2=693675&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Tue Sep 9 18:50:41 2008
@@ -23,12 +23,11 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
-import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.util.DateUtil;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.GadgetTestFixture;
import org.apache.shindig.gadgets.LockedDomainService;
-import org.apache.shindig.gadgets.oauth.OAuthArguments;
+import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.commons.lang.StringUtils;
@@ -57,10 +56,8 @@
// TODO: This is horrible. It needs to be fixed.
HttpUtil.setTimeSource(timeSource);
expect(contentFetcherFactory.get()).andReturn(fetcher).anyTimes();
- expect(contentFetcherFactory.getSigningFetcher(isA(SecurityToken.class)))
- .andReturn(signingFetcher).anyTimes();
expect(contentFetcherFactory.getOAuthFetcher(
- isA(SecurityToken.class), isA(OAuthArguments.class)))
+ isA(HttpRequest.class)))
.andReturn(oauthFetcher).anyTimes();
gadgetRenderer = new GadgetRenderingTask(gadgetServer, bundleFactory,
registry, containerConfig, urlGenerator, lockedDomainService);
Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java?rev=693675&r1=693674&r2=693675&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java Tue Sep 9 18:50:41 2008
@@ -19,9 +19,9 @@
import org.apache.shindig.auth.AuthenticationServletFilter;
import org.apache.shindig.common.servlet.GuiceServletContextListener;
+import org.apache.shindig.gadgets.DefaultGuiceModule;
import org.apache.shindig.gadgets.servlet.ConcatProxyServlet;
import org.apache.shindig.gadgets.servlet.GadgetRenderingServlet;
-import org.apache.shindig.gadgets.servlet.HttpGuiceModule;
import org.apache.shindig.social.opensocial.service.DataServiceServlet;
import org.apache.shindig.social.opensocial.service.JsonRpcServlet;
@@ -104,7 +104,7 @@
Map<String, String> initParams = Maps.newHashMap();
String modules = Join
- .join(":", EndToEndModule.class.getName(), HttpGuiceModule.class.getName());
+ .join(":", EndToEndModule.class.getName(), DefaultGuiceModule.class.getName());
initParams.put(GuiceServletContextListener.MODULES_ATTRIBUTE, modules);
context.setInitParams(initParams);