diff options
author | Anton Tananaev <anton@traccar.org> | 2023-11-26 08:18:32 -0800 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2023-11-26 08:18:32 -0800 |
commit | fc8678b22929026e6c62284add8ff1cbca247f20 (patch) | |
tree | cb4ef554b1074585fc31bc531e7c884dce433ca0 /src/main/java/org/traccar/api/security/SecurityRequestFilter.java | |
parent | acdc451e3e2ab94f548f078c4bd49985b3c2f01d (diff) | |
download | trackermap-server-fc8678b22929026e6c62284add8ff1cbca247f20.tar.gz trackermap-server-fc8678b22929026e6c62284add8ff1cbca247f20.tar.bz2 trackermap-server-fc8678b22929026e6c62284add8ff1cbca247f20.zip |
Store session expiration
Diffstat (limited to 'src/main/java/org/traccar/api/security/SecurityRequestFilter.java')
-rw-r--r-- | src/main/java/org/traccar/api/security/SecurityRequestFilter.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/org/traccar/api/security/SecurityRequestFilter.java b/src/main/java/org/traccar/api/security/SecurityRequestFilter.java index e308024da..c33a80015 100644 --- a/src/main/java/org/traccar/api/security/SecurityRequestFilter.java +++ b/src/main/java/org/traccar/api/security/SecurityRequestFilter.java @@ -38,6 +38,7 @@ import java.io.IOException; import java.lang.reflect.Method; import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; +import java.util.Date; public class SecurityRequestFilter implements ContainerRequestFilter { @@ -92,7 +93,8 @@ public class SecurityRequestFilter implements ContainerRequestFilter { User user = loginResult.getUser(); if (user != null) { statisticsManager.registerRequest(user.getId()); - securityContext = new UserSecurityContext(new UserPrincipal(user.getId())); + securityContext = new UserSecurityContext( + new UserPrincipal(user.getId(), loginResult.getExpiration())); } } catch (StorageException | GeneralSecurityException | IOException e) { throw new WebApplicationException(e); @@ -101,12 +103,13 @@ public class SecurityRequestFilter implements ContainerRequestFilter { } else if (request.getSession() != null) { Long userId = (Long) request.getSession().getAttribute(SessionResource.USER_ID_KEY); + Date expiration = (Date) request.getSession().getAttribute(SessionResource.EXPIRATION_KEY); if (userId != null) { User user = injector.getInstance(PermissionsService.class).getUser(userId); if (user != null) { user.checkDisabled(); statisticsManager.registerRequest(userId); - securityContext = new UserSecurityContext(new UserPrincipal(userId)); + securityContext = new UserSecurityContext(new UserPrincipal(userId, expiration)); } } |