Remove users manager

5 files changed, 17 insertions, 269 deletions

diff --git a/src/main/java/org/traccar/database/DataManager.java b/src/main/java/org/traccar/database/DataManager.java
index fd45a0321..6921634dd 100644
--- a/src/main/java/org/traccar/database/DataManager.java
+++ b/src/main/java/org/traccar/database/DataManager.java
@@ -25,7 +25,6 @@ import liquibase.database.DatabaseFactory;
 import liquibase.exception.LiquibaseException;
 import liquibase.resource.FileSystemResourceAccessor;
 import liquibase.resource.ResourceAccessor;
-import org.traccar.Context;
 import org.traccar.Main;
 import org.traccar.config.Config;
 import org.traccar.config.Keys;
@@ -155,7 +154,7 @@ public class DataManager {
         } else {
             if (ldapProvider != null && ldapProvider.login(email, password)) {
                 user = ldapProvider.getUser(email);
-                Context.getUsersManager().addItem(user);
+                user.setId(storage.addObject(user, new Request(new Columns.Exclude("id"))));
                 return user;
             }
         }
diff --git a/src/main/java/org/traccar/database/DeviceManager.java b/src/main/java/org/traccar/database/DeviceManager.java
index e1d6ad1dd..9ba486988 100644
--- a/src/main/java/org/traccar/database/DeviceManager.java
+++ b/src/main/java/org/traccar/database/DeviceManager.java
@@ -177,22 +177,6 @@ public class DeviceManager extends BaseObjectManager<Device> implements Identity
         }
     }
 
-    public Set<Long> getAllManagedItems(long userId) {
-        Set<Long> result = new HashSet<>(getAllUserItems(userId));
-        for (long managedUserId : Context.getUsersManager().getUserItems(userId)) {
-            result.addAll(getAllUserItems(managedUserId));
-        }
-        return result;
-    }
-
-    public Set<Long> getManagedItems(long userId) {
-        Set<Long> result = new HashSet<>(getUserItems(userId));
-        for (long managedUserId : Context.getUsersManager().getUserItems(userId)) {
-            result.addAll(getUserItems(managedUserId));
-        }
-        return result;
-    }
-
     private void addByUniqueId(Device device) {
         try {
             writeLock();
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index f34810439..833480eea 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -18,14 +18,17 @@ package org.traccar.database;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.traccar.Context;
-import org.traccar.model.BaseModel;
+import org.traccar.api.security.PermissionsService;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
-import org.traccar.model.ManagedUser;
 import org.traccar.model.Permission;
 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;
+import org.traccar.storage.query.Condition;
+import org.traccar.storage.query.Request;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -39,7 +42,7 @@ public class PermissionsManager {
     private static final Logger LOGGER = LoggerFactory.getLogger(PermissionsManager.class);
 
     private final DataManager dataManager;
-    private final UsersManager usersManager;
+    private final Storage storage;
 
     private volatile Server server;
 
@@ -50,9 +53,9 @@ public class PermissionsManager {
     private final Map<Long, Set<Long>> deviceUsers = new HashMap<>();
     private final Map<Long, Set<Long>> groupDevices = new HashMap<>();
 
-    public PermissionsManager(DataManager dataManager, UsersManager usersManager) {
+    public PermissionsManager(DataManager dataManager, Storage storage) {
         this.dataManager = dataManager;
-        this.usersManager = usersManager;
+        this.storage = storage;
         refreshServer();
         refreshDeviceAndGroupPermissions();
     }
@@ -74,11 +77,11 @@ public class PermissionsManager {
     }
 
     public User getUser(long userId) {
-        readLock();
         try {
-            return usersManager.getById(userId);
-        } finally {
-            readUnlock();
+            return storage.getObject(User.class, new Request(
+                    new Columns.All(), new Condition.Equals("id", "id", userId)));
+        } catch (StorageException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -222,20 +225,6 @@ public class PermissionsManager {
         }
     }
 
-    public void checkManager(long userId, long managedUserId) throws SecurityException {
-        checkManager(userId);
-        if (!usersManager.getUserItems(userId).contains(managedUserId)) {
-            throw new SecurityException("User access denied");
-        }
-    }
-
-    public void checkUserLimit(long userId) throws SecurityException {
-        int userLimit = getUser(userId).getUserLimit();
-        if (userLimit != -1 && usersManager.getUserItems(userId).size() >= userLimit) {
-            throw new SecurityException("Manager user limit reached");
-        }
-    }
-
     public boolean getUserReadonly(long userId) {
         User user = getUser(userId);
         return user != null && user.getReadonly();
@@ -260,64 +249,11 @@ public class PermissionsManager {
         }
     }
 
-    public void checkUserUpdate(long userId, User before, User after) throws SecurityException {
-        if (before.getAdministrator() != after.getAdministrator()
-                || before.getDeviceLimit() != after.getDeviceLimit()
-                || before.getUserLimit() != after.getUserLimit()) {
-            checkAdmin(userId);
-        }
-        User user = getUser(userId);
-        if (user != null && user.getExpirationTime() != null
-                && (after.getExpirationTime() == null
-                || user.getExpirationTime().compareTo(after.getExpirationTime()) < 0)) {
-            checkAdmin(userId);
-        }
-        if (before.getReadonly() != after.getReadonly()
-                || before.getDeviceReadonly() != after.getDeviceReadonly()
-                || before.getDisabled() != after.getDisabled()
-                || before.getLimitCommands() != after.getLimitCommands()
-                || before.getDisableReports() != after.getDisableReports()) {
-            if (userId == after.getId()) {
-                checkAdmin(userId);
-            }
-            if (!getUserAdmin(userId)) {
-                checkManager(userId);
-            }
-        }
-    }
-
-    public void checkUser(long userId, long managedUserId) throws SecurityException {
-        if (userId != managedUserId && !getUserAdmin(userId)) {
-            checkManager(userId, managedUserId);
-        }
-    }
-
     public void checkDevice(long userId, long deviceId) throws SecurityException {
-        if (!Context.getDeviceManager().getUserItems(userId).contains(deviceId) && !getUserAdmin(userId)) {
-            checkManager(userId);
-            for (long managedUserId : usersManager.getUserItems(userId)) {
-                if (Context.getDeviceManager().getUserItems(managedUserId).contains(deviceId)) {
-                    return;
-                }
-            }
-            throw new SecurityException("Device access denied");
-        }
-    }
-
-    public void checkRegistration(long userId) {
-        if (!server.getRegistration() && !getUserAdmin(userId)) {
-            throw new SecurityException("Registration disabled");
-        }
-    }
-
-    public void checkPermission(Class<?> object, long userId, long objectId)
-            throws SecurityException {
-        SimpleObjectManager<? extends BaseModel> manager = null;
-
-        if (object.equals(Device.class)) {
-            checkDevice(userId, objectId);
-        } else {
-            throw new IllegalArgumentException("Unknown object type");
+        try {
+            new PermissionsService(storage).checkPermission(Device.class, userId, deviceId);
+        } catch (StorageException e) {
+            throw new RuntimeException(e);
         }
     }
 
@@ -326,8 +262,6 @@ public class PermissionsManager {
             if (permission.getPropertyClass().equals(Device.class)
                     || permission.getPropertyClass().equals(Group.class)) {
                 refreshDeviceAndGroupPermissions();
-            } else if (permission.getPropertyClass().equals(ManagedUser.class)) {
-                usersManager.refreshUserItems();
             }
         }
     }
diff --git a/src/main/java/org/traccar/database/SimpleObjectManager.java b/src/main/java/org/traccar/database/SimpleObjectManager.java
index 74bbc054f..8bb22b8a8 100644
--- a/src/main/java/org/traccar/database/SimpleObjectManager.java
+++ b/src/main/java/org/traccar/database/SimpleObjectManager.java
@@ -16,82 +16,12 @@
  */
 package org.traccar.database;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.traccar.Context;
 import org.traccar.model.BaseModel;
-import org.traccar.model.Permission;
-import org.traccar.model.User;
-import org.traccar.storage.StorageException;
 
 public abstract class SimpleObjectManager<T extends BaseModel> extends BaseObjectManager<T> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SimpleObjectManager.class);
-
-    private Map<Long, Set<Long>> userItems;
-
     protected SimpleObjectManager(DataManager dataManager, Class<T> baseClass) {
         super(dataManager, baseClass);
     }
 
-    public final Set<Long> getUserItems(long userId) {
-        try {
-            readLock();
-            Set<Long> result = userItems.get(userId);
-            if (result != null) {
-                return new HashSet<>(result);
-            } else {
-                return new HashSet<>();
-            }
-        } finally {
-            readUnlock();
-        }
-    }
-
-    public Set<Long> getManagedItems(long userId) {
-        Set<Long> result = getUserItems(userId);
-        for (long managedUserId : Context.getUsersManager().getUserItems(userId)) {
-            result.addAll(getUserItems(managedUserId));
-        }
-        return result;
-    }
-
-    public final boolean checkItemPermission(long userId, long itemId) {
-        return getUserItems(userId).contains(itemId);
-    }
-
-    @Override
-    public void refreshItems() {
-        super.refreshItems();
-        refreshUserItems();
-    }
-
-    public final void refreshUserItems() {
-        if (getDataManager() != null) {
-            try {
-                writeLock();
-                userItems = new ConcurrentHashMap<>();
-                for (Permission permission : getDataManager().getPermissions(User.class, getBaseClass())) {
-                    Set<Long> items = userItems.computeIfAbsent(permission.getOwnerId(), key -> new HashSet<>());
-                    items.add(permission.getPropertyId());
-                }
-            } catch (StorageException | ClassNotFoundException error) {
-                LOGGER.warn("Error getting permissions", error);
-            } finally {
-                writeUnlock();
-            }
-        }
-    }
-
-    @Override
-    public void removeItem(long itemId) throws StorageException {
-        super.removeItem(itemId);
-        refreshUserItems();
-    }
-
 }
diff --git a/src/main/java/org/traccar/database/UsersManager.java b/src/main/java/org/traccar/database/UsersManager.java
deleted file mode 100644
index a54226cfe..000000000
--- a/src/main/java/org/traccar/database/UsersManager.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 Andrey Kunitsyn (andrey@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 java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.traccar.model.User;
-import org.traccar.storage.StorageException;
-
-public class UsersManager extends SimpleObjectManager<User> {
-
-    private Map<String, User> usersTokens;
-
-    public UsersManager(DataManager dataManager) {
-        super(dataManager, User.class);
-        if (usersTokens == null) {
-            usersTokens = new ConcurrentHashMap<>();
-        }
-    }
-
-    private void putToken(User user) {
-        if (usersTokens == null) {
-            usersTokens = new ConcurrentHashMap<>();
-        }
-        if (user.getToken() != null) {
-            usersTokens.put(user.getToken(), user);
-        }
-    }
-
-    @Override
-    protected void addNewItem(User user) {
-        super.addNewItem(user);
-        putToken(user);
-    }
-
-    @Override
-    protected void updateCachedItem(User user) {
-        User cachedUser = getById(user.getId());
-        super.updateCachedItem(user);
-        putToken(user);
-        if (cachedUser.getToken() != null && !cachedUser.getToken().equals(user.getToken())) {
-            usersTokens.remove(cachedUser.getToken());
-        }
-    }
-
-    @Override
-    public void addItem(User user) throws StorageException {
-        super.addItem(user);
-        getDataManager().updateUserPassword(user);
-    }
-
-    @Override
-    public void updateItem(User user) throws StorageException {
-        if (user.getHashedPassword() != null) {
-            getDataManager().updateUserPassword(user);
-        }
-        super.updateItem(user);
-    }
-
-    @Override
-    protected void removeCachedItem(long userId) {
-        User cachedUser = getById(userId);
-        if (cachedUser != null) {
-            String userToken = cachedUser.getToken();
-            super.removeCachedItem(userId);
-            if (userToken != null) {
-                usersTokens.remove(userToken);
-            }
-        }
-    }
-
-    @Override
-    public Set<Long> getManagedItems(long userId) {
-        Set<Long> result = getUserItems(userId);
-        result.add(userId);
-        return result;
-    }
-
-    public User getUserByToken(String token) {
-        return usersTokens.get(token);
-    }
-
-}