From 8a368fabfa795678deccb5c430ccc8ea643b9403 Mon Sep 17 00:00:00 2001 From: Lorenzo Affetti Date: Mon, 16 Mar 2020 11:32:35 +0100 Subject: [PATCH] fix(http): make label service authorized by default Fix resource type for label backends. --- http/api_handler.go | 6 ++---- http/check_service.go | 2 +- http/notification_endpoint.go | 2 +- http/notification_rule.go | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/http/api_handler.go b/http/api_handler.go index fd9803b0661..cf9123ad31e 100644 --- a/http/api_handler.go +++ b/http/api_handler.go @@ -119,6 +119,7 @@ func NewAPIHandler(b *APIBackend, opts ...APIHandlerOptFn) *APIHandler { noAuthUserResourceMappingService := b.UserResourceMappingService b.UserResourceMappingService = authorizer.NewURMService(b.OrgLookupService, b.UserResourceMappingService) + b.LabelService = authorizer.NewLabelServiceWithOrg(b.LabelService, b.OrgLookupService) h.Mount("/api/v2", serveLinksHandler(b.HTTPErrorHandler)) @@ -128,7 +129,6 @@ func NewAPIHandler(b *APIBackend, opts ...APIHandlerOptFn) *APIHandler { bucketBackend := NewBucketBackend(b.Logger.With(zap.String("handler", "bucket")), b) bucketBackend.BucketService = authorizer.NewBucketService(b.BucketService, noAuthUserResourceMappingService) - bucketBackend.LabelService = authorizer.NewLabelServiceWithOrg(b.LabelService, b.OrgLookupService) h.Mount(prefixBuckets, NewBucketHandler(b.Logger, bucketBackend)) checkBackend := NewCheckBackend(b.Logger.With(zap.String("handler", "check")), b) @@ -146,14 +146,13 @@ func NewAPIHandler(b *APIBackend, opts ...APIHandlerOptFn) *APIHandler { h.Mount(prefixDelete, NewDeleteHandler(b.Logger, deleteBackend)) documentBackend := NewDocumentBackend(b.Logger.With(zap.String("handler", "document")), b) - documentBackend.LabelService = authorizer.NewLabelServiceWithOrg(b.LabelService, b.OrgLookupService) documentBackend.DocumentService = authorizer.NewDocumentService(b.DocumentService) h.Mount(prefixDocuments, NewDocumentHandler(documentBackend)) fluxBackend := NewFluxBackend(b.Logger.With(zap.String("handler", "query")), b) h.Mount(prefixQuery, NewFluxHandler(b.Logger, fluxBackend)) - h.Mount(prefixLabels, NewLabelHandler(b.Logger, authorizer.NewLabelServiceWithOrg(b.LabelService, b.OrgLookupService), b.HTTPErrorHandler)) + h.Mount(prefixLabels, NewLabelHandler(b.Logger, b.LabelService, b.HTTPErrorHandler)) notificationEndpointBackend := NewNotificationEndpointBackend(b.Logger.With(zap.String("handler", "notificationEndpoint")), b) notificationEndpointBackend.NotificationEndpointService = authorizer.NewNotificationEndpointService(b.NotificationEndpointService, @@ -168,7 +167,6 @@ func NewAPIHandler(b *APIBackend, opts ...APIHandlerOptFn) *APIHandler { orgBackend := NewOrgBackend(b.Logger.With(zap.String("handler", "org")), b) orgBackend.OrganizationService = authorizer.NewOrgService(b.OrganizationService) orgBackend.SecretService = authorizer.NewSecretService(b.SecretService) - orgBackend.LabelService = authorizer.NewLabelServiceWithOrg(b.LabelService, b.OrgLookupService) h.Mount(prefixOrganizations, NewOrgHandler(b.Logger, orgBackend)) scraperBackend := NewScraperBackend(b.Logger.With(zap.String("handler", "scraper")), b) diff --git a/http/check_service.go b/http/check_service.go index 19c0bbfaa42..ce86bab3903 100644 --- a/http/check_service.go +++ b/http/check_service.go @@ -124,7 +124,7 @@ func NewCheckHandler(log *zap.Logger, b *CheckBackend) *CheckHandler { HTTPErrorHandler: b.HTTPErrorHandler, log: b.log.With(zap.String("handler", "label")), LabelService: b.LabelService, - ResourceType: influxdb.TelegrafsResourceType, + ResourceType: influxdb.ChecksResourceType, } h.HandlerFunc("GET", checksIDLabelsPath, newGetLabelsHandler(labelBackend)) h.HandlerFunc("POST", checksIDLabelsPath, newPostLabelHandler(labelBackend)) diff --git a/http/notification_endpoint.go b/http/notification_endpoint.go index a33e70fe759..0ab8a4e865b 100644 --- a/http/notification_endpoint.go +++ b/http/notification_endpoint.go @@ -119,7 +119,7 @@ func NewNotificationEndpointHandler(log *zap.Logger, b *NotificationEndpointBack HTTPErrorHandler: b.HTTPErrorHandler, log: b.log.With(zap.String("handler", "label")), LabelService: b.LabelService, - ResourceType: influxdb.TelegrafsResourceType, + ResourceType: influxdb.NotificationEndpointResourceType, } h.HandlerFunc("GET", notificationEndpointsIDLabelsPath, newGetLabelsHandler(labelBackend)) h.HandlerFunc("POST", notificationEndpointsIDLabelsPath, newPostLabelHandler(labelBackend)) diff --git a/http/notification_rule.go b/http/notification_rule.go index d01a1191c99..85f69071ec3 100644 --- a/http/notification_rule.go +++ b/http/notification_rule.go @@ -132,7 +132,7 @@ func NewNotificationRuleHandler(log *zap.Logger, b *NotificationRuleBackend) *No HTTPErrorHandler: b.HTTPErrorHandler, log: b.log.With(zap.String("handler", "label")), LabelService: b.LabelService, - ResourceType: influxdb.TelegrafsResourceType, + ResourceType: influxdb.NotificationRuleResourceType, } h.HandlerFunc("GET", notificationRulesIDLabelsPath, newGetLabelsHandler(labelBackend)) h.HandlerFunc("POST", notificationRulesIDLabelsPath, newPostLabelHandler(labelBackend))