Made public adapters visible only if they are authorized

integratedmodelling · Jul 26, 2023 · aa3ec5c · aa3ec5c · inigo-cobian · Jul 26, 2023
1 parent 0e3f44c
commit aa3ec5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/klab.node/src/main/java/org/integratedmodelling/klab/node/controllers/EngineController.java b/klab.node/src/main/java/org/integratedmodelling/klab/node/controllers/EngineController.java
@@ -67,8 +67,8 @@ public class EngineController {
 	}
 
 
-    private boolean isPublicCapability(ResourceAdapterReference adapter) {
-        return PublicCapability.isPublicCapability(adapter.getName());
+    private boolean isPublicCapability(ResourceAdapterReference adapter, String permissions) {
+        return "*".equals(permissions) && PublicCapability.isPublicCapability(adapter.getName());
     }
 
 	/**
@@ -92,7 +92,7 @@ public NodeCapabilities capabilities(EngineAuthorization user) {
 			// check if the adapter is authorized for this user
 			String authorized = Configuration.INSTANCE
 					.getProperty("klab.adapter." + adapter.getName().toLowerCase() + ".auth", "");
-            if (isAuthorized(user, authorized) || isPublicCapability(adapter)) {
+            if (isAuthorized(user, authorized) || isPublicCapability(adapter, authorized)) {
 				ret.getResourceAdapters().add(adapter);
 				if (adapter.isUniversal()) {
 					IUrnAdapter uad = Resources.INSTANCE.getUrnAdapter(adapter.getName());

diff --git a/klab.node/src/main/java/org/integratedmodelling/klab/node/utils/PublicCapability.java b/klab.node/src/main/java/org/integratedmodelling/klab/node/utils/PublicCapability.java
@@ -5,7 +5,7 @@
 
 public class PublicCapability {
     private final static List<String> PUBLIC_CAPABILITIES = Arrays.asList("stats");
-    
+
     public static boolean isPublicCapability(String capability) {
         return PUBLIC_CAPABILITIES.contains(capability);
     }