Skip to content

Commit

Permalink
[bugfix] Use case-insensitive selects when getting remote accounts by…
Browse files Browse the repository at this point in the history
… username/domain (#1191)

* [bugfix] Case-insensitive account selection

* don't lowercase cache key
  • Loading branch information
tsmethurst committed Dec 1, 2022
1 parent 5a0e418 commit cf20397
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
11 changes: 7 additions & 4 deletions internal/db/bundb/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"context"
"errors"
"fmt"
"strings"
"time"

"codeberg.org/gruf/go-cache/v3/result"
Expand Down Expand Up @@ -108,11 +109,13 @@ func (a *accountDB) GetAccountByUsernameDomain(ctx context.Context, username str
q := a.newAccountQ(account)

if domain != "" {
q = q.Where("? = ?", bun.Ident("account.username"), username)
q = q.Where("? = ?", bun.Ident("account.domain"), domain)
q = q.
Where("LOWER(?) = ?", bun.Ident("account.username"), strings.ToLower(username)).
Where("? = ?", bun.Ident("account.domain"), domain)
} else {
q = q.Where("? = ?", bun.Ident("account.username"), username)
q = q.Where("? IS NULL", bun.Ident("account.domain"))
q = q.
Where("? = ?", bun.Ident("account.username"), strings.ToLower(username)). // usernames on our instance are always lowercase
Where("? IS NULL", bun.Ident("account.domain"))
}

return q.Scan(ctx)
Expand Down
17 changes: 17 additions & 0 deletions internal/db/bundb/account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"context"
"crypto/rand"
"crypto/rsa"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -84,6 +85,22 @@ func (suite *AccountTestSuite) TestGetAccountByUsernameDomain() {
suite.NotNil(account2)
}

func (suite *AccountTestSuite) TestGetAccountByUsernameDomainMixedCase() {
testAccount := suite.testAccounts["remote_account_2"]

account1, err := suite.db.GetAccountByUsernameDomain(context.Background(), testAccount.Username, testAccount.Domain)
suite.NoError(err)
suite.NotNil(account1)

account2, err := suite.db.GetAccountByUsernameDomain(context.Background(), strings.ToUpper(testAccount.Username), testAccount.Domain)
suite.NoError(err)
suite.NotNil(account2)

account3, err := suite.db.GetAccountByUsernameDomain(context.Background(), strings.ToLower(testAccount.Username), testAccount.Domain)
suite.NoError(err)
suite.NotNil(account3)
}

func (suite *AccountTestSuite) TestUpdateAccount() {
ctx := context.Background()

Expand Down

0 comments on commit cf20397

Please sign in to comment.