@@ -42,14 +42,14 @@ type Vault struct {
42
42
vaultInfo VaultInfo
43
43
}
44
44
45
- type VaultAccessData struct {
45
+ type VaultCredentials struct {
46
46
KeyfilePath string
47
47
Password string
48
48
DBKey []byte
49
49
}
50
50
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
53
53
}
54
54
55
55
// NewVault : Create new instance of vault and load vault info
@@ -113,24 +113,24 @@ func (v *Vault) checkPaths() error {
113
113
return nil
114
114
}
115
115
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 {
118
118
v .logger .Debug ("skipping database key generation, already set" )
119
119
return nil
120
120
}
121
121
122
- if accessData .Password == "" {
122
+ if credentials .Password == "" {
123
123
return errors .New ("empty vault password provided" )
124
124
}
125
125
126
- if accessData .KeyfilePath == "" && v .vaultInfo .HasKeyfile == 1 {
126
+ if credentials .KeyfilePath == "" && v .vaultInfo .HasKeyfile == 1 {
127
127
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 {
129
129
return errors .New ("you are specifying an unnecessary keyfile" )
130
130
}
131
131
132
132
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 )
134
134
if err != nil {
135
135
return errors .Wrap (err , "could not generate vault unlock key" )
136
136
}
@@ -142,7 +142,7 @@ func (v *Vault) generateAndSetDBKey(accessData *VaultAccessData) error {
142
142
}
143
143
144
144
v .logger .Debug ("deriving decryption key" )
145
- accessData .DBKey , err = v .deriveKey (masterPassword , keySalt )
145
+ credentials .DBKey , err = v .deriveKey (masterPassword , keySalt )
146
146
if err != nil {
147
147
return errors .Wrap (err , "could not derive database key from master password" )
148
148
}
@@ -151,14 +151,14 @@ func (v *Vault) generateAndSetDBKey(accessData *VaultAccessData) error {
151
151
}
152
152
153
153
// 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 {
155
155
v .logger .Debug ("generating database key" )
156
- if err := v .generateAndSetDBKey (accessData ); err != nil {
156
+ if err := v .generateAndSetDBKey (credentials ); err != nil {
157
157
return errors .Wrap (err , "could not generate database key" )
158
158
}
159
159
160
160
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 {
162
162
return errors .Wrap (err , "could not open encrypted database" )
163
163
}
164
164
0 commit comments