Refactor login

7 files changed, 104 insertions, 82 deletions

diff --git a/src/main/java/org/traccar/api/MediaFilter.java b/src/main/java/org/traccar/api/MediaFilter.java
index c6ac811d7..e0609871a 100644
--- a/src/main/java/org/traccar/api/MediaFilter.java
+++ b/src/main/java/org/traccar/api/MediaFilter.java
@@ -61,7 +61,6 @@ public class MediaFilter implements Filter {
             if (session != null) {
                 userId = (Long) session.getAttribute(SessionResource.USER_ID_KEY);
                 if (userId != null) {
-                    permissionsService.checkUserEnabled(userId);
                     statisticsManager.registerRequest(userId);
                 }
             }
diff --git a/src/main/java/org/traccar/api/resource/SessionResource.java b/src/main/java/org/traccar/api/resource/SessionResource.java
index a0bf0cba5..70561f997 100644
--- a/src/main/java/org/traccar/api/resource/SessionResource.java
+++ b/src/main/java/org/traccar/api/resource/SessionResource.java
@@ -15,18 +15,16 @@
  */
 package org.traccar.api.resource;
 
-import org.traccar.Context;
 import org.traccar.api.BaseResource;
+import org.traccar.database.LoginService;
 import org.traccar.helper.DataConverter;
 import org.traccar.helper.ServletHelper;
 import org.traccar.helper.LogAction;
 import org.traccar.model.User;
 import org.traccar.storage.StorageException;
-import org.traccar.storage.query.Columns;
-import org.traccar.storage.query.Condition;
-import org.traccar.storage.query.Request;
 
 import javax.annotation.security.PermitAll;
+import javax.inject.Inject;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -54,6 +52,9 @@ public class SessionResource extends BaseResource {
     public static final String USER_COOKIE_KEY = "user";
     public static final String PASS_COOKIE_KEY = "password";
 
+    @Inject
+    private LoginService loginService;
+
     @javax.ws.rs.core.Context
     private HttpServletRequest request;
 
@@ -62,11 +63,10 @@ public class SessionResource extends BaseResource {
     public User get(@QueryParam("token") String token) throws StorageException, UnsupportedEncodingException {
 
         if (token != null) {
-            User user = storage.getObject(User.class, new Request(
-                    new Columns.All(), new Condition.Equals("token", "token", token)));
+            User user = loginService.login(token);
             if (user != null) {
-                Context.getPermissionsManager().checkUserEnabled(user.getId());
                 request.getSession().setAttribute(USER_ID_KEY, user.getId());
+                LogAction.login(user.getId(), ServletHelper.retrieveRemoteAddress(request));
                 return user;
             }
         }
@@ -90,18 +90,17 @@ public class SessionResource extends BaseResource {
                 }
             }
             if (email != null && password != null) {
-                User user = Context.getPermissionsManager().login(email, password);
+                User user = loginService.login(email, password);
                 if (user != null) {
-                    Context.getPermissionsManager().checkUserEnabled(user.getId());
                     request.getSession().setAttribute(USER_ID_KEY, user.getId());
+                    LogAction.login(user.getId(), ServletHelper.retrieveRemoteAddress(request));
                     return user;
                 }
             }
 
         } else {
 
-            Context.getPermissionsManager().checkUserEnabled(userId);
-            return Context.getPermissionsManager().getUser(userId);
+            return permissionsService.getUser(userId);
 
         }
 
@@ -112,7 +111,7 @@ public class SessionResource extends BaseResource {
     @POST
     public User add(
             @FormParam("email") String email, @FormParam("password") String password) throws StorageException {
-        User user = Context.getPermissionsManager().login(email, password);
+        User user = loginService.login(email, password);
         if (user != null) {
             request.getSession().setAttribute(USER_ID_KEY, user.getId());
             LogAction.login(user.getId(), ServletHelper.retrieveRemoteAddress(request));
diff --git a/src/main/java/org/traccar/api/security/PermissionsService.java b/src/main/java/org/traccar/api/security/PermissionsService.java
index 8732a0d04..f39ded2b7 100644
--- a/src/main/java/org/traccar/api/security/PermissionsService.java
+++ b/src/main/java/org/traccar/api/security/PermissionsService.java
@@ -92,19 +92,6 @@ public class PermissionsService {
         }
     }
 
-    public void checkUserEnabled(long userId) throws StorageException, SecurityException {
-        User user = getUser(userId);
-        if (user == null) {
-            throw new SecurityException("Unknown account");
-        }
-        if (user.getDisabled()) {
-            throw new SecurityException("Account is disabled");
-        }
-        if (user.getExpirationTime() != null && System.currentTimeMillis() > user.getExpirationTime().getTime()) {
-            throw new SecurityException("Account has expired");
-        }
-    }
-
     public void checkEdit(long userId, Class<?> clazz, boolean addition) throws StorageException, SecurityException {
         if (!getUser(userId).getAdministrator()) {
             boolean denied = false;
diff --git a/src/main/java/org/traccar/api/security/SecurityRequestFilter.java b/src/main/java/org/traccar/api/security/SecurityRequestFilter.java
index 9f20acb40..ad45dc112 100644
--- a/src/main/java/org/traccar/api/security/SecurityRequestFilter.java
+++ b/src/main/java/org/traccar/api/security/SecurityRequestFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2022 Anton Tananaev (anton@traccar.org)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ package org.traccar.api.security;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.traccar.Context;
 import org.traccar.Main;
 import org.traccar.api.resource.SessionResource;
+import org.traccar.database.LoginService;
 import org.traccar.database.StatisticsManager;
 import org.traccar.helper.DataConverter;
 import org.traccar.model.User;
@@ -77,7 +77,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
 
                 try {
                     String[] auth = decodeBasicAuth(authHeader);
-                    User user = Context.getPermissionsManager().login(auth[0], auth[1]);
+                    User user = Main.getInjector().getInstance(LoginService.class).login(auth[0], auth[1]);
                     if (user != null) {
                         Main.getInjector().getInstance(StatisticsManager.class).registerRequest(user.getId());
                         securityContext = new UserSecurityContext(new UserPrincipal(user.getId()));
@@ -90,7 +90,6 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
 
                 Long userId = (Long) request.getSession().getAttribute(SessionResource.USER_ID_KEY);
                 if (userId != null) {
-                    Context.getPermissionsManager().checkUserEnabled(userId);
                     Main.getInjector().getInstance(StatisticsManager.class).registerRequest(userId);
                     securityContext = new UserSecurityContext(new UserPrincipal(userId));
                 }
diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index 3cad2dd63..aa600e375 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -15,15 +15,11 @@
  */
 package org.traccar.database;
 
-import org.traccar.Main;
-import org.traccar.config.Config;
-import org.traccar.config.Keys;
 import org.traccar.model.BaseModel;
 import org.traccar.model.Device;
 import org.traccar.model.Permission;
 import org.traccar.model.Position;
 import org.traccar.model.Server;
-import org.traccar.model.User;
 import org.traccar.storage.Storage;
 import org.traccar.storage.StorageException;
 import org.traccar.storage.query.Columns;
@@ -40,34 +36,9 @@ public class DataManager {
 
     private final Storage storage;
 
-    private final boolean forceLdap;
-
     @Inject
-    public DataManager(Config config, Storage storage) throws Exception {
+    public DataManager(Storage storage) throws Exception {
         this.storage = storage;
-        forceLdap = config.getBoolean(Keys.LDAP_FORCE);
-    }
-
-    public User login(String email, String password) throws StorageException {
-        User user = storage.getObject(User.class, new Request(
-                new Columns.Include("id", "login", "hashedPassword", "salt"),
-                new Condition.Or(
-                        new Condition.Equals("email", "email", email.trim()),
-                        new Condition.Equals("login", "email"))));
-        LdapProvider ldapProvider = Main.getInjector().getInstance(LdapProvider.class);
-        if (user != null) {
-            if (ldapProvider != null && user.getLogin() != null && ldapProvider.login(user.getLogin(), password)
-                    || !forceLdap && user.isPasswordValid(password)) {
-                return user;
-            }
-        } else {
-            if (ldapProvider != null && ldapProvider.login(email, password)) {
-                user = ldapProvider.getUser(email);
-                user.setId(storage.addObject(user, new Request(new Columns.Exclude("id"))));
-                return user;
-            }
-        }
-        return null;
     }
 
     public void updateDeviceStatus(Device device) throws StorageException {
diff --git a/src/main/java/org/traccar/database/LoginService.java b/src/main/java/org/traccar/database/LoginService.java
new file mode 100644
index 000000000..a30e443b5
--- /dev/null
+++ b/src/main/java/org/traccar/database/LoginService.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.database;
+
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
+import org.traccar.model.User;
+import org.traccar.storage.Storage;
+import org.traccar.storage.StorageException;
+import org.traccar.storage.query.Columns;
+import org.traccar.storage.query.Condition;
+import org.traccar.storage.query.Request;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+
+public class LoginService {
+
+    private final Storage storage;
+    private final LdapProvider ldapProvider;
+
+    private final boolean forceLdap;
+
+    @Inject
+    public LoginService(Config config, Storage storage, @Nullable LdapProvider ldapProvider) {
+        this.storage = storage;
+        this.ldapProvider = ldapProvider;
+        forceLdap = config.getBoolean(Keys.LDAP_FORCE);
+    }
+
+    public User login(String token) throws StorageException {
+        User user = storage.getObject(User.class, new Request(
+                new Columns.All(), new Condition.Equals("token", "token", token)));
+        if (user != null) {
+            checkUserEnabled(user);
+        }
+        return user;
+    }
+
+    public User login(String email, String password) throws StorageException {
+        User user = storage.getObject(User.class, new Request(
+                new Columns.Include("id", "login", "hashedPassword", "salt"),
+                new Condition.Or(
+                        new Condition.Equals("email", "email", email.trim()),
+                        new Condition.Equals("login", "email"))));
+        if (user != null) {
+            if (ldapProvider != null && user.getLogin() != null && ldapProvider.login(user.getLogin(), password)
+                    || !forceLdap && user.isPasswordValid(password)) {
+                checkUserEnabled(user);
+                return user;
+            }
+        } else {
+            if (ldapProvider != null && ldapProvider.login(email, password)) {
+                user = ldapProvider.getUser(email);
+                user.setId(storage.addObject(user, new Request(new Columns.Exclude("id"))));
+                checkUserEnabled(user);
+                return user;
+            }
+        }
+        return null;
+    }
+
+
+    private void checkUserEnabled(User user) throws SecurityException {
+        if (user == null) {
+            throw new SecurityException("Unknown account");
+        }
+        if (user.getDisabled()) {
+            throw new SecurityException("Account is disabled");
+        }
+        if (user.getExpirationTime() != null && System.currentTimeMillis() > user.getExpirationTime().getTime()) {
+            throw new SecurityException("Account has expired");
+        }
+    }
+
+}
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index f6fbd9489..4ac27c717 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -190,19 +190,6 @@ public class PermissionsManager {
         }
     }
 
-    public void checkUserEnabled(long userId) throws SecurityException {
-        User user = getUser(userId);
-        if (user == null) {
-            throw new SecurityException("Unknown account");
-        }
-        if (user.getDisabled()) {
-            throw new SecurityException("Account is disabled");
-        }
-        if (user.getExpirationTime() != null && System.currentTimeMillis() > user.getExpirationTime().getTime()) {
-            throw new SecurityException("Account has expired");
-        }
-    }
-
     public void refreshPermissions(Permission permission) {
         if (permission.getOwnerClass().equals(User.class)) {
             if (permission.getPropertyClass().equals(Device.class)
@@ -212,13 +199,4 @@ public class PermissionsManager {
         }
     }
 
-    public User login(String email, String password) throws StorageException {
-        User user = dataManager.login(email, password);
-        if (user != null) {
-            checkUserEnabled(user.getId());
-            return getUser(user.getId());
-        }
-        return null;
-    }
-
 }