Skip to content

Commit 5e20fd6

Browse files
lunny6543
lunny
and
6543
authored
Move middlewares to web/middleware (#14480)
Co-authored-by: 6543 <6543@obermui.de>
1 parent 0e0424c commit 5e20fd6

26 files changed

+126
-126
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/oauth2.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

1313
"code.gitea.io/gitea/models"
1414
"code.gitea.io/gitea/modules/log"
15-
"code.gitea.io/gitea/modules/middlewares"
1615
"code.gitea.io/gitea/modules/timeutil"
16+
"code.gitea.io/gitea/modules/web/middleware"
1717
)
1818

1919
// Ensure the struct implements the interface.
@@ -122,7 +122,7 @@ func (o *OAuth2) VerifyAuthData(req *http.Request, w http.ResponseWriter, store
122122
return nil
123123
}
124124

125-
if middlewares.IsInternalPath(req) || !middlewares.IsAPIPath(req) && !isAttachmentDownload(req) {
125+
if middleware.IsInternalPath(req) || !middleware.IsAPIPath(req) && !isAttachmentDownload(req) {
126126
return nil
127127
}
128128

‎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
@@ -121,16 +121,16 @@ func handleSignIn(resp http.ResponseWriter, req *http.Request, sess SessionStore
121121
// Language setting of the user overwrites the one previously set
122122
// If the user does not have a locale set, we save the current one.
123123
if len(user.Language) == 0 {
124-
lc := middlewares.Locale(resp, req)
124+
lc := middleware.Locale(resp, req)
125125
user.Language = lc.Language()
126126
if err := models.UpdateUserCols(user, "language"); err != nil {
127127
log.Error(fmt.Sprintf("Error updating user language [user: %d, locale: %s]", user.ID, user.Language))
128128
return
129129
}
130130
}
131131

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

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

‎modules/auth/sso/sspi_windows.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"code.gitea.io/gitea/models"
1313
"code.gitea.io/gitea/modules/base"
1414
"code.gitea.io/gitea/modules/log"
15-
"code.gitea.io/gitea/modules/middlewares"
1615
"code.gitea.io/gitea/modules/setting"
1716
"code.gitea.io/gitea/modules/templates"
17+
"code.gitea.io/gitea/modules/web/middleware"
1818

1919
gouuid "github.com/google/uuid"
2020
"github.com/quasoft/websspi"
@@ -136,7 +136,7 @@ func (s *SSPI) VerifyAuthData(req *http.Request, w http.ResponseWriter, store Da
136136
}
137137

138138
// Make sure requests to API paths and PWA resources do not create a new session
139-
if !middlewares.IsAPIPath(req) && !isAttachmentDownload(req) {
139+
if !middleware.IsAPIPath(req) && !isAttachmentDownload(req) {
140140
handleSignIn(w, req, sess, user)
141141
}
142142

@@ -167,9 +167,9 @@ func (s *SSPI) shouldAuthenticate(req *http.Request) (shouldAuth bool) {
167167
} else if req.FormValue("auth_with_sspi") == "1" {
168168
shouldAuth = true
169169
}
170-
} else if middlewares.IsInternalPath(req) {
170+
} else if middleware.IsInternalPath(req) {
171171
shouldAuth = false
172-
} else if middlewares.IsAPIPath(req) || isAttachmentDownload(req) {
172+
} else if middleware.IsAPIPath(req) || isAttachmentDownload(req) {
173173
shouldAuth = true
174174
}
175175
return

‎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: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"code.gitea.io/gitea/modules/base"
2727
mc "code.gitea.io/gitea/modules/cache"
2828
"code.gitea.io/gitea/modules/log"
29-
"code.gitea.io/gitea/modules/middlewares"
3029
"code.gitea.io/gitea/modules/setting"
3130
"code.gitea.io/gitea/modules/templates"
3231
"code.gitea.io/gitea/modules/translation"
3332
"code.gitea.io/gitea/modules/util"
33+
"code.gitea.io/gitea/modules/web/middleware"
3434

3535
"gitea.com/go-chi/cache"
3636
"gitea.com/go-chi/session"
@@ -56,7 +56,7 @@ type Context struct {
5656
translation.Locale
5757
Cache cache.Cache
5858
csrf CSRF
59-
Flash *middlewares.Flash
59+
Flash *middleware.Flash
6060
Session session.Store
6161

6262
Link string // current request URL
@@ -206,7 +206,7 @@ func (ctx *Context) HTMLString(name string, data interface{}) (string, error) {
206206
// RenderWithErr used for page has form validation but need to prompt error to users.
207207
func (ctx *Context) RenderWithErr(msg string, tpl base.TplName, form interface{}) {
208208
if form != nil {
209-
middlewares.AssignForm(form, ctx.Data)
209+
middleware.AssignForm(form, ctx.Data)
210210
}
211211
ctx.Flash.ErrorMsg = msg
212212
ctx.Data["Flash"] = ctx.Flash
@@ -384,12 +384,12 @@ func (ctx *Context) Redirect(location string, status ...int) {
384384

385385
// SetCookie set cookies to web browser
386386
func (ctx *Context) SetCookie(name string, value string, others ...interface{}) {
387-
middlewares.SetCookie(ctx.Resp, name, value, others...)
387+
middleware.SetCookie(ctx.Resp, name, value, others...)
388388
}
389389

390390
// GetCookie returns given cookie value from request header.
391391
func (ctx *Context) GetCookie(name string) string {
392-
return middlewares.GetCookie(ctx.Req, name)
392+
return middleware.GetCookie(ctx.Req, name)
393393
}
394394

395395
// GetSuperSecureCookie returns given cookie value from request header with secret string.
@@ -496,10 +496,10 @@ func GetContext(req *http.Request) *Context {
496496

497497
// SignedUserName returns signed user's name via context
498498
func SignedUserName(req *http.Request) string {
499-
if middlewares.IsInternalPath(req) {
499+
if middleware.IsInternalPath(req) {
500500
return ""
501501
}
502-
if middlewares.IsAPIPath(req) {
502+
if middleware.IsAPIPath(req) {
503503
ctx, ok := req.Context().Value(apiContextKey).(*APIContext)
504504
if ok {
505505
v := ctx.Data["SignedUserName"]
@@ -539,7 +539,7 @@ func Contexter() func(next http.Handler) http.Handler {
539539

540540
return func(next http.Handler) http.Handler {
541541
return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
542-
var locale = middlewares.Locale(resp, req)
542+
var locale = middleware.Locale(resp, req)
543543
var startTime = time.Now()
544544
var link = setting.AppSubURL + strings.TrimSuffix(req.URL.EscapedPath(), "/")
545545
var ctx = Context{
@@ -567,7 +567,7 @@ func Contexter() func(next http.Handler) http.Handler {
567567
flashCookie := ctx.GetCookie("macaron_flash")
568568
vals, _ := url.ParseQuery(flashCookie)
569569
if len(vals) > 0 {
570-
f := &middlewares.Flash{
570+
f := &middleware.Flash{
571571
DataStore: &ctx,
572572
Values: vals,
573573
ErrorMsg: vals.Get("error"),
@@ -578,7 +578,7 @@ func Contexter() func(next http.Handler) http.Handler {
578578
ctx.Data["Flash"] = f
579579
}
580580

581-
f := &middlewares.Flash{
581+
f := &middleware.Flash{
582582
DataStore: &ctx,
583583
Values: url.Values{},
584584
ErrorMsg: "",
@@ -588,22 +588,22 @@ func Contexter() func(next http.Handler) http.Handler {
588588
}
589589
ctx.Resp.Before(func(resp ResponseWriter) {
590590
if flash := f.Encode(); len(flash) > 0 {
591-
middlewares.SetCookie(resp, "macaron_flash", flash, 0,
591+
middleware.SetCookie(resp, "macaron_flash", flash, 0,
592592
setting.SessionConfig.CookiePath,
593-
middlewares.Domain(setting.SessionConfig.Domain),
594-
middlewares.HTTPOnly(true),
595-
middlewares.Secure(setting.SessionConfig.Secure),
593+
middleware.Domain(setting.SessionConfig.Domain),
594+
middleware.HTTPOnly(true),
595+
middleware.Secure(setting.SessionConfig.Secure),
596596
//middlewares.SameSite(opt.SameSite), FIXME: we need a samesite config
597597
)
598598
return
599599
}
600600

601601
ctx.SetCookie("macaron_flash", "", -1,
602602
setting.SessionConfig.CookiePath,
603-
middlewares.Domain(setting.SessionConfig.Domain),
604-
middlewares.HTTPOnly(true),
605-
middlewares.Secure(setting.SessionConfig.Secure),
606-
//middlewares.SameSite(), FIXME: we need a samesite config
603+
middleware.Domain(setting.SessionConfig.Domain),
604+
middleware.HTTPOnly(true),
605+
middleware.Secure(setting.SessionConfig.Secure),
606+
//middleware.SameSite(), FIXME: we need a samesite config
607607
)
608608
})
609609

‎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)