You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/08/31 11:40:15 UTC
svn commit: r690667 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/test/java/org/apache/shindig/auth/ server/src/main/webapp/WEB-INF/
server/src/test/java/org/apache/shindig/server/endtoend/ social-api/src/...
Author: etnu
Date: Sun Aug 31 02:40:14 2008
New Revision: 690667
URL: http://svn.apache.org/viewvc?rev=690667&view=rev
Log:
Patches for SHINDIG-554.
This moves all of the authentication handling code to org.apache.shindig.auth.
OAuth handlers remain in the social package.
Note that right now, only the social API is using the filters. There is no binding for auth tokens in the default filter. Since overrides module isn't available until Guice 2.0, we will provide a separate auth module that can be used when running a standalone gadget renderer.
Added:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java
- copied, changed from r690646, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AnonymousAuthenticationHandler.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java
- copied, changed from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java
- copied, changed from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/AuthenticationHandler.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
- copied, changed from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
- copied, changed from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/UrlParameterAuthenticationHandler.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java
- copied, changed from r690075, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AnonymousAuthenticationHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/UrlParameterAuthenticationHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/AuthenticationHandler.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java
Modified:
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndServer.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java
Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java (from r690646, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AnonymousAuthenticationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AnonymousAuthenticationHandler.java&r1=690646&r2=690667&rev=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AnonymousAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousAuthenticationHandler.java Sun Aug 31 02:40:14 2008
@@ -15,11 +15,10 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.core.oauth;
+package org.apache.shindig.auth;
import org.apache.shindig.common.AnonymousSecurityToken;
import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import com.google.inject.Inject;
import com.google.inject.name.Named;
Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java (from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java&r1=690075&r2=690667&rev=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthInfo.java Sun Aug 31 02:40:14 2008
@@ -15,8 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.core.oauth;
-
+package org.apache.shindig.auth;
import org.apache.shindig.common.SecurityToken;
@@ -27,7 +26,7 @@
* Used by auth filters.
*/
public class AuthInfo {
-
+
/**
* Constants for request attribute keys
*/
Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java (from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/AuthenticationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/AuthenticationHandler.java&r1=690075&r2=690667&rev=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/AuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationHandler.java Sun Aug 31 02:40:14 2008
@@ -15,13 +15,28 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.opensocial.oauth;
+package org.apache.shindig.auth;
import org.apache.shindig.common.SecurityToken;
import javax.servlet.http.HttpServletRequest;
+/**
+ * Implements a specific authentication mechanism and produces a SecurityToken when authentication
+ * is successful.
+ */
public interface AuthenticationHandler {
+
+ /**
+ * @return The name of the authentication handler, used for debugging.
+ */
String getName();
+
+ /**
+ * Produce a security token extracted from the HTTP request.
+ *
+ * @param request The request to extract a token from.
+ * @return A valid security token for the request, or null if it wasn't possible to authenticate.
+ */
SecurityToken getSecurityTokenFromRequest(HttpServletRequest request);
}
Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java (from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java&r1=690075&r2=690667&rev=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java Sun Aug 31 02:40:14 2008
@@ -15,26 +15,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.core.oauth;
+package org.apache.shindig.auth;
import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.common.servlet.GuiceServletContextListener;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
+import org.apache.shindig.common.servlet.InjectedFilter;
import com.google.inject.Inject;
-import com.google.inject.Injector;
-import javax.servlet.Filter;
+import java.io.IOException;
+import java.util.List;
+
import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.util.List;
/**
* Filter that attempts to authenticate an incoming HTTP request. It uses the guice injected
@@ -44,28 +39,11 @@
* If you wish to add a container specific type of auth system simply register an
* additional handler.
*/
-public class AuthenticationServletFilter implements Filter {
+public class AuthenticationServletFilter extends InjectedFilter {
public static final String AUTH_TYPE_OAUTH = "OAuth";
private List<AuthenticationHandler> handlers;
- /**
- * Initializes the filter. We retrieve the Guice injector and ask for all
- * the injected methods to be called, setting a variety of helper objects
- * and configuration state.
- */
- public void init(FilterConfig filterConfig) throws ServletException {
- ServletContext context = filterConfig.getServletContext();
- Injector injector = (Injector)
- context.getAttribute(GuiceServletContextListener.INJECTOR_ATTRIBUTE);
- if (injector == null) {
- throw new UnavailableException(
- "Guice Injector not found! Make sure you registered "
- + GuiceServletContextListener.class.getName() + " as a listener");
- }
- injector.injectMembers(this);
- }
-
@Inject
public void setAuthenticationHandlers(List<AuthenticationHandler> handlers) {
this.handlers = handlers;
Copied: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java (from r690075, incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/UrlParameterAuthenticationHandler.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java&p1=incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/UrlParameterAuthenticationHandler.java&r1=690075&r2=690667&rev=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/UrlParameterAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java Sun Aug 31 02:40:14 2008
@@ -15,21 +15,24 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.core.oauth;
+package org.apache.shindig.auth;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.SecurityTokenDecoder;
import org.apache.shindig.common.SecurityTokenException;
-import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Produces security tokens by extracting the "st" parameter from the request url or post body.
+ */
public class UrlParameterAuthenticationHandler implements AuthenticationHandler {
public static final String AUTH_URL_PARAMETER = "SecurityTokenUrlParameter";
@@ -37,13 +40,10 @@
UrlParameterAuthenticationHandler.class.getName());
private final SecurityTokenDecoder securityTokenDecoder;
- private final ParameterFetcher parameterFetcher;
@Inject
- public UrlParameterAuthenticationHandler(SecurityTokenDecoder securityTokenDecoder,
- @Named("DataServiceServlet")ParameterFetcher parameterFetcher) {
+ public UrlParameterAuthenticationHandler(SecurityTokenDecoder securityTokenDecoder) {
this.securityTokenDecoder = securityTokenDecoder;
- this.parameterFetcher = parameterFetcher;
}
public String getName() {
@@ -52,7 +52,10 @@
public SecurityToken getSecurityTokenFromRequest(HttpServletRequest request) {
try {
- return securityTokenDecoder.createToken(parameterFetcher.fetch(request));
+ String token = request.getParameter("st");
+ Map<String, String> parameters
+ = Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, token);
+ return securityTokenDecoder.createToken(parameters);
} catch (SecurityTokenException e) {
logger.log(Level.INFO, "Valid security token not found.", e);
return null;
Copied: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java (from r690075, incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java&p1=incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java&r1=690075&r2=690667&rev=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/auth/AuthInfoTest.java Sun Aug 31 02:40:14 2008
@@ -15,14 +15,14 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.shindig.social.core.oauth;
-
-import junit.framework.TestCase;
+package org.apache.shindig.auth;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.testing.FakeHttpServletRequest;
+import junit.framework.TestCase;
+
import javax.servlet.http.HttpServletRequest;
public class AuthInfoTest extends TestCase {
@@ -33,7 +33,7 @@
AuthInfo.setSecurityToken(req, token);
assertEquals(token, AuthInfo.getSecurityToken(req));
}
-
+
public void testAuthType() throws Exception {
HttpServletRequest req = new FakeHttpServletRequest();
AuthInfo.setAuthType(req, "FakeAuth");
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.full.xml Sun Aug 31 02:40:14 2008
@@ -33,7 +33,7 @@
<filter>
<filter-name>oauthFilter</filter-name>
- <filter-class>org.apache.shindig.social.core.oauth.AuthenticationServletFilter</filter-class>
+ <filter-class>org.apache.shindig.auth.AuthenticationServletFilter</filter-class>
</filter>
<filter-mapping>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.social.xml Sun Aug 31 02:40:14 2008
@@ -31,7 +31,7 @@
<filter>
<filter-name>oauthFilter</filter-name>
- <filter-class>org.apache.shindig.social.core.oauth.AuthenticationServletFilter</filter-class>
+ <filter-class>org.apache.shindig.auth.AuthenticationServletFilter</filter-class>
</filter>
<filter-mapping>
Modified: incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shindig/trunk/java/server/src/main/webapp/WEB-INF/web.xml Sun Aug 31 02:40:14 2008
@@ -33,7 +33,7 @@
<filter>
<filter-name>oauthFilter</filter-name>
- <filter-class>org.apache.shindig.social.core.oauth.AuthenticationServletFilter</filter-class>
+ <filter-class>org.apache.shindig.auth.AuthenticationServletFilter</filter-class>
</filter>
<filter-mapping>
Modified: incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java (original)
+++ incubator/shindig/trunk/java/server/src/test/java/org/apache/shindig/server/endtoend/EndToEndModule.java Sun Aug 31 02:40:14 2008
@@ -17,21 +17,21 @@
*/
package org.apache.shindig.server.endtoend;
+import org.apache.shindig.auth.AnonymousAuthenticationHandler;
+import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.servlet.ParameterFetcher;
+import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXmlConverter;
-import org.apache.shindig.social.core.oauth.AnonymousAuthenticationHandler;
-import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import org.apache.shindig.social.opensocial.service.BeanConverter;
import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
-import java.util.List;
-
import com.google.inject.AbstractModule;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
+import java.util.List;
+
/**
* Guice module for the end-to-end tests.
*/
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=690667&r1=690666&r2=690667&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 Sun Aug 31 02:40:14 2008
@@ -17,11 +17,11 @@
*/
package org.apache.shindig.server.endtoend;
+import org.apache.shindig.auth.AuthenticationServletFilter;
import org.apache.shindig.common.servlet.GuiceServletContextListener;
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.core.oauth.AuthenticationServletFilter;
import org.apache.shindig.social.opensocial.service.DataServiceServlet;
import org.apache.shindig.social.opensocial.service.JsonRpcServlet;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/config/SocialApiGuiceModule.java Sun Aug 31 02:40:14 2008
@@ -18,27 +18,27 @@
package org.apache.shindig.social.core.config;
+import org.apache.shindig.auth.AnonymousAuthenticationHandler;
+import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.servlet.ParameterFetcher;
-import org.apache.shindig.social.core.oauth.AnonymousAuthenticationHandler;
import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXmlConverter;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import org.apache.shindig.social.opensocial.service.BeanConverter;
import org.apache.shindig.social.opensocial.service.DataServiceServletFetcher;
import org.apache.shindig.social.opensocial.service.HandlerProvider;
import org.apache.shindig.social.sample.service.SampleContainerHandlerProvider;
-import java.util.List;
-
import com.google.inject.AbstractModule;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Names;
+import java.util.List;
+
/**
* Provides social api component injection. Implementor may want to replace this module if they
* need to replace some of the internals of the Social API, like for instance the JSON to Bean to JSON
- * converter Beans, however in general this should not be required, as most default implementations have
+ * converter Beans, however in general this should not be required, as most default implementations have
* been specified with the Guice @ImplementedBy annotation.
*/
public class SocialApiGuiceModule extends AbstractModule {
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationHandlerProvider.java Sun Aug 31 02:40:14 2008
@@ -17,7 +17,9 @@
*/
package org.apache.shindig.social.core.oauth;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
+import org.apache.shindig.auth.AnonymousAuthenticationHandler;
+import org.apache.shindig.auth.AuthenticationHandler;
+import org.apache.shindig.auth.UrlParameterAuthenticationHandler;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java Sun Aug 31 02:40:14 2008
@@ -17,19 +17,22 @@
*/
package org.apache.shindig.social.core.oauth;
+import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.common.SecurityToken;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import org.apache.shindig.social.opensocial.oauth.OAuthLookupService;
import com.google.inject.Inject;
+
import net.oauth.OAuth;
import net.oauth.OAuthMessage;
import net.oauth.server.OAuthServlet;
+
import org.apache.commons.lang.StringUtils;
-import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
+
/**
* This class only handles "two-legged" OAuth (aka Consumer Request) OAuth requests. The request
* must include a xoauth_requestor_id parameter, which will be the userId of the person the
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java Sun Aug 31 02:40:14 2008
@@ -17,13 +17,13 @@
*/
package org.apache.shindig.social.opensocial.service;
+import org.apache.shindig.auth.AuthInfo;
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
-import org.apache.shindig.social.opensocial.spi.SocialSpiException;
-import org.apache.shindig.social.core.oauth.AuthInfo;
import org.apache.shindig.social.core.util.BeanJsonConverter;
+import org.apache.shindig.social.opensocial.spi.SocialSpiException;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -34,6 +34,7 @@
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/config/SocialApiGuiceModuleTest.java Sun Aug 31 02:40:14 2008
@@ -17,8 +17,8 @@
*/
package org.apache.shindig.social.core.config;
+import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.social.core.oauth.AuthenticationHandlerProvider;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -31,26 +31,25 @@
public class SocialApiGuiceModuleTest extends TestCase {
private Injector injector;
-
+
@Override public void setUp() throws Exception {
super.setUp();
injector = Guice.createInjector(new SocialApiGuiceModule());
}
-
+
/**
* Test default auth handler injection
*/
public void testAuthHandler() {
- List<AuthenticationHandler> expected =
- injector.getInstance(AuthenticationHandlerProvider.class).get();
-
+ injector.getInstance(AuthenticationHandlerProvider.class).get();
+
AuthenticationHandlerProvider provider =
injector.getInstance(AuthenticationHandlerProvider.class);
assertEquals(3, provider.get().size());
List<AuthenticationHandler> handlers = injector.getInstance(
Key.get(new TypeLiteral<List<AuthenticationHandler>>(){}));
-
+
assertEquals(3, handlers.size());
}
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java?rev=690667&r1=690666&r2=690667&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthenticationProviderHandlerTest.java Sun Aug 31 02:40:14 2008
@@ -17,8 +17,8 @@
*/
package org.apache.shindig.social.core.oauth;
+import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.social.core.config.SocialApiGuiceModule;
-import org.apache.shindig.social.opensocial.oauth.AuthenticationHandler;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
@@ -40,16 +40,16 @@
public void testCustomHandler() {
Injector injector = Guice.createInjector(new SocialApiGuiceModule(),
new CustomAuthHandlerProviderModule());
-
+
AuthenticationHandlerProvider provider = injector.getInstance(
AuthenticationHandlerProvider.class);
assertEquals(0, provider.get().size());
-
+
List<AuthenticationHandler> handlers = injector.getInstance(
Key.get(new TypeLiteral<List<AuthenticationHandler>>(){}));
assertEquals(0, handlers.size());
}
-
+
/**
* AuthenticationHandlerProvider with no handlers
*/
@@ -57,13 +57,13 @@
public ProvidesNoHandlers() {
super(null, null, null);
}
-
+
@Override
public List<AuthenticationHandler> get() {
return Collections.emptyList();
}
}
-
+
/**
* Module with a custom AuthenticationHandler
*/