yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1515: Do not crash when bridge users got disconnected.

Browse Source
This commit is contained in:
Jakub
2022-02-22 16:41:32 +01:00
parent aa8cc3fc4b
commit 63379001e3
5 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/context/context.go
View File

@ -172,3 +172,7 @@ func (ctx *TestContext) MessagePreparationStarted(username string) {
func (ctx *TestContext) MessagePreparationFinished(username string) {
ctx.pmapiController.UnlockEvents(username)
}
func (ctx *TestContext) CredentialsFailsOnWrite(shouldFail bool) {
ctx.credStore.(*fakeCredStore).failOnWrite = shouldFail
}

24
test/context/credentials.go
View File

@ -21,6 +21,7 @@ import (
"strings"
"github.com/ProtonMail/proton-bridge/internal/users/credentials"
"github.com/pkg/errors"
)
// bridgePassword is password to be used for IMAP or SMTP under tests.
@ -28,6 +29,8 @@ const bridgePassword = "bridgepassword"
type fakeCredStore struct {
credentials map[string]*credentials.Credentials
failOnWrite bool
}
// newFakeCredStore returns a fake credentials store (optionally configured with the given credentials).
@ -52,6 +55,9 @@ func (c *fakeCredStore) List() (userIDs []string, err error) {
}
func (c *fakeCredStore) Add(userID, userName, uid, ref string, mailboxPassword []byte, emails []string) (*credentials.Credentials, error) {
if c.failOnWrite {
return nil, errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
bridgePassword := bridgePassword
if c, ok := c.credentials[userID]; ok {
bridgePassword = c.BridgePassword
@ -73,14 +79,23 @@ func (c *fakeCredStore) Get(userID string) (*credentials.Credentials, error) {
}
func (c *fakeCredStore) SwitchAddressMode(userID string) (*credentials.Credentials, error) {
if c.failOnWrite {
return nil, errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
return c.credentials[userID], nil
}
func (c *fakeCredStore) UpdateEmails(userID string, emails []string) (*credentials.Credentials, error) {
if c.failOnWrite {
return nil, errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
return c.credentials[userID], nil
}
func (c *fakeCredStore) UpdatePassword(userID string, password []byte) (*credentials.Credentials, error) {
if c.failOnWrite {
return nil, errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
creds, err := c.Get(userID)
if err != nil {
return nil, err
@ -90,6 +105,9 @@ func (c *fakeCredStore) UpdatePassword(userID string, password []byte) (*credent
}
func (c *fakeCredStore) UpdateToken(userID, uid, ref string) (*credentials.Credentials, error) {
if c.failOnWrite {
return nil, errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
creds, err := c.Get(userID)
if err != nil {
return nil, err
@ -99,12 +117,18 @@ func (c *fakeCredStore) UpdateToken(userID, uid, ref string) (*credentials.Crede
}
func (c *fakeCredStore) Logout(userID string) (*credentials.Credentials, error) {
if c.failOnWrite {
return nil, errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
c.credentials[userID].APIToken = ""
c.credentials[userID].MailboxPassword = []byte{}
return c.credentials[userID], nil
}
func (c *fakeCredStore) Delete(userID string) error {
if c.failOnWrite {
return errors.New("An invalid attempt to change the owner of an item. (-25244)")
}
delete(c.credentials, userID)
return nil
}