luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imagebundler: treat octet streams with svg signature as svg mimetypes

Browse source
This commit is contained in:
Alexander Wang 2025-02-21 08:42:46 -08:00
parent 7741382f92
commit 36282393fd
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/imgbundler/imgbundler.go
View file

@ -166,7 +166,7 @@ func worker(ctx context.Context, l simplelog.Logger, inputPath string, href []by
var err error var err error
if isRemote { if isRemote {
l.Debug(fmt.Sprintf("fetching %s remotely", string(href))) l.Debug(fmt.Sprintf("fetching %s remotely", string(href)))
buf, mimeType, err = httpGet(ctx, html.UnescapeString(string(href))) buf, mimeType, err = httpGet(ctx, l, html.UnescapeString(string(href)))
} else { } else {
l.Debug(fmt.Sprintf("reading %s from disk", string(href))) l.Debug(fmt.Sprintf("reading %s from disk", string(href)))
path := html.UnescapeString(string(href)) path := html.UnescapeString(string(href))
@ -181,8 +181,15 @@ func worker(ctx context.Context, l simplelog.Logger, inputPath string, href []by
if mimeType == "" { if mimeType == "" {
mimeType = sniffMimeType(href, buf, isRemote) mimeType = sniffMimeType(href, buf, isRemote)
l.Debug(fmt.Sprintf("no mimetype provided - sniffed MIME type for %s: %s", string(href), mimeType))
} else {
l.Debug(fmt.Sprintf("mimetype provided for %s: %s", string(href), mimeType))
} }
mimeType = strings.Replace(mimeType, "text/xml", "image/svg+xml", 1) mimeType = strings.Replace(mimeType, "text/xml", "image/svg+xml", 1)
if mimeType == "application/octet-stream" && bytes.Contains(buf, []byte("<svg")) {
l.Debug(fmt.Sprintf("octet-stream mimetype replaced with svg for %s", string(href)))
mimeType = "image/svg+xml"
}
b64 := base64.StdEncoding.EncodeToString(buf) b64 := base64.StdEncoding.EncodeToString(buf)
out := []byte(fmt.Sprintf(`<image href="data:%s;base64,%s"`, mimeType, b64)) out := []byte(fmt.Sprintf(`<image href="data:%s;base64,%s"`, mimeType, b64))
@ -194,7 +201,7 @@ func worker(ctx context.Context, l simplelog.Logger, inputPath string, href []by
var httpClient = &http.Client{} var httpClient = &http.Client{}
func httpGet(ctx context.Context, href string) ([]byte, string, error) { func httpGet(ctx context.Context, l simplelog.Logger, href string) ([]byte, string, error) {
ctx, cancel := context.WithTimeout(ctx, time.Minute) ctx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel() defer cancel()
@ -208,6 +215,7 @@ func httpGet(ctx context.Context, href string) ([]byte, string, error) {
return nil, "", err return nil, "", err
} }
defer resp.Body.Close() defer resp.Body.Close()
l.Debug(fmt.Sprintf("fetched %s remotely - response code %v", string(href), resp.StatusCode))
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
return nil, "", fmt.Errorf("expected status 200 but got %d %s", resp.StatusCode, resp.Status) return nil, "", fmt.Errorf("expected status 200 but got %d %s", resp.StatusCode, resp.Status)
} }
@ -216,7 +224,10 @@ func httpGet(ctx context.Context, href string) ([]byte, string, error) {
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
return buf, resp.Header.Get("Content-Type"), nil contentType := resp.Header.Get("Content-Type")
l.Debug(fmt.Sprintf("fetched content type: %s, Content length: %d bytes", contentType, len(buf)))
return buf, contentType, nil
} }
// sniffMimeType sniffs the mime type of href based on its file extension and contents. // sniffMimeType sniffs the mime type of href based on its file extension and contents.