mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Improve template system and panic recovery (#24461)
Partially for #24457 Major changes: 1. The old `signedUserNameStringPointerKey` is quite hacky, use `ctx.Data[SignedUser]` instead 2. Move duplicate code from `Contexter` to `CommonTemplateContextData` 3. Remove incorrect copying&pasting code `ctx.Data["Err_Password"] = true` in API handlers 4. Use one unique `RenderPanicErrorPage` for panic error page rendering 5. Move `stripSlashesMiddleware` to be the first middleware 6. Install global panic recovery handler, it works for both `install` and `web` 7. Make `500.tmpl` only depend minimal template functions/variables, avoid triggering new panics Screenshot: <details>  </details>
This commit is contained in:
		@@ -3,7 +3,63 @@
 | 
			
		||||
 | 
			
		||||
package middleware
 | 
			
		||||
 | 
			
		||||
// DataStore represents a data store
 | 
			
		||||
type DataStore interface {
 | 
			
		||||
	GetData() map[string]interface{}
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/modules/setting"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// ContextDataStore represents a data store
 | 
			
		||||
type ContextDataStore interface {
 | 
			
		||||
	GetData() ContextData
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
type ContextData map[string]any
 | 
			
		||||
 | 
			
		||||
func (ds ContextData) GetData() map[string]any {
 | 
			
		||||
	return ds
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func (ds ContextData) MergeFrom(other ContextData) ContextData {
 | 
			
		||||
	for k, v := range other {
 | 
			
		||||
		ds[k] = v
 | 
			
		||||
	}
 | 
			
		||||
	return ds
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const ContextDataKeySignedUser = "SignedUser"
 | 
			
		||||
 | 
			
		||||
type contextDataKeyType struct{}
 | 
			
		||||
 | 
			
		||||
var contextDataKey contextDataKeyType
 | 
			
		||||
 | 
			
		||||
func WithContextData(c context.Context) context.Context {
 | 
			
		||||
	return context.WithValue(c, contextDataKey, make(ContextData, 10))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func GetContextData(c context.Context) ContextData {
 | 
			
		||||
	if ds, ok := c.Value(contextDataKey).(ContextData); ok {
 | 
			
		||||
		return ds
 | 
			
		||||
	}
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func CommonTemplateContextData() ContextData {
 | 
			
		||||
	return ContextData{
 | 
			
		||||
		"IsLandingPageHome":          setting.LandingPageURL == setting.LandingPageHome,
 | 
			
		||||
		"IsLandingPageExplore":       setting.LandingPageURL == setting.LandingPageExplore,
 | 
			
		||||
		"IsLandingPageOrganizations": setting.LandingPageURL == setting.LandingPageOrganizations,
 | 
			
		||||
 | 
			
		||||
		"ShowRegistrationButton":        setting.Service.ShowRegistrationButton,
 | 
			
		||||
		"ShowMilestonesDashboardPage":   setting.Service.ShowMilestonesDashboardPage,
 | 
			
		||||
		"ShowFooterVersion":             setting.Other.ShowFooterVersion,
 | 
			
		||||
		"DisableDownloadSourceArchives": setting.Repository.DisableDownloadSourceArchives,
 | 
			
		||||
 | 
			
		||||
		"EnableSwagger":      setting.API.EnableSwagger,
 | 
			
		||||
		"EnableOpenIDSignIn": setting.Service.EnableOpenIDSignIn,
 | 
			
		||||
		"PageStartTime":      time.Now(),
 | 
			
		||||
 | 
			
		||||
		"RunModeIsProd": setting.IsProd,
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ var FlashNow bool
 | 
			
		||||
 | 
			
		||||
// Flash represents a one time data transfer between two requests.
 | 
			
		||||
type Flash struct {
 | 
			
		||||
	DataStore
 | 
			
		||||
	DataStore ContextDataStore
 | 
			
		||||
	url.Values
 | 
			
		||||
	ErrorMsg, WarningMsg, InfoMsg, SuccessMsg string
 | 
			
		||||
}
 | 
			
		||||
@@ -34,7 +34,7 @@ func (f *Flash) set(name, msg string, current ...bool) {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if isShow {
 | 
			
		||||
		f.GetData()["Flash"] = f
 | 
			
		||||
		f.DataStore.GetData()["Flash"] = f
 | 
			
		||||
	} else {
 | 
			
		||||
		f.Set(name, msg)
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -12,8 +12,3 @@ import (
 | 
			
		||||
func IsAPIPath(req *http.Request) bool {
 | 
			
		||||
	return strings.HasPrefix(req.URL.Path, "/api/")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// IsInternalPath returns true if the specified URL is an internal API path
 | 
			
		||||
func IsInternalPath(req *http.Request) bool {
 | 
			
		||||
	return strings.HasPrefix(req.URL.Path, "/api/internal/")
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user