feat: migrate to gopenpgp v2

test/fakeapi/auth.go

@@ -147,6 +147,14 @@ func (api *FakePMAPI) AuthRefresh(token string) (*pmapi.Auth, error) {
 	return auth, nil
 }
 
+func (api *FakePMAPI) AuthSalt() (string, error) {
+	if err := api.checkInternetAndRecordCall(GET, "/keys/salts", nil); err != nil {
+		return "", err
+	}
+
+	return "", nil
+}
+
 func (api *FakePMAPI) Logout() {
 	api.controller.clientManager.LogoutClient(api.userID)
 }
@@ -164,5 +172,17 @@ func (api *FakePMAPI) DeleteAuth() error {
 }
 
 func (api *FakePMAPI) ClearData() {
+	if api.userKeyRing != nil {
+		api.userKeyRing.ClearPrivateParams()
+		api.userKeyRing = nil
+	}
+
+	for addrID, addr := range api.addrKeyRing {
+		if addr != nil {
+			addr.ClearPrivateParams()
+			delete(api.addrKeyRing, addrID)
+		}
+	}
+
 	api.unsetUser()
 }

test/fakeapi/fakeapi.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 	"github.com/sirupsen/logrus"
 )
@@ -33,12 +34,14 @@ type FakePMAPI struct {
 	controller       *Controller
 	eventIDGenerator idGenerator
 
-	auths     chan<- *pmapi.Auth
-	user      *pmapi.User
-	addresses *pmapi.AddressList
-	labels    []*pmapi.Label
-	messages  []*pmapi.Message
-	events    []*pmapi.Event
+	auths       chan<- *pmapi.Auth
+	user        *pmapi.User
+	userKeyRing *crypto.KeyRing
+	addresses   *pmapi.AddressList
+	addrKeyRing map[string]*crypto.KeyRing
+	labels      []*pmapi.Label
+	messages    []*pmapi.Message
+	events      []*pmapi.Event
 
 	// uid represents the API UID. It is the unique session ID.
 	uid, lastToken string
@@ -48,9 +51,10 @@ type FakePMAPI struct {
 
 func New(controller *Controller, userID string) *FakePMAPI {
 	fakePMAPI := &FakePMAPI{
-		controller: controller,
-		log:        logrus.WithField("pkg", "fakeapi"),
-		userID:     userID,
+		controller:  controller,
+		log:         logrus.WithField("pkg", "fakeapi"),
+		userID:      userID,
+		addrKeyRing: make(map[string]*crypto.KeyRing),
 	}
 
 	fakePMAPI.addEvent(&pmapi.Event{

test/fakeapi/user.go

@@ -18,7 +18,7 @@
 package fakeapi
 
 import (
-	pmcrypto "github.com/ProtonMail/gopenpgp/crypto"
+	"github.com/ProtonMail/gopenpgp/v2/crypto"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
 )
 
@@ -29,13 +29,37 @@ func (api *FakePMAPI) GetMailSettings() (pmapi.MailSettings, error) {
 	return pmapi.MailSettings{}, nil
 }
 
-func (api *FakePMAPI) Unlock(mailboxPassword string) (*pmcrypto.KeyRing, error) {
-	return &pmcrypto.KeyRing{
-		FirstKeyID: "key",
-	}, nil
+func (api *FakePMAPI) IsUnlocked() bool {
+	return api.userKeyRing != nil
 }
 
-func (api *FakePMAPI) UnlockAddresses(password []byte) error {
+func (api *FakePMAPI) Unlock(passphrase []byte) (err error) {
+	if api.userKeyRing != nil {
+		return
+	}
+
+	if api.userKeyRing, err = api.user.Keys.UnlockAll(passphrase, nil); err != nil {
+		return
+	}
+
+	for _, a := range *api.addresses {
+		if a.HasKeys == pmapi.MissingKeys {
+			continue
+		}
+
+		if api.addrKeyRing[a.ID] != nil {
+			continue
+		}
+
+		var kr *crypto.KeyRing
+
+		if kr, err = a.Keys.UnlockAll(passphrase, api.userKeyRing); err != nil {
+			return
+		}
+
+		api.addrKeyRing[a.ID] = kr
+	}
+
 	return nil
 }
 
@@ -47,6 +71,7 @@ func (api *FakePMAPI) UpdateUser() (*pmapi.User, error) {
 	if err := api.checkAndRecordCall(GET, "/users", nil); err != nil {
 		return nil, err
 	}
+
 	return api.user, nil
 }
 
@@ -84,8 +109,6 @@ func (api *FakePMAPI) Addresses() pmapi.AddressList {
 	return *api.addresses
 }
 
-func (api *FakePMAPI) KeyRingForAddressID(addrID string) (*pmcrypto.KeyRing, error) {
-	return &pmcrypto.KeyRing{
-		FirstKeyID: "key",
-	}, nil
+func (api *FakePMAPI) KeyRingForAddressID(addrID string) (*crypto.KeyRing, error) {
+	return api.addrKeyRing[addrID], nil
 }