fix: update deps

dnitsch · dnitsch · commit 6e38338f7ba1 · 2022-03-25T14:39:45.000Z
remove versions from root
add version command
update readme
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 NAME := aws-cli-auth
-VERSION := v0.4.0
+VERSION := v0.6.0
 REVISION := $(shell git rev-parse --short HEAD)
 
-LDFLAGS := -ldflags="-s -w -X \"github.com/dnitsch/aws-cli-auth/version.Version=$(VERSION)\" -X \"github.com/dnitsch/aws-cli-auth/version.Revision=$(REVISION)\" -extldflags -static"
+LDFLAGS := -ldflags="-s -w -X \"github.com/dnitsch/aws-cli-auth/cmd.Version=$(VERSION)\" -X \"github.com/dnitsch/aws-cli-auth/cmd.Revision=$(REVISION)\" -extldflags -static"
 
 .PHONY: test test_ci tidy install buildprep build buildmac buildwin
 
diff --git a/README.md b/README.md
@@ -25,18 +25,22 @@ Download from [Releases page](https://github.com/dnitsch/aws-cli-auth/releases).
 MacOS
 
 ```bash
-curl -L https://github.com/dnitsch/aws-cli-auth/releases/download/v0.3.0/aws-cli-auth-darwin -o aws-cli-auth
+curl -L https://github.com/dnitsch/aws-cli-auth/releases/download/v0.6.0/aws-cli-auth-darwin -o aws-cli-auth
 chmod +x aws-cli-auth
 sudo mv aws-cli-auth /usr/local/bin
 ```
 
 Linux
 ```bash
-curl -L https://github.com/dnitsch/aws-cli-auth/releases/download/v0.3.0/aws-cli-auth-linux -o aws-cli-auth
+curl -L https://github.com/dnitsch/aws-cli-auth/releases/download/v0.6.0/aws-cli-auth-linux -o aws-cli-auth
 chmod +x aws-cli-auth
 sudo mv aws-cli-auth /usr/local/bin
 ```
 
+Windows
+```posh
+iwr -Uri "https://github.com/dnitsch/aws-cli-auth/releases/download/v0.6.0/aws-cli-auth-windows.exe" -OutFile "aws-cli-auth"
+```
 
 
 ## Usage
diff --git a/cmd/clear.go b/cmd/clear.go
@@ -23,6 +23,7 @@ func init() {
 
 func clear(cmd *cobra.Command, args []string) {
 	web := web.New()
+	secretStore := util.NewSecretStore("")
 
 	if force {
 
@@ -31,6 +32,6 @@ func clear(cmd *cobra.Command, args []string) {
 		}
 		util.Writeln("Chromium Cache cleared")
 	}
-	util.Clear()
+	secretStore.ClearAll()
 
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -7,7 +7,6 @@ import (
 	"github.com/dnitsch/aws-cli-auth/internal/config"
 	"github.com/dnitsch/aws-cli-auth/internal/util"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var (
@@ -40,26 +39,11 @@ func init() {
 }
 
 func initConfig() {
-	if cfgFile != "" {
-		// Use config file from the flag.
-		viper.SetConfigFile(cfgFile)
-	} else {
-		// Find home directory.
-		home, err := os.UserHomeDir()
-		cobra.CheckErr(err)
-
-		// Search config in home directory with name ".cobra" (without extension).
-		viper.AddConfigPath(home)
-		viper.SetConfigType("yaml")
-		viper.SetConfigName(fmt.Sprintf(".%s", config.SELF_NAME))
-	}
-
-	viper.AutomaticEnv()
-	viper.WriteConfig()
-
 	util.IsTraceEnabled = verbose
-
-	if err := viper.ReadInConfig(); err == nil {
-		util.Traceln("Using config file:", viper.ConfigFileUsed())
+	if _, err := os.Stat(util.ConfigIniFile()); err != nil {
+		// creating a file
+		rolesInit := []byte(fmt.Sprintf("[%s]\n", config.INI_CONF_SECTION))
+		err := os.WriteFile(util.ConfigIniFile(), rolesInit, 0644)
+		cobra.CheckErr(err)
 	}
 }
diff --git a/cmd/saml.go b/cmd/saml.go
@@ -26,7 +26,6 @@ func init() {
 	samlCmd.PersistentFlags().StringVarP(&acsUrl, "acsurl", "a", "https://signin.aws.amazon.com/saml", "Override the default ACS Url, used for checkin the post of the SAMLResponse")
 	samlCmd.PersistentFlags().IntVarP(&duration, "max-duration", "d", 900, "Override default max session duration, in seconds, of the role session [900-43200]")
 	rootCmd.AddCommand(samlCmd)
-
 }
 
 func getSaml(cmd *cobra.Command, args []string) {
diff --git a/cmd/specific.go b/cmd/specific.go
@@ -22,10 +22,8 @@ Returns the same JSON object as the call to the AWS cli for any of the sts Assum
 	}
 )
 
-// var strategy map[string]func
-
 func init() {
-	specificCmd.PersistentFlags().StringVarP(&method, "method", "m", "WEB_ID", "Runs a specific credentialProvider as opposed to rel")
+	specificCmd.PersistentFlags().StringVarP(&method, "method", "m", "WEB_ID", "Runs a specific credentialProvider as opposed to relying on the default chain provider fallback")
 	rootCmd.AddCommand(specificCmd)
 }
 
diff --git a/cmd/version.go b/cmd/version.go
@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"fmt"
+
+	"github.com/dnitsch/aws-cli-auth/internal/config"
+	"github.com/spf13/cobra"
+)
+
+var (
+	Version  string = "0.0.1"
+	Revision string = "1111aaaa"
+)
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}
+
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: fmt.Sprintf("Get version number %s", config.SELF_NAME),
+	Long:  `Version and Revision number of the installed CLI`,
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Printf("Version: %s\nRevision: %s\n", Version, Revision)
+	},
+}
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/viper v1.10.1
-	github.com/zalando/go-keyring v0.2.0
+	github.com/zalando/go-keyring v0.2.1
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -612,6 +612,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/zalando/go-keyring v0.2.0 h1:IZOFhp3Gw5WeaGTVpKtKD2o/s+BeeqQkKUhtMDTQ190=
 github.com/zalando/go-keyring v0.2.0/go.mod h1:cu3uCHLkG4H4ali7PdTkEWoq2p07YHHoI+oi16YT5x8=
+github.com/zalando/go-keyring v0.2.1 h1:MBRN/Z8H4U5wEKXiD67YbDAr5cj/DOStmSga70/2qKc=
+github.com/zalando/go-keyring v0.2.1/go.mod h1:g63M2PPn0w5vjmEbwAX3ib5I+41zdm4esSETOn9Y6Dw=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
diff --git a/internal/auth/saml.go b/internal/auth/saml.go
@@ -8,19 +8,22 @@ import (
 	"github.com/dnitsch/aws-cli-auth/internal/web"
 )
 
+// GetSamlCreds
 func GetSamlCreds(conf config.SamlConfig) {
 	if conf.BaseConfig.CfgSectionName == "" && conf.BaseConfig.StoreInProfile {
 		util.Writeln("Config-Section name must be provided if store-profile is enabled")
 		util.Exit(nil)
 	}
 
 	web := web.New()
+	secretStore := util.NewSecretStore(conf.BaseConfig.Role)
 	var awsCreds *util.AWSCredentials
+
 	var err error
 
 	// Try to reuse stored credential in secret
 	if !conf.BaseConfig.StoreInProfile {
-		awsCreds, err = util.AWSCredential(conf.BaseConfig.Role)
+		awsCreds, err = secretStore.AWSCredential()
 	}
 
 	if !util.IsValid(awsCreds) || err != nil {
@@ -43,7 +46,7 @@ func GetSamlCreds(conf config.SamlConfig) {
 		}
 
 		awsCreds.Version = 1
-		util.SaveAWSCredential(conf.BaseConfig.Role, awsCreds)
+		secretStore.SaveAWSCredential(awsCreds)
 	}
 
 	util.SetCredentials(awsCreds, conf)
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -1,8 +1,11 @@
 package config
 
-const SELF_NAME = "aws-cli-auth"
-const WEB_ID_TOKEN_VAR = "AWS_WEB_IDENTITY_TOKEN_FILE"
-const AWS_ROLE_ARN = "AWS_ROLE_ARN"
+const (
+	SELF_NAME        = "aws-cli-auth"
+	WEB_ID_TOKEN_VAR = "AWS_WEB_IDENTITY_TOKEN_FILE"
+	AWS_ROLE_ARN     = "AWS_ROLE_ARN"
+	INI_CONF_SECTION = "role"
+)
 
 type BaseConfig struct {
 	Role                 string
diff --git a/internal/util/helper.go b/internal/util/helper.go
@@ -6,19 +6,28 @@ import (
 	"log"
 	"os"
 	"path"
+	"strings"
 
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/sts"
 	"github.com/dnitsch/aws-cli-auth/internal/config"
 	ini "gopkg.in/ini.v1"
 )
 
-func GetHomeDir() string {
+func HomeDir() string {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		log.Fatal("unable to get the user home dir")
 	}
 	return home
 }
 
+func ConfigIniFile() string {
+	return path.Join(HomeDir(), fmt.Sprintf(".%s.ini", config.SELF_NAME))
+}
+
 func WriteDataDir(datadir string) {
 	os.MkdirAll(datadir, 0755)
 }
@@ -45,7 +54,7 @@ func storeCredentialsInProfile(creds AWSCredentials, configSection string) error
 		awsConfPath = overriddenpath
 	} else {
 		// os.MkdirAll(datadir, 0755)
-		awsCredsPath := path.Join(GetHomeDir(), ".aws", "credentials")
+		awsCredsPath := path.Join(HomeDir(), ".aws", "credentials")
 		if _, err := os.Stat(awsCredsPath); os.IsNotExist(err) {
 			os.Mkdir(awsCredsPath, 0655)
 		}
@@ -88,3 +97,64 @@ func GetWebIdTokenFileContents() (string, error) {
 	}
 	return string(content), nil
 }
+
+func IsValid(cred *AWSCredentials) bool {
+	if cred == nil {
+		return false
+	}
+
+	sess, err := session.NewSession()
+	if err != nil {
+		Writeln("Failed to create aws client session")
+		Exit(err)
+	}
+
+	creds := credentials.NewStaticCredentialsFromCreds(credentials.Value{
+		AccessKeyID:     cred.AWSAccessKey,
+		SecretAccessKey: cred.AWSSecretKey,
+		SessionToken:    cred.AWSSessionToken,
+	})
+
+	svc := sts.New(sess, aws.NewConfig().WithCredentials(creds))
+
+	input := &sts.GetCallerIdentityInput{}
+
+	_, err = svc.GetCallerIdentity(input)
+
+	if err != nil {
+		Writeln("The previous credential isn't valid")
+	}
+
+	return err == nil
+}
+
+func WriteIniSection(role string) error {
+	section := fmt.Sprintf("%s.%s", config.INI_CONF_SECTION, RoleKeyConverter(role))
+	cfg, err := ini.Load(ConfigIniFile())
+	if err != nil {
+		Writeln("Fail to read Ini file: %v", err)
+		Exit(err)
+	}
+	if !cfg.HasSection(section) {
+		sct, err := cfg.NewSection(section)
+		if err != nil {
+			return err
+		}
+		sct.Key("name").SetValue(role)
+		cfg.SaveTo(ConfigIniFile())
+	}
+
+	return nil
+}
+
+func GetAllIniSections() ([]string, error) {
+	sections := []string{}
+	cfg, err := ini.Load(ConfigIniFile())
+	if err != nil {
+		return nil, err
+	}
+	for _, v := range cfg.Section(config.INI_CONF_SECTION).ChildSections() {
+		sections = append(sections, strings.Replace(v.Name(), fmt.Sprintf("%s.", config.INI_CONF_SECTION), "", -1))
+	}
+	return sections, nil
+}
diff --git a/internal/util/helper_test.go b/internal/util/helper_test.go
@@ -0,0 +1,53 @@
+package util
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/dnitsch/aws-cli-auth/internal/config"
+	ini "gopkg.in/ini.v1"
+)
+
+// Tests need fixing up a bit
+func TestGetEntryInIni(t *testing.T) {
+	cfg, err := ini.Load("~/.aws-cli-auth.ini")
+	if err != nil {
+		Writeln("Fail to read file: %v", err)
+		Exit(err)
+	}
+	section := cfg.Section("roles")
+	roles := section.ChildSections()
+
+	if len(roles) < 2 {
+		t.Errorf("Not Enough children")
+	}
+}
+
+//
+func TestCreateEntryInIni(t *testing.T) {
+	role := "arn:aws:iam::111122342343:role/DevAdmin"
+
+	cfg, err := ini.Load(ConfigIniFile())
+	if err != nil {
+		Writeln("Fail to read Ini file: %v", err)
+		Exit(err)
+	}
+
+	section := cfg.Section(config.INI_CONF_SECTION) //
+	if !cfg.HasSection(fmt.Sprintf("%s.%s", config.INI_CONF_SECTION, RoleKeyConverter(role))) {
+		t.Errorf("section NOT Exists")
+	}
+	roles := section.ChildSections()
+	subSectionExists := false
+	for _, v := range roles {
+		if v.Name() == fmt.Sprintf("roles.%s", RoleKeyConverter(role)) {
+			subSectionExists = true
+			break
+		}
+	}
+	// role := section.HasKey("arn:aws:iam::111122342343:role/DevAdmin")
+
+	if !subSectionExists {
+		t.Errorf("Not found nothing to do")
+	}
+}
diff --git a/internal/util/secret.go b/internal/util/secret.go
diff --git a/internal/util/secret_test.go b/internal/util/secret_test.go
diff --git a/internal/web/web.go b/internal/web/web.go
diff --git a/version.go b/version.go

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ func init() {`
`23`	`23`
`24`	`24`	`func clear(cmd *cobra.Command, args []string) {`
`25`	`25`	`web := web.New()`
	`26`	`+ secretStore := util.NewSecretStore("")`
`26`	`27`
`27`	`28`	`if force {`
`28`	`29`
`@@ -31,6 +32,6 @@ func clear(cmd *cobra.Command, args []string) {`
`31`	`32`	`}`
`32`	`33`	`util.Writeln("Chromium Cache cleared")`
`33`	`34`	`}`
`34`		`- util.Clear()`
	`35`	`+ secretStore.ClearAll()`
`35`	`36`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ func init() {`
`26`	`26`	`samlCmd.PersistentFlags().StringVarP(&acsUrl, "acsurl", "a", "https://signin.aws.amazon.com/saml", "Override the default ACS Url, used for checkin the post of the SAMLResponse")`
`27`	`27`	`samlCmd.PersistentFlags().IntVarP(&duration, "max-duration", "d", 900, "Override default max session duration, in seconds, of the role session [900-43200]")`
`28`	`28`	`rootCmd.AddCommand(samlCmd)`
`29`		`-`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`func getSaml(cmd *cobra.Command, args []string) {`
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,8 @@ Returns the same JSON object as the call to the AWS cli for any of the sts Assum`
`22`	`22`	`}`
`23`	`23`	`)`
`24`	`24`
`25`		`-// var strategy map[string]func`
`26`		`-`
`27`	`25`	`func init() {`
`28`		`- specificCmd.PersistentFlags().StringVarP(&method, "method", "m", "WEB_ID", "Runs a specific credentialProvider as opposed to rel")`
	`26`	`+ specificCmd.PersistentFlags().StringVarP(&method, "method", "m", "WEB_ID", "Runs a specific credentialProvider as opposed to relying on the default chain provider fallback")`
`29`	`27`	`rootCmd.AddCommand(specificCmd)`
`30`	`28`	`}`
`31`	`29`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ require (`
`8`	`8`	`github.com/pkg/errors v0.9.1`
`9`	`9`	`github.com/spf13/cobra v1.3.0`
`10`	`10`	`github.com/spf13/viper v1.10.1`
`11`		`- github.com/zalando/go-keyring v0.2.0`
	`11`	`+ github.com/zalando/go-keyring v0.2.1`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,22 @@ import (`
`8`	`8`	`"github.com/dnitsch/aws-cli-auth/internal/web"`
`9`	`9`	`)`
`10`	`10`
	`11`	`+// GetSamlCreds`
`11`	`12`	`func GetSamlCreds(conf config.SamlConfig) {`
`12`	`13`	`if conf.BaseConfig.CfgSectionName == "" && conf.BaseConfig.StoreInProfile {`
`13`	`14`	`util.Writeln("Config-Section name must be provided if store-profile is enabled")`
`14`	`15`	`util.Exit(nil)`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`web := web.New()`
	`19`	`+ secretStore := util.NewSecretStore(conf.BaseConfig.Role)`
`18`	`20`	`var awsCreds *util.AWSCredentials`
	`21`	`+`
`19`	`22`	`var err error`
`20`	`23`
`21`	`24`	`// Try to reuse stored credential in secret`
`22`	`25`	`if !conf.BaseConfig.StoreInProfile {`
`23`		`- awsCreds, err = util.AWSCredential(conf.BaseConfig.Role)`
	`26`	`+ awsCreds, err = secretStore.AWSCredential()`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`if !util.IsValid(awsCreds) \|\| err != nil {`
`@@ -43,7 +46,7 @@ func GetSamlCreds(conf config.SamlConfig) {`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`awsCreds.Version = 1`
`46`		`- util.SaveAWSCredential(conf.BaseConfig.Role, awsCreds)`
	`49`	`+ secretStore.SaveAWSCredential(awsCreds)`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`util.SetCredentials(awsCreds, conf)`