cloud-governance 1.1.387__tar.gz → 1.1.389__tar.gz

{cloud_governance-1.1.387/cloud_governance.egg-info → cloud_governance-1.1.389}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-governance
-Version: 1.1.387
+Version: 1.1.389
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat

{cloud_governance-1.1.387 → cloud_governance-1.1.389}/cloud_governance/common/clouds/aws/cloudtrail/cloudtrail_operations.py

@@ -116,21 +116,55 @@ class CloudTrailOperations:
                         return [event.get('Username'), event]
         return ['', '']
 
-    def __check_event_is_assumed_role(self, cloudtrail_event: str):
+    def __extract_username_from_arn(self, arn: str, user_type: str):
         """
-        This method checks if it assumed_role, if it is return the username and its event from role.
-        @param cloudtrail_event:
-        @return:
+        Extract username from ARN based on userIdentity type.
+        @param arn: The ARN from userIdentity
+        @param user_type: The userIdentity type (IAMUser, AssumedRole, FederatedUser, etc.)
+        @return: username or empty string
+        """
+        if not arn or '/' not in arn:
+            return ''
+
+        # ARN formats:
+        # IAMUser: arn:aws:iam::account:user/[path/]username
+        # AssumedRole: arn:aws:sts::account:assumed-role/role-name/session-name
+        # FederatedUser: arn:aws:sts::account:federated-user/username
+        # Root: arn:aws:iam::account:root (no slash, return 'root')
+
+        parts = arn.split('/')
+        if len(parts) < 2:
+            # No username in ARN (e.g., root user)
+            return parts[-1] if parts else ''
+
+        # Last part is always the username/session-name
+        return parts[-1]
+
+    def __check_event_is_assumed_role(self, cloudtrail_event_str: str):
+        """
+        This method extracts username from userIdentity ARN for IAM users and AssumedRole users.
+        For SAML SSO (AssumedRole), it extracts the username from the session name in the ARN.
+        For IAM users, it extracts the username from the ARN path.
+        @param cloudtrail_event_str: JSON string of CloudTrailEvent
+        @return: [username, parsed_event] or [False, '']
         """
         try:
-            cloudtrail_event = json.loads(cloudtrail_event)
-            if cloudtrail_event.get('userIdentity').get('type') == "AssumedRole":
-                role_name = cloudtrail_event.get('userIdentity').get('sessionContext').get('sessionIssuer').get('arn')
-                assumerole_username, event = self.__get_username_by_role(role_name, "CreateRole", "AWS::IAM::Role")
-                if not assumerole_username:
-                    arn = cloudtrail_event.get('userIdentity').get('arn')
-                    assumerole_username, event = self.__ger_username_from_arn(resource_arn=arn)
-                return [assumerole_username, event]
+            cloudtrail_event = json.loads(cloudtrail_event_str)
+            user_identity = cloudtrail_event.get('userIdentity', {})
+            user_type = user_identity.get('type')
+            arn = user_identity.get('arn')
+
+            # Handle supported user types by extracting from ARN
+            if user_type in ('AssumedRole', 'IAMUser', 'FederatedUser'):
+                username = self.__extract_username_from_arn(arn, user_type)
+                if username:
+                    # Return parsed event wrapped in a dict with CloudTrailEvent key for consistency
+                    return [username, {'CloudTrailEvent': cloudtrail_event_str}]
+
+            # For Root or other types without proper ARN
+            if user_type == 'Root':
+                return ['root', {'CloudTrailEvent': cloudtrail_event_str}]
+
             return [False, '']
         except Exception as err:
             return [False, '']

{cloud_governance-1.1.387 → cloud_governance-1.1.389/cloud_governance.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloud-governance
-Version: 1.1.387
+Version: 1.1.389
 Summary: Cloud Governance Tool
 Home-page: https://github.com/redhat-performance/cloud-governance
 Author: Red Hat

{cloud_governance-1.1.387 → cloud_governance-1.1.389}/setup.py

@@ -2,7 +2,7 @@ from codecs import open
 from os import path
 from setuptools import setup, find_packages
 
-__version__ = '1.1.387'
+__version__ = '1.1.389'
 
 here = path.abspath(path.dirname(__file__))