mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-03-23 01:54:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return the correct error

Browse source
This commit is contained in:
Kegan Dougal 2017-02-21 16:32:53 +00:00
parent c9c602129d
commit 62a9375f56
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/github.com/matrix-org/dendrite/clientapi/auth/auth.go
View file

@ -4,6 +4,8 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"strings" "strings"
"github.com/matrix-org/dendrite/clientapi/jsonerror"
) )
// VerifyAccessToken verifies that an access token was supplied in the given HTTP request // VerifyAccessToken verifies that an access token was supplied in the given HTTP request
@ -12,15 +14,17 @@ import (
func VerifyAccessToken(req *http.Request) (userID string, err error) { func VerifyAccessToken(req *http.Request) (userID string, err error) {
_, tokenErr := extractAccessToken(req) _, tokenErr := extractAccessToken(req)
if tokenErr != nil { if tokenErr != nil {
// err = MatrixError(MatrixError.M_MISSING_TOKEN, tokenErr.Error()) err = jsonerror.MissingToken(tokenErr.Error())
return return
} }
// TODO: Do something with the token // TODO: Check the token against the database
return return
} }
// extractAccessToken from a request, or return an error detailing what went wrong. // extractAccessToken from a request, or return an error detailing what went wrong. The
// error message MUST be human-readable and comprehensible to the client.
func extractAccessToken(req *http.Request) (string, error) { func extractAccessToken(req *http.Request) (string, error) {
// cf https://github.com/matrix-org/synapse/blob/v0.19.2/synapse/api/auth.py#L631
authBearer := req.Header.Get("Authorization") authBearer := req.Header.Get("Authorization")
queryToken := req.URL.Query().Get("access_token") queryToken := req.URL.Query().Get("access_token")
if authBearer != "" && queryToken != "" { if authBearer != "" && queryToken != "" {