From fed6597faa141ba3ee8b11bff2c987ac981fd91b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Tue, 24 May 2022 08:59:27 -0700
Subject: Include address in login logs

---
 .../java/org/traccar/api/resource/SessionResource.java  |  5 ++---
 src/main/java/org/traccar/helper/LogAction.java         | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/org/traccar/api/resource/SessionResource.java b/src/main/java/org/traccar/api/resource/SessionResource.java
index 8422e0b49..136aab0eb 100644
--- a/src/main/java/org/traccar/api/resource/SessionResource.java
+++ b/src/main/java/org/traccar/api/resource/SessionResource.java
@@ -110,8 +110,7 @@ public class SessionResource extends BaseResource {
             @FormParam("email") String email, @FormParam("password") String password) throws StorageException {
         User user = Context.getPermissionsManager().login(email, password);
         if (user != null) {
-            request.getSession().setAttribute(USER_ID_KEY, user.getId());
-            LogAction.login(user.getId());
+            LogAction.login(user.getId(), ServletHelper.retrieveRemoteAddress(request));
             return user;
         } else {
             LogAction.failedLogin(ServletHelper.retrieveRemoteAddress(request));
@@ -121,7 +120,7 @@ public class SessionResource extends BaseResource {
 
     @DELETE
     public Response remove() {
-        LogAction.logout(getUserId());
+        LogAction.logout(getUserId(), ServletHelper.retrieveRemoteAddress(request));
         request.getSession().removeAttribute(USER_ID_KEY);
         return Response.noContent().build();
     }
diff --git a/src/main/java/org/traccar/helper/LogAction.java b/src/main/java/org/traccar/helper/LogAction.java
index d16b25483..b255b9206 100644
--- a/src/main/java/org/traccar/helper/LogAction.java
+++ b/src/main/java/org/traccar/helper/LogAction.java
@@ -47,7 +47,7 @@ public final class LogAction {
 
     private static final String PATTERN_OBJECT = "user: %d, action: %s, object: %s, id: %d";
     private static final String PATTERN_LINK = "user: %d, action: %s, owner: %s, id: %d, property: %s, id: %d";
-    private static final String PATTERN_LOGIN = "user: %d, action: %s";
+    private static final String PATTERN_LOGIN = "user: %d, action: %s, from: %s";
     private static final String PATTERN_LOGIN_FAILED = "login failed from: %s";
     private static final String PATTERN_DEVICE_ACCUMULATORS = "user: %d, action: %s, deviceId: %d";
     private static final String PATTERN_REPORT = "user: %d, report: %s, from: %s, to: %s, devices: %s, groups: %s";
@@ -72,12 +72,12 @@ public final class LogAction {
         logLinkAction(ACTION_UNLINK, userId, owner, ownerId, property, propertyId);
     }
 
-    public static void login(long userId) {
-        logLoginAction(ACTION_LOGIN, userId);
+    public static void login(long userId, String remoteAddress) {
+        logLoginAction(ACTION_LOGIN, userId, remoteAddress);
     }
 
-    public static void logout(long userId) {
-        logLoginAction(ACTION_LOGOUT, userId);
+    public static void logout(long userId, String remoteAddress) {
+        logLoginAction(ACTION_LOGOUT, userId, remoteAddress);
     }
 
     public static void failedLogin(String remoteAddress) {
@@ -105,8 +105,11 @@ public final class LogAction {
                 Introspector.decapitalize(property.getSimpleName()), propertyId));
     }
 
-    private static void logLoginAction(String action, long userId) {
-        LOGGER.info(String.format(PATTERN_LOGIN, userId, action));
+    private static void logLoginAction(String action, long userId, String remoteAddress) {
+        if (remoteAddress == null || remoteAddress.isEmpty()) {
+            remoteAddress = "unknown";
+        }
+        LOGGER.info(String.format(PATTERN_LOGIN, userId, action, remoteAddress));
     }
 
     public static void logReport(
-- 
cgit v1.2.3