Skip to content

Commit 91ae78e

Browse files
committed
rename to credentials
1 parent 2f51064 commit 91ae78e

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

cmd/enpasscli/main.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -191,25 +191,25 @@ func entryPassword(logger *logrus.Logger, vault *enpass.Vault, args *Args) {
191191
}
192192
}
193193

194-
func assembleVaultAccessData(logger *logrus.Logger, args *Args, store *unlock.SecureStore) *enpass.VaultAccessData {
195-
accessData := &enpass.VaultAccessData{
194+
func assembleVaultCredentials(logger *logrus.Logger, args *Args, store *unlock.SecureStore) *enpass.VaultCredentials {
195+
credentials := &enpass.VaultCredentials{
196196
Password: os.Getenv("MASTERPW"),
197197
KeyfilePath: *args.keyFilePath,
198198
}
199199

200-
if !accessData.IsComplete() && store != nil {
200+
if !credentials.IsComplete() && store != nil {
201201
var err error
202-
if accessData.DBKey, err = store.Read(); err != nil {
203-
logger.WithError(err).Fatal("could not read access data from store")
202+
if credentials.DBKey, err = store.Read(); err != nil {
203+
logger.WithError(err).Fatal("could not read credentials from store")
204204
}
205-
logger.Debug("read access data from store")
205+
logger.Debug("read credentials from store")
206206
}
207207

208-
if !accessData.IsComplete() {
209-
accessData.Password = prompt(logger, args, "master password")
208+
if !credentials.IsComplete() {
209+
credentials.Password = prompt(logger, args, "master password")
210210
}
211211

212-
return accessData
212+
return credentials
213213
}
214214

215215
func initializeStore(logger *logrus.Logger, args *Args) *unlock.SecureStore {
@@ -283,12 +283,12 @@ func main() {
283283
logger.Debug("initialized store")
284284
}
285285

286-
accessData := assembleVaultAccessData(logger, args, store)
286+
credentials := assembleVaultCredentials(logger, args, store)
287287

288288
defer func() {
289289
vault.Close()
290290
}()
291-
if err := vault.Open(accessData); err != nil {
291+
if err := vault.Open(credentials); err != nil {
292292
logger.WithError(err).Error("could not open vault")
293293
logger.Exit(2)
294294
}
@@ -310,8 +310,8 @@ func main() {
310310
}
311311

312312
if store != nil {
313-
if err := store.Write(accessData.DBKey); err != nil {
314-
logger.WithError(err).Fatal("failed to write access data to store")
313+
if err := store.Write(credentials.DBKey); err != nil {
314+
logger.WithError(err).Fatal("failed to write credentials to store")
315315
}
316316
}
317317
}

pkg/enpass/vault.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ type Vault struct {
4242
vaultInfo VaultInfo
4343
}
4444

45-
type VaultAccessData struct {
45+
type VaultCredentials struct {
4646
KeyfilePath string
4747
Password string
4848
DBKey []byte
4949
}
5050

51-
func (accessData *VaultAccessData) IsComplete() bool {
52-
return accessData.Password != "" || accessData.DBKey != nil
51+
func (credentials *VaultCredentials) IsComplete() bool {
52+
return credentials.Password != "" || credentials.DBKey != nil
5353
}
5454

5555
// NewVault : Create new instance of vault and load vault info
@@ -113,24 +113,24 @@ func (v *Vault) checkPaths() error {
113113
return nil
114114
}
115115

116-
func (v *Vault) generateAndSetDBKey(accessData *VaultAccessData) error {
117-
if accessData.DBKey != nil {
116+
func (v *Vault) generateAndSetDBKey(credentials *VaultCredentials) error {
117+
if credentials.DBKey != nil {
118118
v.logger.Debug("skipping database key generation, already set")
119119
return nil
120120
}
121121

122-
if accessData.Password == "" {
122+
if credentials.Password == "" {
123123
return errors.New("empty vault password provided")
124124
}
125125

126-
if accessData.KeyfilePath == "" && v.vaultInfo.HasKeyfile == 1 {
126+
if credentials.KeyfilePath == "" && v.vaultInfo.HasKeyfile == 1 {
127127
return errors.New("you should specify a keyfile")
128-
} else if accessData.KeyfilePath != "" && v.vaultInfo.HasKeyfile == 0 {
128+
} else if credentials.KeyfilePath != "" && v.vaultInfo.HasKeyfile == 0 {
129129
return errors.New("you are specifying an unnecessary keyfile")
130130
}
131131

132132
v.logger.Debug("generating master password")
133-
masterPassword, err := v.generateMasterPassword([]byte(accessData.Password), accessData.KeyfilePath)
133+
masterPassword, err := v.generateMasterPassword([]byte(credentials.Password), credentials.KeyfilePath)
134134
if err != nil {
135135
return errors.Wrap(err, "could not generate vault unlock key")
136136
}
@@ -142,7 +142,7 @@ func (v *Vault) generateAndSetDBKey(accessData *VaultAccessData) error {
142142
}
143143

144144
v.logger.Debug("deriving decryption key")
145-
accessData.DBKey, err = v.deriveKey(masterPassword, keySalt)
145+
credentials.DBKey, err = v.deriveKey(masterPassword, keySalt)
146146
if err != nil {
147147
return errors.Wrap(err, "could not derive database key from master password")
148148
}
@@ -151,14 +151,14 @@ func (v *Vault) generateAndSetDBKey(accessData *VaultAccessData) error {
151151
}
152152

153153
// Open : setup a connection to the Enpass database. Call this before doing anything.
154-
func (v *Vault) Open(accessData *VaultAccessData) error {
154+
func (v *Vault) Open(credentials *VaultCredentials) error {
155155
v.logger.Debug("generating database key")
156-
if err := v.generateAndSetDBKey(accessData); err != nil {
156+
if err := v.generateAndSetDBKey(credentials); err != nil {
157157
return errors.Wrap(err, "could not generate database key")
158158
}
159159

160160
v.logger.Debug("opening encrypted database")
161-
if err := v.openEncryptedDatabase(v.databaseFilename, accessData.DBKey); err != nil {
161+
if err := v.openEncryptedDatabase(v.databaseFilename, credentials.DBKey); err != nil {
162162
return errors.Wrap(err, "could not open encrypted database")
163163
}
164164

pkg/enpass/vault_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ func TestVault_Initialize(t *testing.T) {
1717
t.Errorf("vault initialization failed: %+v", err)
1818
}
1919
defer vault.Close()
20-
accessData := &VaultAccessData{Password: testPassword}
21-
if err := vault.Open(accessData); err != nil {
20+
credentials := &VaultCredentials{Password: testPassword}
21+
if err := vault.Open(credentials); err != nil {
2222
t.Errorf("opening vault failed: %+v", err)
2323
}
2424
}
@@ -29,8 +29,8 @@ func TestVault_GetEntries(t *testing.T) {
2929
t.Errorf("vault initialization failed: %+v", err)
3030
}
3131
defer vault.Close()
32-
accessData := &VaultAccessData{Password: testPassword}
33-
if err := vault.Open(accessData); err != nil {
32+
credentials := &VaultCredentials{Password: testPassword}
33+
if err := vault.Open(credentials); err != nil {
3434
t.Errorf("opening vault failed: %+v", err)
3535
}
3636

0 commit comments

Comments
 (0)