Changeset 68
- Timestamp:
- 05/24/08 23:37:54 (6 months ago)
- Files:
-
- core/trunk/pom.xml (modified) (2 diffs)
- core/trunk/src/main/java/org/restafarian/core/security/AuthenticatedUserManager.java (modified) (3 diffs)
- core/trunk/src/main/java/org/restafarian/core/security/CookieBasedUserManager.java (added)
- core/trunk/src/main/java/org/restafarian/core/security/DefaultUserManager.java (modified) (2 diffs)
- core/trunk/src/main/java/org/restafarian/core/security/ServiceBasedUserManager.java (modified) (3 diffs)
- core/trunk/src/main/java/org/restafarian/core/security/SessionBasedUserManager.java (modified) (2 diffs)
- core/trunk/src/main/java/org/restafarian/core/security/SpringBasedUserManager.java (added)
- core/trunk/src/main/java/org/restafarian/core/security/UserManager.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
core/trunk/pom.xml
r65 r68 1 1 <?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"> 5 3 <modelVersion>4.0.0</modelVersion> 6 4 <groupId>org.restafarian</groupId> … … 145 143 <version>1.7.0</version> 146 144 </dependency> 145 <dependency> 146 <groupId>org.springframework.security</groupId> 147 <artifactId>spring-security-core</artifactId> 148 <version>2.0.1</version> 149 </dependency> 147 150 </dependencies> 148 151 core/trunk/src/main/java/org/restafarian/core/security/AuthenticatedUserManager.java
r7 r68 3 3 import javax.servlet.ServletContext; 4 4 import javax.servlet.http.HttpServletRequest; 5 import javax.servlet.http.HttpServletResponse; 5 6 6 7 import org.apache.commons.configuration.Configuration; … … 74 75 * 75 76 * @param req the <code>HttpServletRequest</code> object 77 * @param res the <code>HttpServletResponse</code> object 76 78 * @param user the currently authenticated user 77 79 */ 78 public void setAuthenticatedUser(HttpServletRequest req, Person user) {80 public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 79 81 ServletContext context = req.getSession().getServletContext(); 80 82 UserManager userManager = (UserManager) context.getAttribute("authenticatedUserManager"); … … 85 87 } 86 88 } 87 userManager.setAuthenticatedUser(req, user);89 userManager.setAuthenticatedUser(req, res, user); 88 90 } 89 91 } core/trunk/src/main/java/org/restafarian/core/security/DefaultUserManager.java
r7 r68 3 3 import javax.servlet.ServletContext; 4 4 import javax.servlet.http.HttpServletRequest; 5 import javax.servlet.http.HttpServletResponse; 5 6 6 7 import org.apache.commons.configuration.Configuration; … … 50 51 * 51 52 * @param req the <code>HttpServletRequest</code> object 53 * @param res the <code>HttpServletResponse</code> object 52 54 * @param user the currently authenticated user 53 55 */ 54 public void setAuthenticatedUser(HttpServletRequest req, Person user) {56 public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 55 57 // default implementation does nothing 56 58 } core/trunk/src/main/java/org/restafarian/core/security/ServiceBasedUserManager.java
r7 r68 2 2 3 3 import javax.servlet.ServletContext; 4 import javax.servlet.http.Cookie; 4 5 import javax.servlet.http.HttpServletRequest; 6 import javax.servlet.http.HttpServletResponse; 5 7 6 8 import org.apache.commons.betwixt.io.BeanReader; 7 9 import org.apache.commons.configuration.Configuration; 8 10 import org.apache.commons.httpclient.HttpClient; 11 import org.apache.commons.httpclient.cookie.CookiePolicy; 9 12 import org.apache.commons.httpclient.methods.GetMethod; 10 13 import org.apache.commons.lang.StringUtils; … … 46 49 HttpClient client = new HttpClient(); 47 50 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 } 48 60 try { 49 61 int statusCode = client.executeMethod(get); … … 65 77 * 66 78 * @param req the <code>HttpServletRequest</code> object 79 * @param res the <code>HttpServletResponse</code> object 67 80 * @param user the currently authenticated user 68 81 */ 69 public void setAuthenticatedUser(HttpServletRequest req, Person user) {82 public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 70 83 // default implementation does nothing 71 84 } core/trunk/src/main/java/org/restafarian/core/security/SessionBasedUserManager.java
r7 r68 3 3 import javax.servlet.ServletContext; 4 4 import javax.servlet.http.HttpServletRequest; 5 import javax.servlet.http.HttpServletResponse; 5 6 6 7 import org.apache.commons.configuration.Configuration; … … 42 43 * 43 44 * @param req the <code>HttpServletRequest</code> object 45 * @param res the <code>HttpServletResponse</code> object 44 46 * @param user the currently authenticated user 45 47 */ 46 public void setAuthenticatedUser(HttpServletRequest req, Person user) {48 public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user) { 47 49 if (user != null) { 48 50 req.getSession().setAttribute(AUTHENTICATED_USER, user); core/trunk/src/main/java/org/restafarian/core/security/UserManager.java
r7 r68 3 3 import javax.servlet.ServletContext; 4 4 import javax.servlet.http.HttpServletRequest; 5 import javax.servlet.http.HttpServletResponse; 5 6 6 7 import org.apache.commons.configuration.Configuration; … … 33 34 * 34 35 * @param req the <code>HttpServletRequest</code> object 36 * @param res the <code>HttpServletResponse</code> object 35 37 * @param user the currently authenticated user 36 38 */ 37 public void setAuthenticatedUser(HttpServletRequest req, Person user);39 public void setAuthenticatedUser(HttpServletRequest req, HttpServletResponse res, Person user); 38 40 }