mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-11 13:16:53 +00:00
0ef9c9c9c9
Rewrite the vault to have one RWlock rather then two separate locks for data and reference counts. In certain circumstance, it could be possible that that different requests could end up in undefined states if a user got deleted successfully while at he same time another goroutine/thread is loading the given user. While I have not been able to reproduce this in a test, restricting the access scope to one lock rather than two, should avoid corner cases where logic code is executing outside of the lock scope.
42 lines
1.1 KiB
Go
42 lines
1.1 KiB
Go
// Copyright (c) 2023 Proton AG
|
|
//
|
|
// This file is part of Proton Mail Bridge.
|
|
//
|
|
// Proton Mail Bridge is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Proton Mail Bridge is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
//go:build debug
|
|
|
|
package vault
|
|
|
|
import (
|
|
"encoding/json"
|
|
)
|
|
|
|
func (vault *Vault) ImportJSON(dec []byte) {
|
|
vault.modSafe(func(data *Data) {
|
|
if err := json.Unmarshal(dec, data); err != nil {
|
|
panic(err)
|
|
}
|
|
})
|
|
}
|
|
|
|
func (vault *Vault) ExportJSON() []byte {
|
|
enc, err := json.MarshalIndent(vault.getSafe(), "", " ")
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return enc
|
|
}
|