fix: add conditional kill hanging process

todo: this would be better as a separate command

Author: dnitsch

README.md

@@ -31,8 +31,8 @@ sudo mv aws-cli-auth /usr/local/bin
 ## Usage
 
 ```bash
-CLI tool for retrieving AWS temporary credentials using OIDC or SAML providers. 
-Stores them under the $HOME/.aws/credentials file under a specified path
+CLI tool for retrieving AWS temporary credentials using SAML providers. 
+Stores them under the $HOME/.aws/credentials file under a specified path or returns the crednetial_process payload for use in config
 
 Usage:
   aws-cli-auth [command]
@@ -45,8 +45,9 @@ Available Commands:
 Flags:
       --cfg-section string   config section name in the yaml config file
   -h, --help                 help for aws-cli-auth
+  -k, --kill-rod             If aws-cli-auth exited improprely in a previous run there is a chance that there could be hanging processes left over - this will clean them up forcefully
   -r, --role string          Set the role you want to assume when SAML or OIDC process completes
-  -s, --store-profile        By default the credentials are returned to stdout to be used by the credential_process
+  -s, --store-profile        By default the credentials are returned to stdout to be used by the credential_process. Set this flag to instead store the credentials under a named profile section
 
 Use "aws-cli-auth [command] --help" for more information about a command.
 ```

cmd/root.go

@@ -10,10 +10,11 @@ import (
 )
 
 var (
-	cfgSectionName string
-	cfgFile        string
-	storeInProfile bool
-	rootCmd        = &cobra.Command{
+	cfgSectionName     string
+	cfgFile            string
+	storeInProfile     bool
+	killHangingProcess bool
+	rootCmd            = &cobra.Command{
 		Use:   "aws-cli-auth",
 		Short: "CLI tool for retrieving AWS temporary credentials using  SAML providers",
 		Long: `CLI tool for retrieving AWS temporary credentials using SAML providers. 
@@ -32,6 +33,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&role, "role", "r", "", "Set the role you want to assume when SAML or OIDC process completes")
 	rootCmd.PersistentFlags().StringVarP(&cfgSectionName, "cfg-section", "", "", "config section name in the yaml config file")
 	rootCmd.PersistentFlags().BoolVarP(&storeInProfile, "store-profile", "s", false, "By default the credentials are returned to stdout to be used by the credential_process. Set this flag to instead store the credentials under a named profile section")
+	rootCmd.PersistentFlags().BoolVarP(&killHangingProcess, "kill-rod", "k", false, "If aws-cli-auth exited improprely in a previous run there is a chance that there could be hanging processes left over - this will clean them up forcefully")
 }
 
 func initConfig() {

cmd/saml.go

@@ -35,7 +35,7 @@ func getSaml(cmd *cobra.Command, args []string) {
 		PrincipalArn: principalArn,
 		Duration:     duration,
 		AcsUrl:       acsUrl,
-		BaseConfig:   config.BaseConfig{StoreInProfile: storeInProfile, Role: role, CfgSectionName: cfgSectionName},
+		BaseConfig:   config.BaseConfig{StoreInProfile: storeInProfile, Role: role, CfgSectionName: cfgSectionName, DoKillHangingProcess: killHangingProcess},
 	}
 
 	saml.GetSamlCreds(conf)

internal/config/config.go

@@ -3,9 +3,10 @@ package config
 const SELF_NAME = "aws-cli-auth"
 
 type BaseConfig struct {
-	Role           string
-	CfgSectionName string
-	StoreInProfile bool
+	Role                 string
+	CfgSectionName       string
+	StoreInProfile       bool
+	DoKillHangingProcess bool
 }
 
 type SamlConfig struct {

internal/saml/saml.go

@@ -25,7 +25,7 @@ func GetSamlCreds(conf config.SamlConfig) {
 
 	if !util.IsValid(awsCreds) || err != nil {
 
-		t, err := web.GetSamlLogin(conf.ProviderUrl, conf.AcsUrl)
+		t, err := web.GetSamlLogin(conf)
 		if err != nil {
 			fmt.Printf("Err: %v", err)
 		}

internal/web/web.go

@@ -17,9 +17,11 @@ import (
 	ps "github.com/mitchellh/go-ps"
 )
 
-func GetSamlLogin(loginUrl, acsUrl string) (string, error) {
+func GetSamlLogin(conf config.SamlConfig) (string, error) {
 
-	checkRodProcess()
+	if conf.BaseConfig.DoKillHangingProcess {
+		checkRodProcess()
+	}
 
 	l := launcher.New().
 		Headless(false).
@@ -37,12 +39,12 @@ func GetSamlLogin(loginUrl, acsUrl string) (string, error) {
 
 	defer browser.MustClose()
 
-	page := browser.MustPage(loginUrl)
+	page := browser.MustPage(conf.ProviderUrl)
 
 	router := browser.HijackRequests()
 	defer router.MustStop()
 
-	router.MustAdd(acsUrl, func(ctx *rod.Hijack) {
+	router.MustAdd(conf.AcsUrl, func(ctx *rod.Hijack) {
 		body := ctx.Request.Body()
 		_ = ctx.LoadResponse(http.DefaultClient, true)
 		ctx.Response.SetBody(body)
@@ -51,7 +53,7 @@ func GetSamlLogin(loginUrl, acsUrl string) (string, error) {
 	go router.Run()
 
 	wait := page.EachEvent(func(e *proto.PageFrameRequestedNavigation) (stop bool) {
-		return e.URL == acsUrl
+		return e.URL == conf.AcsUrl
 	})
 	wait()