From 797352583a4266eeec7a0b479c7fff4a5648dcb1 Mon Sep 17 00:00:00 2001 From: Ahsan Barkati Date: Wed, 15 Feb 2023 23:49:03 +0530 Subject: [PATCH] Create PAT supporting auth middleware --- ee/query-service/app/api/api.go | 42 ++--- ee/query-service/app/api/pat.go | 30 ++- ee/query-service/app/server.go | 53 +++++- ee/query-service/dao/interface.go | 2 +- ee/query-service/dao/sqlite/pat.go | 7 +- pkg/query-service/app/auth.go | 116 ++++++++++++ pkg/query-service/app/http_handler.go | 253 ++++++++------------------ pkg/query-service/app/server.go | 9 +- pkg/query-service/auth/rbac.go | 14 ++ 9 files changed, 320 insertions(+), 206 deletions(-) create mode 100644 pkg/query-service/app/auth.go diff --git a/ee/query-service/app/api/api.go b/ee/query-service/app/api/api.go index 93330c0572..42410b65e7 100644 --- a/ee/query-service/app/api/api.go +++ b/ee/query-service/app/api/api.go @@ -69,65 +69,65 @@ func (ah *APIHandler) CheckFeature(f string) bool { } // RegisterRoutes registers routes for this handler on the given router -func (ah *APIHandler) RegisterRoutes(router *mux.Router) { +func (ah *APIHandler) RegisterRoutes(router *mux.Router, am *baseapp.AuthMiddleware) { // note: add ee override methods first // routes available only in ee version router.HandleFunc("/api/v1/licenses", - baseapp.AdminAccess(ah.listLicenses)). + am.AdminAccess(ah.listLicenses)). Methods(http.MethodGet) router.HandleFunc("/api/v1/licenses", - baseapp.AdminAccess(ah.applyLicense)). + am.AdminAccess(ah.applyLicense)). Methods(http.MethodPost) router.HandleFunc("/api/v1/featureFlags", - baseapp.OpenAccess(ah.getFeatureFlags)). + am.OpenAccess(ah.getFeatureFlags)). Methods(http.MethodGet) router.HandleFunc("/api/v1/loginPrecheck", - baseapp.OpenAccess(ah.precheckLogin)). + am.OpenAccess(ah.precheckLogin)). Methods(http.MethodGet) // paid plans specific routes router.HandleFunc("/api/v1/complete/saml", - baseapp.OpenAccess(ah.receiveSAML)). + am.OpenAccess(ah.receiveSAML)). Methods(http.MethodPost) router.HandleFunc("/api/v1/complete/google", - baseapp.OpenAccess(ah.receiveGoogleAuth)). + am.OpenAccess(ah.receiveGoogleAuth)). Methods(http.MethodGet) router.HandleFunc("/api/v1/orgs/{orgId}/domains", - baseapp.AdminAccess(ah.listDomainsByOrg)). + am.AdminAccess(ah.listDomainsByOrg)). Methods(http.MethodGet) router.HandleFunc("/api/v1/domains", - baseapp.AdminAccess(ah.postDomain)). + am.AdminAccess(ah.postDomain)). Methods(http.MethodPost) router.HandleFunc("/api/v1/domains/{id}", - baseapp.AdminAccess(ah.putDomain)). + am.AdminAccess(ah.putDomain)). Methods(http.MethodPut) router.HandleFunc("/api/v1/domains/{id}", - baseapp.AdminAccess(ah.deleteDomain)). + am.AdminAccess(ah.deleteDomain)). Methods(http.MethodDelete) // base overrides - router.HandleFunc("/api/v1/version", baseapp.OpenAccess(ah.getVersion)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/invite/{token}", baseapp.OpenAccess(ah.getInvite)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/register", baseapp.OpenAccess(ah.registerUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/login", baseapp.OpenAccess(ah.loginUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/traces/{traceId}", baseapp.ViewAccess(ah.searchTraces)).Methods(http.MethodGet) - router.HandleFunc("/api/v2/metrics/query_range", baseapp.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/version", am.OpenAccess(ah.getVersion)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/invite/{token}", am.OpenAccess(ah.getInvite)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/register", am.OpenAccess(ah.registerUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/login", am.OpenAccess(ah.loginUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(ah.searchTraces)).Methods(http.MethodGet) + router.HandleFunc("/api/v2/metrics/query_range", am.ViewAccess(ah.queryRangeMetricsV2)).Methods(http.MethodPost) // PAT APIs - router.HandleFunc("/api/v1/pat", baseapp.SelfAccess(ah.createPAT)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/pat", baseapp.SelfAccess(ah.getPATs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/pat/{id}", baseapp.SelfAccess(ah.deletePAT)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/pat", am.OpenAccess(ah.createPAT)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/pat", am.OpenAccess(ah.getPATs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/pat/{id}", am.OpenAccess(ah.deletePAT)).Methods(http.MethodDelete) - ah.APIHandler.RegisterRoutes(router) + ah.APIHandler.RegisterRoutes(router, am) } diff --git a/ee/query-service/app/api/pat.go b/ee/query-service/app/api/pat.go index 7c6052cffb..d708ba0606 100644 --- a/ee/query-service/app/api/pat.go +++ b/ee/query-service/app/api/pat.go @@ -5,6 +5,7 @@ import ( "crypto/rand" "encoding/base64" "encoding/json" + "fmt" "net/http" "time" @@ -55,7 +56,14 @@ func (ah *APIHandler) createPAT(w http.ResponseWriter, r *http.Request) { func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) { ctx := context.Background() - user, _ := auth.GetUserFromRequest(r) + user, err := auth.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } zap.S().Infof("Get PATs for user: %+v", user.Id) pats, apierr := ah.AppDao().ListPATs(ctx, user.Id) if apierr != nil { @@ -68,6 +76,26 @@ func (ah *APIHandler) getPATs(w http.ResponseWriter, r *http.Request) { func (ah *APIHandler) deletePAT(w http.ResponseWriter, r *http.Request) { ctx := context.Background() id := mux.Vars(r)["id"] + user, err := auth.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + pat, apierr := ah.AppDao().GetPAT(ctx, id) + if apierr != nil { + RespondError(w, apierr, nil) + return + } + if pat.UserID != user.Id { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: fmt.Errorf("unauthorized PAT delete request"), + }, nil) + return + } zap.S().Infof("Delete PAT with id: %+v", id) if apierr := ah.AppDao().DeletePAT(ctx, id); apierr != nil { RespondError(w, apierr, nil) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index f97f5e0da1..a634057531 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -10,6 +10,7 @@ import ( "net/http" _ "net/http/pprof" // http profiler "os" + "strings" "time" "github.com/gorilla/handlers" @@ -25,7 +26,9 @@ import ( licensepkg "go.signoz.io/signoz/ee/query-service/license" "go.signoz.io/signoz/ee/query-service/usage" + baseapp "go.signoz.io/signoz/pkg/query-service/app" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + baseauth "go.signoz.io/signoz/pkg/query-service/auth" baseconst "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/healthcheck" basealm "go.signoz.io/signoz/pkg/query-service/integrations/alertManager" @@ -199,17 +202,61 @@ func (s *Server) createPrivateServer(apiHandler *api.APIHandler) (*http.Server, }, nil } +func getPATToken(r *http.Request) (string, error) { + authHeader := r.Header.Get("Authorization") + if authHeader == "" { + return "", nil + } + + authHeaderParts := strings.Fields(authHeader) + if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { + return "", fmt.Errorf("authorization header format must be Bearer {token}") + } + + return authHeaderParts[1], nil +} + func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, error) { r := mux.NewRouter() + getUserFromPAT := func(r *http.Request) (*model.UserPayload, error) { + patToken, err := getPATToken(r) + if err != nil { + return nil, fmt.Errorf("failed to get PAT token in request headers, err: %v", err) + } + ctx := context.Background() + dao := apiHandler.AppDao() + pat, err := dao.GetPAT(ctx, patToken) + if err != nil { + return nil, fmt.Errorf("failed to fetch PAT token from DB, err %v", err) + } + user, apierr := dao.GetUser(ctx, pat.UserID) + if apierr != nil { + return nil, fmt.Errorf("failed to fetch user for PAT from DB, err: %v", apierr) + } + return user, nil + } + + getUserFromRequest := func(r *http.Request) (*model.UserPayload, error) { + user, err := getUserFromPAT(r) + if err == nil && user != nil { + zap.S().Debugf("Found valid PAT user: %+v", user) + return user, nil + } + if err != nil { + zap.S().Debugf("Error while getting user for PAT: %+v", err) + } + return baseauth.GetUserFromRequest(r) + } + am := baseapp.NewAuthMiddleware(getUserFromRequest) r.Use(setTimeoutMiddleware) r.Use(s.analyticsMiddleware) r.Use(loggingMiddleware) - apiHandler.RegisterRoutes(r) - apiHandler.RegisterMetricsRoutes(r) - apiHandler.RegisterLogsRoutes(r) + apiHandler.RegisterRoutes(r, am) + apiHandler.RegisterMetricsRoutes(r, am) + apiHandler.RegisterLogsRoutes(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/ee/query-service/dao/interface.go b/ee/query-service/dao/interface.go index 5bb7c02412..da6963f68c 100644 --- a/ee/query-service/dao/interface.go +++ b/ee/query-service/dao/interface.go @@ -35,7 +35,7 @@ type ModelDao interface { GetDomainByEmail(ctx context.Context, email string) (*model.OrgDomain, basemodel.BaseApiError) CreatePAT(ctx context.Context, p *model.PAT) basemodel.BaseApiError - GetPAT(ctx context.Context, patID string) (*model.PAT, basemodel.BaseApiError) + GetPAT(ctx context.Context, pat string) (*model.PAT, basemodel.BaseApiError) ListPATs(ctx context.Context, userID string) ([]model.PAT, basemodel.BaseApiError) DeletePAT(ctx context.Context, id string) basemodel.BaseApiError } diff --git a/ee/query-service/dao/sqlite/pat.go b/ee/query-service/dao/sqlite/pat.go index fc3c406ecb..7b3569db66 100644 --- a/ee/query-service/dao/sqlite/pat.go +++ b/ee/query-service/dao/sqlite/pat.go @@ -43,18 +43,17 @@ func (m *modelDao) DeletePAT(ctx context.Context, id string) basemodel.BaseApiEr return nil } -func (m *modelDao) GetPAT(ctx context.Context, patID string) (*model.PAT, basemodel.BaseApiError) { +func (m *modelDao) GetPAT(ctx context.Context, token string) (*model.PAT, basemodel.BaseApiError) { pats := []model.PAT{} - if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE id=?;`, patID); err != nil { - zap.S().Errorf("Failed to fetch PAT with ID: %s, err: %v", patID, zap.Error(err)) + if err := m.DB().Select(&pats, `SELECT * FROM personal_access_tokens WHERE token=?;`, token); err != nil { return nil, model.InternalError(fmt.Errorf("failed to fetch PAT")) } if len(pats) != 1 { return nil, &model.ApiError{ Typ: model.ErrorInternal, - Err: fmt.Errorf("found zero or multiple PATS with same ID"), + Err: fmt.Errorf("found zero or multiple PATs with same token, %s", token), } } diff --git a/pkg/query-service/app/auth.go b/pkg/query-service/app/auth.go new file mode 100644 index 0000000000..ef6541a4f6 --- /dev/null +++ b/pkg/query-service/app/auth.go @@ -0,0 +1,116 @@ +package app + +import ( + "errors" + "net/http" + + "github.com/gorilla/mux" + "go.signoz.io/signoz/pkg/query-service/auth" + "go.signoz.io/signoz/pkg/query-service/model" +) + +type AuthMiddleware struct { + GetUserFromRequest func(r *http.Request) (*model.UserPayload, error) +} + +func NewAuthMiddleware(f func(r *http.Request) (*model.UserPayload, error)) *AuthMiddleware { + return &AuthMiddleware{ + GetUserFromRequest: f, + } +} + +// func (am *AuthMiddleware) GetUserFromRequest(r *http.Request) (*model.UserPayload, error) { +// return auth.GetUserFromRequest(r) +// } + +func (am *AuthMiddleware) OpenAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + f(w, r) + } +} + +func (am *AuthMiddleware) ViewAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + + if !(auth.IsViewer(user) || auth.IsEditor(user) || auth.IsAdmin(user)) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible to viewers/editors/admins."), + }, nil) + return + } + f(w, r) + } +} + +func (am *AuthMiddleware) EditAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + if !(auth.IsEditor(user) || auth.IsAdmin(user)) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible to editors/admins."), + }, nil) + return + } + f(w, r) + } +} + +func (am *AuthMiddleware) SelfAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + id := mux.Vars(r)["id"] + if !(auth.IsSelfAccessRequest(user, id) || auth.IsAdmin(user)) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible for self access or to the admins."), + }, nil) + return + } + f(w, r) + } +} + +func (am *AuthMiddleware) AdminAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + user, err := am.GetUserFromRequest(r) + if err != nil { + RespondError(w, &model.ApiError{ + Typ: model.ErrorUnauthorized, + Err: err, + }, nil) + return + } + if !auth.IsAdmin(user) { + RespondError(w, &model.ApiError{ + Typ: model.ErrorForbidden, + Err: errors.New("API is accessible to admins only"), + }, nil) + return + } + f(w, r) + } +} diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index 06de321612..eeb324f149 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -229,202 +229,109 @@ func writeHttpResponse(w http.ResponseWriter, data interface{}) { } } -func (aH *APIHandler) RegisterMetricsRoutes(router *mux.Router) { +func (aH *APIHandler) RegisterMetricsRoutes(router *mux.Router, am *AuthMiddleware) { subRouter := router.PathPrefix("/api/v2/metrics").Subrouter() - subRouter.HandleFunc("/query_range", ViewAccess(aH.QueryRangeMetricsV2)).Methods(http.MethodPost) - subRouter.HandleFunc("/autocomplete/list", ViewAccess(aH.metricAutocompleteMetricName)).Methods(http.MethodGet) - subRouter.HandleFunc("/autocomplete/tagKey", ViewAccess(aH.metricAutocompleteTagKey)).Methods(http.MethodGet) - subRouter.HandleFunc("/autocomplete/tagValue", ViewAccess(aH.metricAutocompleteTagValue)).Methods(http.MethodGet) + subRouter.HandleFunc("/query_range", am.ViewAccess(aH.QueryRangeMetricsV2)).Methods(http.MethodPost) + subRouter.HandleFunc("/autocomplete/list", am.ViewAccess(aH.metricAutocompleteMetricName)).Methods(http.MethodGet) + subRouter.HandleFunc("/autocomplete/tagKey", am.ViewAccess(aH.metricAutocompleteTagKey)).Methods(http.MethodGet) + subRouter.HandleFunc("/autocomplete/tagValue", am.ViewAccess(aH.metricAutocompleteTagValue)).Methods(http.MethodGet) } func (aH *APIHandler) Respond(w http.ResponseWriter, data interface{}) { writeHttpResponse(w, data) } -func OpenAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - f(w, r) - } -} - -func ViewAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - - if !(auth.IsViewer(user) || auth.IsEditor(user) || auth.IsAdmin(user)) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible to viewers/editors/admins."), - }, nil) - return - } - f(w, r) - } -} - -func EditAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - if !(auth.IsEditor(user) || auth.IsAdmin(user)) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible to editors/admins."), - }, nil) - return - } - f(w, r) - } -} - -func SelfAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - id := mux.Vars(r)["id"] - if !(auth.IsSelfAccessRequest(user, id) || auth.IsAdmin(user)) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible for self access or to the admins."), - }, nil) - return - } - f(w, r) - } -} - -func AdminAccess(f func(http.ResponseWriter, *http.Request)) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - user, err := auth.GetUserFromRequest(r) - if err != nil { - RespondError(w, &model.ApiError{ - Typ: model.ErrorUnauthorized, - Err: err, - }, nil) - return - } - if !auth.IsAdmin(user) { - RespondError(w, &model.ApiError{ - Typ: model.ErrorForbidden, - Err: errors.New("API is accessible to admins only"), - }, nil) - return - } - f(w, r) - } -} - // RegisterPrivateRoutes registers routes for this handler on the given router func (aH *APIHandler) RegisterPrivateRoutes(router *mux.Router) { router.HandleFunc("/api/v1/channels", aH.listChannels).Methods(http.MethodGet) } // RegisterRoutes registers routes for this handler on the given router -func (aH *APIHandler) RegisterRoutes(router *mux.Router) { - router.HandleFunc("/api/v1/query_range", ViewAccess(aH.queryRangeMetrics)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/query", ViewAccess(aH.queryMetrics)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/channels", ViewAccess(aH.listChannels)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/channels/{id}", ViewAccess(aH.getChannel)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/channels/{id}", AdminAccess(aH.editChannel)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/channels/{id}", AdminAccess(aH.deleteChannel)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/channels", EditAccess(aH.createChannel)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/testChannel", EditAccess(aH.testChannel)).Methods(http.MethodPost) +func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *AuthMiddleware) { + router.HandleFunc("/api/v1/query_range", am.ViewAccess(aH.queryRangeMetrics)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/query", am.ViewAccess(aH.queryMetrics)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/channels", am.ViewAccess(aH.listChannels)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/channels/{id}", am.ViewAccess(aH.getChannel)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/channels/{id}", am.AdminAccess(aH.editChannel)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/channels/{id}", am.AdminAccess(aH.deleteChannel)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/channels", am.EditAccess(aH.createChannel)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/testChannel", am.EditAccess(aH.testChannel)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/rules", ViewAccess(aH.listRules)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/rules/{id}", ViewAccess(aH.getRule)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/rules", EditAccess(aH.createRule)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/rules/{id}", EditAccess(aH.editRule)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/rules/{id}", EditAccess(aH.deleteRule)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/rules/{id}", EditAccess(aH.patchRule)).Methods(http.MethodPatch) - router.HandleFunc("/api/v1/testRule", EditAccess(aH.testRule)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/rules", am.ViewAccess(aH.listRules)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/rules/{id}", am.ViewAccess(aH.getRule)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/rules", am.EditAccess(aH.createRule)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.editRule)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.deleteRule)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/rules/{id}", am.EditAccess(aH.patchRule)).Methods(http.MethodPatch) + router.HandleFunc("/api/v1/testRule", am.EditAccess(aH.testRule)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/dashboards", ViewAccess(aH.getDashboards)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/dashboards", EditAccess(aH.createDashboards)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/dashboards/grafana", EditAccess(aH.createDashboardsTransform)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/dashboards/{uuid}", ViewAccess(aH.getDashboard)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/dashboards/{uuid}", EditAccess(aH.updateDashboard)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/dashboards/{uuid}", EditAccess(aH.deleteDashboard)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/variables/query", ViewAccess(aH.queryDashboardVars)).Methods(http.MethodGet) - router.HandleFunc("/api/v2/variables/query", ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/dashboards", am.ViewAccess(aH.getDashboards)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/dashboards", am.EditAccess(aH.createDashboards)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/dashboards/grafana", am.EditAccess(aH.createDashboardsTransform)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/dashboards/{uuid}", am.ViewAccess(aH.getDashboard)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/dashboards/{uuid}", am.EditAccess(aH.updateDashboard)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/dashboards/{uuid}", am.EditAccess(aH.deleteDashboard)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/variables/query", am.ViewAccess(aH.queryDashboardVars)).Methods(http.MethodGet) + router.HandleFunc("/api/v2/variables/query", am.ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/feedback", OpenAccess(aH.submitFeedback)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/feedback", am.OpenAccess(aH.submitFeedback)).Methods(http.MethodPost) // router.HandleFunc("/api/v1/get_percentiles", aH.getApplicationPercentiles).Methods(http.MethodGet) - router.HandleFunc("/api/v1/services", ViewAccess(aH.getServices)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/services/list", ViewAccess(aH.getServicesList)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/service/overview", ViewAccess(aH.getServiceOverview)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/service/top_operations", ViewAccess(aH.getTopOperations)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/service/top_level_operations", ViewAccess(aH.getServicesTopLevelOps)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/traces/{traceId}", ViewAccess(aH.SearchTraces)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/usage", ViewAccess(aH.getUsage)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/dependency_graph", ViewAccess(aH.dependencyGraph)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/settings/ttl", AdminAccess(aH.setTTL)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/settings/ttl", ViewAccess(aH.getTTL)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/services", am.ViewAccess(aH.getServices)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/services/list", am.ViewAccess(aH.getServicesList)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/service/overview", am.ViewAccess(aH.getServiceOverview)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/service/top_operations", am.ViewAccess(aH.getTopOperations)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/service/top_level_operations", am.ViewAccess(aH.getServicesTopLevelOps)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/traces/{traceId}", am.ViewAccess(aH.SearchTraces)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/usage", am.ViewAccess(aH.getUsage)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/dependency_graph", am.ViewAccess(aH.dependencyGraph)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/settings/ttl", am.AdminAccess(aH.setTTL)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/settings/ttl", am.ViewAccess(aH.getTTL)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/version", OpenAccess(aH.getVersion)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/featureFlags", OpenAccess(aH.getFeatureFlags)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/configs", OpenAccess(aH.getConfigs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/health", OpenAccess(aH.getHealth)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/version", am.OpenAccess(aH.getVersion)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/featureFlags", am.OpenAccess(aH.getFeatureFlags)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/configs", am.OpenAccess(aH.getConfigs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/getSpanFilters", ViewAccess(aH.getSpanFilters)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getTagFilters", ViewAccess(aH.getTagFilters)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getFilteredSpans", ViewAccess(aH.getFilteredSpans)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getFilteredSpans/aggregates", ViewAccess(aH.getFilteredSpanAggregates)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/getTagValues", ViewAccess(aH.getTagValues)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getSpanFilters", am.ViewAccess(aH.getSpanFilters)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getTagFilters", am.ViewAccess(aH.getTagFilters)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getFilteredSpans", am.ViewAccess(aH.getFilteredSpans)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getFilteredSpans/aggregates", am.ViewAccess(aH.getFilteredSpanAggregates)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getTagValues", am.ViewAccess(aH.getTagValues)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/listErrors", ViewAccess(aH.listErrors)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/countErrors", ViewAccess(aH.countErrors)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/errorFromErrorID", ViewAccess(aH.getErrorFromErrorID)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/errorFromGroupID", ViewAccess(aH.getErrorFromGroupID)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/nextPrevErrorIDs", ViewAccess(aH.getNextPrevErrorIDs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/listErrors", am.ViewAccess(aH.listErrors)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/countErrors", am.ViewAccess(aH.countErrors)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/errorFromErrorID", am.ViewAccess(aH.getErrorFromErrorID)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/errorFromGroupID", am.ViewAccess(aH.getErrorFromGroupID)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/nextPrevErrorIDs", am.ViewAccess(aH.getNextPrevErrorIDs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/disks", ViewAccess(aH.getDisks)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/disks", am.ViewAccess(aH.getDisks)).Methods(http.MethodGet) // === Authentication APIs === - router.HandleFunc("/api/v1/invite", AdminAccess(aH.inviteUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/invite/{token}", OpenAccess(aH.getInvite)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/invite/{email}", AdminAccess(aH.revokeInvite)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/invite", AdminAccess(aH.listPendingInvites)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/invite", am.AdminAccess(aH.inviteUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/invite/{token}", am.OpenAccess(aH.getInvite)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/invite/{email}", am.AdminAccess(aH.revokeInvite)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/invite", am.AdminAccess(aH.listPendingInvites)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/register", OpenAccess(aH.registerUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/login", OpenAccess(aH.loginUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/register", am.OpenAccess(aH.registerUser)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/login", am.OpenAccess(aH.loginUser)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/user", AdminAccess(aH.listUsers)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/user/{id}", SelfAccess(aH.getUser)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/user/{id}", SelfAccess(aH.editUser)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/user/{id}", AdminAccess(aH.deleteUser)).Methods(http.MethodDelete) + router.HandleFunc("/api/v1/user", am.AdminAccess(aH.listUsers)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/user/{id}", am.SelfAccess(aH.getUser)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/user/{id}", am.SelfAccess(aH.editUser)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/user/{id}", am.AdminAccess(aH.deleteUser)).Methods(http.MethodDelete) - router.HandleFunc("/api/v1/user/{id}/flags", SelfAccess(aH.patchUserFlag)).Methods(http.MethodPatch) + router.HandleFunc("/api/v1/user/{id}/flags", am.SelfAccess(aH.patchUserFlag)).Methods(http.MethodPatch) - router.HandleFunc("/api/v1/rbac/role/{id}", SelfAccess(aH.getRole)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/rbac/role/{id}", AdminAccess(aH.editRole)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/rbac/role/{id}", am.SelfAccess(aH.getRole)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/rbac/role/{id}", am.AdminAccess(aH.editRole)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/org", AdminAccess(aH.getOrgs)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/org/{id}", AdminAccess(aH.getOrg)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/org/{id}", AdminAccess(aH.editOrg)).Methods(http.MethodPut) - router.HandleFunc("/api/v1/orgUsers/{id}", AdminAccess(aH.getOrgUsers)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/org", am.AdminAccess(aH.getOrgs)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/org/{id}", am.AdminAccess(aH.getOrg)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/org/{id}", am.AdminAccess(aH.editOrg)).Methods(http.MethodPut) + router.HandleFunc("/api/v1/orgUsers/{id}", am.AdminAccess(aH.getOrgUsers)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/getResetPasswordToken/{id}", AdminAccess(aH.getResetPasswordToken)).Methods(http.MethodGet) - router.HandleFunc("/api/v1/resetPassword", OpenAccess(aH.resetPassword)).Methods(http.MethodPost) - router.HandleFunc("/api/v1/changePassword/{id}", SelfAccess(aH.changePassword)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/getResetPasswordToken/{id}", am.AdminAccess(aH.getResetPasswordToken)).Methods(http.MethodGet) + router.HandleFunc("/api/v1/resetPassword", am.OpenAccess(aH.resetPassword)).Methods(http.MethodPost) + router.HandleFunc("/api/v1/changePassword/{id}", am.SelfAccess(aH.changePassword)).Methods(http.MethodPost) } func Intersection(a, b []int) (c []int) { @@ -2221,13 +2128,13 @@ func (aH *APIHandler) WriteJSON(w http.ResponseWriter, r *http.Request, response } // logs -func (aH *APIHandler) RegisterLogsRoutes(router *mux.Router) { +func (aH *APIHandler) RegisterLogsRoutes(router *mux.Router, am *AuthMiddleware) { subRouter := router.PathPrefix("/api/v1/logs").Subrouter() - subRouter.HandleFunc("", ViewAccess(aH.getLogs)).Methods(http.MethodGet) - subRouter.HandleFunc("/tail", ViewAccess(aH.tailLogs)).Methods(http.MethodGet) - subRouter.HandleFunc("/fields", ViewAccess(aH.logFields)).Methods(http.MethodGet) - subRouter.HandleFunc("/fields", EditAccess(aH.logFieldUpdate)).Methods(http.MethodPost) - subRouter.HandleFunc("/aggregate", ViewAccess(aH.logAggregate)).Methods(http.MethodGet) + subRouter.HandleFunc("", am.ViewAccess(aH.getLogs)).Methods(http.MethodGet) + subRouter.HandleFunc("/tail", am.ViewAccess(aH.tailLogs)).Methods(http.MethodGet) + subRouter.HandleFunc("/fields", am.ViewAccess(aH.logFields)).Methods(http.MethodGet) + subRouter.HandleFunc("/fields", am.EditAccess(aH.logFieldUpdate)).Methods(http.MethodPost) + subRouter.HandleFunc("/aggregate", am.ViewAccess(aH.logAggregate)).Methods(http.MethodGet) } func (aH *APIHandler) logFields(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index c9505b9391..c99046fac4 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -20,6 +20,7 @@ import ( "github.com/soheilhy/cmux" "go.signoz.io/signoz/pkg/query-service/app/clickhouseReader" "go.signoz.io/signoz/pkg/query-service/app/dashboards" + "go.signoz.io/signoz/pkg/query-service/auth" "go.signoz.io/signoz/pkg/query-service/constants" "go.signoz.io/signoz/pkg/query-service/dao" "go.signoz.io/signoz/pkg/query-service/featureManager" @@ -176,9 +177,11 @@ func (s *Server) createPublicServer(api *APIHandler) (*http.Server, error) { r.Use(s.analyticsMiddleware) r.Use(loggingMiddleware) - api.RegisterRoutes(r) - api.RegisterMetricsRoutes(r) - api.RegisterLogsRoutes(r) + am := NewAuthMiddleware(auth.GetUserFromRequest) + + api.RegisterRoutes(r, am) + api.RegisterMetricsRoutes(r, am) + api.RegisterLogsRoutes(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/pkg/query-service/auth/rbac.go b/pkg/query-service/auth/rbac.go index 44f65576ed..38ae283bb2 100644 --- a/pkg/query-service/auth/rbac.go +++ b/pkg/query-service/auth/rbac.go @@ -3,6 +3,7 @@ package auth import ( "context" "net/http" + "strings" "github.com/pkg/errors" "go.signoz.io/signoz/pkg/query-service/constants" @@ -48,6 +49,19 @@ func InitAuthCache(ctx context.Context) error { return nil } +func GetAuthorizationToken(r *http.Request) string { + authHeader := r.Header.Get("Authorization") + if authHeader == "" { + return "" + } + + authHeaderParts := strings.Fields(authHeader) + if len(authHeaderParts) != 2 || strings.ToLower(authHeaderParts[0]) != "bearer" { + return "" + } + return authHeaderParts[1] +} + func GetUserFromRequest(r *http.Request) (*model.UserPayload, error) { accessJwt, err := ExtractJwtFromRequest(r) if err != nil {