mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-10-21 08:46:08 +00:00
4c59c8c768
Replace #23310, Close #19733 And fix various UI problems, including regressions from #22959 #22950 and more. ## SVG Detection The old regexp may mismatch non-SVG files. This PR adds new tests for those cases. ## UI Changes ### Before ![image](https://user-images.githubusercontent.com/2114189/222967716-f6ad8721-f46a-4a3f-9eb0-a89e488d3436.png) ![image](https://user-images.githubusercontent.com/2114189/222967780-8af8981a-e69d-4304-9dc4-0235582fa4f4.png) ### After ![image](https://user-images.githubusercontent.com/2114189/222967575-c21c23d4-0200-4e09-aac3-57895e853000.png) ![image](https://user-images.githubusercontent.com/2114189/222967585-8b8da262-bc96-441a-9851-8d3845f2659d.png) ![image](https://user-images.githubusercontent.com/2114189/222967595-58d9bea5-6df4-41fa-bf8a-86704117959d.png) ![image](https://user-images.githubusercontent.com/2114189/222967608-38757c1a-b8bd-4ebf-b7a8-3b30edb7f303.png) ![image](https://user-images.githubusercontent.com/2114189/222967623-9849a339-6fae-4484-8fa5-939e2fdacbf5.png) ![image](https://user-images.githubusercontent.com/2114189/222967633-4383d7dd-62ba-47a3-8c10-86f7ca7757ae.png) --------- Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
120 lines
4.9 KiB
Go
120 lines
4.9 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package typesniffer
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/base64"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestDetectContentTypeLongerThanSniffLen(t *testing.T) {
|
|
// Pre-condition: Shorter than sniffLen detects SVG.
|
|
assert.Equal(t, "image/svg+xml", DetectContentType([]byte(`<!-- Comment --><svg></svg>`)).contentType)
|
|
// Longer than sniffLen detects something else.
|
|
assert.NotEqual(t, "image/svg+xml", DetectContentType([]byte(`<!-- `+strings.Repeat("x", sniffLen)+` --><svg></svg>`)).contentType)
|
|
}
|
|
|
|
func TestIsTextFile(t *testing.T) {
|
|
assert.True(t, DetectContentType([]byte{}).IsText())
|
|
assert.True(t, DetectContentType([]byte("lorem ipsum")).IsText())
|
|
}
|
|
|
|
func TestIsSvgImage(t *testing.T) {
|
|
assert.True(t, DetectContentType([]byte("<svg></svg>")).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(" <svg></svg>")).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<svg width="100"></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?><svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<!-- Comment -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<!-- Multiple -->
|
|
<!-- Comments -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<!-- Multiline
|
|
Comment -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN"
|
|
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
|
|
<!-- Comment -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
|
|
<!-- Multiple -->
|
|
<!-- Comments -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
|
|
<!-- Multline
|
|
Comment -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
assert.True(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
|
<!-- Multline
|
|
Comment -->
|
|
<svg></svg>`)).IsSvgImage())
|
|
|
|
// the DetectContentType should work for incomplete data, because only beginning bytes are used for detection
|
|
assert.True(t, DetectContentType([]byte(`<svg>....`)).IsSvgImage())
|
|
|
|
assert.False(t, DetectContentType([]byte{}).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte("svg")).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte("<svgfoo></svgfoo>")).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte("text<svg></svg>")).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte("<html><body><svg></svg></body></html>")).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte(`<script>"<svg></svg>"</script>`)).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte(`<!-- <svg></svg> inside comment -->
|
|
<foo></foo>`)).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte(`<?xml version="1.0" encoding="UTF-8"?>
|
|
<!-- <svg></svg> inside comment -->
|
|
<foo></foo>`)).IsSvgImage())
|
|
|
|
assert.False(t, DetectContentType([]byte(`
|
|
<!-- comment1 -->
|
|
<div>
|
|
<!-- comment2 -->
|
|
<svg></svg>
|
|
</div>
|
|
`)).IsSvgImage())
|
|
|
|
assert.False(t, DetectContentType([]byte(`
|
|
<!-- comment1
|
|
-->
|
|
<div>
|
|
<!-- comment2
|
|
-->
|
|
<svg></svg>
|
|
</div>
|
|
`)).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte(`<html><body><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg></svg></body></html>`)).IsSvgImage())
|
|
assert.False(t, DetectContentType([]byte(`<html><body><?xml version="1.0" encoding="UTF-8"?><svg></svg></body></html>`)).IsSvgImage())
|
|
}
|
|
|
|
func TestIsPDF(t *testing.T) {
|
|
pdf, _ := base64.StdEncoding.DecodeString("JVBERi0xLjYKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0ZURlY29kZT4+CnN0cmVhbQp4nF3NPwsCMQwF8D2f4s2CNYk1baF0EHRwOwg4iJt/NsFb/PpevUE4Mjwe")
|
|
assert.True(t, DetectContentType(pdf).IsPDF())
|
|
assert.False(t, DetectContentType([]byte("plain text")).IsPDF())
|
|
}
|
|
|
|
func TestIsVideo(t *testing.T) {
|
|
mp4, _ := base64.StdEncoding.DecodeString("AAAAGGZ0eXBtcDQyAAAAAGlzb21tcDQyAAEI721vb3YAAABsbXZoZAAAAADaBlwX2gZcFwAAA+gA")
|
|
assert.True(t, DetectContentType(mp4).IsVideo())
|
|
assert.False(t, DetectContentType([]byte("plain text")).IsVideo())
|
|
}
|
|
|
|
func TestIsAudio(t *testing.T) {
|
|
mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl")
|
|
assert.True(t, DetectContentType(mp3).IsAudio())
|
|
assert.False(t, DetectContentType([]byte("plain text")).IsAudio())
|
|
}
|
|
|
|
func TestDetectContentTypeFromReader(t *testing.T) {
|
|
mp3, _ := base64.StdEncoding.DecodeString("SUQzBAAAAAABAFRYWFgAAAASAAADbWFqb3JfYnJhbmQAbXA0MgBUWFhYAAAAEQAAA21pbm9yX3Zl")
|
|
st, err := DetectContentTypeFromReader(bytes.NewReader(mp3))
|
|
assert.NoError(t, err)
|
|
assert.True(t, st.IsAudio())
|
|
}
|