don't remove members if doesn't have permission to get their last act…

…ive, just ignore them
Legit-Labs · Dec 10, 2023 · 75c6687 · 75c6687
1 parent 9ef7c2f
commit 75c6687
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/internal/collectors/github/members_collector.go b/internal/collectors/github/members_collector.go
@@ -132,14 +132,18 @@ func (c *memberCollector) enrichMembers(org *ghcollected.ExtendedOrg, members []
 		localMember := member
 		gw.Do(func() {
 			memberLastActive, err := c.collectMemberLastActiveTime(org.Name(), *localMember.Login)
+			lastActive := -1
+
+			if err == nil && !memberLastActive.IsZero() {
+				lastActive = int(memberLastActive.UnixNano())
+			}
+
 			if err != nil {
 				perm := c.memberMissingPermission(org, localMember)
 				c.IssueMissingPermissions(perm)
-				return
-			}
-			if !memberLastActive.IsZero() {
-				resChannel <- ghcollected.NewOrganizationMember(localMember, int(memberLastActive.UnixNano()), memberType)
 			}
+
+			resChannel <- ghcollected.NewOrganizationMember(localMember, lastActive, memberType)
 		})
 	}
 

diff --git a/policies/github/member.rego b/policies/github/member.rego
@@ -35,6 +35,7 @@ stale_member_found[mem] := true {
 	some member
 	mem := input.members[member]
 	mem.is_admin == false
+	mem.last_active != -1
 	isStale(mem.last_active, 6)
 }
 
@@ -55,6 +56,7 @@ stale_admin_found[mem] := true {
 	some member
 	mem := input.members[member]
 	mem.is_admin == true
+	mem.last_active != -1
 	isStale(mem.last_active, 6)
 }