Skip to content

Commit

Permalink
update data store, allow checking if keyring exists, add reset method
Browse files Browse the repository at this point in the history
  • Loading branch information
iignatevich committed May 27, 2024
1 parent 19f9710 commit 9d81f86
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
17 changes: 17 additions & 0 deletions keyring.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ type DataStore interface {
// CleanStorage cleanups storage (credentials or key-value).
// Error is returned if the vault couldn't be unlocked.
CleanStorage(item SecretItem) error
// Exists checks if keyring exists in persistent storage.
Exists() bool
// Save saves the keyring to the persistent storage.
Save() error
// Destroy removes the keyring from the persistent storage.
Expand All @@ -77,6 +79,7 @@ type DataStore interface {
type Keyring interface {
launchr.Service
DataStore
ResetStorage()
}

type keyringService struct {
Expand All @@ -97,6 +100,11 @@ func (k *keyringService) ServiceInfo() launchr.ServiceInfo {
return launchr.ServiceInfo{}
}

// ResetStorage cleans store for subsequent reload.
func (k *keyringService) ResetStorage() {
k.store = nil
}

func (k *keyringService) defaultStore() (DataStore, error) {
if k.store != nil {
return k.store, nil
Expand Down Expand Up @@ -167,6 +175,15 @@ func (k *keyringService) CleanStorage(item SecretItem) error {
return s.CleanStorage(item)
}

// Exists checks if keyring exists in persistent storage.
func (k *keyringService) Exists() bool {
s, err := k.defaultStore()
if err != nil {
return false
}
return s.Exists()
}

// Save implements DataStore interface. Uses service default store.
func (k *keyringService) Save() error {
s, err := k.defaultStore()
Expand Down
14 changes: 14 additions & 0 deletions yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,20 @@ func (s *dataStoreYaml) CleanStorage(item SecretItem) error {
return nil
}

// Exists checks if keyring exists in persistent storage.
func (s *dataStoreYaml) Exists() bool {
ageStorage, ok := s.file.(*ageFile)
if !ok {
panic("impossible type assertion")
}

info, err := os.Stat(ageStorage.file.fname)
if os.IsNotExist(err) {
return false
}
return !info.IsDir()
}

// Save implements DataStore interface.
func (s *dataStoreYaml) Save() error {
err := s.file.Open(os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0600)
Expand Down

0 comments on commit 9d81f86

Please sign in to comment.