Add --non-interactive flag to auth

Signed-off-by: Peter Verraedt <peter@verraedt.be>

Author: peterverraedt

cmd/iron/cli/app.go

@@ -52,11 +52,12 @@ type App struct {
 	updater        *selfupdate.Updater
 	repo           selfupdate.RepositorySlug
 
-	Admin   bool
-	Debug   int
-	Native  bool
-	Workdir string
-	PamTTL  time.Duration
+	Admin          bool
+	Debug          int
+	Native         bool
+	Workdir        string
+	PamTTL         time.Duration
+	NonInteractive bool
 
 	inShell bool
 }
@@ -376,13 +377,20 @@ func (a *App) init(cmd *cobra.Command, zone string) error {
 		clientName = fmt.Sprintf("%s-%s", clientName, version.String())
 	}
 
+	var prompt iron.Prompt
+
+	if a.NonInteractive {
+		prompt = iron.Bot{}
+	}
+
 	a.Client, err = iron.New(cmd.Context(), env, iron.Option{
 		ClientName:                 clientName,
 		Admin:                      a.Admin,
 		UseNativeProtocol:          a.Native,
 		MaxConns:                   16,
 		DialFunc:                   dialer,
 		GeneratedNativePasswordAge: env.GeneratedPasswordTimeout,
+		AuthenticationPrompt:       prompt,
 	})
 	if err != nil {
 		// Doesn't make sense to print usage here

cmd/iron/cli/commands.go

@@ -56,7 +56,7 @@ func (a *App) auth() *cobra.Command {
 		}
 	}
 
-	return &cobra.Command{
+	cmd := &cobra.Command{
 		Use:               use,
 		Aliases:           []string{"authenticate", "iinit"},
 		Short:             "Authenticate against the irods server.",
@@ -88,6 +88,10 @@ func (a *App) auth() *cobra.Command {
 			}
 		},
 	}
+
+	cmd.Flags().BoolVar(&a.NonInteractive, "non-interactive", false, "Authenticate non-interactively, don't prompt any user input. Useful to fail gracefully in unattended scripts if the authentication method would unexpectedly request e.g. a password.")
+
+	return cmd
 }
 
 func (a *App) mkdir() *cobra.Command {

cmd/iron/main.go

@@ -66,5 +66,7 @@ func main() {
 		_ = os.Chdir(home) //nolint:errcheck
 	}
 
-	cmd.ExecuteContext(ctx) //nolint:errcheck
+	if err := cmd.ExecuteContext(ctx); err != nil {
+		os.Exit(1)
+	}
 }

prompt.go

@@ -107,6 +107,11 @@ func (p *prompt) Password(message string) (string, error) {
 type Bot map[string]string
 
 func (b Bot) Print(message string) error {
+	// If we need to open an URL, print a newline
+	if result := AuthenticateURL.FindStringSubmatch(message); len(result) > 1 {
+		return errors.New("cannot open URL in bot mode")
+	}
+
 	return nil
 }