320 add context aware privilege for logical definition

.github/workflows/release.yaml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - main
+      - master-who
 
 jobs:
   build:
@@ -55,7 +55,7 @@ jobs:
           # Increment the base version (assuming semantic versioning)
           IFS='.' read -r -a version_parts <<< "$base_version"
           version_parts[2]=$((version_parts[2] + 1))
-          new_base_version="${version_parts[0]}.${version_parts[1]}.${version_parts[2]}"
+          new_base_version="${version_parts[0]}.${version_parts[1]}.${version_parts[2]}-WHO"
 
           echo "New version: $new_base_version"
           find . -name 'pom.xml' -exec mvn versions:set -DnewVersion=$new_base_version -DgenerateBackupPoms=false -f {} \;
@@ -93,11 +93,21 @@ jobs:
     with:
       version: ${{ needs.build.outputs.version }}
       service: ${{ needs.build.outputs.service }}
-      branch_var: ${{vars.BUMP_WEBPROTEGE_BRANCH}}
+      branch_var: ${{vars.BUMP_ICATX_BRANCH}}
     secrets:
       PROTEGE_PROJECT_CLIENT_ID: ${{ secrets.PROTEGE_PROJECT_CLIENT_ID }}
       PROTEGE_PROJECT_CLIENT_SECRET: ${{ secrets.PROTEGE_PROJECT_CLIENT_SECRET }}
 
+  notify-deploy:
+    needs: build
+    uses: ./.github/workflows/notify-deploy-project.yaml
+    with:
+      version: ${{ needs.build.outputs.version }}
+      service: ${{ needs.build.outputs.service }}
+      branch_var: ${{vars.DEPLOY_BRANCH}}
+    secrets:
+      PROTEGE_PROJECT_CLIENT_ID: ${{ secrets.PROTEGE_PROJECT_CLIENT_ID }}
+      PROTEGE_PROJECT_CLIENT_SECRET: ${{ secrets.PROTEGE_PROJECT_CLIENT_SECRET }}
 env:
   DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
   DOCKER_TOKEN: ${{secrets.DOCKER_PASSWORD}}

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>edu.stanford.protege</groupId>
 	<artifactId>webprotege-authorization-service</artifactId>
-	<version>3.0.5-SNAPSHOT</version>
+	<version>3.0.19-WHO</version>
 	<name>webprotege-authorization-service</name>
 	<description>A service that checks users are authorized to execute operations in WebProtége</description>
 	<properties>
@@ -40,22 +40,32 @@
 			<artifactId>spring-boot-starter-reactor-netty</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>edu.stanford.protege</groupId>
+			<artifactId>webprotege-jackson</artifactId>
+			<version>0.9.3</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>
 			<version>3.0.2</version>
 		</dependency>
-
+		<dependency>
+			<groupId>edu.stanford.protege</groupId>
+			<artifactId>webprotege-criteria</artifactId>
+			<version>0.9.5-WHO</version>
+		</dependency>
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>webprotege-ipc</artifactId>
-			<version>2.0.1</version>
+			<version>2.0.11</version>
 		</dependency>
 
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>webprotege-authorization</artifactId>
-			<version>2.1.2</version>
+			<version>2.1.3</version>
 		</dependency>
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
@@ -131,6 +141,11 @@
 			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.ben-manes.caffeine</groupId>
+			<artifactId>caffeine</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<dependencyManagement>

src/main/java/edu/stanford/protege/webprotege/authorization/AccessManager.java

@@ -69,7 +69,8 @@ Set<Capability> getCapabilityClosure(@Nonnull Subject subject,
      */
     boolean hasPermission(@Nonnull Subject subject,
                           @Nonnull Resource resource,
-                          @Nonnull Capability capability);
+                          @Nonnull Capability capability,
+                          String jwt);
 
     Collection<Subject> getSubjectsWithAccessToResource(Resource resource);