mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-02-25 22:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include medium in database requests and function calls

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-31 16:32:50 +01:00
parent 163b213b63
commit e0cad6dc20
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
5 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -248,9 +248,9 @@ var Err3PIDInUse = errors.New("This third-party identifier is already in use")
// and a local Matrix user (identified by the user's ID's local part). // and a local Matrix user (identified by the user's ID's local part).
// If the third-party identifier is already part of an association, returns Err3PIDInUse. // If the third-party identifier is already part of an association, returns Err3PIDInUse.
// Returns an error if there was a problem talking to the database. // Returns an error if there was a problem talking to the database.
func (d *Database) SaveThreePIDAssociation(threepid string, localpart string) (err error) { func (d *Database) SaveThreePIDAssociation(threepid string, localpart string, medium string) (err error) {
return common.WithTransaction(d.db, func(txn *sql.Tx) error { return common.WithTransaction(d.db, func(txn *sql.Tx) error {
user, err := d.threepids.selectLocalpartForThreePID(txn, threepid) user, err := d.threepids.selectLocalpartForThreePID(txn, threepid, medium)
if err != nil { if err != nil {
return err return err
} }
@ -259,7 +259,7 @@ func (d *Database) SaveThreePIDAssociation(threepid string, localpart string) (e
return Err3PIDInUse return Err3PIDInUse
} }
return d.threepids.insertThreePID(txn, threepid, localpart) return d.threepids.insertThreePID(txn, threepid, medium, localpart)
}) })
} }
@ -267,8 +267,8 @@ func (d *Database) SaveThreePIDAssociation(threepid string, localpart string) (e
// identifier. // identifier.
// If no association exists involving this third-party identifier, returns nothing. // If no association exists involving this third-party identifier, returns nothing.
// If there was a problem talking to the database, returns an error. // If there was a problem talking to the database, returns an error.
func (d *Database) RemoveThreePIDAssociation(threepid string) (err error) { func (d *Database) RemoveThreePIDAssociation(threepid string, medium string) (err error) {
return d.threepids.deleteThreePID(threepid) return d.threepids.deleteThreePID(threepid, medium)
} }
// GetLocalpartForThreePID looks up the localpart associated with a given third-party // GetLocalpartForThreePID looks up the localpart associated with a given third-party
@ -276,8 +276,8 @@ func (d *Database) RemoveThreePIDAssociation(threepid string) (err error) {
// If no association involves the given third-party idenfitier, returns an empty // If no association involves the given third-party idenfitier, returns an empty
// string. // string.
// Returns an error if there was a problem talking to the database. // Returns an error if there was a problem talking to the database.
func (d *Database) GetLocalpartForThreePID(threepid string) (localpart string, err error) { func (d *Database) GetLocalpartForThreePID(threepid string, medium string) (localpart string, err error) {
return d.threepids.selectLocalpartForThreePID(nil, threepid) return d.threepids.selectLocalpartForThreePID(nil, threepid, medium)
} }
// GetThreePIDsForLocalpart looks up the third-party identifiers associated with // GetThreePIDsForLocalpart looks up the third-party identifiers associated with

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

@ -35,16 +35,16 @@ CREATE INDEX IF NOT EXISTS account_threepid_localpart ON account_threepid(localp
` `
const selectLocalpartForThreePIDSQL = "" + const selectLocalpartForThreePIDSQL = "" +
"SELECT localpart FROM account_threepid WHERE threepid = $1" "SELECT localpart FROM account_threepid WHERE threepid = $1 AND medium = $2"
const selectThreePIDsForLocalpartSQL = "" + const selectThreePIDsForLocalpartSQL = "" +
"SELECT threepid, medium FROM account_threepid WHERE localpart = $1" "SELECT threepid, medium FROM account_threepid WHERE localpart = $1"
const insertThreePIDSQL = "" + const insertThreePIDSQL = "" +
"INSERT INTO account_threepid (threepid, localpart) VALUES ($1, $2)" "INSERT INTO account_threepid (threepid, medium, localpart) VALUES ($1, $2, $3)"
const deleteThreePIDSQL = "" + const deleteThreePIDSQL = "" +
"DELETE FROM account_threepid WHERE threepid = $1" "DELETE FROM account_threepid WHERE threepid = $1 AND medium = $2"
type threepidStatements struct { type threepidStatements struct {
selectLocalpartForThreePIDStmt *sql.Stmt selectLocalpartForThreePIDStmt *sql.Stmt
@ -74,14 +74,14 @@ func (s *threepidStatements) prepare(db *sql.DB) (err error) {
return return
} }
func (s *threepidStatements) selectLocalpartForThreePID(txn *sql.Tx, threepid string) (localpart string, err error) { func (s *threepidStatements) selectLocalpartForThreePID(txn *sql.Tx, threepid string, medium string) (localpart string, err error) {
var stmt *sql.Stmt var stmt *sql.Stmt
if txn != nil { if txn != nil {
stmt = txn.Stmt(s.selectLocalpartForThreePIDStmt) stmt = txn.Stmt(s.selectLocalpartForThreePIDStmt)
} else { } else {
stmt = s.selectLocalpartForThreePIDStmt stmt = s.selectLocalpartForThreePIDStmt
} }
err = stmt.QueryRow(threepid).Scan(&localpart) err = stmt.QueryRow(threepid, medium).Scan(&localpart)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return "", nil return "", nil
} }
@ -107,12 +107,12 @@ func (s *threepidStatements) selectThreePIDsForLocalpart(localpart string) (thre
return return
} }
func (s *threepidStatements) insertThreePID(txn *sql.Tx, threepid string, localpart string) (err error) { func (s *threepidStatements) insertThreePID(txn *sql.Tx, threepid string, medium string, localpart string) (err error) {
_, err = txn.Stmt(s.insertThreePIDStmt).Exec(threepid, localpart) _, err = txn.Stmt(s.insertThreePIDStmt).Exec(threepid, medium, localpart)
return return
} }
func (s *threepidStatements) deleteThreePID(threepid string) (err error) { func (s *threepidStatements) deleteThreePID(threepid string, medium string) (err error) {
_, err = s.deleteThreePIDStmt.Exec(threepid) _, err = s.deleteThreePIDStmt.Exec(threepid, medium)
return return
} }

12
src/github.com/matrix-org/dendrite/clientapi/readers/threepid.go
View file

@ -40,10 +40,10 @@ type threePID struct {
Address string `json:"address"` Address string `json:"address"`
} }
// Request3PIDToken implements: // RequestEmailToken implements:
// POST /account/3pid/email/requestToken // POST /account/3pid/email/requestToken
// POST /register/email/requestToken // POST /register/email/requestToken
func Request3PIDToken(req *http.Request, accountDB *accounts.Database) util.JSONResponse { func RequestEmailToken(req *http.Request, accountDB *accounts.Database) util.JSONResponse {
var body threepid.EmailAssociationRequest var body threepid.EmailAssociationRequest
if reqErr := httputil.UnmarshalJSONRequest(req, &body); reqErr != nil { if reqErr := httputil.UnmarshalJSONRequest(req, &body); reqErr != nil {
return *reqErr return *reqErr
@ -53,7 +53,7 @@ func Request3PIDToken(req *http.Request, accountDB *accounts.Database) util.JSON
var err error var err error
// Check if the 3PID is already in use locally // Check if the 3PID is already in use locally
localpart, err := accountDB.GetLocalpartForThreePID(body.Email) localpart, err := accountDB.GetLocalpartForThreePID(body.Email, "email")
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
@ -88,7 +88,7 @@ func CheckAndSave3PIDAssociation(
return *reqErr return *reqErr
} }
verified, address, err := threepid.CheckAssociation(body.Creds) verified, address, medium, err := threepid.CheckAssociation(body.Creds)
if err != nil { if err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
@ -108,7 +108,7 @@ func CheckAndSave3PIDAssociation(
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
if err = accountDB.SaveThreePIDAssociation(address, localpart); err != nil { if err = accountDB.SaveThreePIDAssociation(address, localpart, medium); err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }
@ -152,7 +152,7 @@ func Forget3PID(req *http.Request, accountDB *accounts.Database) util.JSONRespon
return *reqErr return *reqErr
} }
if err := accountDB.RemoveThreePIDAssociation(body.Address); err != nil { if err := accountDB.RemoveThreePIDAssociation(body.Address, body.Medium); err != nil {
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }

2
src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
View file

@ -253,7 +253,7 @@ func Setup(
r0mux.Handle("/{path:(?:account/3pid|register)}/email/requestToken", r0mux.Handle("/{path:(?:account/3pid|register)}/email/requestToken",
common.MakeAPI("account_3pid_request_token", func(req *http.Request) util.JSONResponse { common.MakeAPI("account_3pid_request_token", func(req *http.Request) util.JSONResponse {
return readers.Request3PIDToken(req, accountDB) return readers.RequestEmailToken(req, accountDB)
}), }),
).Methods("POST", "OPTIONS") ).Methods("POST", "OPTIONS")

14
src/github.com/matrix-org/dendrite/clientapi/threepid/threepid.go
View file

@ -88,14 +88,14 @@ func CreateSession(req EmailAssociationRequest) (string, error) {
// identity server. // identity server.
// Returns a boolean set to true if the association has been validated, false if not. // Returns a boolean set to true if the association has been validated, false if not.
// If the association has been validated, also returns the related third-party // If the association has been validated, also returns the related third-party
// identifier. // identifier and its medium.
// Returns an error if there was a problem sending the request or decoding the // Returns an error if there was a problem sending the request or decoding the
// response, or if the identity server responded with a non-OK status. // response, or if the identity server responded with a non-OK status.
func CheckAssociation(creds Credentials) (bool, string, error) { func CheckAssociation(creds Credentials) (bool, string, string, error) {
url := fmt.Sprintf("https://%s/_matrix/identity/api/v1/3pid/getValidated3pid?sid=%s&client_secret=%s", creds.IDServer, creds.SID, creds.Secret) url := fmt.Sprintf("https://%s/_matrix/identity/api/v1/3pid/getValidated3pid?sid=%s&client_secret=%s", creds.IDServer, creds.SID, creds.Secret)
resp, err := http.Get(url) resp, err := http.Get(url)
if err != nil { if err != nil {
return false, "", err return false, "", "", err
} }
var respBody struct { var respBody struct {
@ -107,14 +107,14 @@ func CheckAssociation(creds Credentials) (bool, string, error) {
} }
if err = json.NewDecoder(resp.Body).Decode(&respBody); err != nil { if err = json.NewDecoder(resp.Body).Decode(&respBody); err != nil {
return false, "", err return false, "", "", err
} }
if respBody.ErrCode == "M_SESSION_NOT_VALIDATED" { if respBody.ErrCode == "M_SESSION_NOT_VALIDATED" {
return false, "", nil return false, "", "", nil
} else if len(respBody.ErrCode) > 0 { } else if len(respBody.ErrCode) > 0 {
return false, "", errors.New(respBody.Error) return false, "", "", errors.New(respBody.Error)
} }
return true, respBody.Address, nil return true, respBody.Address, respBody.Medium, nil
} }