ProtonMail
/
proton-bridge
mirror of https://github.com/ProtonMail/proton-bridge
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(GODT-3214): encrypt only with primary key.

This commit is contained in:
Jakub 2024-02-27 14:43:06 +01:00 committed by Jakub Cuth
parent c9b6cc162b
commit 9b1feed68b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/services/imapservice/connector.go
View File

@ -677,13 +677,18 @@ func (s *Connector) importMessage(
} }
if err := s.identityState.WithAddrKR(s.addrID, func(_, addrKR *crypto.KeyRing) error { if err := s.identityState.WithAddrKR(s.addrID, func(_, addrKR *crypto.KeyRing) error {
primaryKey, errKey := addrKR.FirstKey()
if errKey != nil {
return fmt.Errorf("failed to get primary key for import: %w", errKey)
}
var messageID string var messageID string
p, err2 := parser.New(bytes.NewReader(literal)) p, err2 := parser.New(bytes.NewReader(literal))
if err2 != nil { if err2 != nil {
return fmt.Errorf("failed to parse literal: %w", err2) return fmt.Errorf("failed to parse literal: %w", err2)
} }
if slices.Contains(labelIDs, proton.DraftsLabel) { if slices.Contains(labelIDs, proton.DraftsLabel) {
msg, err := s.createDraftWithParser(ctx, p, addrKR, addr) msg, err := s.createDraftWithParser(ctx, p, primaryKey, addr)
if err != nil { if err != nil {
return fmt.Errorf("failed to create draft: %w", err) return fmt.Errorf("failed to create draft: %w", err)
} }
@ -699,7 +704,7 @@ func (s *Connector) importMessage(
} }
literal = buf.Bytes() literal = buf.Bytes()
} }
str, err := s.client.ImportMessages(ctx, addrKR, 1, 1, []proton.ImportReq{{ str, err := s.client.ImportMessages(ctx, primaryKey, 1, 1, []proton.ImportReq{{
Metadata: proton.ImportMetadata{ Metadata: proton.ImportMetadata{
AddressID: s.addrID, AddressID: s.addrID,
LabelIDs: labelIDs, LabelIDs: labelIDs,
@ -726,7 +731,7 @@ func (s *Connector) importMessage(
return fmt.Errorf("failed to fetch message: %w", err) return fmt.Errorf("failed to fetch message: %w", err)
} }
if literal, err = message.DecryptAndBuildRFC822(addrKR, full.Message, full.AttData, defaultMessageJobOpts()); err != nil { if literal, err = message.DecryptAndBuildRFC822(primaryKey, full.Message, full.AttData, defaultMessageJobOpts()); err != nil {
return fmt.Errorf("failed to build message: %w", err) return fmt.Errorf("failed to build message: %w", err)
} }