Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-24 02:46:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1975: Migrate keychain secrets

Browse Source
This commit is contained in:
James Houlahan
2022-11-21 01:38:51 +01:00
parent 7ed8d76d84
commit 48dfdabaf4
10 changed files with 742 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/vault/helper.go
View File

@ -30,8 +30,6 @@ type Keychain struct {
}
func GetHelper(vaultDir string) (string, error) {
var keychain Keychain
filePath := filepath.Clean(filepath.Join(vaultDir, "keychain.json"))
if _, err := os.Stat(filePath); errors.Is(err, fs.ErrNotExist) {
@ -43,6 +41,8 @@ func GetHelper(vaultDir string) (string, error) {
return "", err
}
var keychain Keychain
if err := json.Unmarshal(b, &keychain); err != nil {
return "", err
}
@ -56,7 +56,5 @@ func SetHelper(vaultDir, helper string) error {
return err
}
filePath := filepath.Clean(filepath.Join(vaultDir, "keychain.json"))
return os.WriteFile(filePath, b, 0o600)
return os.WriteFile(filepath.Clean(filepath.Join(vaultDir, "keychain.json")), b, 0o600)
}

1
internal/vault/types_data.go
View File

@ -22,6 +22,7 @@ type Data struct {
Users []UserData
Cookies []byte
Certs Certs
Migrated bool
}
func newDefaultData(gluonDir string) Data {

10
internal/vault/vault.go
View File

@ -175,6 +175,16 @@ func (vault *Vault) DeleteUser(userID string) error {
})
}
func (vault *Vault) Migrated() bool {
return vault.get().Migrated
}
func (vault *Vault) SetMigrated() error {
return vault.mod(func(data *Data) {
data.Migrated = true
})
}
func (vault *Vault) Close() error {
vault.refLock.Lock()
defer vault.refLock.Unlock()