From e52accaf90bfed2dc6289eaebbf0f397bb5f2942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Ram=C3=B3n?= Date: Mon, 22 Feb 2016 18:02:25 -0500 Subject: [PATCH 1/2] adds missing srv.Handler.QueryAuthorizer --- cmd/influxd/run/server.go | 1 + services/meta/query_authorizer.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/cmd/influxd/run/server.go b/cmd/influxd/run/server.go index 8b5c641f46..10705c3587 100644 --- a/cmd/influxd/run/server.go +++ b/cmd/influxd/run/server.go @@ -289,6 +289,7 @@ func (s *Server) appendHTTPDService(c httpd.Config) { } srv := httpd.NewService(c) srv.Handler.MetaClient = s.MetaClient + srv.Handler.QueryAuthorizer = meta.NewQueryAuthorizer(s.MetaClient) srv.Handler.QueryExecutor = s.QueryExecutor srv.Handler.PointsWriter = s.PointsWriter srv.Handler.Version = s.buildInfo.Version diff --git a/services/meta/query_authorizer.go b/services/meta/query_authorizer.go index 6b1bc5c983..a4687f0558 100644 --- a/services/meta/query_authorizer.go +++ b/services/meta/query_authorizer.go @@ -10,6 +10,12 @@ type QueryAuthorizer struct { Client *Client } +func NewQueryAuthorizer(c *Client) *QueryAuthorizer { + return &QueryAuthorizer{ + Client: c, + } +} + // AuthorizeQuery authorizes u to execute q on database. // Database can be "" for queries that do not require a database. // If no user is provided it will return an error unless the query's first statement is to create From f235852c0bf779c6ada53d19ec8cbd2738e15b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Ram=C3=B3n?= Date: Tue, 23 Feb 2016 00:03:32 -0500 Subject: [PATCH 2/2] updates changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eca72c6205..2b5df60951 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - [#5716](https://github.com/influxdata/influxdb/pull/5716): models: improve handling of points with empty field names or with no fields. - [#5719](https://github.com/influxdata/influxdb/issues/5719): Fix cache not deduplicating points - [#5754](https://github.com/influxdata/influxdb/issues/5754): Adding a node as meta only results in a data node also being registered +- [#5787](https://github.com/influxdata/influxdb/pull/5787): HTTP: Add QueryAuthorizer instance to httpd service’s handler. @chris-ramon ## v0.10.1 [2016-02-18]