Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 23:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-791: RequestKey.equals throws NPE if method is null

Browse Source 
http://jira.springframework.org/browse/SEC-791. Fixed handling of equals when one http method is null.
This commit is contained in:
Luke Taylor 2008-04-22 12:32:33 +00:00
parent 9eaa1cbbdd
commit 88ea87642a
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/springframework/security/intercept/web/RequestKey.java
View File

@ -3,6 +3,7 @@ package org.springframework.security.intercept.web;
/** /**
* @author Luke Taylor * @author Luke Taylor
* @version $Id$ * @version $Id$
* @since 2.0
*/ */
public class RequestKey { public class RequestKey {
private String url; private String url;
@ -47,10 +48,10 @@ public class RequestKey {
return false; return false;
} }
if (method == null && key.method != null) { if (method == null) {
return false; return key.method == null;
} }
return method.equals(key.method); return method.equals(key.method);
} }
} }

51
core/src/test/java/org/springframework/security/intercept/web/RequestKeyTests.java Normal file
View File

@ -0,0 +1,51 @@
package org.springframework.security.intercept.web;
import static org.junit.Assert.*;
import org.junit.Test;
/**
*
* @author Luke Taylor
* @version $Id$
*
*/
public class RequestKeyTests {
@Test
public void equalsWorksWithNullHttpMethod() {
RequestKey key1 = new RequestKey("/someurl");
RequestKey key2 = new RequestKey("/someurl");
assertEquals(key1, key2);
key1 = new RequestKey("/someurl","GET");
assertFalse(key1.equals(key2));
assertFalse(key2.equals(key1));
}
@Test
public void keysWithSameUrlAndHttpMethodAreEqual() {
RequestKey key1 = new RequestKey("/someurl", "GET");
RequestKey key2 = new RequestKey("/someurl", "GET");
assertEquals(key1, key2);
}
@Test
public void keysWithSameUrlAndDifferentHttpMethodAreNotEqual() {
RequestKey key1 = new RequestKey("/someurl", "GET");
RequestKey key2 = new RequestKey("/someurl", "POST");
assertFalse(key1.equals(key2));
assertFalse(key2.equals(key1));
}
@Test
public void keysWithDifferentUrlsAreNotEquals() {
RequestKey key1 = new RequestKey("/someurl", "GET");
RequestKey key2 = new RequestKey("/anotherurl", "GET");
assertFalse(key1.equals(key2));
assertFalse(key2.equals(key1));
}
}