Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2026-02-13 12:28:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1141 Use attachment name from content type if not specified in content disposition

Browse Source
This commit is contained in:
Michal Horejsek
2021-04-19 08:21:18 +02:00
committed by Jakub Cuth
parent 4038752a9a
commit ee961ae4a8
4 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/message/parser.go
View File

@ -503,12 +503,15 @@ func parseAttachment(h message.Header) (*pmapi.Attachment, error) {
}
att.Header = mimeHeader
mimeType, _, err := h.ContentType()
mimeType, mimeTypeParams, err := h.ContentType()
if err != nil {
return nil, err
}
att.MIMEType = mimeType
// Prefer attachment name from filename param in content disposition.
// If not available, try to get it from name param in content type.
// Otherwise fallback to attachment.bin.
_, dispParams, dispErr := h.ContentDisposition()
if dispErr != nil {
ext, err := mime.ExtensionsByType(att.MIMEType)
@ -521,10 +524,12 @@ func parseAttachment(h message.Header) (*pmapi.Attachment, error) {
}
} else {
att.Name = dispParams["filename"]
if att.Name == "" {
att.Name = "attachment.bin"
}
}
if att.Name == "" {
att.Name = mimeTypeParams["name"]
}
if att.Name == "" {
att.Name = "attachment.bin"
}
// Only set ContentID if it should be inline;