Cache password to avoid invoking password source on each API request

go-jira · Nov 2, 2019 · 0f059a5 · 0f059a5
1 parent 5902449
commit 0f059a5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/jiracli/cli.go b/jiracli/cli.go
@@ -71,6 +71,9 @@ type GlobalOptions struct {
 	// location using the `pass` tool, if missing prompt the user and store in the PasswordDirectory
 	PasswordSource figtree.StringOption `yaml:"password-source,omitempty" json:"password-source,omitempty"`
 
+	// Cached password to avoid invoking password source on each API request
+	cachedPassword string
+
 	// PasswordDirectory is only used for the "pass" PasswordSource.  It is the location for the encrypted password
 	// files used by `pass`.  Effectively this overrides the "PASSWORD_STORE_DIR" environment variable
 	PasswordDirectory figtree.StringOption `yaml:"password-directory,omitempty" json:"password-directory,omitempty"`

diff --git a/jiracli/password.go b/jiracli/password.go
@@ -42,15 +42,19 @@ func (o *GlobalOptions) keyName() string {
 }
 
 func (o *GlobalOptions) GetPass() string {
-	passwd := ""
+	if o.cachedPassword != "" {
+		return o.cachedPassword
+	}
 	if o.PasswordSource.Value != "" {
 		if o.PasswordSource.Value == "keyring" {
+			log.Info("Querying keyring password source.")
 			var err error
-			passwd, err = keyringGet(o.keyName())
+			o.cachedPassword, err = keyringGet(o.keyName())
 			if err != nil {
 				panic(err)
 			}
 		} else if o.PasswordSource.Value == "gopass" {
+			log.Info("Querying gopass password source.")
 			if o.PasswordDirectory.Value != "" {
 				orig := os.Getenv("PASSWORD_STORE_DIR")
 				os.Setenv("PASSWORD_STORE_DIR", o.PasswordDirectory.Value)
@@ -62,14 +66,15 @@ func (o *GlobalOptions) GetPass() string {
 				cmd.Stdout = buf
 				cmd.Stderr = buf
 				if err := cmd.Run(); err == nil {
-					passwd = strings.TrimSpace(buf.String())
+					o.cachedPassword = strings.TrimSpace(buf.String())
 				} else {
 					panic(err)
 				}
 			} else {
 				log.Warning("Gopass binary was not found! Fallback to default password behaviour!")
 			}
 		} else if o.PasswordSource.Value == "pass" {
+			log.Info("Querying pass password source.")
 			if o.PasswordDirectory.Value != "" {
 				orig := os.Getenv("PASSWORD_STORE_DIR")
 				os.Setenv("PASSWORD_STORE_DIR", o.PasswordDirectory.Value)
@@ -81,30 +86,32 @@ func (o *GlobalOptions) GetPass() string {
 				cmd.Stdout = buf
 				cmd.Stderr = buf
 				if err := cmd.Run(); err == nil {
-					passwd = strings.TrimSpace(buf.String())
+					o.cachedPassword = strings.TrimSpace(buf.String())
 				} else {
 					panic(err)
 				}
 			} else {
 				log.Warning("Pass binary was not found! Fallback to default password behaviour!")
 			}
 		} else if o.PasswordSource.Value == "stdin" {
+			log.Info("Reading password from stdin.")
 			allBytes, err := ioutil.ReadAll(os.Stdin)
 			if err != nil {
 				panic(fmt.Sprintf("unable to read bytes from stdin: %s", err))
 			}
-			passwd = string(allBytes)
+			o.cachedPassword = string(allBytes)
 		} else {
 			log.Warningf("Unknown password-source: %s", o.PasswordSource)
 		}
 	}
 
-	if passwd != "" {
-		return passwd
+	if o.cachedPassword != "" {
+		log.Info("Password cached.")
+		return o.cachedPassword
 	}
 
-	if passwd = os.Getenv("JIRA_API_TOKEN"); passwd != "" && o.AuthMethod() == "api-token" {
-		return passwd
+	if o.cachedPassword = os.Getenv("JIRA_API_TOKEN"); o.cachedPassword != "" && o.AuthMethod() == "api-token" {
+		return o.cachedPassword
 	}
 
 	prompt := fmt.Sprintf("Jira Password [%s]: ", o.Login)
@@ -120,15 +127,15 @@ func (o *GlobalOptions) GetPass() string {
 			Message: prompt,
 			Help:    help,
 		},
-		&passwd,
+		&o.cachedPassword,
 		nil,
 	)
 	if err != nil {
 		log.Errorf("%s", err)
 		panic(Exit{Code: 1})
 	}
-	o.SetPass(passwd)
-	return passwd
+	o.SetPass(o.cachedPassword)
+	return o.cachedPassword
 }
 
 func (o *GlobalOptions) SetPass(passwd string) error {