fix: GSuite data only populated on match (#1233)

On Gsuite Intel, User and Group properties are only populated on existing node (ON MATCH). On first run only ID is populated. This PR fix this issue.
lyft · Aug 23, 2023 · ab04b20 · ab04b20
1 parent af0b60f
commit ab04b20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/cartography/intel/gsuite/api.py b/cartography/intel/gsuite/api.py
@@ -130,9 +130,9 @@ def load_gsuite_groups(neo4j_session: neo4j.Session, groups: List[Dict], gsuite_
         UNWIND $GroupData as group
         MERGE (g:GSuiteGroup{id: group.id})
         ON CREATE SET
-        g.firstseen = $UpdateTag
-        ON MATCH SET
-        g.group_id = group.id,
+        g.firstseen = $UpdateTag,
+        g.group_id = group.id
+        SET
         g.admin_created = group.adminCreated,
         g.description = group.description,
         g.direct_members_count = group.directMembersCount,
@@ -152,9 +152,9 @@ def load_gsuite_users(neo4j_session: neo4j.Session, users: List[Dict], gsuite_up
         UNWIND $UserData as user
         MERGE (u:GSuiteUser{id: user.id})
         ON CREATE SET
-        u.firstseen = $UpdateTag
-        ON MATCH SET
         u.user_id = user.id,
+        u.firstseen = $UpdateTag
+        SET
         u.agreed_to_terms = user.agreedToTerms,
         u.archived = user.archived,
         u.change_password_at_next_login = user.changePasswordAtNextLogin,
@@ -193,7 +193,7 @@ def load_gsuite_members(neo4j_session: neo4j.Session, group: Dict, members: List
         MERGE (user)-[r:MEMBER_GSUITE_GROUP]->(group)
         ON CREATE SET
         r.firstseen = $UpdateTag
-        ON MATCH SET
+        SET
         r.lastupdated = $UpdateTag
     """
     neo4j_session.run(
@@ -208,7 +208,7 @@ def load_gsuite_members(neo4j_session: neo4j.Session, group: Dict, members: List
         MERGE (group_1)-[r:MEMBER_GSUITE_GROUP]->(group_2)
         ON CREATE SET
         r.firstseen = $UpdateTag
-        ON MATCH SET
+        SET
         r.lastupdated = $UpdateTag
     """
     neo4j_session.run(membership_qry, MemberData=members, GroupID=group.get("id"), UpdateTag=gsuite_update_tag)

diff --git a/tests/unit/cartography/intel/gsuite/test_api.py b/tests/unit/cartography/intel/gsuite/test_api.py
@@ -107,9 +107,9 @@ def test_load_gsuite_groups():
         UNWIND $GroupData as group
         MERGE (g:GSuiteGroup{id: group.id})
         ON CREATE SET
-        g.firstseen = $UpdateTag
-        ON MATCH SET
-        g.group_id = group.id,
+        g.firstseen = $UpdateTag,
+        g.group_id = group.id
+        SET
         g.admin_created = group.adminCreated,
         g.description = group.description,
         g.direct_members_count = group.directMembersCount,
@@ -135,9 +135,9 @@ def test_load_gsuite_users():
         UNWIND $UserData as user
         MERGE (u:GSuiteUser{id: user.id})
         ON CREATE SET
-        u.firstseen = $UpdateTag
-        ON MATCH SET
         u.user_id = user.id,
+        u.firstseen = $UpdateTag
+        SET
         u.agreed_to_terms = user.agreedToTerms,
         u.archived = user.archived,
         u.change_password_at_next_login = user.changePasswordAtNextLogin,