mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	* Add secure/httpOnly attributes to the lang cookie (#9690) (#14279) * apply to InitLocales() too Co-authored-by: Timo Gurr <timo.gurr@gmail.com>
This commit is contained in:
		@@ -110,13 +110,15 @@ func InitLocales() {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	i18n.I18n(i18n.Options{
 | 
						i18n.I18n(i18n.Options{
 | 
				
			||||||
		SubURL:       setting.AppSubURL,
 | 
							SubURL:         setting.AppSubURL,
 | 
				
			||||||
		Files:        localFiles,
 | 
							Files:          localFiles,
 | 
				
			||||||
		Langs:        setting.Langs,
 | 
							Langs:          setting.Langs,
 | 
				
			||||||
		Names:        setting.Names,
 | 
							Names:          setting.Names,
 | 
				
			||||||
		DefaultLang:  "en-US",
 | 
							DefaultLang:    "en-US",
 | 
				
			||||||
		Redirect:     false,
 | 
							Redirect:       false,
 | 
				
			||||||
		CookieDomain: setting.SessionConfig.Domain,
 | 
							CookieHttpOnly: true,
 | 
				
			||||||
 | 
							Secure:         setting.SessionConfig.Secure,
 | 
				
			||||||
 | 
							CookieDomain:   setting.SessionConfig.Domain,
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -247,13 +247,15 @@ func NewMacaron() *macaron.Macaron {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	m.Use(i18n.I18n(i18n.Options{
 | 
						m.Use(i18n.I18n(i18n.Options{
 | 
				
			||||||
		SubURL:       setting.AppSubURL,
 | 
							SubURL:         setting.AppSubURL,
 | 
				
			||||||
		Files:        localFiles,
 | 
							Files:          localFiles,
 | 
				
			||||||
		Langs:        setting.Langs,
 | 
							Langs:          setting.Langs,
 | 
				
			||||||
		Names:        setting.Names,
 | 
							Names:          setting.Names,
 | 
				
			||||||
		DefaultLang:  "en-US",
 | 
							DefaultLang:    "en-US",
 | 
				
			||||||
		Redirect:     false,
 | 
							Redirect:       false,
 | 
				
			||||||
		CookieDomain: setting.SessionConfig.Domain,
 | 
							CookieHttpOnly: true,
 | 
				
			||||||
 | 
							Secure:         setting.SessionConfig.Secure,
 | 
				
			||||||
 | 
							CookieDomain:   setting.SessionConfig.Domain,
 | 
				
			||||||
	}))
 | 
						}))
 | 
				
			||||||
	m.Use(cache.Cacher(cache.Options{
 | 
						m.Use(cache.Cacher(cache.Options{
 | 
				
			||||||
		Adapter:       setting.CacheService.Adapter,
 | 
							Adapter:       setting.CacheService.Adapter,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user