YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-02-14 10:20:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update skipper name (#1080)

Browse Source
This commit is contained in:
boojack 2023-02-12 17:29:23 +08:00 committed by GitHub
parent a997e1d10d
commit 870559046f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/acl.go
View File

@ -58,7 +58,7 @@ func aclMiddleware(s *Server, next echo.HandlerFunc) echo.HandlerFunc {
ctx := c.Request().Context() ctx := c.Request().Context()
path := c.Path() path := c.Path()
if s.DefaultAuthSkipper(c) { if s.defaultAuthSkipper(c) {
return next(c) return next(c)
} }

6
server/common.go
View File

@ -18,16 +18,16 @@ func composeResponse(data interface{}) response {
} }
} }
func DefaultGetRequestSkipper(c echo.Context) bool { func defaultGetRequestSkipper(c echo.Context) bool {
return c.Request().Method == http.MethodGet return c.Request().Method == http.MethodGet
} }
func DefaultAPIRequestSkipper(c echo.Context) bool { func defaultAPIRequestSkipper(c echo.Context) bool {
path := c.Path() path := c.Path()
return common.HasPrefixes(path, "/api") return common.HasPrefixes(path, "/api")
} }
func (server *Server) DefaultAuthSkipper(c echo.Context) bool { func (server *Server) defaultAuthSkipper(c echo.Context) bool {
ctx := c.Request().Context() ctx := c.Request().Context()
path := c.Path() path := c.Path()

3
server/embed_frontend.go
View File

@ -25,7 +25,7 @@ func embedFrontend(e *echo.Echo) {
// Use echo static middleware to serve the built dist folder // Use echo static middleware to serve the built dist folder
// refer: https://github.com/labstack/echo/blob/master/middleware/static.go // refer: https://github.com/labstack/echo/blob/master/middleware/static.go
e.Use(middleware.StaticWithConfig(middleware.StaticConfig{ e.Use(middleware.StaticWithConfig(middleware.StaticConfig{
Skipper: DefaultAPIRequestSkipper, Skipper: defaultAPIRequestSkipper,
HTML5: true, HTML5: true,
Filesystem: getFileSystem("dist"), Filesystem: getFileSystem("dist"),
})) }))
@ -38,6 +38,7 @@ func embedFrontend(e *echo.Echo) {
} }
}) })
assetsGroup.Use(middleware.StaticWithConfig(middleware.StaticConfig{ assetsGroup.Use(middleware.StaticWithConfig(middleware.StaticConfig{
Skipper: defaultAPIRequestSkipper,
HTML5: true, HTML5: true,
Filesystem: getFileSystem("dist/assets"), Filesystem: getFileSystem("dist/assets"),
})) }))

6
server/profile/profile.go
View File

@ -15,11 +15,11 @@ type Profile struct {
// Mode can be "prod" or "dev" // Mode can be "prod" or "dev"
Mode string `json:"mode"` Mode string `json:"mode"`
// Port is the binding port for server // Port is the binding port for server
Port int `json:"port"` Port int `json:"-"`
// Data is the data directory // Data is the data directory
Data string `json:"data"` Data string `json:"-"`
// DSN points to where Memos stores its own data // DSN points to where Memos stores its own data
DSN string `json:"dsn"` DSN string `json:"-"`
// Version is the current version of server // Version is the current version of server
Version string `json:"version"` Version string `json:"version"`
} }

4
server/server.go
View File

@ -58,14 +58,14 @@ func NewServer(ctx context.Context, profile *profile.Profile) (*Server, error) {
e.Use(middleware.Gzip()) e.Use(middleware.Gzip())
e.Use(middleware.CSRFWithConfig(middleware.CSRFConfig{ e.Use(middleware.CSRFWithConfig(middleware.CSRFConfig{
Skipper: s.DefaultAuthSkipper, Skipper: s.defaultAuthSkipper,
TokenLookup: "cookie:_csrf", TokenLookup: "cookie:_csrf",
})) }))
e.Use(middleware.CORS()) e.Use(middleware.CORS())
e.Use(middleware.SecureWithConfig(middleware.SecureConfig{ e.Use(middleware.SecureWithConfig(middleware.SecureConfig{
Skipper: DefaultGetRequestSkipper, Skipper: defaultGetRequestSkipper,
XSSProtection: "1; mode=block", XSSProtection: "1; mode=block",
ContentTypeNosniff: "nosniff", ContentTypeNosniff: "nosniff",
XFrameOptions: "SAMEORIGIN", XFrameOptions: "SAMEORIGIN",