Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dead code in SessionFixationProtectionStrategy 

The retainedAttributes property is no longer used as a result of removing deprecations in 6e204fff72

Fixes gh-4057
Related gh-2757 gh-2918
This commit is contained in:
Stefan Penndorf 2016-09-07 12:50:15 +02:00 committed by Joe Grandja
parent aceba1f1cf
commit d6397c2362
1 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
View File

@ -64,12 +64,6 @@ public class SessionFixationProtectionStrategy extends
*/ */
boolean migrateSessionAttributes = true; boolean migrateSessionAttributes = true;
/**
* In the case where the attributes will not be migrated, this field allows a list of
* named attributes which should <em>not</em> be discarded.
*/
private List<String> retainedAttributes = null;
/** /**
* Called to extract the existing attributes from the session, prior to invalidating * Called to extract the existing attributes from the session, prior to invalidating
* it. If {@code migrateAttributes} is set to {@code false}, only Spring Security * it. If {@code migrateAttributes} is set to {@code false}, only Spring Security
@ -124,36 +118,19 @@ public class SessionFixationProtectionStrategy extends
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private HashMap<String, Object> createMigratedAttributeMap(HttpSession session) { private HashMap<String, Object> createMigratedAttributeMap(HttpSession session) {
HashMap<String, Object> attributesToMigrate = null; HashMap<String, Object> attributesToMigrate = new HashMap<String, Object>();
if (migrateSessionAttributes || retainedAttributes == null) { Enumeration enumer = session.getAttributeNames();
attributesToMigrate = new HashMap<String, Object>();
Enumeration enumer = session.getAttributeNames(); while (enumer.hasMoreElements()) {
String key = (String) enumer.nextElement();
while (enumer.hasMoreElements()) { if (!migrateSessionAttributes && !key.startsWith("SPRING_SECURITY_")) {
String key = (String) enumer.nextElement(); // Only retain Spring Security attributes
if (!migrateSessionAttributes && !key.startsWith("SPRING_SECURITY_")) { continue;
// Only retain Spring Security attributes
continue;
}
attributesToMigrate.put(key, session.getAttribute(key));
} }
attributesToMigrate.put(key, session.getAttribute(key));
} }
else {
// Only retain the attributes which have been specified in the
// retainAttributes list
if (!retainedAttributes.isEmpty()) {
attributesToMigrate = new HashMap<String, Object>();
for (String name : retainedAttributes) {
Object value = session.getAttribute(name);
if (value != null) {
attributesToMigrate.put(name, value);
}
}
}
}
return attributesToMigrate; return attributesToMigrate;
} }