mirror of
				https://github.com/optim-enterprises-bv/vault.git
				synced 2025-10-30 18:17:55 +00:00 
			
		
		
		
	 35667f93a7
			
		
	
	35667f93a7
	
	
	
		
			
			* Add priority queue to sdk * fix issue of storing pointers and now copy * update to use copy structure * Remove file, put Item struct def. into other file * add link * clean up docs * refactor internal data structure to hide heap method implementations. Other cleanup after feedback * rename PushItem and PopItem to just Push/Pop, after encapsulating the heap methods * updates after feedback * refactoring/renaming * guard against pushing a nil item * minor updates after feedback * Add SetCredentials, GenerateCredentials gRPC methods to combined database backend gPRC * Initial Combined database backend implementation of static accounts and automatic rotation * vendor updates * initial implementation of static accounts with Combined database backend, starting with PostgreSQL implementation * add lock and setup of rotation queue * vendor the queue * rebase on new method signature of queue * remove mongo tests for now * update default role sql * gofmt after rebase * cleanup after rebasing to remove checks for ErrNotFound error * rebase cdcr-priority-queue * vendor dependencies with 'go mod vendor' * website database docs for Static Role support * document the rotate-role API endpoint * postgres specific static role docs * use constants for paths * updates from review * remove dead code * combine and clarify error message for older plugins * Update builtin/logical/database/backend.go Co-Authored-By: Jim Kalafut <jim@kalafut.net> * cleanups from feedback * code and comment cleanups * move db.RLock higher to protect db.GenerateCredentials call * Return output with WALID if we failed to delete the WAL * Update builtin/logical/database/path_creds_create.go Co-Authored-By: Jim Kalafut <jim@kalafut.net> * updates after running 'make fmt' * update after running 'make proto' * Update builtin/logical/database/path_roles.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * Update builtin/logical/database/path_roles.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * update comment and remove and rearrange some dead code * Update website/source/api/secret/databases/index.html.md Co-Authored-By: Jim Kalafut <jim@kalafut.net> * cleanups after review * Update sdk/database/dbplugin/grpc_transport.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * code cleanup after feedback * remove PasswordLastSet; it's not used * document GenerateCredentials and SetCredentials * Update builtin/logical/database/path_rotate_credentials.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * wrap pop and popbykey in backend methods to protect against nil cred rotation queue * use strings.HasPrefix instead of direct equality check for path * Forgot to commit this * updates after feedback * re-purpose an outdated test to now check that static and dynamic roles cannot share a name * check for unique name across dynamic and static roles * refactor loadStaticWALs to return a map of name/setCredentialsWAL struct to consolidate where we're calling set credentials * remove commented out code * refactor to have loadstaticwals filter out wals for roles that no longer exist * return error if nil input given * add nil check for input into setStaticAccount * Update builtin/logical/database/path_roles.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * add constant for queue tick time in seconds, used for comparrison in updates * Update builtin/logical/database/path_roles.go Co-Authored-By: Jim Kalafut <jim@kalafut.net> * code cleanup after review * remove misplaced code comment * remove commented out code * create a queue in the Factory method, even if it's never used * update path_roles to use a common set of fields, with specific overrides for dynamic/static roles by type * document new method * move rotation things into a specific file * rename test file and consolidate some static account tests * Update builtin/logical/database/path_roles.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * Update builtin/logical/database/rotation.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * Update builtin/logical/database/rotation.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * Update builtin/logical/database/rotation.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * Update builtin/logical/database/rotation.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * Update builtin/logical/database/rotation.go Co-Authored-By: Brian Kassouf <briankassouf@users.noreply.github.com> * update code comments, method names, and move more methods into rotation.go * update comments to be capitalized * remove the item from the queue before we try to destroy it * findStaticWAL returns an error * use lowercase keys when encoding WAL entries * small cleanups * remove vestigial static account check * remove redundant DeleteWAL call in populate queue * if we error on loading role, push back to queue with 10 second backoff * poll in initqueue to make sure the backend is setup and can write/delete data * add revoke_user_on_delete flag to allow users to opt-in to revoking the static database user on delete of the Vault role. Default false * add code comments on read-only loop * code comment updates * re-push if error returned from find static wal * add locksutil and acquire locks when pop'ing from the queue * grab exclusive locks for updating static roles * Add SetCredentials and GenerateCredentials stubs to mockPlugin * add a switch in initQueue to listen for cancelation * remove guard on zero time, it should have no affect * create a new context in Factory to pass on and use for closing the backend queue * restore master copy of vendor dir
		
			
				
	
	
		
			175 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			175 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| package database
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"fmt"
 | |
| 	"time"
 | |
| 
 | |
| 	"github.com/hashicorp/vault/sdk/database/dbplugin"
 | |
| 	"github.com/hashicorp/vault/sdk/framework"
 | |
| 	"github.com/hashicorp/vault/sdk/helper/strutil"
 | |
| 	"github.com/hashicorp/vault/sdk/logical"
 | |
| )
 | |
| 
 | |
| func pathCredsCreate(b *databaseBackend) []*framework.Path {
 | |
| 	return []*framework.Path{
 | |
| 		&framework.Path{
 | |
| 			Pattern: "creds/" + framework.GenericNameRegex("name"),
 | |
| 			Fields: map[string]*framework.FieldSchema{
 | |
| 				"name": &framework.FieldSchema{
 | |
| 					Type:        framework.TypeString,
 | |
| 					Description: "Name of the role.",
 | |
| 				},
 | |
| 			},
 | |
| 
 | |
| 			Callbacks: map[logical.Operation]framework.OperationFunc{
 | |
| 				logical.ReadOperation: b.pathCredsCreateRead(),
 | |
| 			},
 | |
| 
 | |
| 			HelpSynopsis:    pathCredsCreateReadHelpSyn,
 | |
| 			HelpDescription: pathCredsCreateReadHelpDesc,
 | |
| 		},
 | |
| 		&framework.Path{
 | |
| 			Pattern: "static-creds/" + framework.GenericNameRegex("name"),
 | |
| 			Fields: map[string]*framework.FieldSchema{
 | |
| 				"name": &framework.FieldSchema{
 | |
| 					Type:        framework.TypeString,
 | |
| 					Description: "Name of the static role.",
 | |
| 				},
 | |
| 			},
 | |
| 
 | |
| 			Callbacks: map[logical.Operation]framework.OperationFunc{
 | |
| 				logical.ReadOperation: b.pathStaticCredsRead(),
 | |
| 			},
 | |
| 
 | |
| 			HelpSynopsis:    pathStaticCredsReadHelpSyn,
 | |
| 			HelpDescription: pathStaticCredsReadHelpDesc,
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func (b *databaseBackend) pathCredsCreateRead() framework.OperationFunc {
 | |
| 	return func(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 | |
| 		name := data.Get("name").(string)
 | |
| 
 | |
| 		// Get the role
 | |
| 		role, err := b.Role(ctx, req.Storage, name)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		if role == nil {
 | |
| 			return logical.ErrorResponse(fmt.Sprintf("unknown role: %s", name)), nil
 | |
| 		}
 | |
| 
 | |
| 		dbConfig, err := b.DatabaseConfig(ctx, req.Storage, role.DBName)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 
 | |
| 		// If role name isn't in the database's allowed roles, send back a
 | |
| 		// permission denied.
 | |
| 		if !strutil.StrListContains(dbConfig.AllowedRoles, "*") && !strutil.StrListContainsGlob(dbConfig.AllowedRoles, name) {
 | |
| 			return nil, fmt.Errorf("%q is not an allowed role", name)
 | |
| 		}
 | |
| 
 | |
| 		// Get the Database object
 | |
| 		db, err := b.GetConnection(ctx, req.Storage, role.DBName)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 
 | |
| 		db.RLock()
 | |
| 		defer db.RUnlock()
 | |
| 
 | |
| 		ttl, _, err := framework.CalculateTTL(b.System(), 0, role.DefaultTTL, 0, role.MaxTTL, 0, time.Time{})
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		expiration := time.Now().Add(ttl)
 | |
| 		// Adding a small buffer since the TTL will be calculated again after this call
 | |
| 		// to ensure the database credential does not expire before the lease
 | |
| 		expiration = expiration.Add(5 * time.Second)
 | |
| 
 | |
| 		usernameConfig := dbplugin.UsernameConfig{
 | |
| 			DisplayName: req.DisplayName,
 | |
| 			RoleName:    name,
 | |
| 		}
 | |
| 
 | |
| 		// Create the user
 | |
| 		username, password, err := db.CreateUser(ctx, role.Statements, usernameConfig, expiration)
 | |
| 		if err != nil {
 | |
| 			b.CloseIfShutdown(db, err)
 | |
| 			return nil, err
 | |
| 		}
 | |
| 
 | |
| 		resp := b.Secret(SecretCredsType).Response(map[string]interface{}{
 | |
| 			"username": username,
 | |
| 			"password": password,
 | |
| 		}, map[string]interface{}{
 | |
| 			"username":              username,
 | |
| 			"role":                  name,
 | |
| 			"db_name":               role.DBName,
 | |
| 			"revocation_statements": role.Statements.Revocation,
 | |
| 		})
 | |
| 		resp.Secret.TTL = role.DefaultTTL
 | |
| 		resp.Secret.MaxTTL = role.MaxTTL
 | |
| 		return resp, nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func (b *databaseBackend) pathStaticCredsRead() framework.OperationFunc {
 | |
| 	return func(ctx context.Context, req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
 | |
| 		name := data.Get("name").(string)
 | |
| 
 | |
| 		role, err := b.StaticRole(ctx, req.Storage, name)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 		if role == nil {
 | |
| 			return logical.ErrorResponse("unknown role: %s", name), nil
 | |
| 		}
 | |
| 
 | |
| 		dbConfig, err := b.DatabaseConfig(ctx, req.Storage, role.DBName)
 | |
| 		if err != nil {
 | |
| 			return nil, err
 | |
| 		}
 | |
| 
 | |
| 		// If role name isn't in the database's allowed roles, send back a
 | |
| 		// permission denied.
 | |
| 		if !strutil.StrListContains(dbConfig.AllowedRoles, "*") && !strutil.StrListContainsGlob(dbConfig.AllowedRoles, name) {
 | |
| 			return nil, fmt.Errorf("%q is not an allowed role", name)
 | |
| 		}
 | |
| 
 | |
| 		return &logical.Response{
 | |
| 			Data: map[string]interface{}{
 | |
| 				"username":            role.StaticAccount.Username,
 | |
| 				"password":            role.StaticAccount.Password,
 | |
| 				"ttl":                 role.StaticAccount.PasswordTTL().Seconds(),
 | |
| 				"rotation_period":     role.StaticAccount.RotationPeriod.Seconds(),
 | |
| 				"last_vault_rotation": role.StaticAccount.LastVaultRotation,
 | |
| 			},
 | |
| 		}, nil
 | |
| 	}
 | |
| }
 | |
| 
 | |
| const pathCredsCreateReadHelpSyn = `
 | |
| Request database credentials for a certain role.
 | |
| `
 | |
| 
 | |
| const pathCredsCreateReadHelpDesc = `
 | |
| This path reads database credentials for a certain role. The
 | |
| database credentials will be generated on demand and will be automatically
 | |
| revoked when the lease is up.
 | |
| `
 | |
| 
 | |
| const pathStaticCredsReadHelpSyn = `
 | |
| Request database credentials for a certain static role. These credentials are
 | |
| rotated periodically.
 | |
| `
 | |
| 
 | |
| const pathStaticCredsReadHelpDesc = `
 | |
| This path reads database credentials for a certain static role. The database
 | |
| credentials are rotated periodically according to their configuration, and will
 | |
| return the same password until they are rotated.
 | |
| `
 |