Merge pull request #26 from superlinkx/exit-error-wrapping

Improved context when exiting with error
BloodHoundAD · Jan 31, 2023 · 834f5fd · 834f5fd
2 parents a942107 + 742e952
commit 834f5fd
Show file tree

Hide file tree

Showing 64 changed files with 518 additions and 771 deletions.
diff --git a/cmd/configure.go b/cmd/configure.go
@@ -58,7 +58,7 @@ var configureCmd = &cobra.Command{
 
 func configureCmdImpl(cmd *cobra.Command, args []string) {
 	if err := configure(); err != nil {
-		exit(err)
+		exit(fmt.Errorf("failed to configure cobra CLI: %w", err))
 	}
 }
 

diff --git a/cmd/install_windows.go b/cmd/install_windows.go
@@ -60,9 +60,9 @@ func installCmdImpl(cmd *cobra.Command, args []string) {
 	)
 
 	if err := configureService(); err != nil {
-		exit(err)
+		exit(fmt.Errorf("failed to configure service: %w", err))
 	} else if err := installService(constants.DisplayName, config, recoveryActions); err != nil {
-		exit(err)
+		exit(fmt.Errorf("failed to install service: %w", err))
 	}
 }
 

diff --git a/cmd/list-app-owners.go b/cmd/list-app-owners.go
@@ -48,18 +48,13 @@ func listAppOwnersCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure app owners...")
-		start := time.Now()
-		stream := listAppOwners(ctx, azClient, listApps(ctx, azClient))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure app owners...")
+	start := time.Now()
+	stream := listAppOwners(ctx, azClient, listApps(ctx, azClient))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listAppOwners(ctx context.Context, client client.AzureClient, apps <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-app-role-assignments.go b/cmd/list-app-role-assignments.go
@@ -48,19 +48,14 @@ func listAppRoleAssignmentsCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure active directory app role assignments...")
-		start := time.Now()
-		servicePrincipals := listServicePrincipals(ctx, azClient)
-		stream := listAppRoleAssignments(ctx, azClient, servicePrincipals)
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure active directory app role assignments...")
+	start := time.Now()
+	servicePrincipals := listServicePrincipals(ctx, azClient)
+	stream := listAppRoleAssignments(ctx, azClient, servicePrincipals)
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listAppRoleAssignments(ctx context.Context, client client.AzureClient, servicePrincipals <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-apps.go b/cmd/list-apps.go
@@ -45,18 +45,13 @@ func listAppsCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure active directory applications...")
-		start := time.Now()
-		stream := listApps(ctx, azClient)
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure active directory applications...")
+	start := time.Now()
+	stream := listApps(ctx, azClient)
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listApps(ctx context.Context, client client.AzureClient) <-chan interface{} {

diff --git a/cmd/list-automation-account-role-assignments.go b/cmd/list-automation-account-role-assignments.go
@@ -49,19 +49,14 @@ func listAutomationAccountRoleAssignmentImpl(cmd *cobra.Command, args []string)
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure automation account role assignments...")
-		start := time.Now()
-		subscriptions := listSubscriptions(ctx, azClient)
-		stream := listAutomationAccountRoleAssignments(ctx, azClient, listAutomationAccounts(ctx, azClient, subscriptions))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure automation account role assignments...")
+	start := time.Now()
+	subscriptions := listSubscriptions(ctx, azClient)
+	stream := listAutomationAccountRoleAssignments(ctx, azClient, listAutomationAccounts(ctx, azClient, subscriptions))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listAutomationAccountRoleAssignments(ctx context.Context, client client.AzureClient, automationAccounts <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-automation-accounts.go b/cmd/list-automation-accounts.go
@@ -48,18 +48,13 @@ func listAutomationAccountsCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure automation accounts...")
-		start := time.Now()
-		stream := listAutomationAccounts(ctx, azClient, listSubscriptions(ctx, azClient))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure automation accounts...")
+	start := time.Now()
+	stream := listAutomationAccounts(ctx, azClient, listSubscriptions(ctx, azClient))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listAutomationAccounts(ctx context.Context, client client.AzureClient, subscriptions <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-azure-ad.go b/cmd/list-azure-ad.go
@@ -50,18 +50,13 @@ func listAzureADCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure ad objects...")
-		start := time.Now()
-		stream := listAllAD(ctx, azClient)
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure ad objects...")
+	start := time.Now()
+	stream := listAllAD(ctx, azClient)
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listAllAD(ctx context.Context, client client.AzureClient) <-chan interface{} {

diff --git a/cmd/list-azure-rm.go b/cmd/list-azure-rm.go
@@ -52,18 +52,13 @@ func listAzureRMCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure resource management objects...")
-		start := time.Now()
-		stream := listAllRM(ctx, azClient)
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure resource management objects...")
+	start := time.Now()
+	stream := listAllRM(ctx, azClient)
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listAllRM(ctx context.Context, client client.AzureClient) <-chan interface{} {

diff --git a/cmd/list-device-owners.go b/cmd/list-device-owners.go
@@ -48,18 +48,13 @@ func listDeviceOwnersCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure device owners...")
-		start := time.Now()
-		stream := listDeviceOwners(ctx, azClient, listDevices(ctx, azClient))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure device owners...")
+	start := time.Now()
+	stream := listDeviceOwners(ctx, azClient, listDevices(ctx, azClient))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listDeviceOwners(ctx context.Context, client client.AzureClient, devices <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-devices.go b/cmd/list-devices.go
@@ -45,18 +45,13 @@ func listDevicesCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure active directory devices...")
-		start := time.Now()
-		stream := listDevices(ctx, azClient)
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure active directory devices...")
+	start := time.Now()
+	stream := listDevices(ctx, azClient)
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listDevices(ctx context.Context, client client.AzureClient) <-chan interface{} {

diff --git a/cmd/list-function-app-role-assignments.go b/cmd/list-function-app-role-assignments.go
@@ -49,19 +49,14 @@ func listFunctionAppRoleAssignmentImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure function app role assignments...")
-		start := time.Now()
-		subscriptions := listSubscriptions(ctx, azClient)
-		stream := listFunctionAppRoleAssignments(ctx, azClient, listFunctionApps(ctx, azClient, subscriptions))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure function app role assignments...")
+	start := time.Now()
+	subscriptions := listSubscriptions(ctx, azClient)
+	stream := listFunctionAppRoleAssignments(ctx, azClient, listFunctionApps(ctx, azClient, subscriptions))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listFunctionAppRoleAssignments(ctx context.Context, client client.AzureClient, functionApps <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-function-apps.go b/cmd/list-function-apps.go
@@ -48,18 +48,13 @@ func listFunctionAppsCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure function apps...")
-		start := time.Now()
-		stream := listFunctionApps(ctx, azClient, listSubscriptions(ctx, azClient))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure function apps...")
+	start := time.Now()
+	stream := listFunctionApps(ctx, azClient, listSubscriptions(ctx, azClient))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listFunctionApps(ctx context.Context, client client.AzureClient, subscriptions <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-group-members.go b/cmd/list-group-members.go
@@ -48,18 +48,13 @@ func listGroupMembersCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure group members...")
-		start := time.Now()
-		stream := listGroupMembers(ctx, azClient, listGroups(ctx, azClient))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure group members...")
+	start := time.Now()
+	stream := listGroupMembers(ctx, azClient, listGroups(ctx, azClient))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listGroupMembers(ctx context.Context, client client.AzureClient, groups <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-group-owners.go b/cmd/list-group-owners.go
@@ -48,18 +48,13 @@ func listGroupOwnersCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure group owners...")
-		start := time.Now()
-		stream := listGroupOwners(ctx, azClient, listGroups(ctx, azClient))
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure group owners...")
+	start := time.Now()
+	stream := listGroupOwners(ctx, azClient, listGroups(ctx, azClient))
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listGroupOwners(ctx context.Context, client client.AzureClient, groups <-chan interface{}) <-chan interface{} {

diff --git a/cmd/list-groups.go b/cmd/list-groups.go
@@ -45,18 +45,13 @@ func listGroupsCmdImpl(cmd *cobra.Command, args []string) {
 	defer gracefulShutdown(stop)
 
 	log.V(1).Info("testing connections")
-	if err := testConnections(); err != nil {
-		exit(err)
-	} else if azClient, err := newAzureClient(); err != nil {
-		exit(err)
-	} else {
-		log.Info("collecting azure active directory groups...")
-		start := time.Now()
-		stream := listGroups(ctx, azClient)
-		outputStream(ctx, stream)
-		duration := time.Since(start)
-		log.Info("collection completed", "duration", duration.String())
-	}
+	azClient := connectAndCreateClient()
+	log.Info("collecting azure active directory groups...")
+	start := time.Now()
+	stream := listGroups(ctx, azClient)
+	outputStream(ctx, stream)
+	duration := time.Since(start)
+	log.Info("collection completed", "duration", duration.String())
 }
 
 func listGroups(ctx context.Context, client client.AzureClient) <-chan interface{} {