Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(jwt): allow jwt's to be used in query proxy calls (#16010)

pull/16023/head
Lyon Hill 2019-11-22 02:12:36 -07:00 committed by George
parent 4d0e0ba1a4
commit c8de76eaf9
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
http/query.go
View File

@ -21,6 +21,7 @@ import (
"github.com/influxdata/flux/parser" "github.com/influxdata/flux/parser"
"github.com/influxdata/flux/repl" "github.com/influxdata/flux/repl"
"github.com/influxdata/influxdb" "github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/jsonweb"
"github.com/influxdata/influxdb/query" "github.com/influxdata/influxdb/query"
"github.com/influxdata/influxql" "github.com/influxdata/influxql"
) )
@ -368,6 +369,8 @@ func decodeProxyQueryRequest(ctx context.Context, r *http.Request, auth influxdb
token = a token = a
case *influxdb.Session: case *influxdb.Session:
token = a.EphemeralAuth(req.Org.ID) token = a.EphemeralAuth(req.Org.ID)
case *jsonweb.Token:
token = a.EphemeralAuth(req.Org.ID)
default: default:
return pr, n, influxdb.ErrAuthorizerNotSupported return pr, n, influxdb.ErrAuthorizerNotSupported
} }

10
jsonweb/token.go
View File

@ -124,3 +124,13 @@ func (t *Token) GetUserID() influxdb.ID {
func (t *Token) Kind() string { func (t *Token) Kind() string {
return kind return kind
} }
// EphemeralAuth creates a influxdb Auth form a jwt token
func (t *Token) EphemeralAuth(orgID influxdb.ID) *influxdb.Authorization {
return &influxdb.Authorization{
ID: t.Identifier(),
OrgID: orgID,
Status: influxdb.Active,
Permissions: t.Permissions,
}
}