Assembla home | Assembla project page
 

Changeset 68

Show
Ignore:
Timestamp:
05/24/08 23:37:54 (6 months ago)
Author:
restamon
Message:

Spring Security/OpenID integration

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • core/trunk/pom.xml

    r65 r68  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <project 
    3   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" 
    4   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
     2<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    53  <modelVersion>4.0.0</modelVersion> 
    64  <groupId>org.restafarian</groupId> 
     
    145143      <version>1.7.0</version> 
    146144    </dependency> 
     145    <dependency> 
     146      <groupId>org.springframework.security</groupId> 
     147      <artifactId>spring-security-core</artifactId> 
     148      <version>2.0.1</version> 
     149    </dependency> 
    147150  </dependencies> 
    148151 
  • core/trunk/src/main/java/org/restafarian/core/security/AuthenticatedUserManager.java

    r7 r68  
    33import javax.servlet.ServletContext; 
    44import javax.servlet.http.HttpServletRequest; 
     5import javax.servlet.http.HttpServletResponse; 
    56 
    67import org.apache.commons.configuration.Configuration; 
     
    7475         * 
    7576         * @param req the <code>HttpServletRequest</code> object 
     77         * @param res the <code>HttpServletResponse</code> object 
    7678         * @param user the currently authenticated user 
    7779         */ 
    78         public void setAuthenticatedUser(HttpServletRequest req, Person user) { 
     80        public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 
    7981                ServletContext context = req.getSession().getServletContext(); 
    8082                UserManager userManager = (UserManager) context.getAttribute("authenticatedUserManager"); 
     
    8587                        } 
    8688                } 
    87                 userManager.setAuthenticatedUser(req, user); 
     89                userManager.setAuthenticatedUser(req, res, user); 
    8890        } 
    8991} 
  • core/trunk/src/main/java/org/restafarian/core/security/DefaultUserManager.java

    r7 r68  
    33import javax.servlet.ServletContext; 
    44import javax.servlet.http.HttpServletRequest; 
     5import javax.servlet.http.HttpServletResponse; 
    56 
    67import org.apache.commons.configuration.Configuration; 
     
    5051         * 
    5152         * @param req the <code>HttpServletRequest</code> object 
     53         * @param res the <code>HttpServletResponse</code> object 
    5254         * @param user the currently authenticated user 
    5355         */ 
    54         public void setAuthenticatedUser(HttpServletRequest req, Person user) { 
     56        public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 
    5557                // default implementation does nothing 
    5658        } 
  • core/trunk/src/main/java/org/restafarian/core/security/ServiceBasedUserManager.java

    r7 r68  
    22 
    33import javax.servlet.ServletContext; 
     4import javax.servlet.http.Cookie; 
    45import javax.servlet.http.HttpServletRequest; 
     6import javax.servlet.http.HttpServletResponse; 
    57 
    68import org.apache.commons.betwixt.io.BeanReader; 
    79import org.apache.commons.configuration.Configuration; 
    810import org.apache.commons.httpclient.HttpClient; 
     11import org.apache.commons.httpclient.cookie.CookiePolicy; 
    912import org.apache.commons.httpclient.methods.GetMethod; 
    1013import org.apache.commons.lang.StringUtils; 
     
    4649                        HttpClient client = new HttpClient(); 
    4750                        GetMethod get = new GetMethod(serviceURL); 
     51                        Cookie[] cookies = req.getCookies(); 
     52                        if (cookies != null && cookies.length > 0) { 
     53                                get.getParams().setCookiePolicy(CookiePolicy.RFC_2109); 
     54                                for (int x=0; x<cookies.length; x++) { 
     55                                        if (!"JSESSIONID".equalsIgnoreCase(cookies[x].getName())) { 
     56                                        get.setRequestHeader("Cookie", cookies[x].getName() + "=" + cookies[x].getValue()); 
     57                                        } 
     58                                } 
     59                        } 
    4860                        try { 
    4961                                int statusCode = client.executeMethod(get); 
     
    6577         * 
    6678         * @param req the <code>HttpServletRequest</code> object 
     79         * @param res the <code>HttpServletResponse</code> object 
    6780         * @param user the currently authenticated user 
    6881         */ 
    69         public void setAuthenticatedUser(HttpServletRequest req, Person user) { 
     82        public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 
    7083                // default implementation does nothing 
    7184        } 
  • core/trunk/src/main/java/org/restafarian/core/security/SessionBasedUserManager.java

    r7 r68  
    33import javax.servlet.ServletContext; 
    44import javax.servlet.http.HttpServletRequest; 
     5import javax.servlet.http.HttpServletResponse; 
    56 
    67import org.apache.commons.configuration.Configuration; 
     
    4243         * 
    4344         * @param req the <code>HttpServletRequest</code> object 
     45         * @param res the <code>HttpServletResponse</code> object 
    4446         * @param user the currently authenticated user 
    4547         */ 
    46         public void setAuthenticatedUser(HttpServletRequest req, Person user) { 
     48        public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 
    4749                if (user != null) { 
    4850                        req.getSession().setAttribute(AUTHENTICATED_USER, user); 
  • core/trunk/src/main/java/org/restafarian/core/security/UserManager.java

    r7 r68  
    33import javax.servlet.ServletContext; 
    44import javax.servlet.http.HttpServletRequest; 
     5import javax.servlet.http.HttpServletResponse; 
    56 
    67import org.apache.commons.configuration.Configuration; 
     
    3334         * 
    3435         * @param req the <code>HttpServletRequest</code> object 
     36         * @param res the <code>HttpServletResponse</code> object 
    3537         * @param user the currently authenticated user 
    3638         */ 
    37         public void setAuthenticatedUser(HttpServletRequest req, Person user); 
     39        public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user); 
    3840}