Use gitea.com/go-chi/binding

Author: lunny

cmd/web.go

@@ -134,7 +134,7 @@ func runWeb(ctx *cli.Context) error {
 			}
 		}
 		c := routes.NewChi()
-		c.Mount("/", routers.InstallRoutes())
+		c.Mount("/", routes.InstallRoutes())
 		err := listen(c, false)
 		select {
 		case <-graceful.GetManager().IsShutdown():

go.mod

@@ -5,6 +5,7 @@ go 1.14
 require (
 	code.gitea.io/gitea-vet v0.2.1
 	code.gitea.io/sdk/gitea v0.13.1
+	gitea.com/go-chi/binding v0.0.0-20201220025549-f1056649c959
 	gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27
 	gitea.com/lunny/levelqueue v0.3.0
 	gitea.com/macaron/binding v0.0.0-20190822013154-a5f53841ed2b
@@ -21,7 +22,6 @@ require (
 	github.com/PuerkitoBio/goquery v1.5.1
 	github.com/RoaringBitmap/roaring v0.5.5 // indirect
 	github.com/alecthomas/chroma v0.8.2
-	github.com/alexedwards/scs/v2 v2.4.0
 	github.com/andybalholm/brotli v1.0.1 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/blevesearch/bleve v1.0.14
@@ -89,7 +89,6 @@ require (
 	github.com/sergi/go-diff v1.1.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
-	github.com/smartystreets/goconvey v1.6.4
 	github.com/spf13/viper v1.7.1 // indirect
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/testify v1.6.1

go.sum

@@ -40,6 +40,8 @@ code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFj
 code.gitea.io/sdk/gitea v0.13.1 h1:Y7bpH2iO6Q0KhhMJfjP/LZ0AmiYITeRQlCD8b0oYqhk=
 code.gitea.io/sdk/gitea v0.13.1/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gitea.com/go-chi/binding v0.0.0-20201220025549-f1056649c959 h1:xcFbqqw8JUPTivvrwgDl5X1Chiby0gzASqbY5LmcOZ0=
+gitea.com/go-chi/binding v0.0.0-20201220025549-f1056649c959/go.mod h1:2F9XqNn+FUSSG6yXlEF/KRQk9Rf99eEqJkGBcrp6APM=
 gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27 h1:cdb1OTNXGLwQ55gg+9tIPWufdsnrHWcIq8Qs+j/E8JU=
 gitea.com/go-chi/session v0.0.0-20201218134809-7209fa084f27/go.mod h1:Ozg8IchVNb/Udg+ui39iHRYqVHSvf3C99ixdpLR8Vu0=
 gitea.com/lunny/levelqueue v0.3.0 h1:MHn1GuSZkxvVEDMyAPqlc7A3cOW+q8RcGhRgH/xtm6I=
@@ -128,8 +130,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/alexedwards/scs/v2 v2.4.0 h1:XfnMamKnvp1muJVNr1WzikQTclopsBXWZtzz0NBjOK0=
-github.com/alexedwards/scs/v2 v2.4.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gvmdl7h3RRj8=
 github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
 github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
 github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=

modules/context/default.go

@@ -5,12 +5,13 @@
 package context
 
 import (
+	"context"
 	"net/http"
 
 	"code.gitea.io/gitea/modules/auth"
-	"code.gitea.io/gitea/modules/middlewares/binding"
 	"code.gitea.io/gitea/modules/translation"
 
+	"gitea.com/go-chi/binding"
 	"gitea.com/go-chi/session"
 	"github.com/unrolled/render"
 )
@@ -98,3 +99,17 @@ func (ctx *DefaultContext) Flash(tp, v string) {
 	ctx.Data[tp] = v
 	ctx.Data["Flash"] = ctx.flash
 }
+
+var (
+	defaultContextKey interface{} = "default_context"
+)
+
+// WithDefaultContext set up install context in request
+func WithDefaultContext(req *http.Request, ctx *DefaultContext) *http.Request {
+	return req.WithContext(context.WithValue(req.Context(), defaultContextKey, ctx))
+}
+
+// GetDefaultContext retrieves install context from request
+func GetDefaultContext(req *http.Request) *DefaultContext {
+	return req.Context().Value(defaultContextKey).(*DefaultContext)
+}

modules/context/install.go

@@ -8,10 +8,10 @@ import (
 	"reflect"
 	"strings"
 
-	"code.gitea.io/gitea/modules/middlewares/binding"
 	"code.gitea.io/gitea/modules/translation"
 	"code.gitea.io/gitea/modules/validation"
 
+	"gitea.com/go-chi/binding"
 	"github.com/unknwon/com"
 )
 

modules/forms/forms.go

@@ -9,7 +9,8 @@ import (
 	"net/http"
 
 	"code.gitea.io/gitea/modules/context"
-	"code.gitea.io/gitea/modules/middlewares/binding"
+
+	"gitea.com/go-chi/binding"
 )
 
 // InstallForm form for installation page
@@ -63,6 +64,6 @@ type InstallForm struct {
 
 // Validate validates the fields
 func (f *InstallForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
-	ctx := context.GetInstallContext(req)
+	ctx := context.GetDefaultContext(req)
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }