mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 10:37:56 +00:00 
			
		
		
		
	 3189278c84
			
		
	
	3189278c84
	
	
	
		
			
			* Use Colored UI if stdout is a tty * Add format options to operator unseal * Add format test on operator unseal * Add -no-color output flag, and use BasicUi if no-color flag is provided * Move seal status formatting logic to OutputSealStatus * Apply no-color to warnings from DeprecatedCommands as well * Add OutputWithFormat to support arbitrary data, add format option to auth list * Add ability to output arbitrary list data on TableFormatter * Clear up switch logic on format * Add format option for list-related commands * Add format option to rest of commands that returns a client API response * Remove initOutputYAML and initOutputJSON, and use OutputWithFormat instead * Remove outputAsYAML and outputAsJSON, and use OutputWithFormat instead * Remove -no-color flag, use env var exclusively to toggle colored output * Fix compile * Remove -no-color flag in main.go * Add missing FlagSetOutputFormat * Fix generate-root/decode test * Migrate init functions to main.go * Add no-color flag back as hidden * Handle non-supported data types for TableFormatter.OutputList * Pull formatting much further up to remove the need to use c.flagFormat (#3950) * Pull formatting much further up to remove the need to use c.flagFormat Also remove OutputWithFormat as the logic can cause issues. * Use const for env var * Minor updates * Remove unnecessary check * Fix SSH output and some tests * Fix tests * Make race detector not run on generate root since it kills Travis these days * Update docs * Update docs * Address review feedback * Handle --format as well as -format
		
			
				
	
	
		
			146 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			146 lines
		
	
	
		
			3.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package command
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"io"
 | |
| 	"os"
 | |
| 	"strings"
 | |
| 
 | |
| 	"github.com/hashicorp/vault/helper/password"
 | |
| 	"github.com/mitchellh/cli"
 | |
| 	"github.com/posener/complete"
 | |
| )
 | |
| 
 | |
| var _ cli.Command = (*OperatorUnsealCommand)(nil)
 | |
| var _ cli.CommandAutocomplete = (*OperatorUnsealCommand)(nil)
 | |
| 
 | |
| type OperatorUnsealCommand struct {
 | |
| 	*BaseCommand
 | |
| 
 | |
| 	flagReset bool
 | |
| 
 | |
| 	testOutput io.Writer // for tests
 | |
| }
 | |
| 
 | |
| func (c *OperatorUnsealCommand) Synopsis() string {
 | |
| 	return "Unseals the Vault server"
 | |
| }
 | |
| 
 | |
| func (c *OperatorUnsealCommand) Help() string {
 | |
| 	helpText := `
 | |
| Usage: vault operator unseal [options] [KEY]
 | |
| 
 | |
|   Provide a portion of the master key to unseal a Vault server. Vault starts
 | |
|   in a sealed state. It cannot perform operations until it is unsealed. This
 | |
|   command accepts a portion of the master key (an "unseal key").
 | |
| 
 | |
|   The unseal key can be supplied as an argument to the command, but this is
 | |
|   not recommended as the unseal key will be available in your history:
 | |
| 
 | |
|       $ vault operator unseal IXyR0OJnSFobekZMMCKCoVEpT7wI6l+USMzE3IcyDyo=
 | |
| 
 | |
|   Instead, run the command with no arguments and it will prompt for the key:
 | |
| 
 | |
|       $ vault operator unseal
 | |
|       Key (will be hidden): IXyR0OJnSFobekZMMCKCoVEpT7wI6l+USMzE3IcyDyo=
 | |
| 
 | |
| ` + c.Flags().Help()
 | |
| 
 | |
| 	return strings.TrimSpace(helpText)
 | |
| }
 | |
| 
 | |
| func (c *OperatorUnsealCommand) Flags() *FlagSets {
 | |
| 	set := c.flagSet(FlagSetHTTP | FlagSetOutputFormat)
 | |
| 
 | |
| 	f := set.NewFlagSet("Command Options")
 | |
| 
 | |
| 	f.BoolVar(&BoolVar{
 | |
| 		Name:       "reset",
 | |
| 		Aliases:    []string{},
 | |
| 		Target:     &c.flagReset,
 | |
| 		Default:    false,
 | |
| 		EnvVar:     "",
 | |
| 		Completion: complete.PredictNothing,
 | |
| 		Usage:      "Discard any previously entered keys to the unseal process.",
 | |
| 	})
 | |
| 
 | |
| 	return set
 | |
| }
 | |
| 
 | |
| func (c *OperatorUnsealCommand) AutocompleteArgs() complete.Predictor {
 | |
| 	return complete.PredictAnything
 | |
| }
 | |
| 
 | |
| func (c *OperatorUnsealCommand) AutocompleteFlags() complete.Flags {
 | |
| 	return c.Flags().Completions()
 | |
| }
 | |
| 
 | |
| func (c *OperatorUnsealCommand) Run(args []string) int {
 | |
| 	f := c.Flags()
 | |
| 
 | |
| 	if err := f.Parse(args); err != nil {
 | |
| 		c.UI.Error(err.Error())
 | |
| 		return 1
 | |
| 	}
 | |
| 
 | |
| 	unsealKey := ""
 | |
| 
 | |
| 	args = f.Args()
 | |
| 	switch len(args) {
 | |
| 	case 0:
 | |
| 		// We will prompt for the unsealKey later
 | |
| 	case 1:
 | |
| 		unsealKey = strings.TrimSpace(args[0])
 | |
| 	default:
 | |
| 		c.UI.Error(fmt.Sprintf("Too many arguments (expected 1, got %d)", len(args)))
 | |
| 		return 1
 | |
| 	}
 | |
| 
 | |
| 	client, err := c.Client()
 | |
| 	if err != nil {
 | |
| 		c.UI.Error(err.Error())
 | |
| 		return 2
 | |
| 	}
 | |
| 
 | |
| 	if c.flagReset {
 | |
| 		status, err := client.Sys().ResetUnsealProcess()
 | |
| 		if err != nil {
 | |
| 			c.UI.Error(fmt.Sprintf("Error resetting unseal process: %s", err))
 | |
| 			return 2
 | |
| 		}
 | |
| 		return OutputSealStatus(c.UI, client, status)
 | |
| 	}
 | |
| 
 | |
| 	if unsealKey == "" {
 | |
| 		// Override the output
 | |
| 		writer := (io.Writer)(os.Stdout)
 | |
| 		if c.testOutput != nil {
 | |
| 			writer = c.testOutput
 | |
| 		}
 | |
| 
 | |
| 		fmt.Fprintf(writer, "Unseal Key (will be hidden): ")
 | |
| 		value, err := password.Read(os.Stdin)
 | |
| 		fmt.Fprintf(writer, "\n")
 | |
| 		if err != nil {
 | |
| 			c.UI.Error(wrapAtLength(fmt.Sprintf("An error occurred attempting to "+
 | |
| 				"ask for an unseal key. The raw error message is shown below, but "+
 | |
| 				"usually this is because you attempted to pipe a value into the "+
 | |
| 				"unseal command or you are executing outside of a terminal (tty). "+
 | |
| 				"You should run the unseal command from a terminal for maximum "+
 | |
| 				"security. If this is not an option, the unseal can be provided as "+
 | |
| 				"the first argument to the unseal command. The raw error "+
 | |
| 				"was:\n\n%s", err)))
 | |
| 			return 1
 | |
| 		}
 | |
| 		unsealKey = strings.TrimSpace(value)
 | |
| 	}
 | |
| 
 | |
| 	status, err := client.Sys().Unseal(unsealKey)
 | |
| 	if err != nil {
 | |
| 		c.UI.Error(fmt.Sprintf("Error unsealing: %s", err))
 | |
| 		return 2
 | |
| 	}
 | |
| 
 | |
| 	return OutputSealStatus(c.UI, client, status)
 | |
| }
 |