ONOS-1993 Implement API-level permission checking + security util code location replacement
Change-Id: I7bf20eda9c12ed2a44334504333b093057764cd2
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index 5c78bb4..f4fd648 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -31,6 +31,7 @@
import org.onosproject.core.CoreService;
import org.onosproject.core.IdBlockStore;
import org.onosproject.core.IdGenerator;
+import org.onosproject.core.Permission;
import org.onosproject.core.Version;
import org.onosproject.event.EventDeliveryService;
import org.osgi.service.component.ComponentContext;
@@ -44,6 +45,8 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.onosproject.security.AppGuard.checkPermission;
+
/**
* Core service implementation.
@@ -97,21 +100,29 @@
@Override
public Version version() {
+ checkPermission(Permission.APP_READ);
+
return version;
}
@Override
public Set<ApplicationId> getAppIds() {
+ checkPermission(Permission.APP_READ);
+
return applicationIdStore.getAppIds();
}
@Override
public ApplicationId getAppId(Short id) {
+ checkPermission(Permission.APP_READ);
+
return applicationIdStore.getAppId(id);
}
@Override
public ApplicationId getAppId(String name) {
+ checkPermission(Permission.APP_READ);
+
return applicationIdStore.getAppId(name);
}