Expose data source read permission

as per MangoAutomation/ma-core-public#1559
MangoAutomation · Mar 12, 2020 · b2a08aa · b2a08aa
1 parent 6a76028
commit b2a08aa
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/...m/infiniteautomation/mango/spring/service/maintenanceEvents/MaintenanceEventsService.java b/...m/infiniteautomation/mango/spring/service/maintenanceEvents/MaintenanceEventsService.java
@@ -249,15 +249,15 @@ public void row(DataPointVO point, int index) {
                             DataSourceVO newDs = dataSourceDao.get(k);
                             return newDs;
                         });
-                        if(!permissionService.hasDataSourcePermission(user, source))
+                        if(!permissionService.hasDataSourceEditPermission(user, source))
                             hasPermission.setFalse();
                     }
                 }else {
                     DataSourceVO source = sources.computeIfAbsent(point.getDataSourceId(), k -> {
                         DataSourceVO newDs = dataSourceDao.get(k);
                         return newDs;
                     });
-                    if(!permissionService.hasDataSourcePermission(user, source))
+                    if(!permissionService.hasDataSourceEditPermission(user, source))
                         hasPermission.setFalse();
                 }
             }
@@ -289,7 +289,7 @@ public void row(DataSourceVO source, int index) {
                 //short circuit the logic if we already failed
                 return;
             }else {
-                if(!permissionService.hasDataSourcePermission(user, source))
+                if(!permissionService.hasDataSourceEditPermission(user, source))
                     hasPermission.setFalse();
             }
         }

diff --git a/Maintenance Events/src/com/serotonin/m2m2/maintenanceEvents/MaintenanceEventType.java b/Maintenance Events/src/com/serotonin/m2m2/maintenanceEvents/MaintenanceEventType.java
@@ -112,7 +112,7 @@ public boolean hasPermission(PermissionHolder user, PermissionService service) {
             return false;
         else {
             for(int dsId : vo.getDataSources())
-                if(!service.hasDataSourcePermission(user, dsId))
+                if(!service.hasDataSourceEditPermission(user, dsId))
                     return false;
 
             for(int dpId : vo.getDataPoints()) {

diff --git a/Mango API/src/com/infiniteautomation/mango/rest/v2/DataPointTagsRestController.java b/Mango API/src/com/infiniteautomation/mango/rest/v2/DataPointTagsRestController.java
@@ -263,7 +263,7 @@ public Map<String, String> setTagsForDataPoint(
             DataPointVO dataPoint = dataPointService.get(xid);
 
             PermissionHolder user = Common.getUser();
-            permissionService.ensureDataSourcePermission(user, dataPoint.getDataSourceId());
+            permissionService.ensureDataSourceEditPermission(user, dataPoint.getDataSourceId());
 
             dataPoint.setTags(tags);
             dataPointTagsDao.saveDataPointTags(dataPoint);
@@ -285,7 +285,7 @@ public Map<String, String> mergeTagsForDataPoint(
         return dataPointTagsDao.doInTransaction(txStatus -> {
             DataPointVO dataPoint = dataPointService.get(xid);
             PermissionHolder user = Common.getUser();
-            permissionService.ensureDataSourcePermission(user, dataPoint.getDataSourceId());
+            permissionService.ensureDataSourceEditPermission(user, dataPoint.getDataSourceId());
 
             Map<String, String> existingTags = dataPointTagsDao.getTagsForDataPointId(dataPoint.getId());
 

diff --git a/Mango API/src/com/infiniteautomation/mango/rest/v2/EventTypesRestController.java b/Mango API/src/com/infiniteautomation/mango/rest/v2/EventTypesRestController.java
@@ -316,7 +316,7 @@ private List<EventTypeVOModel<?,?,?>> getEventTypesForSubtype(String typeName, S
                     throw new BadRequestException();
 
                 for(DataSourceVO vo : dataSourceDao.getAll()) {
-                    if(permissionService.hasDataSourcePermission(user, vo)) {
+                    if(permissionService.hasDataSourceEditPermission(user, vo)) {
                         AbstractDataSourceModel<?> dsModel = modelMapper.map(vo, AbstractDataSourceModel.class, user);
                         DataSourceEventTypeModel model = new DataSourceEventTypeModel(new DataSourceEventType(vo.getId(), 0), dsModel);
                         types.add(new EventTypeVOModel<DataSourceEventType, AbstractDataSourceModel<?>, String>(model, new TranslatableMessage("event.eventsFor", vo.getName()), false, true, true));
@@ -420,7 +420,7 @@ private List<EventTypeVOModel<?,?,?>> getEventTypesForSubtypeAndReferenceId1(Str
                 if(ds == null)
                     throw new NotFoundException();
 
-                permissionService.ensureDataSourcePermission(user, ds);
+                permissionService.ensureDataSourceEditPermission(user, ds);
                 AbstractDataSourceModel<?> dsModel = modelMapper.map(ds, AbstractDataSourceModel.class, user);
                 for(EventTypeVO type : ds.getEventTypes()) {
                     DataSourceEventType eventType = (DataSourceEventType)type.getEventType();

diff --git a/Mango API/src/com/infiniteautomation/mango/rest/v2/PointValueRestController.java b/Mango API/src/com/infiniteautomation/mango/rest/v2/PointValueRestController.java
@@ -1195,7 +1195,7 @@ private ResponseEntity<TemporaryResource<PurgePointValuesResponseModel, Abstract
                                 throw new NotFoundException();
 
                             //Ensure edit permission
-                            permissionService.ensureDataSourcePermission(user, ds);
+                            permissionService.ensureDataSourceEditPermission(user, ds);
 
                             //Do purge based on settings
                             if(model.isPurgeAll())

diff --git a/...PI/src/com/infiniteautomation/mango/rest/v2/model/datasource/AbstractDataSourceModel.java b/...PI/src/com/infiniteautomation/mango/rest/v2/model/datasource/AbstractDataSourceModel.java
@@ -49,6 +49,7 @@ public abstract class AbstractDataSourceModel<T extends DataSourceVO> extends Ab
     private List<EventTypeAlarmLevelModel> eventAlarmLevels;
     private PurgeSettings purgeSettings;
     private Set<String> editPermission;
+    private Set<String> readPermission;
 
     public AbstractDataSourceModel() {
 
@@ -102,6 +103,10 @@ public void fromVO(T vo) {
         for(Role role : vo.getEditRoles()) {
             this.editPermission.add(role.getXid());
         }
+        this.readPermission = new HashSet<>();
+        for(Role role : vo.getReadRoles()) {
+            this.readPermission.add(role.getXid());
+        }
     }
 
     @Override
@@ -118,6 +123,7 @@ public T toVO() {
             purgeSettings.toVO(vo);
         PermissionService service = Common.getBean(PermissionService.class);
         vo.setEditRoles(service.explodeLegacyPermissionGroupsToRoles(editPermission));
+        vo.setReadRoles(service.explodeLegacyPermissionGroupsToRoles(readPermission));
         return vo;
     }
 
@@ -201,4 +207,12 @@ public void setEditPermission(Set<String> editPermission) {
         this.editPermission = editPermission;
     }
 
+    public Set<String> getReadPermission() {
+        return readPermission;
+    }
+
+    public void setReadPermission(Set<String> readPermission) {
+        this.readPermission = readPermission;
+    }
+
 }
diff --git a/Mango API/src/com/infiniteautomation/mango/rest/v2/websocket/DataPointWebSocketHandler.java b/Mango API/src/com/infiniteautomation/mango/rest/v2/websocket/DataPointWebSocketHandler.java
@@ -37,7 +37,7 @@ public DataPointWebSocketHandler(RestModelMapper mapper, PermissionService permi
 
     @Override
     protected boolean hasPermission(PermissionHolder user, DataPointVO vo) {
-        return user.hasAdminRole() || permissionService.hasDataSourcePermission(user, vo.getDataSourceId());
+        return user.hasAdminRole() || permissionService.hasDataSourceEditPermission(user, vo.getDataSourceId());
     }
 
     @Override