commit 541ef71e6c20aa008ce4facb5a70a4d2bce83284
author Changhoon Yoon <chyoon87@kaist.ac.kr> Sat May 23 17:18:34 2015 +0900
committer Gerrit Code Review <gerrit@onlab.us> Thu May 28 07:06:12 2015 +0000
tree 778b459d5545f2f0dcd522af1760723a4f49191c
parent 52c98bd074ef2c52eb59fdc91a07b353eb6451a5

ONOS-1993 Implement API-level permission checking + security util code location replacement

Change-Id: I7bf20eda9c12ed2a44334504333b093057764cd2

core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java

diff --git a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
index ee60cc7..cc33d56 100644
--- a/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
+++ b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
@@ -32,6 +32,7 @@
 import org.onosproject.cluster.NodeId;
 import org.onosproject.cluster.RoleInfo;
 import org.onosproject.core.MetricsHelper;
+import org.onosproject.core.Permission;
 import org.onosproject.event.ListenerRegistry;
 import org.onosproject.event.EventDeliveryService;
 import org.onosproject.mastership.MastershipAdminService;
@@ -62,6 +63,8 @@
 import static org.onosproject.cluster.ControllerNode.State.ACTIVE;
 import static org.onosproject.net.MastershipRole.MASTER;
 import static org.slf4j.LoggerFactory.getLogger;
+import static org.onosproject.security.AppGuard.checkPermission;
+
 
 @Component(immediate = true)
 @Service
@@ -142,12 +145,16 @@
 
     @Override
     public MastershipRole getLocalRole(DeviceId deviceId) {
+        checkPermission(Permission.CLUSTER_READ);
+
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getRole(clusterService.getLocalNode().id(), deviceId);
     }
 
     @Override
     public void relinquishMastership(DeviceId deviceId) {
+        checkPermission(Permission.CLUSTER_WRITE);
+
         store.relinquishRole(clusterService.getLocalNode().id(), deviceId)
              .whenComplete((event, error) -> {
                  if (event != null) {
@@ -158,6 +165,8 @@
 
     @Override
     public CompletableFuture<MastershipRole> requestRoleFor(DeviceId deviceId) {
+        checkPermission(Permission.CLUSTER_WRITE);
+
         checkNotNull(deviceId, DEVICE_ID_NULL);
         final Context timer = startTimer(requestRoleTimer);
         return store.requestRole(deviceId).whenComplete((result, error) -> stopTimer(timer));
@@ -166,18 +175,24 @@
 
     @Override
     public NodeId getMasterFor(DeviceId deviceId) {
+        checkPermission(Permission.CLUSTER_READ);
+
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getMaster(deviceId);
     }
 
     @Override
     public Set<DeviceId> getDevicesOf(NodeId nodeId) {
+        checkPermission(Permission.CLUSTER_READ);
+
         checkNotNull(nodeId, NODE_ID_NULL);
         return store.getDevices(nodeId);
     }
 
     @Override
     public RoleInfo getNodesFor(DeviceId deviceId) {
+        checkPermission(Permission.CLUSTER_READ);
+
         checkNotNull(deviceId, DEVICE_ID_NULL);
         return store.getNodes(deviceId);
     }
@@ -189,12 +204,16 @@
 
     @Override
     public void addListener(MastershipListener listener) {
+        checkPermission(Permission.CLUSTER_EVENT);
+
         checkNotNull(listener);
         listenerRegistry.addListener(listener);
     }
 
     @Override
     public void removeListener(MastershipListener listener) {
+        checkPermission(Permission.CLUSTER_EVENT);
+
         checkNotNull(listener);
         listenerRegistry.removeListener(listener);
     }