fixup! Fix go-gitea#16252 - Equivalent to go-gitea#16268

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath · Jun 27, 2021 · 88d9546 · 88d9546
1 parent 339a74b
commit 88d9546
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 22 deletions.
diff --git a/models/helper.go b/models/helper.go
@@ -4,6 +4,10 @@
 
 package models
 
+import (
+	jsoniter "github.com/json-iterator/go"
+)
+
 func keysInt64(m map[int64]struct{}) []int64 {
 	keys := make([]int64, 0, len(m))
 	for k := range m {
@@ -27,3 +31,14 @@ func valuesUser(m map[int64]*User) []*User {
 	}
 	return values
 }
+
+// JSONUnmarshalIgnoreErroneousBOM - due to a bug in xorm (see https://gitea.com/xorm/xorm/pulls/1957) - it's
+// possible that a Blob may gain an unwanted prefix of 0xff 0xfe.
+func JSONUnmarshalIgnoreErroneousBOM(bs []byte, v interface{}) error {
+	json := jsoniter.ConfigCompatibleWithStandardLibrary
+	err := json.Unmarshal(bs, &v)
+	if err != nil && len(bs) > 2 && bs[0] == 0xff && bs[1] == 0xfe {
+		err = json.Unmarshal(bs[2:], &v)
+	}
+	return err
+}
diff --git a/models/login_source.go b/models/login_source.go
@@ -11,7 +11,6 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
-	jsoniter "github.com/json-iterator/go"
 
 	"xorm.io/xorm"
 	"xorm.io/xorm/convert"
@@ -127,17 +126,6 @@ func Cell2Int64(val xorm.Cell) int64 {
 	return (*val).(int64)
 }
 
-// JsonUnmarshalIgnoreErroneousBOM - due to a bug in xorm (see https://gitea.com/xorm/xorm/pulls/1957) - it's
-// possible that a Blob may gain an unwanted prefix of 0xff 0xfe.
-func JsonUnmarshalIgnoreErroneousBOM(bs []byte, v interface{}) error {
-	json := jsoniter.ConfigCompatibleWithStandardLibrary
-	err := json.Unmarshal(bs, &v)
-	if err != nil && len(bs) > 2 && bs[0] == 0xff && bs[1] == 0xfe {
-		err = json.Unmarshal(bs[2:], &v)
-	}
-	return err
-}
-
 // BeforeSet is invoked from XORM before setting the value of a field of this object.
 func (source *LoginSource) BeforeSet(colName string, val xorm.Cell) {
 	if colName == "type" {

diff --git a/models/repo_unit.go b/models/repo_unit.go
@@ -28,7 +28,7 @@ type UnitConfig struct{}
 
 // FromDB fills up a UnitConfig from serialized format.
 func (cfg *UnitConfig) FromDB(bs []byte) error {
-	return JsonUnmarshalIgnoreErroneousBOM(bs, &cfg)
+	return JSONUnmarshalIgnoreErroneousBOM(bs, &cfg)
 }
 
 // ToDB exports a UnitConfig to a serialized format.
@@ -44,7 +44,7 @@ type ExternalWikiConfig struct {
 
 // FromDB fills up a ExternalWikiConfig from serialized format.
 func (cfg *ExternalWikiConfig) FromDB(bs []byte) error {
-	return JsonUnmarshalIgnoreErroneousBOM(bs, &cfg)
+	return JSONUnmarshalIgnoreErroneousBOM(bs, &cfg)
 }
 
 // ToDB exports a ExternalWikiConfig to a serialized format.
@@ -62,7 +62,7 @@ type ExternalTrackerConfig struct {
 
 // FromDB fills up a ExternalTrackerConfig from serialized format.
 func (cfg *ExternalTrackerConfig) FromDB(bs []byte) error {
-	return JsonUnmarshalIgnoreErroneousBOM(bs, &cfg)
+	return JSONUnmarshalIgnoreErroneousBOM(bs, &cfg)
 }
 
 // ToDB exports a ExternalTrackerConfig to a serialized format.
@@ -80,7 +80,7 @@ type IssuesConfig struct {
 
 // FromDB fills up a IssuesConfig from serialized format.
 func (cfg *IssuesConfig) FromDB(bs []byte) error {
-	return JsonUnmarshalIgnoreErroneousBOM(bs, &cfg)
+	return JSONUnmarshalIgnoreErroneousBOM(bs, &cfg)
 }
 
 // ToDB exports a IssuesConfig to a serialized format.
@@ -103,7 +103,7 @@ type PullRequestsConfig struct {
 
 // FromDB fills up a PullRequestsConfig from serialized format.
 func (cfg *PullRequestsConfig) FromDB(bs []byte) error {
-	return JsonUnmarshalIgnoreErroneousBOM(bs, &cfg)
+	return JSONUnmarshalIgnoreErroneousBOM(bs, &cfg)
 }
 
 // ToDB exports a PullRequestsConfig to a serialized format.

diff --git a/services/auth/source/ldap/source.go b/services/auth/source/ldap/source.go
@@ -69,7 +69,7 @@ func (source *Source) FromDB(bs []byte) error {
 		Source: source,
 	}
 
-	err := models.JsonUnmarshalIgnoreErroneousBOM(bs, &wrapped)
+	err := models.JSONUnmarshalIgnoreErroneousBOM(bs, &wrapped)
 	if err != nil {
 		return err
 	}

diff --git a/services/auth/source/oauth2/source.go b/services/auth/source/oauth2/source.go
@@ -32,7 +32,7 @@ type Source struct {
 
 // FromDB fills up an OAuth2Config from serialized format.
 func (source *Source) FromDB(bs []byte) error {
-	return models.JsonUnmarshalIgnoreErroneousBOM(bs, source)
+	return models.JSONUnmarshalIgnoreErroneousBOM(bs, source)
 }
 
 // ToDB exports an SMTPConfig to a serialized format.

diff --git a/services/auth/source/pam/source.go b/services/auth/source/pam/source.go
@@ -28,7 +28,7 @@ type Source struct {
 
 // FromDB fills up a PAMConfig from serialized format.
 func (source *Source) FromDB(bs []byte) error {
-	return models.JsonUnmarshalIgnoreErroneousBOM(bs, &source)
+	return models.JSONUnmarshalIgnoreErroneousBOM(bs, &source)
 }
 
 // ToDB exports a PAMConfig to a serialized format.

diff --git a/services/auth/source/smtp/source.go b/services/auth/source/smtp/source.go
@@ -32,7 +32,7 @@ type Source struct {
 
 // FromDB fills up an SMTPConfig from serialized format.
 func (source *Source) FromDB(bs []byte) error {
-	return models.JsonUnmarshalIgnoreErroneousBOM(bs, source)
+	return models.JSONUnmarshalIgnoreErroneousBOM(bs, source)
 }
 
 // ToDB exports an SMTPConfig to a serialized format.

diff --git a/services/auth/source/sspi/source.go b/services/auth/source/sspi/source.go
@@ -27,7 +27,7 @@ type Source struct {
 
 // FromDB fills up an SSPIConfig from serialized format.
 func (cfg *Source) FromDB(bs []byte) error {
-	return models.JsonUnmarshalIgnoreErroneousBOM(bs, cfg)
+	return models.JSONUnmarshalIgnoreErroneousBOM(bs, cfg)
 }
 
 // ToDB exports an SSPIConfig to a serialized format.