chore(jans-cedarling): update schema for role principals (#10395)

* chore(jans-cedarling): update schema for role principals Signed-off-by: SafinWasi <[email protected]> * chore(jans-cedarling): use current folder for docker Signed-off-by: SafinWasi <[email protected]> * chore: restore dockerfile Signed-off-by: SafinWasi <[email protected]> --------- Signed-off-by: SafinWasi <[email protected]>
JanssenProject · Dec 12, 2024 · 2e9afdc · 2e9afdc
1 parent e823bf7
commit 2e9afdc
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 21 deletions.
diff --git a/jans-cedarling/flask-sidecar/secrets/bootstrap.json b/jans-cedarling/flask-sidecar/secrets/bootstrap.json
@@ -33,7 +33,7 @@
     "CEDARLING_LOCK": "disabled",
     "CEDARLING_LOCK_MASTER_CONFIGURATION_URI": null,
     "CEDARLING_DYNAMIC_CONFIGURATION": "disabled",
-    "CEDARLING_LOCK_SSA_JWT": 0,
+    "CEDARLING_LOCK_SSA_JWT": "",
     "CEDARLING_AUDIT_HEALTH_INTERVAL": 0,
     "CEDARLING_AUDIT_TELEMETRY_INTERVAL": 0,
     "CEDARLING_LISTEN_SSE": "disabled"

diff --git a/jans-cedarling/schema/cedarling_core.cedarschema b/jans-cedarling/schema/cedarling_core.cedarschema
@@ -68,8 +68,8 @@ namespace Jans {
         aud: String,
         birthdate?: String,
         email?: email_address,
-        exp: Long,
-        iat: Long,
+        exp?: Long,
+        iat?: Long,
         iss: TrustedIssuer,
         jti?: String,
         name?: String,
@@ -90,42 +90,42 @@ namespace Jans {
 
     // ******  Actions  ******
     action Compare appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Execute appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Monitor appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Read appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Search appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Share appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Tag appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };
     action Write appliesTo {
-      principal: [User, Workload],
+      principal: [User, Workload, Role],
       resource: [Application],
       context: Context
     };

diff --git a/jans-cedarling/schema/cedarling_core.json b/jans-cedarling/schema/cedarling_core.json
@@ -240,11 +240,13 @@
                         },
                         "exp": {
                             "type": "EntityOrCommon",
-                            "name": "Long"
+                            "name": "Long",
+                            "required": false
                         },
                         "iat": {
                             "type": "EntityOrCommon",
-                            "name": "Long"
+                            "name": "Long",
+                            "required": false
                         },
                         "iss": {
                             "type": "EntityOrCommon",
@@ -397,7 +399,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -424,7 +427,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -464,7 +468,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -504,7 +509,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -518,7 +524,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -532,7 +539,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -546,7 +554,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"
@@ -560,7 +569,8 @@
                     ],
                     "principalTypes": [
                         "User",
-                        "Workload"
+                        "Workload",
+                        "Role"
                     ],
                     "context": {
                         "type": "Context"