Regression in media type suffix lookup

Introduced in Hugo 0.82.0.

Fixes #8406

diff --git a/media/mediaType.go b/media/mediaType.go
index 164ad5fd29277a276da3786956fbc7f1ae662b86..21a91524dd1e772370e5de047e50922e8b518812 100644 (file)
--- a/media/mediaType.go
+++ b/media/mediaType.go
@@ -305,7 +305,7 @@ func (t Types) GetBySuffix(suffix string) (tp Type, si SuffixInfo, found bool) {
 }
 
 func (m Type) hasSuffix(suffix string) bool {
-       return strings.Contains(m.suffixesCSV, suffix)
+       return strings.Contains(","+m.suffixesCSV+",", ","+suffix+",")
 }
 
 // GetByMainSubType gets a media type given a main and a sub type e.g. "text" and "plain".

diff --git a/media/mediaType_test.go b/media/mediaType_test.go
index 6bc42b3d4aebbbc05ffc20803893ec71a6d9c5dc..8d92ed1b23061966080757674b56300dd469501c 100644 (file)
--- a/media/mediaType_test.go
+++ b/media/mediaType_test.go
@@ -15,6 +15,7 @@ package media
 
 import (
        "encoding/json"
+       "sort"
        "testing"
 
        qt "github.com/frankban/quicktest"
@@ -98,11 +99,28 @@ func TestBySuffix(t *testing.T) {
 
 func TestGetFirstBySuffix(t *testing.T) {
        c := qt.New(t)
-       _, f, found := DefaultTypes.GetFirstBySuffix("xml")
-       c.Assert(found, qt.Equals, true)
-       c.Assert(f, qt.Equals, SuffixInfo{
-               Suffix:     "xml",
-               FullSuffix: ".xml"})
+
+       types := DefaultTypes
+
+       // Issue #8406
+       geoJSON := newMediaTypeWithMimeSuffix("application", "geo", "json", []string{"geojson", "gjson"})
+       types = append(types, geoJSON)
+       sort.Sort(types)
+
+       check := func(suffix string, expectedType Type) {
+               t, f, found := types.GetFirstBySuffix(suffix)
+               c.Assert(found, qt.Equals, true)
+               c.Assert(f, qt.Equals, SuffixInfo{
+                       Suffix:     suffix,
+                       FullSuffix: "." + suffix})
+               c.Assert(t, qt.Equals, expectedType)
+       }
+
+       check("js", JavascriptType)
+       check("json", JSONType)
+       check("geojson", geoJSON)
+       check("gjson", geoJSON)
+
 }
 
 func TestFromTypeString(t *testing.T) {