Delete legacy cookie before setting new cookie (#31306)
Try to fix #31202 (cherry picked from commit 5342a61124bf2d4fbe4c1d560b13866198149ac9)
This commit is contained in:
		
							parent
							
								
									53d4e90411
								
							
						
					
					
						commit
						20ca5e37e9
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -35,6 +35,10 @@ func GetSiteCookie(req *http.Request, name string) string {
 | 
			
		|||
 | 
			
		||||
// SetSiteCookie returns given cookie value from request header.
 | 
			
		||||
func SetSiteCookie(resp http.ResponseWriter, name, value string, maxAge int) {
 | 
			
		||||
	// Previous versions would use a cookie path with a trailing /.
 | 
			
		||||
	// These are more specific than cookies without a trailing /, so
 | 
			
		||||
	// we need to delete these if they exist.
 | 
			
		||||
	deleteLegacySiteCookie(resp, name)
 | 
			
		||||
	cookie := &http.Cookie{
 | 
			
		||||
		Name:     name,
 | 
			
		||||
		Value:    url.QueryEscape(value),
 | 
			
		||||
| 
						 | 
				
			
			@ -46,10 +50,6 @@ func SetSiteCookie(resp http.ResponseWriter, name, value string, maxAge int) {
 | 
			
		|||
		SameSite: setting.SessionConfig.SameSite,
 | 
			
		||||
	}
 | 
			
		||||
	resp.Header().Add("Set-Cookie", cookie.String())
 | 
			
		||||
	// Previous versions would use a cookie path with a trailing /.
 | 
			
		||||
	// These are more specific than cookies without a trailing /, so
 | 
			
		||||
	// we need to delete these if they exist.
 | 
			
		||||
	deleteLegacySiteCookie(resp, name)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// deleteLegacySiteCookie deletes the cookie with the given name at the cookie
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue