[CHORE] Use forked `binding` library

- Use the forked [binding](https://code.forgejo.org/go-chi/binding) library. This library has two benefits, it removes the usage of `github.com/goccy/go-json` (has no benefit as the minimo library is also using it). It adds the `TrimSpace` feature, which will during the binding part trim the spaces around the value it got from the form, this is done before validation.
2024-11-05 21:40:44 +01:00 · 2024-11-05 21:40:44 +01:00 · 310376525b
parent 25c7c531f5
commit 310376525b
30 changed files with 35 additions and 35 deletions
--- a/assets/go-licenses.json
+++ b/assets/go-licenses.json
--- a/go.mod
+++ b/go.mod
@ -6,6 +6,7 @@ require (
 	code.forgejo.org/f3/gof3/v3 v3.7.0
 	code.forgejo.org/forgejo-contrib/go-libravatar v0.0.0-20191008002943-06d1c002b251
 	code.forgejo.org/forgejo/reply v1.0.2
+	code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720
 	code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d
 	code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5
 	code.forgejo.org/go-chi/session v0.0.0-20241017103059-2a992261fc26
@ -14,7 +15,6 @@ require (
 	code.gitea.io/sdk/gitea v0.17.1
 	codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
 	connectrpc.com/connect v1.17.0
-	gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed
 	gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4
 	github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
--- a/go.sum
+++ b/go.sum
@ -10,6 +10,8 @@ code.forgejo.org/forgejo/archiver/v3 v3.5.1 h1:UmmbA7D5550uf71SQjarmrn6yKwOGxtEj
 code.forgejo.org/forgejo/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4=
 code.forgejo.org/forgejo/reply v1.0.2 h1:dMhQCHV6/O3L5CLWNTol+dNzDAuyCK88z4J/lCdgFuQ=
 code.forgejo.org/forgejo/reply v1.0.2/go.mod h1:RyZUfzQLc+fuLIGjTSQWDAJWPiL4WtKXB/FifT5fM7U=
+code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720 h1:DDdvrdov1a6HK0xiJIUTfGh1RpKP0prkHi2guxhDKIU=
+code.forgejo.org/go-chi/binding v0.0.0-20241105210225-1f8bf5136720/go.mod h1:fWwqaHj0H1/KeCpBqdvKunflq8pYfciEHI5v3UUeE2E=
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d h1:nOu/2GX571t4intmtfvpctS148OqsBYrGUySVm93ifc=
 code.forgejo.org/go-chi/cache v0.0.0-20240912103640-dcb08fba860d/go.mod h1:OVlZ/TqDYJ+RUJ+R+J+OLxtlyjo3pbjBeK7LAWAB+Vk=
 code.forgejo.org/go-chi/captcha v0.0.0-20240905153133-df43b9250ed5 h1:A7P1liXCpJBHEJ5KIDsF0ujnQ8FQ/aX1UixTW0vGrDQ=
@ -32,8 +34,6 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg=
 git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs=
-gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed h1:EZZBtilMLSZNWtHHcgq2mt6NSGhJSZBuduAlinMEmso=
-gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed/go.mod h1:E3i3cgB04dDx0v3CytCgRTTn9Z/9x891aet3r456RVw=
 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4 h1:IFT+hup2xejHqdhS7keYWioqfmxdnfblFDTGoOwcZ+o=
 gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
--- a/modules/issue/template/template.go
+++ b/modules/issue/template/template.go
@ -13,7 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/container"
 	api "code.gitea.io/gitea/modules/structs"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // Validate checks whether an IssueTemplate is considered valid, and returns the first error
--- a/modules/validation/binding.go
+++ b/modules/validation/binding.go
@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/git"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/gobwas/glob"
 )

--- a/modules/validation/binding_test.go
+++ b/modules/validation/binding_test.go
@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	chi "github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 )
--- a/modules/validation/glob_pattern_test.go
+++ b/modules/validation/glob_pattern_test.go
@ -6,7 +6,7 @@ package validation
 import (
 	"testing"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/gobwas/glob"
 )

--- a/modules/validation/refname_test.go
+++ b/modules/validation/refname_test.go
@ -6,7 +6,7 @@ package validation
 import (
 	"testing"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 var gitRefNameValidationTestCases = []validationTestCase{
--- a/modules/validation/regex_pattern_test.go
+++ b/modules/validation/regex_pattern_test.go
@ -7,7 +7,7 @@ import (
 	"regexp"
 	"testing"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 func getRegexPatternErrorString(pattern string) string {
--- a/modules/validation/validurl_test.go
+++ b/modules/validation/validurl_test.go
@ -6,7 +6,7 @@ package validation
 import (
 	"testing"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 var urlValidationTestCases = []validationTestCase{
--- a/modules/web/middleware/binding.go
+++ b/modules/web/middleware/binding.go
@ -13,7 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // Form form binding interface
--- a/modules/web/route.go
+++ b/modules/web/route.go
@ -9,7 +9,7 @@ import (

 	"code.gitea.io/gitea/modules/web/middleware"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/go-chi/chi/v5"
 )

--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@ -103,7 +103,7 @@ import (

 	_ "code.gitea.io/gitea/routers/api/v1/swagger" // for swagger generation

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 func sudo() func(ctx *context.APIContext) {
--- a/routers/private/internal.go
+++ b/routers/private/internal.go
@ -15,7 +15,7 @@ import (
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	chi_middleware "github.com/go-chi/chi/v5/middleware"
 )

--- a/routers/web/auth/oauth.go
+++ b/routers/web/auth/oauth.go
@ -40,7 +40,7 @@ import (
 	remote_service "code.gitea.io/gitea/services/remote"
 	user_service "code.gitea.io/gitea/services/user"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/markbates/goth"
 	"github.com/markbates/goth/gothic"
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@ -58,7 +58,7 @@ import (
 	pull_service "code.gitea.io/gitea/services/pull"
 	repo_service "code.gitea.io/gitea/services/repository"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 const (
--- a/routers/web/repo/setting/webhook.go
+++ b/routers/web/repo/setting/webhook.go
@ -28,7 +28,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	webhook_service "code.gitea.io/gitea/services/webhook"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 const (
--- a/services/forms/admin.go
+++ b/services/forms/admin.go
@ -10,7 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // AdminCreateUserForm form for admin to create user
--- a/services/forms/auth_form.go
+++ b/services/forms/auth_form.go
@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // AuthenticationForm form for authentication
--- a/services/forms/org.go
+++ b/services/forms/org.go
@ -11,7 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // ________                            .__                __  .__
--- a/services/forms/package_form.go
+++ b/services/forms/package_form.go
@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 type PackageCleanupRuleForm struct {
--- a/services/forms/repo_branch_form.go
+++ b/services/forms/repo_branch_form.go
@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // NewBranchForm form for creating a new branch
--- a/services/forms/repo_form.go
+++ b/services/forms/repo_form.go
@ -21,7 +21,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // CreateRepoForm form for creating repository
--- a/services/forms/repo_tag_form.go
+++ b/services/forms/repo_tag_form.go
@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // ProtectTagForm form for changing protected tag settings
--- a/services/forms/runner.go
+++ b/services/forms/runner.go
@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // EditRunnerForm form for admin to create runner
--- a/services/forms/user_form.go
+++ b/services/forms/user_form.go
@ -16,7 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // InstallForm form for installation page
--- a/services/forms/user_form_auth_openid.go
+++ b/services/forms/user_form_auth_openid.go
@ -9,7 +9,7 @@ import (
 	"code.gitea.io/gitea/modules/web/middleware"
 	"code.gitea.io/gitea/services/context"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 // SignInOpenIDForm form for signing in with OpenID
--- a/services/webhook/discord.go
+++ b/services/webhook/discord.go
@ -26,7 +26,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 type discordHandler struct{}
--- a/services/webhook/slack.go
+++ b/services/webhook/slack.go
@ -22,7 +22,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 )

 type slackHandler struct{}
--- a/services/webhook/sourcehut/builds.go
+++ b/services/webhook/sourcehut/builds.go
@ -24,7 +24,7 @@ import (
 	"code.gitea.io/gitea/services/forms"
 	"code.gitea.io/gitea/services/webhook/shared"

-	"gitea.com/go-chi/binding"
+	"code.forgejo.org/go-chi/binding"
 	"gopkg.in/yaml.v3"
 )