aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2021-06-17 09:40:14 -0700
committerGitHub <noreply@github.com>2021-06-17 09:40:14 -0700
commitf39dee2a317d68469ee8ca0b55e91ef9c6e0bc01 (patch)
treed81388b6687dd57eb0137c6baeaaf2a43044fc77 /src/main/java/org/traccar
parent467c46ca1c35c7daa2c127ee758e378f151171a0 (diff)
parente39f556ddfbcc222c0c97673fc1aeda0f3151840 (diff)
downloadtraccar-server-f39dee2a317d68469ee8ca0b55e91ef9c6e0bc01.tar.gz
traccar-server-f39dee2a317d68469ee8ca0b55e91ef9c6e0bc01.tar.bz2
traccar-server-f39dee2a317d68469ee8ca0b55e91ef9c6e0bc01.zip
Merge pull request #4700 from tobyfoo/master
Make access to permissions cache thread-safe
Diffstat (limited to 'src/main/java/org/traccar')
-rw-r--r--src/main/java/org/traccar/database/PermissionsManager.java136
1 files changed, 93 insertions, 43 deletions
diff --git a/src/main/java/org/traccar/database/PermissionsManager.java b/src/main/java/org/traccar/database/PermissionsManager.java
index d2dc62394..a27eac069 100644
--- a/src/main/java/org/traccar/database/PermissionsManager.java
+++ b/src/main/java/org/traccar/database/PermissionsManager.java
@@ -38,6 +38,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
public class PermissionsManager {
@@ -48,6 +50,8 @@ public class PermissionsManager {
private volatile Server server;
+ private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
private final Map<Long, Set<Long>> groupPermissions = new HashMap<>();
private final Map<Long, Set<Long>> devicePermissions = new HashMap<>();
private final Map<Long, Set<Long>> deviceUsers = new HashMap<>();
@@ -60,29 +64,65 @@ public class PermissionsManager {
refreshDeviceAndGroupPermissions();
}
+ protected final void readLock() {
+ lock.readLock().lock();
+ }
+
+ protected final void readUnlock() {
+ lock.readLock().unlock();
+ }
+
+ protected final void writeLock() {
+ lock.writeLock().lock();
+ }
+
+ protected final void writeUnlock() {
+ lock.writeLock().unlock();
+ }
+
public User getUser(long userId) {
- return usersManager.getById(userId);
+ readLock();
+ try {
+ return usersManager.getById(userId);
+ } finally {
+ readUnlock();
+ }
}
public Set<Long> getGroupPermissions(long userId) {
- if (!groupPermissions.containsKey(userId)) {
- groupPermissions.put(userId, new HashSet<>());
+ readLock();
+ try {
+ if (!groupPermissions.containsKey(userId)) {
+ groupPermissions.put(userId, new HashSet<>());
+ }
+ return groupPermissions.get(userId);
+ } finally {
+ readUnlock();
}
- return groupPermissions.get(userId);
}
public Set<Long> getDevicePermissions(long userId) {
- if (!devicePermissions.containsKey(userId)) {
- devicePermissions.put(userId, new HashSet<>());
+ readLock();
+ try {
+ if (!devicePermissions.containsKey(userId)) {
+ devicePermissions.put(userId, new HashSet<>());
+ }
+ return devicePermissions.get(userId);
+ } finally {
+ readUnlock();
}
- return devicePermissions.get(userId);
}
private Set<Long> getAllDeviceUsers(long deviceId) {
- if (!deviceUsers.containsKey(deviceId)) {
- deviceUsers.put(deviceId, new HashSet<>());
+ readLock();
+ try {
+ if (!deviceUsers.containsKey(deviceId)) {
+ deviceUsers.put(deviceId, new HashSet<>());
+ }
+ return deviceUsers.get(deviceId);
+ } finally {
+ readUnlock();
}
- return deviceUsers.get(deviceId);
}
public Set<Long> getDeviceUsers(long deviceId) {
@@ -101,10 +141,15 @@ public class PermissionsManager {
}
public Set<Long> getGroupDevices(long groupId) {
- if (!groupDevices.containsKey(groupId)) {
- groupDevices.put(groupId, new HashSet<>());
+ readLock();
+ try {
+ if (!groupDevices.containsKey(groupId)) {
+ groupDevices.put(groupId, new HashSet<>());
+ }
+ return groupDevices.get(groupId);
+ } finally {
+ readUnlock();
}
- return groupDevices.get(groupId);
}
public void refreshServer() {
@@ -116,44 +161,49 @@ public class PermissionsManager {
}
public final void refreshDeviceAndGroupPermissions() {
- groupPermissions.clear();
- devicePermissions.clear();
+ writeLock();
try {
- GroupTree groupTree = new GroupTree(Context.getGroupsManager().getItems(
- Context.getGroupsManager().getAllItems()),
- Context.getDeviceManager().getAllDevices());
- for (Permission groupPermission : dataManager.getPermissions(User.class, Group.class)) {
- Set<Long> userGroupPermissions = getGroupPermissions(groupPermission.getOwnerId());
- Set<Long> userDevicePermissions = getDevicePermissions(groupPermission.getOwnerId());
- userGroupPermissions.add(groupPermission.getPropertyId());
- for (Group group : groupTree.getGroups(groupPermission.getPropertyId())) {
- userGroupPermissions.add(group.getId());
- }
- for (Device device : groupTree.getDevices(groupPermission.getPropertyId())) {
- userDevicePermissions.add(device.getId());
+ groupPermissions.clear();
+ devicePermissions.clear();
+ try {
+ GroupTree groupTree = new GroupTree(Context.getGroupsManager().getItems(
+ Context.getGroupsManager().getAllItems()),
+ Context.getDeviceManager().getAllDevices());
+ for (Permission groupPermission : dataManager.getPermissions(User.class, Group.class)) {
+ Set<Long> userGroupPermissions = getGroupPermissions(groupPermission.getOwnerId());
+ Set<Long> userDevicePermissions = getDevicePermissions(groupPermission.getOwnerId());
+ userGroupPermissions.add(groupPermission.getPropertyId());
+ for (Group group : groupTree.getGroups(groupPermission.getPropertyId())) {
+ userGroupPermissions.add(group.getId());
+ }
+ for (Device device : groupTree.getDevices(groupPermission.getPropertyId())) {
+ userDevicePermissions.add(device.getId());
+ }
}
- }
- for (Permission devicePermission : dataManager.getPermissions(User.class, Device.class)) {
- getDevicePermissions(devicePermission.getOwnerId()).add(devicePermission.getPropertyId());
- }
+ for (Permission devicePermission : dataManager.getPermissions(User.class, Device.class)) {
+ getDevicePermissions(devicePermission.getOwnerId()).add(devicePermission.getPropertyId());
+ }
- groupDevices.clear();
- for (long groupId : Context.getGroupsManager().getAllItems()) {
- for (Device device : groupTree.getDevices(groupId)) {
- getGroupDevices(groupId).add(device.getId());
+ groupDevices.clear();
+ for (long groupId : Context.getGroupsManager().getAllItems()) {
+ for (Device device : groupTree.getDevices(groupId)) {
+ getGroupDevices(groupId).add(device.getId());
+ }
}
- }
- } catch (SQLException | ClassNotFoundException error) {
- LOGGER.warn("Refresh device permissions error", error);
- }
+ } catch (SQLException | ClassNotFoundException error) {
+ LOGGER.warn("Refresh device permissions error", error);
+ }
- deviceUsers.clear();
- for (Map.Entry<Long, Set<Long>> entry : devicePermissions.entrySet()) {
- for (long deviceId : entry.getValue()) {
- getAllDeviceUsers(deviceId).add(entry.getKey());
+ deviceUsers.clear();
+ for (Map.Entry<Long, Set<Long>> entry : devicePermissions.entrySet()) {
+ for (long deviceId : entry.getValue()) {
+ getAllDeviceUsers(deviceId).add(entry.getKey());
+ }
}
+ } finally {
+ writeUnlock();
}
}