Skip to content
Snippets Groups Projects
Commit ab171fc9 authored by Travis Ralston's avatar Travis Ralston
Browse files

Return a 401 error when a token isn't provided

parent 641eddc9
No related branches found
No related tags found
No related merge requests found
...@@ -4,6 +4,7 @@ import ( ...@@ -4,6 +4,7 @@ import (
"net/http" "net/http"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/turt2live/matrix-media-repo/common"
"github.com/turt2live/matrix-media-repo/common/config" "github.com/turt2live/matrix-media-repo/common/config"
"github.com/turt2live/matrix-media-repo/matrix" "github.com/turt2live/matrix-media-repo/matrix"
"github.com/turt2live/matrix-media-repo/util" "github.com/turt2live/matrix-media-repo/util"
...@@ -20,7 +21,7 @@ func AccessTokenRequiredRoute(next func(r *http.Request, log *logrus.Entry, user ...@@ -20,7 +21,7 @@ func AccessTokenRequiredRoute(next func(r *http.Request, log *logrus.Entry, user
accessToken := util.GetAccessTokenFromRequest(r) accessToken := util.GetAccessTokenFromRequest(r)
if accessToken == "" { if accessToken == "" {
log.Error("Error: no token provided (required)") log.Error("Error: no token provided (required)")
return InternalServerError("Error no token provided (required)") return &ErrorResponse{common.ErrCodeMissingToken, "no token provided (required)", common.ErrCodeUnknownToken}
} }
if config.Get().SharedSecret.Enabled && accessToken == config.Get().SharedSecret.Token { if config.Get().SharedSecret.Enabled && accessToken == config.Get().SharedSecret.Token {
log = log.WithFields(logrus.Fields{"isRepoAdmin": true}) log = log.WithFields(logrus.Fields{"isRepoAdmin": true})
......
...@@ -5,6 +5,7 @@ const ErrCodeHostNotFound = "M_HOST_NOT_FOUND" ...@@ -5,6 +5,7 @@ const ErrCodeHostNotFound = "M_HOST_NOT_FOUND"
const ErrCodeHostBlacklisted = "M_HOST_BLACKLISTED" const ErrCodeHostBlacklisted = "M_HOST_BLACKLISTED"
const ErrCodeNotFound = "M_NOT_FOUND" const ErrCodeNotFound = "M_NOT_FOUND"
const ErrCodeUnknownToken = "M_UNKNOWN_TOKEN" const ErrCodeUnknownToken = "M_UNKNOWN_TOKEN"
const ErrCodeMissingToken = "M_MISSING_TOKEN"
const ErrCodeMediaTooLarge = "M_MEDIA_TOO_LARGE" const ErrCodeMediaTooLarge = "M_MEDIA_TOO_LARGE"
const ErrCodeMediaTooSmall = "M_MEDIA_TOO_SMALL" const ErrCodeMediaTooSmall = "M_MEDIA_TOO_SMALL"
const ErrCodeTooLarge = "M_TOO_LARGE" const ErrCodeTooLarge = "M_TOO_LARGE"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment