Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Query the DB for the hash before inserting in to email_hash #15457

Merged
merged 4 commits into from
Apr 15, 2021
Merged

Query the DB for the hash before inserting in to email_hash #15457

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9caaee9
Query the DB for the has before inserting in to email_hash
zeripath Apr 13, 2021
51926ca
Update models/avatar.go doh
zeripath Apr 14, 2021
854b1b4
fix lint
zeripath Apr 14, 2021
9e424ac
Merge branch 'master' into fix-15451-query-the-db-for-hash-before-ins…
zeripath Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions models/avatar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ func HashedAvatarLink(email string) string {
// we don't care about any DB problem just return the lowerEmail
return lowerEmail, nil
}
has, err := sess.Where("email = ? AND hash = ?", emailHash.Email, emailHash.Hash).Get(new(EmailHash))
if has || err != nil {
// Seriously we don't care about any DB problems just return the lowerEmail - we expect the transaction to fail most of the time
return lowerEmail, nil
}
_, _ = sess.Insert(emailHash)
if err := sess.Commit(); err != nil {
// Seriously we don't care about any DB problems just return the lowerEmail - we expect the transaction to fail most of the time
Expand Down