mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-11 21:48:41 +00:00
silverwind
e3ee28f15b
- Hash emails with sha256. Gravatar moved to sha256, and both it and libravatar.org serve the same image for either hash. - Drop `strk.kbt.io/projects/go/libravatar` for a 46 line inline SRV lookup. It could not bound or cancel its DNS query and panicked on an unexpected resolver error. The replacement carries the request context and a 3s timeout. - Fix federated avatars querying DNS for every avatar on every render. `loadAvatarSetting` compared a cache field that was never assigned, so each call rebuilt the resolver and dropped its cache. That cache is gone, both settings are read where they are used. - Migration 348 recreates `email_hash` with a 64 char hash column and a `hash_type` column, so a later algorithm change can tell old rows apart. The MD5 rows are unreachable and their `UNIQUE` email index would reject the SHA256 replacements. - Fix a re-saved avatar form replacing an uploaded avatar with a random one. - Remove the `duoshuo` `GRAVATAR_SOURCE` alias, that service shut down in 2017. - Remove dead i18n key. Fixes: https://github.com/go-gitea/gitea/issues/34284 Fixes: https://github.com/go-gitea/gitea/issues/28110 Docs: https://gitea.com/gitea/docs/pulls/499 Signed-off-by: silverwind <me@silverwind.io>
52 lines
1.9 KiB
Go
52 lines
1.9 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package avatars_test
|
|
|
|
import (
|
|
"strconv"
|
|
"testing"
|
|
|
|
avatars_model "gitea.dev/models/avatars"
|
|
system_model "gitea.dev/models/system"
|
|
"gitea.dev/models/unittest"
|
|
"gitea.dev/modules/setting"
|
|
"gitea.dev/modules/setting/config"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestEmailAvatarLink(t *testing.T) {
|
|
const email = "gitea@example.com"
|
|
const emailHash = "72af1071d72449afe29e816060e78e78fd85829ba6e2497aa1d4eedd3c9dc611"
|
|
setting.AppSubURL = "/testsuburl"
|
|
setting.GravatarSource = "https://secure.gravatar.com/avatar/"
|
|
|
|
assert.Equal(t, emailHash, avatars_model.HashEmail(" Gitea@Example.com "))
|
|
|
|
setAvatarConfig := func(disableGravatar, enableFederatedAvatar bool) {
|
|
assert.NoError(t, system_model.SetSettings(t.Context(), map[string]string{
|
|
setting.Config().Picture.DisableGravatar.DynKey(): strconv.FormatBool(disableGravatar),
|
|
setting.Config().Picture.EnableFederatedAvatar.DynKey(): strconv.FormatBool(enableFederatedAvatar),
|
|
}))
|
|
config.GetDynGetter().InvalidateCache()
|
|
}
|
|
|
|
setAvatarConfig(true, false)
|
|
assert.Equal(t, "/testsuburl/assets/img/avatar_default.png",
|
|
avatars_model.GenerateEmailAvatarFastLink(t.Context(), email, 100))
|
|
|
|
setAvatarConfig(false, false)
|
|
assert.Equal(t, "https://secure.gravatar.com/avatar/"+emailHash+"?d=identicon&s=100",
|
|
avatars_model.GenerateEmailAvatarFastLink(t.Context(), email, 100))
|
|
|
|
// the DNS query waits until the browser follows the link
|
|
setAvatarConfig(false, true)
|
|
assert.Equal(t, "/testsuburl/avatar/"+emailHash+"?size=100",
|
|
avatars_model.GenerateEmailAvatarFastLink(t.Context(), email, 100))
|
|
storedEmail, err := avatars_model.GetEmailForHash(t.Context(), emailHash)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, email, storedEmail)
|
|
assert.Equal(t, "sha256", unittest.AssertExistsAndLoadBean(t, &avatars_model.EmailHash{Hash: emailHash}, unittest.OrderBy("hash")).HashType)
|
|
}
|