Skip to content

added service principals in AZAddMembers edge #1975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
irshadaj merged 3 commits into from
Oct 16, 2025
Merged

added service principals in AZAddMembers edge #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16dbd37
added service principals in AZAddMembers edge
irshadaj Oct 15, 2025
a73a60b
updated logging statements to use proper parameters
irshadaj Oct 16, 2025
a138223
sometimes code isn't self documenting
irshadaj Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 50 additions & 10 deletions packages/go/analysis/azure/post.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ func AppRoleAssignments(ctx context.Context, db graph.Database) (*analysis.Atomi
return nil
}); err != nil {
if err := operation.Done(); err != nil {
slog.ErrorContext(ctx, fmt.Sprintf("Error caught during azure AppRoleAssignments teardown: %v", err))
slog.ErrorContext(ctx, "Error caught during azure AppRoleAssignments teardown", slog.String("err", err.Error()))
}

return &operation.Stats, err
Expand Down Expand Up @@ -724,7 +724,7 @@ func ExecuteCommand(ctx context.Context, db graph.Database) (*analysis.AtomicPos
return nil
}); err != nil {
if err := operation.Done(); err != nil {
slog.ErrorContext(ctx, fmt.Sprintf("Error caught during azure ExecuteCommand teardown: %v", err))
slog.ErrorContext(ctx, "Error caught during azure ExecuteCommand teardown", slog.String("err", err.Error()))
}

return &operation.Stats, err
Expand Down Expand Up @@ -810,7 +810,7 @@ func globalAdmins(roleAssignments RoleAssignments, tenant *graph.Node, operation

return nil
}); err != nil {
slog.Error(fmt.Sprintf("Failed to submit azure global admins post processing job: %v", err))
slog.Error("Failed to submit azure global admins post processing job", slog.String("err", err.Error()))
}
}

Expand All @@ -828,7 +828,7 @@ func privilegedRoleAdmins(roleAssignments RoleAssignments, tenant *graph.Node, o

return nil
}); err != nil {
slog.Error(fmt.Sprintf("Failed to submit privileged role admins post processing job: %v", err))
slog.Error("Failed to submit privileged role admins post processing job", slog.String("err", err.Error()))
}
}

Expand All @@ -846,7 +846,7 @@ func privilegedAuthAdmins(roleAssignments RoleAssignments, tenant *graph.Node, o

return nil
}); err != nil {
slog.Error(fmt.Sprintf("Failed to submit azure privileged auth admins post processing job: %v", err))
slog.Error("Failed to submit azure privileged auth admins post processing job", slog.String("err", err.Error()))
}
}

Expand All @@ -870,13 +870,29 @@ func addMembers(roleAssignments RoleAssignments, operation analysis.StatTrackedO

return nil
}); err != nil {
slog.Error(fmt.Sprintf("Failed to submit azure add members AddMemberAllGroupsTargetRoles post processing job: %v", err))
slog.Error("Failed to submit post processing job for users with role allowing AZAddMembers edge", slog.String("err", err.Error()))
}

if err := operation.Operation.SubmitReader(func(ctx context.Context, tx graph.Transaction, outC chan<- analysis.CreatePostRelationshipJob) error {
roleAssignments.ServicePrincipalsWithRole(AddMemberAllGroupsTargetRoles()...).Each(func(nextID uint64) bool {
nextJob := analysis.CreatePostRelationshipJob{
FromID: graph.ID(nextID),
ToID: innerGroupID,
Kind: azure.AddMembers,
}

return channels.Submit(ctx, outC, nextJob)
})

return nil
}); err != nil {
slog.Error("Failed to submit post processing job for service principals with role allowing AZAddMembers edge", slog.String("err", err.Error()))
}

if err := operation.Operation.SubmitReader(func(ctx context.Context, tx graph.Transaction, outC chan<- analysis.CreatePostRelationshipJob) error {
if isRoleAssignable, err := innerGroup.Properties.Get(azure.IsAssignableToRole.String()).Bool(); err != nil {
if graph.IsErrPropertyNotFound(err) {
slog.WarnContext(ctx, fmt.Sprintf("Node %d is missing property %s", innerGroup.ID, azure.IsAssignableToRole))
slog.WarnContext(ctx, "Node is missing property", slog.Uint64("nodeID", innerGroup.ID.Uint64()), slog.String("property", azure.IsAssignableToRole.String()))
} else {
return err
}
Expand All @@ -894,7 +910,31 @@ func addMembers(roleAssignments RoleAssignments, operation analysis.StatTrackedO

return nil
}); err != nil {
slog.Error(fmt.Sprintf("Failed to submit azure add members AddMemberGroupNotRoleAssignableTargetRoles post processing job: %v", err))
slog.Error("Failed to submit post processing job for users with role allowing AZAddMembers edge", slog.String("err", err.Error()))
}

if err := operation.Operation.SubmitReader(func(ctx context.Context, tx graph.Transaction, outC chan<- analysis.CreatePostRelationshipJob) error {
if isRoleAssignable, err := innerGroup.Properties.Get(azure.IsAssignableToRole.String()).Bool(); err != nil {
if graph.IsErrPropertyNotFound(err) {
slog.WarnContext(ctx, "Node is missing property", slog.Uint64("nodeID", innerGroup.ID.Uint64()), slog.String("property", azure.IsAssignableToRole.String()))
} else {
return err
}
} else if !isRoleAssignable {
roleAssignments.ServicePrincipalsWithRole(AddMemberGroupNotRoleAssignableTargetRoles()...).Each(func(nextID uint64) bool {
nextJob := analysis.CreatePostRelationshipJob{
FromID: graph.ID(nextID),
ToID: innerGroupID,
Kind: azure.AddMembers,
}

return channels.Submit(ctx, outC, nextJob)
})
}

return nil
}); err != nil {
slog.Error("Failed to submit post processing job for service principals with role allowing AZAddMembers edge", slog.String("err", err.Error()))
}
}
}
Expand All @@ -908,14 +948,14 @@ func UserRoleAssignments(ctx context.Context, db graph.Database) (*analysis.Atom
for _, tenant := range tenantNodes {
if roleAssignments, err := TenantRoleAssignments(ctx, db, tenant); err != nil {
if err := operation.Done(); err != nil {
slog.ErrorContext(ctx, fmt.Sprintf("Error caught during azure UserRoleAssignments.TenantRoleAssignments teardown: %v", err))
slog.ErrorContext(ctx, "Error caught during azure UserRoleAssignments.TenantRoleAssignments teardown", slog.String("err", err.Error()))
}

return &analysis.AtomicPostProcessingStats{}, err
} else {
if err := resetPassword(operation, tenant, roleAssignments); err != nil {
if err := operation.Done(); err != nil {
slog.ErrorContext(ctx, fmt.Sprintf("Error caught during azure UserRoleAssignments.resetPassword teardown: %v", err))
slog.ErrorContext(ctx, "Error caught during azure UserRoleAssignments.resetPassword teardown", slog.String("err", err.Error()))
}

return &analysis.AtomicPostProcessingStats{}, err
Expand Down
10 changes: 10 additions & 0 deletions packages/go/analysis/azure/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ func (s RoleAssignments) GetNodeSet(bm cardinality.Duplex[uint64]) graph.NodeSet
return s.GetNodeKindSet(bm).AllNodes()
}

func (s RoleAssignments) ServicePrincipals() cardinality.Duplex[uint64] {
return s.Principals.Get(azure.ServicePrincipal).IDBitmap()
}

func (s RoleAssignments) Users() cardinality.Duplex[uint64] {
return s.Principals.Get(azure.User).IDBitmap()
}
Expand Down Expand Up @@ -149,6 +153,12 @@ func (s RoleAssignments) UsersWithRole(roleTemplateIDs ...string) cardinality.Du
return result
}

func (s RoleAssignments) ServicePrincipalsWithRole(roleTemplateIDs ...string) cardinality.Duplex[uint64] {
result := s.PrincipalsWithRole(roleTemplateIDs...)
result.And(s.ServicePrincipals())
return result
}

func (s RoleAssignments) UsersWithRolesExclusive(roleTemplateIDs ...string) cardinality.Duplex[uint64] {
result := s.PrincipalsWithRolesExclusive(roleTemplateIDs...)
result.And(s.Users())
Expand Down