IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

use https for fetch gravatar by default (#20964)

Browse Source
This commit is contained in:
Jiajun Huang
2019-12-10 15:59:11 +08:00
committed by Arve Knudsen
parent 1a2dad9d0c
commit 5e34e061d5
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/api/avatar/avatar.go
View File

@@ -27,19 +27,9 @@ import (
gocache "github.com/patrickmn/go-cache" gocache "github.com/patrickmn/go-cache"
) )
var gravatarSource string const (
gravatarSource = "https://secure.gravatar.com/avatar/"
func UpdateGravatarSource() { )
srcCfg := "//secure.gravatar.com/avatar/"
gravatarSource = srcCfg
if strings.HasPrefix(gravatarSource, "//") {
gravatarSource = "http:" + gravatarSource
} else if !strings.HasPrefix(gravatarSource, "http://") &&
!strings.HasPrefix(gravatarSource, "https://") {
gravatarSource = "http://" + gravatarSource
}
}
// Avatar represents the avatar object. // Avatar represents the avatar object.
type Avatar struct { type Avatar struct {
@@ -126,8 +116,6 @@ func (this *CacheServer) Handler(ctx *macaron.Context) {
} }
func NewCacheServer() *CacheServer { func NewCacheServer() *CacheServer {
UpdateGravatarSource()
return &CacheServer{ return &CacheServer{
notFound: newNotFound(), notFound: newNotFound(),
cache: gocache.New(time.Hour, time.Hour*2), cache: gocache.New(time.Hour, time.Hour*2),