Feature/metadata view (#17)

* Hotfix for popups; metadata view

* Fixing metadata view

* Cleanup

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.1.8] - 2024-04-28
+
+## Fixed
+
+-- Fixing issue with popups not being focused and requiring selection with mouse
+
+## Added
+
+-- Adding metadata view on secret objects
+
 ## [0.1.7] - 2024-04-24
 
 ## Added

internal/models/models.go

@@ -209,3 +209,25 @@ type Namespace struct {
 	Name        string
 	Description string
 }
+
+type MetaResponse struct {
+	Data Metadata `json:"data"`
+}
+
+type Metadata struct {
+	CasRequired        bool                   `json:"cas_required"`
+	CreatedTime        string                 `json:"created_time"`
+	CurrentVersion     int                    `json:"current_version"`
+	DeleteVersionAfter string                 `json:"delete_version_after"`
+	MaxVersions        int                    `json:"max_versions"`
+	OldestVersion      int                    `json:"oldest_version"`
+	UpdatedTime        string                 `json:"updated_time"`
+	CustomMetadata     map[string]interface{} `json:"custom_metadata"`
+	Versions           map[string]Version     `json:"versions"`
+}
+
+type Version struct {
+	CreatedTime  string `json:"created_time"`
+	DeletionTime string `json:"deletion_time"`
+	Destroyed    bool   `json:"destroyed"`
+}

internal/state/state.go

@@ -23,6 +23,7 @@ type State struct {
 	SelectedObject     string
 	SelectedPolicyName string
 	SelectedSecret     *api.Secret
+	SelectedSecretMeta *models.Metadata
 	PolicyList         []string
 	PolicyACL          string
 	NewSecretName      string

internal/vault/secret.go

@@ -2,6 +2,7 @@ package vault
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"net/http"
@@ -74,23 +75,52 @@ func (v *Vault) ListNestedSecrets(mount, path string) ([]models.SecretPath, erro
 	return secretPaths, nil
 }
 
-func (v *Vault) GetSecretInfo(mount, path string) (*api.Secret, error) {
+func (v *Vault) GetSecretData(mount, path string) (*api.Secret, error) {
 	secretPath := fmt.Sprintf("%s/data/%s", mount, path)
 	secretPath = sanitizePath(secretPath)
 	secretData, err := v.vault.Logical().Read(secretPath)
 	if err != nil {
 		v.Logger.Err(err).Msgf("failed to read secret: %s", err)
-		return nil, errors.New(fmt.Sprintf("Failed to read secret: %v", err))
+		return nil, fmt.Errorf("failed to read secret: %v", err)
 	}
 
 	if secretData == nil {
 		v.Logger.Err(err).Msgf("no data found at %s", secretPath)
-		return nil, errors.New(fmt.Sprintf("No data found at %s", secretPath))
+		return nil, fmt.Errorf("no data found at %s", secretPath)
 	}
-	//TODO: Add logging
+
 	return secretData, nil
 }
 
+func (v *Vault) GetSecretMetadata(mount, path string) (*models.Metadata, error) {
+	secretPath := fmt.Sprintf("%s/metadata/%s", mount, path)
+	secretPath = sanitizePath(secretPath)
+	var metadata models.Metadata
+	secretData, err := v.vault.Logical().Read(secretPath)
+	if err != nil {
+		v.Logger.Debug().Msgf("failed to read secret metadata: %s", err)
+		return nil, fmt.Errorf("failed to read secret metadata: %v", err)
+	}
+
+	if secretData == nil {
+		v.Logger.Debug().Msgf("no metadata found at %s", secretPath)
+		return nil, fmt.Errorf("no metadata found at %s", secretPath)
+	}
+
+	jsonData, err := json.Marshal(secretData.Data)
+	if err != nil {
+		v.Logger.Err(err).Msgf("failed to marshal secret data: %s", err)
+	}
+	// Convert JSON to Metadata
+	err = json.Unmarshal(jsonData, &metadata)
+	if err != nil {
+		v.Logger.Err(err).Msgf("failed to unmarshal secret data: %s", err)
+	}
+
+	v.Logger.Debug().Msgf("Metadata: %v", metadata.CustomMetadata)
+	return &metadata, nil
+}
+
 func (v *Vault) UpdateSecretObjectKV2(mount string, path string, patch bool, data map[string]interface{}) error {
 	ctx := context.Background()
 

internal/watcher/secretobj.go

@@ -32,12 +32,19 @@ func (w *Watcher) updateSecretState(selectedMount, selectedPath string) {
 		w.logger.Debug().Msgf("Enterprise version detected, setting namespace to %v", w.state.SelectedNamespace)
 		w.vault.SetNamespace(w.state.SelectedNamespace)
 	}
-	secret, err := w.vault.GetSecretInfo(selectedMount, selectedPath)
+	secret, err := w.vault.GetSecretData(selectedMount, selectedPath)
 	if err != nil {
-		w.NotifyHandler(models.HandleError, err.Error())
-		return
+		w.NotifyHandler(models.HandleInfo, err.Error())
+	}
+	metadata, err2 := w.vault.GetSecretMetadata(selectedMount, selectedPath)
+	if err2 != nil {
+		w.NotifyHandler(models.HandleInfo, err2.Error())
+	}
+	if err != nil && err2 != nil {
+		w.NotifyHandler(models.HandleError, "Unable to return secret data or metadata")
 	}
 	w.state.SelectedSecret = secret
+	w.state.SelectedSecretMeta = metadata
 
 }
 

internal/watcher/watcher.go

@@ -25,7 +25,8 @@ type Vault interface {
 	ListNestedSecrets(string, string) ([]models.SecretPath, error)
 	SetNamespace(string)
 	ListNamespaces() ([]string, error)
-	GetSecretInfo(string, string) (*api.Secret, error)
+	GetSecretData(string, string) (*api.Secret, error)
+	GetSecretMetadata(string, string) (*models.Metadata, error)
 	//GetPolicy(string) (string, error)
 	//ListPolicies() ([]string, error)
 }

tui/component/commands.go

@@ -43,6 +43,7 @@ var (
 	SecretObjectCommands = []string{
 		fmt.Sprintf("\n%s Secret Commands:", styles.HighlightSecondaryTag),
 		fmt.Sprintf("%sh%s toggle display for secrets", styles.HighlightPrimaryTag, styles.StandardColorTag),
+		fmt.Sprintf("%st%s toggle display for metadata info", styles.HighlightPrimaryTag, styles.StandardColorTag),
 		fmt.Sprintf("%sc%s copy secret to clipboard", styles.HighlightPrimaryTag, styles.StandardColorTag),
 		fmt.Sprintf("%sj%s toggle json view for secret", styles.HighlightPrimaryTag, styles.StandardColorTag),
 		fmt.Sprintf("%sP%s to PATCH secret", styles.HighlightPrimaryTag, styles.StandardColorTag),
@@ -84,7 +85,6 @@ func NewCommands() *Commands {
 
 func (c *Commands) Update(commands []string) {
 	c.Props.ViewCommands = commands
-
 	c.updateText()
 }
 
@@ -101,6 +101,10 @@ func (c *Commands) Render() error {
 
 func (c *Commands) updateText() {
 	commands := append(c.Props.MainCommands, c.Props.ViewCommands...)
+	// Easy way to handle long list of commands for views
+	if len(c.Props.ViewCommands) > 6 {
+		commands = c.Props.ViewCommands
+	}
 	cmds := strings.Join(commands, "\n")
 	c.TextView.SetText(cmds)
 }

tui/component/components.go

@@ -32,6 +32,8 @@ type Table interface {
 	SetSelectedFunc(fn func(row, column int))
 	SetInputCapture(capture func(event *tcell.EventKey) *tcell.EventKey)
 	ScrollToTop() *tview.Table
+	SetSelectedStyle(style tcell.Style)
+	SetSelectable(rows, columns bool)
 }
 
 //go:generate counterfeiter . TextView