mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-31 02:28:09 +00:00 
			
		
		
		
	 7089487509
			
		
	
	7089487509
	
	
	
		
			
			* WIP: output policy
* Outputs example policy HCL for given request
* Simplify conditional
* Add PATCH capability
* Use OpenAPI spec and regex patterns to determine if path is sudo
* Add test for isSudoPath
* Add changelog
* Fix broken CLI tests
* Add output-policy to client cloning code
* Smaller fixes from PR comments
* Clone client instead of saving and restoring custom values
* Fix test
* Address comments
* Don't unset output-policy flag on KV requests otherwise the preflight request will fail and not populate LastOutputPolicyError
* Print errors saved in buffer from preflight KV requests
* Unescape characters in request URL
* Rename methods and properties to improve readability
* Put KV-specificness at front of KV-specific error
* Simplify logic by doing more direct returns of strings and errors
* Use precompiled regexes and move OpenAPI call to tests
* Remove commented out code
* Remove legacy MFA paths
* Remove unnecessary use of client
* Move sudo paths map to plugin helper
* Remove unused error return
* Add explanatory comment
* Remove need to pass in address
* Make {name} regex less greedy
* Use method and path instead of info from retryablerequest
* Add test for IsSudoPaths, use more idiomatic naming
* Use precompiled regexes and move OpenAPI call to tests (#15170)
* Use precompiled regexes and move OpenAPI call to tests
* Remove commented out code
* Remove legacy MFA paths
* Remove unnecessary use of client
* Move sudo paths map to plugin helper
* Remove unused error return
* Add explanatory comment
* Remove need to pass in address
* Make {name} regex less greedy
* Use method and path instead of info from retryablerequest
* Add test for IsSudoPaths, use more idiomatic naming
* Make stderr writing more obvious, fix nil pointer deref
		
	
		
			
				
	
	
		
			195 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package command
 | |
| 
 | |
| import (
 | |
| 	"errors"
 | |
| 	"fmt"
 | |
| 	"io"
 | |
| 	"path"
 | |
| 	"strings"
 | |
| 
 | |
| 	"github.com/hashicorp/go-secure-stdlib/strutil"
 | |
| 	"github.com/hashicorp/vault/api"
 | |
| 	"github.com/mitchellh/cli"
 | |
| )
 | |
| 
 | |
| func kvReadRequest(client *api.Client, path string, params map[string]string) (*api.Secret, error) {
 | |
| 	r := client.NewRequest("GET", "/v1/"+path)
 | |
| 	for k, v := range params {
 | |
| 		r.Params.Set(k, v)
 | |
| 	}
 | |
| 	resp, err := client.RawRequest(r)
 | |
| 	if resp != nil {
 | |
| 		defer resp.Body.Close()
 | |
| 	}
 | |
| 	if resp != nil && resp.StatusCode == 404 {
 | |
| 		secret, parseErr := api.ParseSecret(resp.Body)
 | |
| 		switch parseErr {
 | |
| 		case nil:
 | |
| 		case io.EOF:
 | |
| 			return nil, nil
 | |
| 		default:
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		if secret != nil && (len(secret.Warnings) > 0 || len(secret.Data) > 0) {
 | |
| 			return secret, nil
 | |
| 		}
 | |
| 		return nil, nil
 | |
| 	}
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 
 | |
| 	return api.ParseSecret(resp.Body)
 | |
| }
 | |
| 
 | |
| func kvPreflightVersionRequest(client *api.Client, path string) (string, int, error) {
 | |
| 	// We don't want to use a wrapping call here so save any custom value and
 | |
| 	// restore after
 | |
| 	currentWrappingLookupFunc := client.CurrentWrappingLookupFunc()
 | |
| 	client.SetWrappingLookupFunc(nil)
 | |
| 	defer client.SetWrappingLookupFunc(currentWrappingLookupFunc)
 | |
| 	currentOutputCurlString := client.OutputCurlString()
 | |
| 	client.SetOutputCurlString(false)
 | |
| 	defer client.SetOutputCurlString(currentOutputCurlString)
 | |
| 	currentOutputPolicy := client.OutputPolicy()
 | |
| 	client.SetOutputPolicy(false)
 | |
| 	defer client.SetOutputPolicy(currentOutputPolicy)
 | |
| 
 | |
| 	r := client.NewRequest("GET", "/v1/sys/internal/ui/mounts/"+path)
 | |
| 	resp, err := client.RawRequest(r)
 | |
| 	if resp != nil {
 | |
| 		defer resp.Body.Close()
 | |
| 	}
 | |
| 	if err != nil {
 | |
| 		// If we get a 404 we are using an older version of vault, default to
 | |
| 		// version 1
 | |
| 		if resp != nil {
 | |
| 			if resp.StatusCode == 404 {
 | |
| 				return "", 1, nil
 | |
| 			}
 | |
| 
 | |
| 			// if the original request had the -output-curl-string or -output-policy flag,
 | |
| 			if (currentOutputCurlString || currentOutputPolicy) && resp.StatusCode == 403 {
 | |
| 				// we provide a more helpful error for the user,
 | |
| 				// who may not understand why the flag isn't working.
 | |
| 				err = fmt.Errorf(
 | |
| 					`This output flag requires the success of a preflight request 
 | |
| to determine the version of a KV secrets engine. Please 
 | |
| re-run this command with a token with read access to %s`, path)
 | |
| 			}
 | |
| 		}
 | |
| 
 | |
| 		return "", 0, err
 | |
| 	}
 | |
| 
 | |
| 	secret, err := api.ParseSecret(resp.Body)
 | |
| 	if err != nil {
 | |
| 		return "", 0, err
 | |
| 	}
 | |
| 	if secret == nil {
 | |
| 		return "", 0, errors.New("nil response from pre-flight request")
 | |
| 	}
 | |
| 	var mountPath string
 | |
| 	if mountPathRaw, ok := secret.Data["path"]; ok {
 | |
| 		mountPath = mountPathRaw.(string)
 | |
| 	}
 | |
| 	options := secret.Data["options"]
 | |
| 	if options == nil {
 | |
| 		return mountPath, 1, nil
 | |
| 	}
 | |
| 	versionRaw := options.(map[string]interface{})["version"]
 | |
| 	if versionRaw == nil {
 | |
| 		return mountPath, 1, nil
 | |
| 	}
 | |
| 	version := versionRaw.(string)
 | |
| 	switch version {
 | |
| 	case "", "1":
 | |
| 		return mountPath, 1, nil
 | |
| 	case "2":
 | |
| 		return mountPath, 2, nil
 | |
| 	}
 | |
| 
 | |
| 	return mountPath, 1, nil
 | |
| }
 | |
| 
 | |
| func isKVv2(path string, client *api.Client) (string, bool, error) {
 | |
| 	mountPath, version, err := kvPreflightVersionRequest(client, path)
 | |
| 	if err != nil {
 | |
| 		return "", false, err
 | |
| 	}
 | |
| 
 | |
| 	return mountPath, version == 2, nil
 | |
| }
 | |
| 
 | |
| func addPrefixToKVPath(p, mountPath, apiPrefix string) string {
 | |
| 	if p == mountPath || p == strings.TrimSuffix(mountPath, "/") {
 | |
| 		return path.Join(mountPath, apiPrefix)
 | |
| 	}
 | |
| 
 | |
| 	tp := strings.TrimPrefix(p, mountPath)
 | |
| 	for {
 | |
| 		// If the entire mountPath is included in the path, we are done
 | |
| 		if tp != p {
 | |
| 			break
 | |
| 		}
 | |
| 		// Trim the parts of the mountPath that are not included in the
 | |
| 		// path, for example, in cases where the mountPath contains
 | |
| 		// namespaces which are not included in the path.
 | |
| 		partialMountPath := strings.SplitN(mountPath, "/", 2)
 | |
| 		if len(partialMountPath) <= 1 || partialMountPath[1] == "" {
 | |
| 			break
 | |
| 		}
 | |
| 		mountPath = strings.TrimSuffix(partialMountPath[1], "/")
 | |
| 		tp = strings.TrimPrefix(tp, mountPath)
 | |
| 	}
 | |
| 
 | |
| 	return path.Join(mountPath, apiPrefix, tp)
 | |
| }
 | |
| 
 | |
| func getHeaderForMap(header string, data map[string]interface{}) string {
 | |
| 	maxKey := 0
 | |
| 	for k := range data {
 | |
| 		if len(k) > maxKey {
 | |
| 			maxKey = len(k)
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	// 4 for the column spaces and 5 for the len("value")
 | |
| 	totalLen := maxKey + 4 + 5
 | |
| 
 | |
| 	return padEqualSigns(header, totalLen)
 | |
| }
 | |
| 
 | |
| func kvParseVersionsFlags(versions []string) []string {
 | |
| 	versionsOut := make([]string, 0, len(versions))
 | |
| 	for _, v := range versions {
 | |
| 		versionsOut = append(versionsOut, strutil.ParseStringSlice(v, ",")...)
 | |
| 	}
 | |
| 
 | |
| 	return versionsOut
 | |
| }
 | |
| 
 | |
| func outputPath(ui cli.Ui, path string, title string) {
 | |
| 	ui.Info(padEqualSigns(title, len(path)))
 | |
| 	ui.Info(path)
 | |
| 	ui.Info("")
 | |
| }
 | |
| 
 | |
| // Pad the table header with equal signs on each side
 | |
| func padEqualSigns(header string, totalLen int) string {
 | |
| 	equalSigns := totalLen - (len(header) + 2)
 | |
| 
 | |
| 	// If we have zero or fewer equal signs bump it back up to two on either
 | |
| 	// side of the header.
 | |
| 	if equalSigns <= 0 {
 | |
| 		equalSigns = 4
 | |
| 	}
 | |
| 
 | |
| 	// If the number of equal signs is not divisible by two add a sign.
 | |
| 	if equalSigns%2 != 0 {
 | |
| 		equalSigns = equalSigns + 1
 | |
| 	}
 | |
| 
 | |
| 	return fmt.Sprintf("%s %s %s", strings.Repeat("=", equalSigns/2), header, strings.Repeat("=", equalSigns/2))
 | |
| }
 |