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/net/driver/impl/DriverManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
index f8bc032..43040da 100644
--- a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
+++ b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
@@ -24,6 +24,7 @@
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
+import org.onosproject.core.Permission;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
@@ -45,6 +46,8 @@
 
 import static org.onlab.util.Tools.nullIsNotFound;
 import static org.onosproject.net.AnnotationKeys.DRIVER;
+import static org.onosproject.security.AppGuard.checkPermission;
+
 
 /**
  * Manages inventory of device drivers.
@@ -105,6 +108,8 @@
 
     @Override
     public Set<Driver> getDrivers() {
+        checkPermission(Permission.DRIVER_READ);
+
         ImmutableSet.Builder<Driver> builder = ImmutableSet.builder();
         drivers.values().forEach(builder::add);
         return builder.build();
@@ -112,6 +117,8 @@
 
     @Override
     public Set<Driver> getDrivers(Class<? extends Behaviour> withBehaviour) {
+        checkPermission(Permission.DRIVER_READ);
+
         return drivers.values().stream()
                 .filter(d -> d.hasBehaviour(withBehaviour))
                 .collect(Collectors.toSet());
@@ -119,11 +126,15 @@
 
     @Override
     public Driver getDriver(String driverName) {
+        checkPermission(Permission.DRIVER_READ);
+
         return nullIsNotFound(drivers.get(driverName), NO_DRIVER);
     }
 
     @Override
     public Driver getDriver(String mfr, String hw, String sw) {
+        checkPermission(Permission.DRIVER_READ);
+
         // First attempt a literal search.
         Driver driver = driverByKey.get(key(mfr, hw, sw));
         if (driver != null) {
@@ -149,6 +160,8 @@
 
     @Override
     public Driver getDriver(DeviceId deviceId) {
+        checkPermission(Permission.DRIVER_READ);
+
         Device device = nullIsNotFound(deviceService.getDevice(deviceId), NO_DEVICE);
         String driverName = device.annotations().value(DRIVER);
         if (driverName != null) {
@@ -161,6 +174,8 @@
 
     @Override
     public DriverHandler createHandler(DeviceId deviceId, String... credentials) {
+        checkPermission(Permission.DRIVER_WRITE);
+
         Driver driver = getDriver(deviceId);
         return new DefaultDriverHandler(new DefaultDriverData(driver));
     }