joerg/net-http
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drop last modified extra field from session, do not keep user profile in session

Browse source
This commit is contained in:
Jörg Prante 2024-04-19 17:12:22 +02:00
parent 715ee9cd2a
commit 7058cfa211
3 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
net-http-server/src/main/java/org/xbib/net/http/server/session/BaseSession.java
View file

@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import org.xbib.datastructures.common.LRUCache;
import org.xbib.net.UserProfile;
@ -13,8 +14,6 @@ public class BaseSession implements Session {
static String CREATED_FIELD = "_created_";
static String LAST_MODIFIED_FIELD = "_lastmodified_";
static String CACHE_PREFIX = "_cache_";
private final SessionListener sessionListener;
@ -83,42 +82,26 @@ public class BaseSession implements Session {
@Override
public boolean isExpired() {
String string = (String) get(LAST_MODIFIED_FIELD);
if (string == null) {
string = (String) get(CREATED_FIELD);
}
if (string == null) {
return false;
}
Instant now = Instant.now();
Instant lastModified = Instant.parse(string);
return Duration.between(lastModified, now).compareTo(lifetime) > 0;
}
public void setUserProfile(UserProfile userProfile) {
this.userProfile = userProfile;
}
public UserProfile getUserProfile() {
return userProfile;
}
@Override
public boolean isAuthenticated() {
return userProfile != null && userProfile.getUserId() != null;
}
@Override
public boolean hasPayload() {
return !isEmpty() &&
!(size() == 1 && containsKey(CREATED_FIELD)) &&
!(size() == 2 && containsKey(CREATED_FIELD) && containsKey(LAST_MODIFIED_FIELD));
return getAge().compareTo(lifetime) > 0;
}
@Override
public Duration getAge() {
Instant instant = containsKey(CREATED_FIELD) ? Instant.parse(get(CREATED_FIELD).toString()) : Instant.now();
return Duration.between(instant, Instant.now());
return Duration.between(getLastModified(), Instant.now());
}
public Instant getLastModified() {
String string = (String) get(CREATED_FIELD);
return string == null ? Instant.now() : Instant.parse(string);
}
public Duration getLifetime() {
return lifetime;
}
@Override
public boolean hasPayload() {
return !isEmpty() && !(size() == 1 && containsKey(CREATED_FIELD));
}
@Override
@ -201,10 +184,6 @@ public class BaseSession implements Session {
return map.toString();
}
public void setLastModified() {
put(LAST_MODIFIED_FIELD, Instant.now().toString());
}
public int getCacheSize() {
return cacheSize;
}

2
net-http-server/src/main/java/org/xbib/net/http/server/session/IncomingContextHandler.java
View file

@ -73,7 +73,7 @@ public class IncomingContextHandler implements HttpHandler {
payload = decodeCookie(cookie);
logger.log(Level.FINE, "payload from cookie = " + payload);
session = toSession(payload);
logger.log(Level.FINE, "session from payload = " + session);
logger.log(Level.FINE, "session from payload = " + session + " expired = " + session.isExpired() + " valid = " + session.isValid());
userProfile = toUserProfile(session);
logger.log(Level.FINE, "userprofile from session = " + userProfile);
} catch (CookieSignatureException e) {

2
net-http-server/src/main/java/org/xbib/net/http/server/session/Session.java
View file

@ -15,8 +15,6 @@ public interface Session extends Map<String, Object> {
boolean isExpired();
boolean isAuthenticated();
boolean hasPayload();
Duration getAge();