Skip to content

Commit 8e845df

Browse files
lunnylunny
committed
Move middlewares to web/middleware
1 parent 41c0776 commit 8e845df

23 files changed

+117
-117
lines changed

‎modules/auth/sso/interface.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/models"
11-
"code.gitea.io/gitea/modules/middlewares"
1211
"code.gitea.io/gitea/modules/session"
12+
"code.gitea.io/gitea/modules/web/middleware"
1313
)
1414

1515
// DataStore represents a data store
16-
type DataStore middlewares.DataStore
16+
type DataStore middleware.DataStore
1717

1818
// SessionStore represents a session store
1919
type SessionStore session.Store

‎modules/auth/sso/sso.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
"code.gitea.io/gitea/models"
1515
"code.gitea.io/gitea/modules/log"
16-
"code.gitea.io/gitea/modules/middlewares"
1716
"code.gitea.io/gitea/modules/setting"
17+
"code.gitea.io/gitea/modules/web/middleware"
1818
)
1919

2020
// ssoMethods contains the list of SSO authentication plugins in the order they are expected to be
@@ -131,16 +131,16 @@ func handleSignIn(resp http.ResponseWriter, req *http.Request, sess SessionStore
131131
// Language setting of the user overwrites the one previously set
132132
// If the user does not have a locale set, we save the current one.
133133
if len(user.Language) == 0 {
134-
lc := middlewares.Locale(resp, req)
134+
lc := middleware.Locale(resp, req)
135135
user.Language = lc.Language()
136136
if err := models.UpdateUserCols(user, "language"); err != nil {
137137
log.Error(fmt.Sprintf("Error updating user language [user: %d, locale: %s]", user.ID, user.Language))
138138
return
139139
}
140140
}
141141

142-
middlewares.SetCookie(resp, "lang", user.Language, nil, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true)
142+
middleware.SetCookie(resp, "lang", user.Language, nil, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true)
143143

144144
// Clear whatever CSRF has right now, force to generate a new one
145-
middlewares.SetCookie(resp, setting.CSRFCookieName, "", -1, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true)
145+
middleware.SetCookie(resp, setting.CSRFCookieName, "", -1, setting.AppSubURL, setting.SessionConfig.Domain, setting.SessionConfig.Secure, true)
146146
}

‎modules/context/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"code.gitea.io/gitea/modules/auth/sso"
1818
"code.gitea.io/gitea/modules/git"
1919
"code.gitea.io/gitea/modules/log"
20-
"code.gitea.io/gitea/modules/middlewares"
2120
"code.gitea.io/gitea/modules/setting"
21+
"code.gitea.io/gitea/modules/web/middleware"
2222

2323
"gitea.com/go-chi/session"
2424
)
@@ -224,7 +224,7 @@ func APIContexter() func(http.Handler) http.Handler {
224224
return func(next http.Handler) http.Handler {
225225

226226
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
227-
var locale = middlewares.Locale(w, req)
227+
var locale = middleware.Locale(w, req)
228228
var ctx = APIContext{
229229
Context: &Context{
230230
Resp: NewResponse(w),

‎modules/context/context.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"code.gitea.io/gitea/modules/base"
2626
mc "code.gitea.io/gitea/modules/cache"
2727
"code.gitea.io/gitea/modules/log"
28-
"code.gitea.io/gitea/modules/middlewares"
2928
"code.gitea.io/gitea/modules/setting"
3029
"code.gitea.io/gitea/modules/templates"
3130
"code.gitea.io/gitea/modules/translation"
3231
"code.gitea.io/gitea/modules/util"
32+
"code.gitea.io/gitea/modules/web/middleware"
3333

3434
"gitea.com/go-chi/cache"
3535
"gitea.com/go-chi/session"
@@ -55,7 +55,7 @@ type Context struct {
5555
translation.Locale
5656
Cache cache.Cache
5757
csrf CSRF
58-
Flash *middlewares.Flash
58+
Flash *middleware.Flash
5959
Session session.Store
6060

6161
Link string // current request URL
@@ -197,7 +197,7 @@ func (ctx *Context) HTMLString(name string, data interface{}) (string, error) {
197197
// RenderWithErr used for page has form validation but need to prompt error to users.
198198
func (ctx *Context) RenderWithErr(msg string, tpl base.TplName, form interface{}) {
199199
if form != nil {
200-
middlewares.AssignForm(form, ctx.Data)
200+
middleware.AssignForm(form, ctx.Data)
201201
}
202202
ctx.Flash.ErrorMsg = msg
203203
ctx.Data["Flash"] = ctx.Flash
@@ -375,12 +375,12 @@ func (ctx *Context) Redirect(location string, status ...int) {
375375

376376
// SetCookie set cookies to web browser
377377
func (ctx *Context) SetCookie(name string, value string, others ...interface{}) {
378-
middlewares.SetCookie(ctx.Resp, name, value, others...)
378+
middleware.SetCookie(ctx.Resp, name, value, others...)
379379
}
380380

381381
// GetCookie returns given cookie value from request header.
382382
func (ctx *Context) GetCookie(name string) string {
383-
return middlewares.GetCookie(ctx.Req, name)
383+
return middleware.GetCookie(ctx.Req, name)
384384
}
385385

386386
// GetSuperSecureCookie returns given cookie value from request header with secret string.
@@ -505,7 +505,7 @@ func Contexter() func(next http.Handler) http.Handler {
505505

506506
return func(next http.Handler) http.Handler {
507507
return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
508-
var locale = middlewares.Locale(resp, req)
508+
var locale = middleware.Locale(resp, req)
509509
var startTime = time.Now()
510510
var link = setting.AppSubURL + strings.TrimSuffix(req.URL.EscapedPath(), "/")
511511
var ctx = Context{
@@ -536,7 +536,7 @@ func Contexter() func(next http.Handler) http.Handler {
536536
flashCookie := ctx.GetCookie("macaron_flash")
537537
vals, _ := url.ParseQuery(flashCookie)
538538
if len(vals) > 0 {
539-
f := &middlewares.Flash{
539+
f := &middleware.Flash{
540540
DataStore: &ctx,
541541
Values: vals,
542542
ErrorMsg: vals.Get("error"),
@@ -547,7 +547,7 @@ func Contexter() func(next http.Handler) http.Handler {
547547
ctx.Data["Flash"] = f
548548
}
549549

550-
f := &middlewares.Flash{
550+
f := &middleware.Flash{
551551
DataStore: &ctx,
552552
Values: url.Values{},
553553
ErrorMsg: "",
@@ -557,22 +557,22 @@ func Contexter() func(next http.Handler) http.Handler {
557557
}
558558
ctx.Resp.Before(func(resp ResponseWriter) {
559559
if flash := f.Encode(); len(flash) > 0 {
560-
middlewares.SetCookie(resp, "macaron_flash", flash, 0,
560+
middleware.SetCookie(resp, "macaron_flash", flash, 0,
561561
setting.SessionConfig.CookiePath,
562-
middlewares.Domain(setting.SessionConfig.Domain),
563-
middlewares.HTTPOnly(true),
564-
middlewares.Secure(setting.SessionConfig.Secure),
562+
middleware.Domain(setting.SessionConfig.Domain),
563+
middleware.HTTPOnly(true),
564+
middleware.Secure(setting.SessionConfig.Secure),
565565
//middlewares.SameSite(opt.SameSite), FIXME: we need a samesite config
566566
)
567567
return
568568
}
569569

570570
ctx.SetCookie("macaron_flash", "", -1,
571571
setting.SessionConfig.CookiePath,
572-
middlewares.Domain(setting.SessionConfig.Domain),
573-
middlewares.HTTPOnly(true),
574-
middlewares.Secure(setting.SessionConfig.Secure),
575-
//middlewares.SameSite(), FIXME: we need a samesite config
572+
middleware.Domain(setting.SessionConfig.Domain),
573+
middleware.HTTPOnly(true),
574+
middleware.Secure(setting.SessionConfig.Secure),
575+
//middleware.SameSite(), FIXME: we need a samesite config
576576
)
577577
})
578578

‎modules/forms/admin.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/middlewares"
11+
"code.gitea.io/gitea/modules/web/middleware"
1212

1313
"gitea.com/go-chi/binding"
1414
)
@@ -27,7 +27,7 @@ type AdminCreateUserForm struct {
2727
// Validate validates form fields
2828
func (f *AdminCreateUserForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
2929
ctx := context.GetContext(req)
30-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
30+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
3131
}
3232

3333
// AdminEditUserForm form for admin to create user
@@ -54,7 +54,7 @@ type AdminEditUserForm struct {
5454
// Validate validates form fields
5555
func (f *AdminEditUserForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
5656
ctx := context.GetContext(req)
57-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
57+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
5858
}
5959

6060
// AdminDashboardForm form for admin dashboard operations
@@ -66,5 +66,5 @@ type AdminDashboardForm struct {
6666
// Validate validates form fields
6767
func (f *AdminDashboardForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
6868
ctx := context.GetContext(req)
69-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
69+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
7070
}

‎modules/forms/auth_form.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/middlewares"
11+
"code.gitea.io/gitea/modules/web/middleware"
1212

1313
"gitea.com/go-chi/binding"
1414
)
@@ -71,5 +71,5 @@ type AuthenticationForm struct {
7171
// Validate validates fields
7272
func (f *AuthenticationForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
7373
ctx := context.GetContext(req)
74-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
74+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
7575
}

‎modules/forms/org.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/context"
13-
"code.gitea.io/gitea/modules/middlewares"
1413
"code.gitea.io/gitea/modules/structs"
14+
"code.gitea.io/gitea/modules/web/middleware"
1515

1616
"gitea.com/go-chi/binding"
1717
)
@@ -33,7 +33,7 @@ type CreateOrgForm struct {
3333
// Validate validates the fields
3434
func (f *CreateOrgForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
3535
ctx := context.GetContext(req)
36-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
36+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
3737
}
3838

3939
// UpdateOrgSettingForm form for updating organization settings
@@ -51,7 +51,7 @@ type UpdateOrgSettingForm struct {
5151
// Validate validates the fields
5252
func (f *UpdateOrgSettingForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
5353
ctx := context.GetContext(req)
54-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
54+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
5555
}
5656

5757
// ___________
@@ -74,5 +74,5 @@ type CreateTeamForm struct {
7474
// Validate validates the fields
7575
func (f *CreateTeamForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
7676
ctx := context.GetContext(req)
77-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
77+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
7878
}

‎modules/forms/repo_branch_form.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99

1010
"code.gitea.io/gitea/modules/context"
11-
"code.gitea.io/gitea/modules/middlewares"
11+
"code.gitea.io/gitea/modules/web/middleware"
1212

1313
"gitea.com/go-chi/binding"
1414
)
@@ -21,5 +21,5 @@ type NewBranchForm struct {
2121
// Validate validates the fields
2222
func (f *NewBranchForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
2323
ctx := context.GetContext(req)
24-
return middlewares.Validate(errs, ctx.Data, f, ctx.Locale)
24+
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
2525
}

0 commit comments

Comments
 (0)