blackroad-os/backroad
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix(db): needs encryption migration function fixed EE-2414 (#6494)

Browse Source 
* fix(db) NeedsEncryptionMigration EE-2414
* fix for case where we started encrypted and restore unencrypted.  We don't want to have two databases
* fix(db): handle decryption error EE-2466

Co-authored-by: Matt Hook <hookenz@gmail.com>
Co-authored-by: andres-portainer <andres-portainer@users.noreply.github.com>
This commit is contained in:
Prabhat Khera
2022-02-02 09:53:59 +13:00
committed by GitHub
parent ad7f87122d
commit a8d3cda3fa
7 changed files with 250 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/datastore/datastore.go
View File

@@ -40,9 +40,16 @@ func NewStore(storePath string, fileService portainer.FileService, connection po
func (store *Store) Open() (newStore bool, err error) {
newStore = true
encryptionReq := store.connection.NeedsEncryptionMigration()
encryptionReq, err := store.connection.NeedsEncryptionMigration()
if err != nil {
return false, err
}
if encryptionReq {
store.encryptDB()
err = store.encryptDB()
if err != nil {
return false, err
}
}
err = store.connection.Open()