Merge branch 'main' into feature/facet-improvements

ee/identitymanager/identity_managers/keycloak/keycloak_identitymanager.py

@@ -27,7 +27,7 @@
 
 
 class KeycloakIdentityManager(BaseIdentityManager):
-
+    """
     RESOURCES = {
         "preset": {
             "table": "preset",
@@ -38,6 +38,9 @@ class KeycloakIdentityManager(BaseIdentityManager):
             "uid": "id",
         },
     }
+    """
+
+    RESOURCES = {}
 
     def __init__(self, tenant_id, context_manager: ContextManager, **kwargs):
         super().__init__(tenant_id, context_manager, **kwargs)
@@ -409,6 +412,8 @@ def create_user(
                 "email": user_email,
                 "enabled": True,
                 "firstName": user_name,
+                "lastName": user_name,
+                "emailVerified": True,
             }
             if password:
                 user_data["credentials"] = [
@@ -628,7 +633,7 @@ def create_user_policy(self, perm, permission: ResourcePermission) -> None:
         # TODO: this is not efficient, we should cache this
         users = self.keycloak_admin.get_users({})
         user = next(
-            (user for user in users if user["email"] == perm.id),
+            (user for user in users if user.get("email") == perm.id),
             None,
         )
         if not user:
@@ -663,19 +668,27 @@ def create_user_policy(self, perm, permission: ResourcePermission) -> None:
         return policy_id
 
     def create_group_policy(self, perm, permission: ResourcePermission) -> None:
+        group_name = perm.id
+        group = self.keycloak_admin.get_groups(query={"search": perm.id})
+        if not group or len(group) > 1:
+            self.logger.error("Problem with group - should be 1 but got %s", len(group))
+            raise HTTPException(status_code=400, detail="Problem with group")
+        group = group[0]
+        group_id = group["id"]
         resp = self.keycloak_admin.connection.raw_post(
             f"{self.admin_url}/authz/resource-server/policy/group",
             data=json.dumps(
                 {
                     "name": f"Allow group {perm.id} to access resource type {permission.resource_type} with name {permission.resource_name}",
                     "description": json.dumps(
                         {
-                            "group_id": perm.id,
+                            "group_name": group_name,
+                            "group_id": group_id,
                             "resource_id": permission.resource_id,
                         }
                     ),
                     "logic": "POSITIVE",
-                    "groups": [{"id": perm.id, "extendChildren": False}],
+                    "groups": [{"id": group_id, "extendChildren": False}],
                     "groupsClaim": "",
                 }
             ),
@@ -838,12 +851,14 @@ def get_permissions(self) -> list[ResourcePermission]:
                     if resource_id not in resources_to_policies:
                         resources_to_policies[resource_id] = []
                     if policy.get("type") == "user":
+                        user_email = details.get("user_email")
                         resources_to_policies[resource_id].append(
-                            {"id": details.get("user_email"), "type": "user"}
+                            {"id": user_email, "type": "user"}
                         )
                     else:
+                        group_name = details.get("group_name")
                         resources_to_policies[resource_id].append(
-                            {"id": details["group_id"], "type": "group"}
+                            {"id": group_name, "type": "group"}
                         )
             permissions_dto = []
             for resource in resources:
@@ -858,6 +873,7 @@ def get_permissions(self) -> list[ResourcePermission]:
                         permissions=[
                             PermissionEntity(
                                 id=policy["id"],
+                                name=policy.get("name", ""),
                                 type=policy["type"],
                             )
                             for policy in resources_to_policies.get(resource_id, [])
@@ -868,6 +884,9 @@ def get_permissions(self) -> list[ResourcePermission]:
         except KeycloakGetError as e:
             self.logger.error("Failed to fetch permissions from Keycloak: %s", str(e))
             raise HTTPException(status_code=500, detail="Failed to fetch permissions")
+        except Exception as e:
+            self.logger.error("Failed to fetch permissions from Keycloak: %s", str(e))
+            raise HTTPException(status_code=500, detail="Failed to fetch permissions")
 
     # TODO: this should use UMA and not evaluation since evaluation needs admin access
     def get_user_permission_on_resource_type(
@@ -916,6 +935,10 @@ def get_user_permission_on_resource_type(
                 for result in results
                 if result["status"] == "PERMIT"
             ]
+            # there is some bug/limitation in keycloak where if the resource_type does not exist, it returns
+            # all other objects, so lets handle it by checking if the word "with" is one of the results name
+            if any("with" in result for result in allowed_resources_ids):
+                return []
             return allowed_resources_ids
         except Exception as e:
             self.logger.error(

keep-ui/app/providers/provider-form.tsx

@@ -489,7 +489,7 @@ const ProviderForm = ({
             );
           } else if (updatedFormErrors.includes("Failed to fetch")) {
             setFormErrors(
-              "Failed to connect to API: Check your internet connection"
+              "Failed to connect to API: Check provider settings and your internet connection"
             );
           } else {
             setFormErrors(updatedFormErrors);

keep-ui/app/rules/CorrelationSidebar/CorrelationSidebarHeader.tsx

@@ -20,7 +20,7 @@ export const CorrelationSidebarHeader = ({
           {isRuleBeingEdited ? "Edit" : "Create"} Correlation
         </Dialog.Title>
         <Dialog.Description as={Subtitle}>
-          Group multiple alerts into single alert
+          Group multiple alerts into a single incident
         </Dialog.Description>
       </div>
       <div>