Fix random avatar begin regenerated on every page refresh #1131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
See this line: https://github.com/go-gitea/gitea/blob/848293671b5d9c31ce3eb9ad8a1f130edd0ee7c5/models/user.go#L335 This line was always returning true because u.CustomAvatarPath() uses a email hash to generate the avatar path, but it was actually generated and served by the user ID. Using hash on all cases is more consistent and fixes the issue.
andreynering
changed the title
lunny
requested changes
Mar 7, 2017
| @@ -296,9 +296,6 @@ func (u *User) GenerateRandomAvatar() error { | |||
| if err != nil { | |||
| return fmt.Errorf("RandomImage: %v", err) | |||
| } | |||
| // NOTICE for random avatar, it still uses id as avatar name, but custom avatar use md5 | |||
| // since random image is not a user's photo, there is no security for enumable | |||
| u.Avatar = fmt.Sprintf("%d", u.ID) | |||
There was a problem hiding this comment.
This line will fix when u.Avatar is empty, then line 305 fw, err := os.Create(u.CustomAvatarPath()) will create an avatars file. This bug is reported by #1114.
lunny
reviewed
Mar 7, 2017
| @@ -296,9 +296,6 @@ func (u *User) GenerateRandomAvatar() error { | |||
| if err != nil { | |||
| return fmt.Errorf("RandomImage: %v", err) | |||
| } | |||
| // NOTICE for random avatar, it still uses id as avatar name, but custom avatar use md5 | |||
| // since random image is not a user's photo, there is no security for enumable | |||
There was a problem hiding this comment.
if u.Avatar == "" {
u.Avatar = fmt.Sprintf("%d", u.ID)
}maybe add this line is OK.
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See this line:
gitea/models/user.go
Line 335 in 8482936
This line was always returning true because
u.CustomAvatarPath()uses a email hash to generate the avatar path, but it was actually generated and served by the user ID.Using hash on all cases is more consistent and fixes the issue.