Skip to content
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

Jump to bottom

BED-4599 configurable collection values #81

Merged
merged 5 commits into from
Aug 29, 2024
Merged

BED-4599 configurable collection values #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2cfdac
feat: enable configuration of various collection options
juggernot325 Aug 9, 2024
98a7af9
fix: shouldnt have been marked required
juggernot325 Aug 12, 2024
575907c
test: Add tests for sanity checks
juggernot325 Aug 12, 2024
1bd90f3
Merge branch 'main' into BED-4599-configurable-collection-values
juggernot325 Aug 29, 2024
4379121
chore: commit gofmt changes
juggernot325 Aug 29, 2024
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
5 changes: 3 additions & 2 deletions client/rest/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@ import (
"strings"
"time"

"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/constants"
)

func NewHTTPClient(proxyUrl string) (*http.Client, error) {
transport := http.DefaultTransport.(*http.Transport).Clone()
transport.MaxConnsPerHost = 200
transport.MaxIdleConnsPerHost = 200
transport.MaxConnsPerHost = config.ColMaxConnsPerHost.Value().(int)
juggernot325 marked this conversation as resolved.
Show resolved Hide resolved
transport.MaxIdleConnsPerHost = config.ColMaxIdleConnsPerHost.Value().(int)
transport.DisableKeepAlives = false

// defaults to TLS 1.0 which is not favorable
Expand Down
3 changes: 2 additions & 1 deletion cmd/list-app-owners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -62,7 +63,7 @@ func listAppOwnersCmdImpl(cmd *cobra.Command, args []string) {
func listAppOwners(ctx context.Context, client client.AzureClient, apps <-chan azureWrapper[models.App]) <-chan azureWrapper[models.AppOwners] {
var (
out = make(chan azureWrapper[models.AppOwners])
streams = pipeline.Demux(ctx.Done(), apps, 25)
streams = pipeline.Demux(ctx.Done(), apps, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
params = query.GraphParams{}
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/list-app-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -65,7 +66,7 @@ func listAppRoleAssignments(ctx context.Context, client client.AzureClient, serv
var (
out = make(chan interface{})
filteredSPs = make(chan models.ServicePrincipal)
streams = pipeline.Demux(ctx.Done(), filteredSPs, 25)
streams = pipeline.Demux(ctx.Done(), filteredSPs, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-automation-account-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -65,7 +66,7 @@ func listAutomationAccountRoleAssignments(ctx context.Context, client client.Azu
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-automation-accounts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -63,7 +64,7 @@ func listAutomationAccounts(ctx context.Context, client client.AzureClient, subs
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-container-registries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -68,7 +69,7 @@ func listContainerRegistries(ctx context.Context, client client.AzureClient, sub
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-container-registry-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -70,7 +71,7 @@ func listContainerRegistryRoleAssignments(ctx context.Context, client client.Azu
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-device-owners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -64,7 +65,7 @@ func listDeviceOwners(ctx context.Context, client client.AzureClient, devices <-
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-function-app-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -65,7 +66,7 @@ func listFunctionAppRoleAssignments(ctx context.Context, client client.AzureClie
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-function-apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -63,7 +64,7 @@ func listFunctionApps(ctx context.Context, client client.AzureClient, subscripti
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-group-members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -66,7 +67,7 @@ func listGroupMembers(ctx context.Context, client client.AzureClient, groups <-c
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
params = query.GraphParams{
Select: unique(listGroupMembersSelect),
Expand Down
3 changes: 2 additions & 1 deletion cmd/list-group-owners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -63,7 +64,7 @@ func listGroupOwners(ctx context.Context, client client.AzureClient, groups <-ch
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
params = query.GraphParams{}
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/list-key-vault-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -64,7 +65,7 @@ func listKeyVaultRoleAssignments(ctx context.Context, client client.AzureClient,
var (
out = make(chan azureWrapper[models.KeyVaultRoleAssignments])
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-key-vaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -64,7 +65,7 @@ func listKeyVaults(ctx context.Context, client client.AzureClient, subscriptions
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-logic-app-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -70,7 +71,7 @@ func listLogicAppRoleAssignments(ctx context.Context, client client.AzureClient,
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-logic-apps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -68,7 +69,7 @@ func listLogicApps(ctx context.Context, client client.AzureClient, subscriptions
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-managed-cluster-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -70,7 +71,7 @@ func listManagedClusterRoleAssignments(ctx context.Context, client client.AzureC
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-managed-clusters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -68,7 +69,7 @@ func listManagedClusters(ctx context.Context, client client.AzureClient, subscri
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-management-group-descendants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -63,7 +64,7 @@ func listManagementGroupDescendants(ctx context.Context, client client.AzureClie
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-management-group-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -64,7 +65,7 @@ func listManagementGroupRoleAssignments(ctx context.Context, client client.Azure
var (
out = make(chan azureWrapper[models.ManagementGroupRoleAssignments])
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/list-resource-group-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"time"

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -65,7 +66,7 @@ func listResourceGroupRoleAssignments(ctx context.Context, client client.AzureCl
var (
out = make(chan azureWrapper[models.ResourceGroupRoleAssignments])
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
5 changes: 3 additions & 2 deletions cmd/list-resource-groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -64,7 +65,7 @@ func listResourceGroups(ctx context.Context, client client.AzureClient, subscrip
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down Expand Up @@ -98,7 +99,7 @@ func listResourceGroups(ctx context.Context, client client.AzureClient, subscrip
} else {
resourceGroup := models.ResourceGroup{
ResourceGroup: item.Ok,
SubscriptionId: "/subscriptions/"+id,
SubscriptionId: "/subscriptions/" + id,
TenantId: client.TenantInfo().TenantId,
}
log.V(2).Info("found resource group", "resourceGroup", resourceGroup)
Expand Down
3 changes: 2 additions & 1 deletion cmd/list-role-assignments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

"github.com/bloodhoundad/azurehound/v2/client"
"github.com/bloodhoundad/azurehound/v2/client/query"
"github.com/bloodhoundad/azurehound/v2/config"
"github.com/bloodhoundad/azurehound/v2/enums"
"github.com/bloodhoundad/azurehound/v2/models"
"github.com/bloodhoundad/azurehound/v2/panicrecovery"
Expand Down Expand Up @@ -65,7 +66,7 @@ func listRoleAssignments(ctx context.Context, client client.AzureClient, roles <
var (
out = make(chan interface{})
ids = make(chan string)
streams = pipeline.Demux(ctx.Done(), ids, 25)
streams = pipeline.Demux(ctx.Done(), ids, config.ColStreamCount.Value().(int))
wg sync.WaitGroup
)

Expand Down
Loading
Loading