Filter models as per RBAC rules

Signed-off-by: Mohammad Ghazanfar Ali Danish <[email protected]>
eclipse-basyx · Dec 23, 2024 · 8188842 · 8188842
1 parent 58cb7bb
commit 8188842
Show file tree

Hide file tree

Showing 27 changed files with 42 additions and 1,560 deletions.
diff --git a/.github/workflows/basyx_test.yml b/.github/workflows/basyx_test.yml
@@ -1,8 +1,6 @@
 name: Build and Test BaSyx
 
 on:
-  push: 
-    branches: [ temp-feature/filter-dyn-rbac ]
   pull_request:
     branches: [ main ]
     paths-ignore:

diff --git a/.github/workflows/docker_test.yml b/.github/workflows/docker_test.yml
@@ -4,8 +4,6 @@
 name: Build and Start Docker Images
 
 on:
-  push: 
-      branches: [ temp-feature/filter-dyn-rbac ]
   pull_request:
     branches: [ main ]
     paths-ignore:

diff --git a/basyx.aasenvironment/basyx.aasenvironment-feature-authorization/pom.xml b/basyx.aasenvironment/basyx.aasenvironment-feature-authorization/pom.xml
@@ -81,10 +81,6 @@
 		<dependency>
 			<groupId>org.eclipse.digitaltwin.basyx</groupId>
 			<artifactId>basyx.authorization.rules.rbac.backend.inmemory</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.digitaltwin.basyx</groupId>
-			<artifactId>basyx.authorization.rules.rbac.backend.submodel</artifactId>
 		</dependency> 
 	</dependencies>
 </project>
diff --git a/...win/basyx/aasenvironment/feature/authorization/AuthorizedAasEnvironmentConfiguration.java b/...win/basyx/aasenvironment/feature/authorization/AuthorizedAasEnvironmentConfiguration.java
@@ -27,16 +27,13 @@
 
 import org.eclipse.digitaltwin.basyx.aasenvironment.AasEnvironment;
 import org.eclipse.digitaltwin.basyx.aasenvironment.feature.authorization.rbac.AasEnvironmentTargetPermissionVerifier;
-import org.eclipse.digitaltwin.basyx.aasenvironment.feature.authorization.rbac.backend.submodel.AasEnvironmentTargetInformationAdapter;
 import org.eclipse.digitaltwin.basyx.aasenvironment.preconfiguration.AasEnvironmentPreconfigurationLoader;
 import org.eclipse.digitaltwin.basyx.authorization.CommonAuthorizationProperties;
 import org.eclipse.digitaltwin.basyx.authorization.rbac.RbacPermissionResolver;
 import org.eclipse.digitaltwin.basyx.authorization.rbac.RbacStorage;
 import org.eclipse.digitaltwin.basyx.authorization.rbac.SimpleRbacPermissionResolver;
 import org.eclipse.digitaltwin.basyx.authorization.rbac.RoleProvider;
 import org.eclipse.digitaltwin.basyx.authorization.rbac.TargetPermissionVerifier;
-import org.eclipse.digitaltwin.basyx.authorization.rules.rbac.backend.submodel.TargetInformationAdapter;
-import org.eclipse.digitaltwin.basyx.conceptdescriptionrepository.feature.authorization.rbac.backend.submodel.CDTargetInformationAdapter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -70,12 +67,5 @@ public RbacPermissionResolver<AasEnvironmentTargetInformation> getAasEnvironment
 	public static AasEnvironmentPreconfigurationLoader getAuthorizedAasEnvironmentPreconfigurationLoader(ResourceLoader resourceLoader, List<String> pathsToLoad) {
 		return new AuthorizedAASEnvironmentPreconfigurationLoader(resourceLoader, pathsToLoad);
 	}
-
-	@Bean
-	@Primary
-	public TargetInformationAdapter getAasEnvInformationAdapter() {
-
-		return new AasEnvironmentTargetInformationAdapter();
-	}
 
 }
diff --git a/...t/feature/authorization/rbac/backend/submodel/AasEnvironmentTargetInformationAdapter.java b/...t/feature/authorization/rbac/backend/submodel/AasEnvironmentTargetInformationAdapter.java
diff --git a/...asyx/aasenvironment/feature/authorization/AasEnvironmentTargetInformationAdapterTest.java b/...asyx/aasenvironment/feature/authorization/AasEnvironmentTargetInformationAdapterTest.java