Merge branch 'master' of https://github.com/traccar/traccar

8 files changed, 229 insertions, 28 deletions

diff --git a/src/main/java/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java
index d1025f548..b453c437f 100644
--- a/src/main/java/org/traccar/helper/BufferUtil.java
+++ b/src/main/java/org/traccar/helper/BufferUtil.java
@@ -71,4 +71,20 @@ public final class BufferUtil {
         }
     }
 
+    public static boolean isPrintable(ByteBuf buf, int length) {
+        boolean printable = true;
+        for (int i = 0; i < length; i++) {
+            byte b = buf.getByte(buf.readerIndex() + i);
+            if (b < 32 && b != '\r' && b != '\n') {
+                printable = false;
+                break;
+            }
+        }
+        return printable;
+    }
+
+    public static String readString(ByteBuf buf, int length) {
+        return buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+    }
+
 }
diff --git a/src/main/java/org/traccar/helper/ObdDecoder.java b/src/main/java/org/traccar/helper/ObdDecoder.java
index b22065f4e..3cbae334a 100644
--- a/src/main/java/org/traccar/helper/ObdDecoder.java
+++ b/src/main/java/org/traccar/helper/ObdDecoder.java
@@ -51,22 +51,7 @@ public final class ObdDecoder {
         StringBuilder codes = new StringBuilder();
         for (int i = 0; i < value.length() / 4; i++) {
             int numValue = Integer.parseInt(value.substring(i * 4, (i + 1) * 4), 16);
-            codes.append(' ');
-            switch (numValue >> 14) {
-                case 1:
-                    codes.append('C');
-                    break;
-                case 2:
-                    codes.append('B');
-                    break;
-                case 3:
-                    codes.append('U');
-                    break;
-                default:
-                    codes.append('P');
-                    break;
-            }
-            codes.append(String.format("%04X", numValue & 0x3FFF));
+            codes.append(' ').append(decodeCode(numValue));
         }
         if (codes.length() > 0) {
             return createEntry(Position.KEY_DTCS, codes.toString().trim());
@@ -75,6 +60,25 @@ public final class ObdDecoder {
         }
     }
 
+    public static String decodeCode(int value) {
+        char prefix;
+        switch (value >> 14) {
+            case 1:
+                prefix = 'C';
+                break;
+            case 2:
+                prefix = 'B';
+                break;
+            case 3:
+                prefix = 'U';
+                break;
+            default:
+                prefix = 'P';
+                break;
+        }
+        return String.format("%c%04X", prefix, value & 0x3FFF);
+    }
+
     public static Map.Entry<String, Object> decodeData(int pid, long value, boolean convert) {
         switch (pid) {
             case 0x04:
diff --git a/src/main/java/org/traccar/helper/ObjectMapperContextResolver.java b/src/main/java/org/traccar/helper/ObjectMapperContextResolver.java
index b40e30d76..634950b85 100644
--- a/src/main/java/org/traccar/helper/ObjectMapperContextResolver.java
+++ b/src/main/java/org/traccar/helper/ObjectMapperContextResolver.java
@@ -17,8 +17,8 @@ package org.traccar.helper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import javax.inject.Inject;
-import javax.ws.rs.ext.ContextResolver;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.ext.ContextResolver;
 
 // This does not work as a lambda
 public class ObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
diff --git a/src/main/java/org/traccar/helper/Parser.java b/src/main/java/org/traccar/helper/Parser.java
index aa39e1ad7..c2aea28fa 100644
--- a/src/main/java/org/traccar/helper/Parser.java
+++ b/src/main/java/org/traccar/helper/Parser.java
@@ -50,6 +50,17 @@ public class Parser {
     public boolean hasNext(int number) {
         for (int i = position; i < position + number; i++) {
             String value = matcher.group(i);
+            if (value == null || value.isEmpty()) {
+                position += number;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean hasNextAny(int number) {
+        for (int i = position; i < position + number; i++) {
+            String value = matcher.group(i);
             if (value != null && !value.isEmpty()) {
                 return true;
             }
diff --git a/src/main/java/org/traccar/helper/ServletHelper.java b/src/main/java/org/traccar/helper/WebHelper.java
index b6c587ec3..9533fe84b 100644
--- a/src/main/java/org/traccar/helper/ServletHelper.java
+++ b/src/main/java/org/traccar/helper/WebHelper.java
@@ -15,11 +15,18 @@
  */
 package org.traccar.helper;
 
-import javax.servlet.http.HttpServletRequest;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
-public final class ServletHelper {
+import jakarta.servlet.http.HttpServletRequest;
 
-    private ServletHelper() {
+import org.eclipse.jetty.util.URIUtil;
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
+
+public final class WebHelper {
+
+    private WebHelper() {
     }
 
     public static String retrieveRemoteAddress(HttpServletRequest request) {
@@ -42,4 +49,17 @@ public final class ServletHelper {
         }
     }
 
+    public static String retrieveWebUrl(Config config) {
+        if (config.hasKey(Keys.WEB_URL)) {
+            return config.getString(Keys.WEB_URL).replaceAll("/$", "");
+        } else {
+            String address;
+            try {
+                address = config.getString(Keys.WEB_ADDRESS, InetAddress.getLocalHost().getHostAddress());
+            } catch (UnknownHostException e) {
+                address = "localhost";
+            }
+            return URIUtil.newURI("http", address, config.getInteger(Keys.WEB_PORT), "", "");
+        }
+    }
 }
diff --git a/src/main/java/org/traccar/helper/model/AttributeUtil.java b/src/main/java/org/traccar/helper/model/AttributeUtil.java
index 43558e8f7..2630f64f0 100644
--- a/src/main/java/org/traccar/helper/model/AttributeUtil.java
+++ b/src/main/java/org/traccar/helper/model/AttributeUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2022 - 2023 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.
@@ -15,25 +15,44 @@
  */
 package org.traccar.helper.model;
 
+import org.traccar.api.security.PermissionsService;
+import org.traccar.config.Config;
 import org.traccar.config.ConfigKey;
 import org.traccar.config.KeyType;
 import org.traccar.config.Keys;
 import org.traccar.model.Device;
 import org.traccar.model.Group;
+import org.traccar.model.Server;
 import org.traccar.session.cache.CacheManager;
+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;
 
 public final class AttributeUtil {
 
     private AttributeUtil() {
     }
 
-    @SuppressWarnings({ "deprecation", "unchecked" })
+    public interface Provider {
+        Device getDevice();
+        Group getGroup(long groupId);
+        Server getServer();
+        Config getConfig();
+    }
+
     public static <T> T lookup(CacheManager cacheManager, ConfigKey<T> key, long deviceId) {
-        Device device = cacheManager.getObject(Device.class, deviceId);
+        return lookup(new CacheProvider(cacheManager, deviceId), key);
+    }
+
+    @SuppressWarnings({ "deprecation", "unchecked" })
+    public static <T> T lookup(Provider provider, ConfigKey<T> key) {
+        Device device = provider.getDevice();
         Object result = device.getAttributes().get(key.getKey());
         long groupId = device.getGroupId();
         while (result == null && groupId > 0) {
-            Group group = cacheManager.getObject(Group.class, groupId);
+            Group group = provider.getGroup(groupId);
             if (group != null) {
                 result = group.getAttributes().get(key.getKey());
                 groupId = group.getGroupId();
@@ -42,10 +61,10 @@ public final class AttributeUtil {
             }
         }
         if (result == null && key.hasType(KeyType.SERVER)) {
-            result = cacheManager.getServer().getAttributes().get(key.getKey());
+            result = provider.getServer().getAttributes().get(key.getKey());
         }
         if (result == null && key.hasType(KeyType.CONFIG)) {
-            result = cacheManager.getConfig().getString(key.getKey());
+            result = provider.getConfig().getString(key.getKey());
         }
 
         if (result != null) {
@@ -91,4 +110,79 @@ public final class AttributeUtil {
         return defaultPassword;
     }
 
+    public static class CacheProvider implements Provider {
+
+        private final CacheManager cacheManager;
+        private final long deviceId;
+
+        public CacheProvider(CacheManager cacheManager, long deviceId) {
+            this.cacheManager = cacheManager;
+            this.deviceId = deviceId;
+        }
+
+        @Override
+        public Device getDevice() {
+            return cacheManager.getObject(Device.class, deviceId);
+        }
+
+        @Override
+        public Group getGroup(long groupId) {
+            return cacheManager.getObject(Group.class, groupId);
+        }
+
+        @Override
+        public Server getServer() {
+            return cacheManager.getServer();
+        }
+
+        @Override
+        public Config getConfig() {
+            return cacheManager.getConfig();
+        }
+    }
+
+    public static class StorageProvider implements Provider {
+
+        private final Config config;
+        private final Storage storage;
+        private final PermissionsService permissionsService;
+        private final Device device;
+
+        public StorageProvider(Config config, Storage storage, PermissionsService permissionsService, Device device) {
+            this.config = config;
+            this.storage = storage;
+            this.permissionsService = permissionsService;
+            this.device = device;
+        }
+
+        @Override
+        public Device getDevice() {
+            return device;
+        }
+
+        @Override
+        public Group getGroup(long groupId) {
+            try {
+                return storage.getObject(
+                        Group.class, new Request(new Columns.All(), new Condition.Equals("id", groupId)));
+            } catch (StorageException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public Server getServer() {
+            try {
+                return permissionsService.getServer();
+            } catch (StorageException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public Config getConfig() {
+            return config;
+        }
+    }
+
 }
diff --git a/src/main/java/org/traccar/helper/model/DeviceUtil.java b/src/main/java/org/traccar/helper/model/DeviceUtil.java
index 597078caf..5d8cb5f25 100644
--- a/src/main/java/org/traccar/helper/model/DeviceUtil.java
+++ b/src/main/java/org/traccar/helper/model/DeviceUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Anton Tananaev (anton@traccar.org)
+ * Copyright 2022 - 2023 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.
@@ -16,11 +16,20 @@
 package org.traccar.helper.model;
 
 import org.traccar.model.Device;
+import org.traccar.model.Group;
+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.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 public final class DeviceUtil {
 
     private DeviceUtil() {
@@ -30,4 +39,41 @@ public final class DeviceUtil {
         storage.updateObject(new Device(), new Request(new Columns.Include("status")));
     }
 
+
+    public static Collection<Device> getAccessibleDevices(
+            Storage storage, long userId,
+            Collection<Long> deviceIds, Collection<Long> groupIds) throws StorageException {
+
+        var devices = storage.getObjects(Device.class, new Request(
+                new Columns.All(),
+                new Condition.Permission(User.class, userId, Device.class)));
+        var deviceById = devices.stream()
+                .collect(Collectors.toUnmodifiableMap(Device::getId, x -> x));
+        var devicesByGroup = devices.stream()
+                .filter(x -> x.getGroupId() > 0)
+                .collect(Collectors.groupingBy(Device::getGroupId));
+
+        var groups = storage.getObjects(Group.class, new Request(
+                new Columns.All(),
+                new Condition.Permission(User.class, userId, Group.class)));
+        var groupsByGroup = groups.stream()
+                .filter(x -> x.getGroupId() > 0)
+                .collect(Collectors.groupingBy(Group::getGroupId));
+
+        var results = deviceIds.stream()
+                .map(deviceById::get)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        var groupQueue = new LinkedList<>(groupIds);
+        while (!groupQueue.isEmpty()) {
+            long groupId = groupQueue.pop();
+            results.addAll(devicesByGroup.getOrDefault(groupId, Collections.emptyList()));
+            groupQueue.addAll(groupsByGroup.getOrDefault(groupId, Collections.emptyList())
+                    .stream().map(Group::getId).collect(Collectors.toUnmodifiableList()));
+        }
+
+        return results;
+    }
+
 }
diff --git a/src/main/java/org/traccar/helper/model/UserUtil.java b/src/main/java/org/traccar/helper/model/UserUtil.java
index 9f93afeae..4b1c404f9 100644
--- a/src/main/java/org/traccar/helper/model/UserUtil.java
+++ b/src/main/java/org/traccar/helper/model/UserUtil.java
@@ -15,6 +15,8 @@
  */
 package org.traccar.helper.model;
 
+import org.traccar.config.Config;
+import org.traccar.config.Keys;
 import org.traccar.model.Server;
 import org.traccar.model.User;
 import org.traccar.storage.Storage;
@@ -23,6 +25,7 @@ import org.traccar.storage.query.Columns;
 import org.traccar.storage.query.Order;
 import org.traccar.storage.query.Request;
 
+import java.util.Date;
 import java.util.TimeZone;
 
 public final class UserUtil {
@@ -65,4 +68,11 @@ public final class UserUtil {
         return preference != null ? preference : defaultValue;
     }
 
+    public static void setUserDefaults(User user, Config config) {
+        user.setDeviceLimit(config.getInteger(Keys.USERS_DEFAULT_DEVICE_LIMIT));
+        int expirationDays = config.getInteger(Keys.USERS_DEFAULT_EXPIRATION_DAYS);
+        if (expirationDays > 0) {
+            user.setExpirationTime(new Date(System.currentTimeMillis() + expirationDays * 86400000L));
+        }
+    }
 }