hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-11 14:23:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent sql scanning into nil value in accounts_table

Browse source 
Signed-off-by: Andrew Morgan <andrewm@matrix.org>
This commit is contained in:
Andrew Morgan 2018-06-04 16:00:04 +01:00
parent 241b1b5ace
commit c7430ec403
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/accounts_table.go
View file

@ -22,6 +22,8 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/authtypes" "github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/userutil" "github.com/matrix-org/dendrite/clientapi/userutil"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
log "github.com/sirupsen/logrus"
) )
const accountsSchema = ` const accountsSchema = `
@ -121,14 +123,27 @@ func (s *accountsStatements) selectPasswordHash(
func (s *accountsStatements) selectAccountByLocalpart( func (s *accountsStatements) selectAccountByLocalpart(
ctx context.Context, localpart string, ctx context.Context, localpart string,
) (acc *authtypes.Account, err error) { ) (*authtypes.Account, error) {
var localpartPtr, appserviceIDPtr sql.NullString
var acc authtypes.Account
stmt := s.selectAccountByLocalpartStmt stmt := s.selectAccountByLocalpartStmt
err = stmt.QueryRowContext(ctx, localpart).Scan(&acc.Localpart, &acc.AppServiceID) err := stmt.QueryRowContext(ctx, localpart).Scan(&localpartPtr, &appserviceIDPtr)
if err == nil { if err != nil {
acc.UserID = userutil.MakeUserID(localpart, s.serverName) log.WithError(err).Error("Unable to retrieve user from the db")
acc.ServerName = s.serverName return nil, err
} }
return if appserviceIDPtr.Valid {
acc.AppServiceID = appserviceIDPtr.String
}
if localpartPtr.Valid {
acc.Localpart = localpartPtr.String
}
acc.UserID = userutil.MakeUserID(localpart, s.serverName)
acc.ServerName = s.serverName
return &acc, nil
} }
func (s *accountsStatements) selectNewNumericLocalpart( func (s *accountsStatements) selectNewNumericLocalpart(