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

fix(GODT-2797): encode attached key name and use same pubkey name as web-app.

This commit is contained in:
Jakub 2023-11-23 14:54:20 +01:00
parent e1723fc24b
commit eaba6b6363
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/services/smtp/smtp.go
View File

@ -138,7 +138,11 @@ func (s *Service) smtpSendMail(ctx context.Context, authID string, from string,
return fmt.Errorf("failed to get public key: %w", err)
}
parser.AttachPublicKey(pubKey, fmt.Sprintf("publickey - %v - %v", addrKR.GetIdentities()[0].Name, key.GetFingerprint()[:8]))
parser.AttachPublicKey(pubKey, fmt.Sprintf(
"publickey - %v - 0x%v",
addrKR.GetIdentities()[0].Name,
strings.ToUpper(key.GetFingerprint()[:8]),
))
}
// Parse the message we want to send (after we have attached the public key).

10
pkg/message/parser/parser.go
View File

@ -18,8 +18,8 @@
package parser
import (
"fmt"
"io"
"mime"
"strings"
"github.com/emersion/go-message"
@ -70,10 +70,12 @@ func (p *Parser) Root() *Part {
}
func (p *Parser) AttachPublicKey(key, keyName string) {
h := message.Header{}
encName := mime.QEncoding.Encode("utf-8", keyName+".asc")
params := map[string]string{"name": encName, "filename": encName}
h.Set("Content-Type", fmt.Sprintf(`application/pgp-keys; name="%v.asc"; filename="%v.asc"`, keyName, keyName))
h.Set("Content-Disposition", fmt.Sprintf(`attachment; name="%v.asc"; filename="%v.asc"`, keyName, keyName))
h := message.Header{}
h.Set("Content-Type", mime.FormatMediaType("application/pgp-keys", params))
h.Set("Content-Disposition", mime.FormatMediaType("attachment", params))
h.Set("Content-Transfer-Encoding", "base64")
p.Root().AddChild(&Part{