The commands added are: boundary daemon start boundary daemon stop boundary daemon add-token boundary daemon status boundary search If these actions are performed on a platform that doesn't support sqlite natively in go an error is returned. Besides some hooks into the cmd package all the significant logic resides in internal/clientcache feat (cmds/authenticate): output the token name when storing token feat: update go-dbw which now uses pure go sqlite driver refact (base.Command): export FlagOutputCurlString Exporting FlagOutputCurlString allows other commands that embed the base.Command to access the flag as needed feat: add a cache Repository to manage cache storage feat: add a "cache" CLI command This new command will support both managing and searching the local CLI cache daemon. feat: start cache daemon as needed when issue CLI commands Move files to new directories and add persona table (#3526) * Add persona table and move files to new directories Client daemon now uses unix sockets and update pathing (#3535) * Add unix socket listen and dialers with file permissions applied * Update the pathing to match RFC Cache refreshing now uses all stored personas. (#3545) Updating headers for LLB files Decouple daemon and cache server (#3566) * Separate daemon from server * Add persona handler to daemon server (#3579) Moved search to use mql and added tests for the search command (#3589) * search uses hashicorp/mql Windows support for client side daemon (#3618) * exec.Command for background process * Log to stderr when in foreground and file always * Use pid files across platform for start and stop Requests with version info must match the daemon's version (#3640) * requests with version info must match daemons Update dependencies and breakout cgo/pure go sqlite drivers (#3657) upgrade go-dbw deps and add cgo build tags Enable graceful shutdown in windows (#3695) * Enable graceful shutdown in windows Co-authored-by: Jim <jlambert@hashicorp.com> Targets delete when a persona changes address or user id (#3673) * Handle cache refresh in repo Add sessions to the client side cache (#3682) * Add sessions to repository * Search command supports sessions * adding session related tests to db and refresh Change cache schema from personas to tokens+users (#3737) * Change from personas to tokens+users * Separate keyring tokens from auth tokens Add support for keyringless auth tokens (#3765) * Add support for keyringless auth tokens Remove expired auth tokens from cache (#3768) * Remove expired auth tokens from cache Complete the TODO of checking for inflight tx (#3779) Delete tokens that the controller says are invalid (#3782) fix search test with boundary token check (#3799) Collect resource info in repository_<resource>s.go (#3769) * Collect resource info in repository_<resource>s.go * Move search logic into the domain (#3794) Daemon and search restricted to supported platforms (#3801) * Daemon and search restricted to supported platforms Reorganize the clientcache packages (#3814) * Refactor for self contained domain logic * Put clientcache stuff under internal
156 lines
3.8 KiB
Go
156 lines
3.8 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/boundary/api"
|
|
"github.com/hashicorp/boundary/internal/clientcache/internal/daemon"
|
|
"github.com/hashicorp/boundary/internal/cmd/base"
|
|
"github.com/hashicorp/boundary/internal/errors"
|
|
"github.com/hashicorp/boundary/version"
|
|
"github.com/mitchellh/cli"
|
|
"github.com/posener/complete"
|
|
)
|
|
|
|
var (
|
|
_ cli.Command = (*AddTokenCommand)(nil)
|
|
_ cli.CommandAutocomplete = (*AddTokenCommand)(nil)
|
|
)
|
|
|
|
type AddTokenCommand struct {
|
|
*base.Command
|
|
}
|
|
|
|
func (c *AddTokenCommand) Synopsis() string {
|
|
return "Add an auth token to a running boundary daemon"
|
|
}
|
|
|
|
func (c *AddTokenCommand) Help() string {
|
|
helpText := `
|
|
Usage: boundary daemon add-token [options]
|
|
|
|
Add an auth token to the daemon:
|
|
|
|
$ boundary daemon add-token
|
|
|
|
For a full list of examples, please see the documentation.
|
|
|
|
` + c.Flags().Help()
|
|
return strings.TrimSpace(helpText)
|
|
}
|
|
|
|
func (c *AddTokenCommand) Flags() *base.FlagSets {
|
|
set := c.FlagSet(base.FlagSetClient | base.FlagSetOutputFormat)
|
|
return set
|
|
}
|
|
|
|
func (c *AddTokenCommand) AutocompleteArgs() complete.Predictor {
|
|
return complete.PredictNothing
|
|
}
|
|
|
|
func (c *AddTokenCommand) AutocompleteFlags() complete.Flags {
|
|
return c.Flags().Completions()
|
|
}
|
|
|
|
func (c *AddTokenCommand) Run(args []string) int {
|
|
ctx := c.Context
|
|
f := c.Flags()
|
|
if err := f.Parse(args); err != nil {
|
|
c.PrintCliError(err)
|
|
return base.CommandUserError
|
|
}
|
|
|
|
apiErr, err := c.Add(ctx)
|
|
if err != nil {
|
|
c.PrintCliError(err)
|
|
return base.CommandCliError
|
|
}
|
|
if apiErr != nil {
|
|
c.PrintApiError(apiErr, "Error from daemon when adding a token")
|
|
return base.CommandApiError
|
|
|
|
}
|
|
return base.CommandSuccess
|
|
}
|
|
|
|
func (c *AddTokenCommand) Add(ctx context.Context) (*api.Error, error) {
|
|
const op = "daemon.(AddTokenCommand).Add"
|
|
client, err := c.Client()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
keyringType, tokenName, err := c.DiscoverKeyringTokenInfo()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
pa := daemon.UpsertTokenRequest{
|
|
BoundaryAddr: client.Addr(),
|
|
}
|
|
switch keyringType {
|
|
case "", base.NoneKeyring:
|
|
keyringType = base.NoneKeyring
|
|
token := client.Token()
|
|
if parts := strings.SplitN(token, "_", 4); len(parts) == 3 {
|
|
pa.AuthTokenId = strings.Join(parts[:2], "_")
|
|
} else {
|
|
return nil, errors.New(ctx, errors.InvalidParameter, op, "found auth token is not in the proper format")
|
|
}
|
|
pa.AuthToken = token
|
|
default:
|
|
at := c.ReadTokenFromKeyring(keyringType, tokenName)
|
|
if at == nil {
|
|
return nil, errors.New(ctx, errors.Conflict, op, "no auth token available to send to daemon")
|
|
}
|
|
pa.Keyring = &daemon.KeyringToken{
|
|
KeyringType: keyringType,
|
|
TokenName: tokenName,
|
|
}
|
|
pa.AuthTokenId = at.Id
|
|
}
|
|
|
|
dotPath, err := DefaultDotDirectory(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return addToken(ctx, dotPath, &pa)
|
|
}
|
|
|
|
func addToken(ctx context.Context, daemonPath string, p *daemon.UpsertTokenRequest) (*api.Error, error) {
|
|
const op = "daemon.addToken"
|
|
client, err := api.NewClient(nil)
|
|
if err != nil {
|
|
return nil, errors.Wrap(ctx, err, op)
|
|
}
|
|
addr := daemon.SocketAddress(daemonPath)
|
|
_, err = os.Stat(strings.TrimPrefix(addr, "unix://"))
|
|
if strings.HasPrefix(addr, "unix://") && err != nil {
|
|
return nil, errors.Wrap(ctx, err, op)
|
|
}
|
|
if err := client.SetAddr(addr); err != nil {
|
|
return nil, errors.Wrap(ctx, err, op)
|
|
}
|
|
// Because this is using the real lib it can pick up from stored locations
|
|
// like the system keychain. Explicitly clear the token for now
|
|
client.SetToken("")
|
|
|
|
req, err := client.NewRequest(ctx, "POST", "/tokens", p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
req.Header.Add(daemon.VersionHeaderKey, version.Get().VersionNumber())
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return resp.Decode(&struct{}{})
|
|
}
|