简柏林 / thingskit · Commits

Commit d43edb83fd1f3f2bbfe09261d6cdcdf61cc5643a

Authored by VoBa
Committed by GitHub
2 parents 35429c94 9fdcd6a4

Merge pull request #20 from BohdanSmetanyuk/feature/edge_event_controller 

added check permissions
Inline Side-by-side
Showing 1 changed file with 2 additions and 0 deletions
@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.page.TimePageData; @@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.page.TimePageData;
32 import org.thingsboard.server.common.data.page.TimePageLink; 32 import org.thingsboard.server.common.data.page.TimePageLink;
33 import org.thingsboard.server.dao.edge.EdgeEventService; 33 import org.thingsboard.server.dao.edge.EdgeEventService;
34 import org.thingsboard.server.queue.util.TbCoreComponent; 34 import org.thingsboard.server.queue.util.TbCoreComponent;
  35 +import org.thingsboard.server.service.security.permission.Operation;
35 36
36 @Slf4j 37 @Slf4j
37 @RestController 38 @RestController
@@ -58,6 +59,7 @@ public class EdgeEventController extends BaseController { @@ -58,6 +59,7 @@ public class EdgeEventController extends BaseController {
58 try { 59 try {
59 TenantId tenantId = getCurrentUser().getTenantId(); 60 TenantId tenantId = getCurrentUser().getTenantId();
60 EdgeId edgeId = new EdgeId(toUUID(strEdgeId)); 61 EdgeId edgeId = new EdgeId(toUUID(strEdgeId));
  62 + checkEdgeId(edgeId, Operation.READ);
61 TimePageLink pageLink = createPageLink(limit, startTime, endTime, ascOrder, offset); 63 TimePageLink pageLink = createPageLink(limit, startTime, endTime, ascOrder, offset);
62 return checkNotNull(edgeEventService.findEdgeEvents(tenantId, edgeId, pageLink)); 64 return checkNotNull(edgeEventService.findEdgeEvents(tenantId, edgeId, pageLink));
63 } catch (Exception e) { 65 } catch (Exception e) {