Slim down cobra Run function (WMI & TSCH)

1 files changed, 92 insertions, 92 deletions

diff --git a/cmd/root.go b/cmd/root.go
index 0f8a17a..3d696aa 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,112 +1,112 @@
 package cmd
 
 import (
-  "fmt"
-  "github.com/FalconOpsLLC/goexec/internal/util"
-  "github.com/FalconOpsLLC/goexec/pkg/goexec"
-  "github.com/FalconOpsLLC/goexec/pkg/goexec/dce"
-  "github.com/FalconOpsLLC/goexec/pkg/goexec/smb"
-  "github.com/RedTeamPentesting/adauth"
-  "github.com/oiweiwei/go-msrpc/ssp"
-  "github.com/oiweiwei/go-msrpc/ssp/gssapi"
-  "github.com/rs/zerolog"
-  "github.com/spf13/cobra"
-  "os"
+	"fmt"
+	"github.com/FalconOpsLLC/goexec/internal/util"
+	"github.com/FalconOpsLLC/goexec/pkg/goexec"
+	"github.com/FalconOpsLLC/goexec/pkg/goexec/dce"
+	"github.com/FalconOpsLLC/goexec/pkg/goexec/smb"
+	"github.com/RedTeamPentesting/adauth"
+	"github.com/oiweiwei/go-msrpc/ssp"
+	"github.com/oiweiwei/go-msrpc/ssp/gssapi"
+	"github.com/rs/zerolog"
+	"github.com/spf13/cobra"
+	"os"
 )
 
 var (
-  debug        bool
-  logJson      bool
-  returnCode   int
-  outputMethod string
-  outputPath   string
-  proxy        string
-
-  log zerolog.Logger
-
-  rpcClient dce.Client
-  smbClient smb.Client
-
-  exec = goexec.ExecutionIO{
-    Input:  new(goexec.ExecutionInput),
-    Output: new(goexec.ExecutionOutput),
-  }
-
-  authOpts   *adauth.Options
-  credential *adauth.Credential
-  target     *adauth.Target
-
-  rootCmd = &cobra.Command{
-    Use:   "goexec",
-    Short: `Windows remote execution multitool`,
-    Long:  `TODO`,
-
-    PersistentPreRun: func(cmd *cobra.Command, args []string) {
-
-      if logJson {
-        log = zerolog.New(os.Stderr)
-      } else {
-        log = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr})
-      }
-
-      log = log.Level(zerolog.InfoLevel).With().Timestamp().Logger()
-      if debug {
-        log = log.Level(zerolog.DebugLevel)
-      }
-
-      if outputMethod == "smb" {
-        if exec.Output.RemotePath == "" {
-          exec.Output.RemotePath = util.RandomWindowsTempFile()
-        }
-        exec.Output.Provider = &smb.OutputFileFetcher{
-          Client:           &smbClient,
-          Share:            `C$`,
-          File:             exec.Output.RemotePath,
-          DeleteOutputFile: true, // TEMP
-        }
-      }
-    },
-  }
+	debug        bool
+	logJson      bool
+	returnCode   int
+	outputMethod string
+	outputPath   string
+	proxy        string
+
+	log zerolog.Logger
+
+	rpcClient dce.Client
+	smbClient smb.Client
+
+	exec = goexec.ExecutionIO{
+		Input:  new(goexec.ExecutionInput),
+		Output: new(goexec.ExecutionOutput),
+	}
+
+	authOpts   *adauth.Options
+	credential *adauth.Credential
+	target     *adauth.Target
+
+	rootCmd = &cobra.Command{
+		Use:   "goexec",
+		Short: `Windows remote execution multitool`,
+		Long:  `TODO`,
+
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+
+			if logJson {
+				log = zerolog.New(os.Stderr)
+			} else {
+				log = zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr})
+			}
+
+			log = log.Level(zerolog.InfoLevel).With().Timestamp().Logger()
+			if debug {
+				log = log.Level(zerolog.DebugLevel)
+			}
+
+			if outputMethod == "smb" {
+				if exec.Output.RemotePath == "" {
+					exec.Output.RemotePath = util.RandomWindowsTempFile()
+				}
+				exec.Output.Provider = &smb.OutputFileFetcher{
+					Client:           &smbClient,
+					Share:            `C$`,
+					File:             exec.Output.RemotePath,
+					DeleteOutputFile: exec.Output.NoDelete, // TEMP
+				}
+			}
+		},
+	}
 )
 
 func init() {
-  // Cobra init
-  {
-    cobra.EnableCommandSorting = false
+	// Cobra init
+	{
+		cobra.EnableCommandSorting = false
 
-    rootCmd.InitDefaultVersionFlag()
-    rootCmd.InitDefaultHelpCmd()
-    rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "Enable debug logging")
-    rootCmd.PersistentFlags().BoolVar(&logJson, "log-json", false, "Log in JSON format")
+		rootCmd.InitDefaultVersionFlag()
+		rootCmd.InitDefaultHelpCmd()
+		rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "Enable debug logging")
+		rootCmd.PersistentFlags().BoolVar(&logJson, "log-json", false, "Log in JSON format")
 
-    dcomCmdInit()
-    rootCmd.AddCommand(dcomCmd)
+		dcomCmdInit()
+		rootCmd.AddCommand(dcomCmd)
 
-    wmiCmdInit()
-    rootCmd.AddCommand(wmiCmd)
+		wmiCmdInit()
+		rootCmd.AddCommand(wmiCmd)
 
-    scmrCmdInit()
-    rootCmd.AddCommand(scmrCmd)
+		scmrCmdInit()
+		rootCmd.AddCommand(scmrCmd)
 
-    tschCmdInit()
-    rootCmd.AddCommand(tschCmd)
-  }
+		tschCmdInit()
+		rootCmd.AddCommand(tschCmd)
+	}
 
-  // Auth init
-  {
-    gssapi.AddMechanism(ssp.SPNEGO)
-    gssapi.AddMechanism(ssp.NTLM)
-    gssapi.AddMechanism(ssp.KRB5)
+	// Auth init
+	{
+		gssapi.AddMechanism(ssp.SPNEGO)
+		gssapi.AddMechanism(ssp.NTLM)
+		gssapi.AddMechanism(ssp.KRB5)
 
-    authOpts = &adauth.Options{Debug: log.Debug().Msgf}
-    authOpts.RegisterFlags(rootCmd.PersistentFlags())
-  }
+		authOpts = &adauth.Options{Debug: log.Debug().Msgf}
+		authOpts.RegisterFlags(rootCmd.PersistentFlags())
+	}
 }
 
 func Execute() {
-  if err := rootCmd.Execute(); err != nil {
-    fmt.Println(err)
-    os.Exit(1)
-  }
-  os.Exit(returnCode)
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	os.Exit(returnCode)
 }