Merge pull request #2960 from Abyss777/server_devicereadonly

Server-wide "device readonly" flag

3 files changed, 11 insertions, 2 deletions

diff --git a/src/org/traccar/api/resource/CommandResource.java b/src/org/traccar/api/resource/CommandResource.java
index e13ae9de8..41b263bf9 100644
--- a/src/org/traccar/api/resource/CommandResource.java
+++ b/src/org/traccar/api/resource/CommandResource.java
@@ -34,7 +34,6 @@ public class CommandResource extends BaseResource {
     @POST
     public Response add(Command entity) {
         Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
         Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
         Context.getConnectionManager().getActiveDevice(entity.getDeviceId()).sendCommand(entity);
         return Response.ok(entity).build();
diff --git a/src/org/traccar/database/PermissionsManager.java b/src/org/traccar/database/PermissionsManager.java
index 78589ad88..5313859df 100644
--- a/src/org/traccar/database/PermissionsManager.java
+++ b/src/org/traccar/database/PermissionsManager.java
@@ -223,7 +223,7 @@ public class PermissionsManager {
     }
 
     public void checkDeviceReadonly(long userId) throws SecurityException {
-        if (!isAdmin(userId) && isDeviceReadonly(userId)) {
+        if (!isAdmin(userId) && (server.getDeviceReadonly() || isDeviceReadonly(userId))) {
             throw new SecurityException("Account is device readonly");
         }
     }
diff --git a/src/org/traccar/model/Server.java b/src/org/traccar/model/Server.java
index 5cf26f7f2..b588a4de0 100644
--- a/src/org/traccar/model/Server.java
+++ b/src/org/traccar/model/Server.java
@@ -46,6 +46,16 @@ public class Server extends Extensible {
         this.readonly = readonly;
     }
 
+    private boolean deviceReadonly;
+
+    public boolean getDeviceReadonly() {
+        return deviceReadonly;
+    }
+
+    public void setDeviceReadonly(boolean deviceReadonly) {
+        this.deviceReadonly = deviceReadonly;
+    }
+
     private String map;
 
     public String getMap() {