hash the complete email address

modules/base/tool.go

@@ -207,11 +207,53 @@ func SizedAvatarLink(email string, size int) string {
  return avatarURL.String()
 }
 
+// SizedAvatarLinkWithDomain returns a sized link to the avatar for the given email
+// address.
+func SizedAvatarLinkWithDomain(emailHash, domain string, size int) string {
+ var avatarURL *url.URL
+ if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
+ var err error
+ avatarURL, err = libravatarURL("ignoreme@" + domain)
+ if err != nil {
+ return DefaultAvatarLink()
+ }
+ // now we replace the hash with the correct one...
+ avatarPath := avatarURL.EscapedPath()
+ lastSlash := strings.LastIndexByte(avatarPath, '/')
+ avatarURL.Path = avatarPath[:lastSlash+1] + emailHash
+ } else if !setting.DisableGravatar {
+ // copy GravatarSourceURL, because we will modify its Path.
+ copyOfGravatarSourceURL := *setting.GravatarSourceURL
+ avatarURL = &copyOfGravatarSourceURL
+ avatarURL.Path = path.Join(avatarURL.Path, emailHash)
+ } else {
+ return DefaultAvatarLink()
+ }
+
+ vals := avatarURL.Query()
+ vals.Set("d", "identicon")
+ if size != DefaultAvatarSize {
+ vals.Set("s", strconv.Itoa(size))
+ }
+ avatarURL.RawQuery = vals.Encode()
+ return avatarURL.String()
+}
+
 // AvatarLink returns relative avatar link to the site domain by given email,
 // which includes app sub-url as prefix. However, it is possible
 // to return full URL if user enables Gravatar-like service.
 func AvatarLink(email string) string {
- return setting.AppSubURL + "/avatar/" + base64.RawURLEncoding.EncodeToString([]byte(email))
+ lowerEmail := strings.ToLower(strings.TrimSpace(email))
+ sum := fmt.Sprintf("%x", md5.Sum([]byte(lowerEmail)))
+ index := strings.IndexByte(email, '@')
+ domain := ""
+ if index >= 0 {
+ domain = email[index+1:]
+ }
+ if len(domain) == 0 {
+ domain = "cdn.libravatar.org"
+ }
+ return setting.AppSubURL + "/avatar/" + url.PathEscape(domain) + "/" + url.PathEscape(sum)
 }
 
 // FileSize calculates the file size and generate user-friendly string.

modules/base/tool_test.go

@@ -1,7 +1,8 @@
 package base
 
 import (
- "encoding/base64"
+ "crypto/md5"
+ "fmt"
  "net/url"
  "testing"
 
@@ -93,11 +94,11 @@ func TestSizedAvatarLink(t *testing.T) {
 
 func TestAvatarLink(t *testing.T) {
  disableGravatar()
- assert.Equal(t, "/avatar/"+base64.RawURLEncoding.EncodeToString([]byte("[email protected]")), AvatarLink("[email protected]"))
+ assert.Equal(t, "/avatar/example.com/"+fmt.Sprintf("%x", md5.Sum([]byte("[email protected]"))), AvatarLink("[email protected]"))
 
  enableGravatar(t)
  assert.Equal(t,
- "/avatar/"+base64.RawURLEncoding.EncodeToString([]byte("[email protected]")),
+ "/avatar/example.com/"+fmt.Sprintf("%x", md5.Sum([]byte("[email protected]"))),
  AvatarLink("[email protected]"),
  )
 }

modules/repository/commits_test.go

@@ -6,7 +6,8 @@ package repository
 
 import (
  "container/list"
- "encoding/base64"
+ "crypto/md5"
+ "fmt"
  "testing"
  "time"
 
@@ -115,7 +116,7 @@ func TestPushCommits_AvatarLink(t *testing.T) {
  pushCommits.AvatarLink("[email protected]"))
 
  assert.Equal(t,
- "/avatar/"+base64.RawURLEncoding.EncodeToString([]byte("[email protected]")),
+ "/avatar/example.com/"+fmt.Sprintf("%x", md5.Sum([]byte("[email protected]"))),
  pushCommits.AvatarLink("[email protected]"))
 }
 

routers/routes/routes.go

@@ -417,7 +417,7 @@ func RegisterRoutes(m *macaron.Macaron) {
  })
  // ***** END: User *****
 
- m.Get("/avatar/:email", user.AvatarByEmail)
+ m.Get("/avatar/:domain/:hash", user.AvatarByEmail)
 
  adminReq := context.Toggle(&context.ToggleOptions{SignInRequired: true, AdminRequired: true})
 

routers/user/avatar.go

@@ -5,7 +5,6 @@
 package user
 
 import (
- "encoding/base64"
  "errors"
  "strconv"
  "strings"
@@ -47,20 +46,15 @@ func Avatar(ctx *context.Context) {
 
 // AvatarByEmail redirects the browser to the appropriate Avatar link
 func AvatarByEmail(ctx *context.Context) {
- email := ctx.Params(":email")
- addr, err := base64.RawURLEncoding.DecodeString(email)
- email = string(addr)
- if err != nil {
- ctx.ServerError("invalid email address", err)
- return
- } else if email == "" {
+ domain := ctx.Params(":domain")
+ hash := ctx.Params(":hash")
+ if len(domain) == 0 || len(hash) == 0 {
  ctx.ServerError("invalid email address", errors.New("email cannot be empty"))
  return
  }
  size := ctx.QueryInt("size")
  if size == 0 {
  size = base.DefaultAvatarSize
  }
-
- ctx.Redirect(base.SizedAvatarLink(email, size))
+ ctx.Redirect(base.SizedAvatarLinkWithDomain(hash, domain, size))
 }