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

WIP cleanup

pull/10616/head
Michael Desa 2017-10-31 20:58:40 -04:00
parent e7e17537a1
commit 708c37dc67
11 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bolt/client.go
View File

@ -86,6 +86,9 @@ func (c *Client) Open(ctx context.Context) error {
if err := c.DashboardsStore.Migrate(ctx); err != nil {
return err
}
if err := c.OrganizationsStore.Migrate(ctx); err != nil {
return err
}
// TODO: this will have to change, and is temporary
if err := c.UsersStore.Migrate(ctx); err != nil {
return err

17
bolt/organizations.go
View File

@ -20,6 +20,23 @@ type OrganizationsStore struct {
client *Client
}
func (s *OrganizationsStore) Migrate(ctx context.Context) error {
o := chronograf.Organization{
ID: 0,
Name: "__default",
}
return s.client.db.Update(func(tx *bolt.Tx) error {
b := tx.Bucket(OrganizationsBucket)
if v, err := internal.MarshalOrganization(&o); err != nil {
return err
} else if err := b.Put(u64tob(o.ID), v); err != nil {
return err
}
return nil
})
}
func (s *OrganizationsStore) Add(ctx context.Context, o *chronograf.Organization) (*chronograf.Organization, error) {
if err := s.client.db.Update(func(tx *bolt.Tx) error {
b := tx.Bucket(OrganizationsBucket)

6
oauth2/jwt.go
View File

@ -93,6 +93,12 @@ func (j *JWT) ValidClaims(jwtToken Token, lifespan time.Duration, alg gojwt.Keyf
return Principal{}, fmt.Errorf("claims duration is different from auth lifespan")
}
if claims.Organization == "" {
// TODO(desa): this okay?
// Set to be the default organization
claims.Organization = "0"
}
return Principal{
Subject: claims.Subject,
Issuer: claims.Issuer,

14
server/auth.go
View File

@ -2,6 +2,7 @@ package server
import (
"context"
"fmt"
"net/http"
"strconv"
@ -86,12 +87,9 @@ func AuthorizedUser(
}
if p.Organization == "" {
// TODO: remove
p.Organization = "1"
// log.Error("Failed to retrieve organization from principal")
// Error(w, http.StatusUnauthorized, "User is not authorized", logger)
// return
p.Organization = "0"
}
// validate that the organization exists
orgID, err := strconv.ParseUint(p.Organization, 10, 64)
if err != nil {
@ -101,7 +99,7 @@ func AuthorizedUser(
}
_, err = store.Organizations(ctx).Get(ctx, chronograf.OrganizationQuery{ID: &orgID})
if err != nil {
log.Error("Failed to retrieve organization from organizations store")
log.Error(fmt.Sprintf("Failed to retrieve organization %d from organizations store", orgID))
Error(w, http.StatusUnauthorized, "User is not authorized", logger)
return
}
@ -177,6 +175,10 @@ func hasAuthorizedRole(u *chronograf.User, role string) bool {
return true
}
}
case SuperAdminRoleName:
// SuperAdmins should have been authorized before this.
// This is only meant to restrict access for non-superadmins.
return false
}
return false

4
server/dashboards.go
View File

@ -220,9 +220,7 @@ func (s *Service) UpdateDashboard(w http.ResponseWriter, r *http.Request) {
// ValidDashboardRequest verifies that the dashboard cells have a query
func ValidDashboardRequest(d *chronograf.Dashboard) error {
if d.Organization == "" {
//TODO: Remove this
d.Organization = "1"
//return fmt.Errorf("organization required")
d.Organization = "0"
}
for i, c := range d.Cells {
if err := ValidDashboardCellRequest(&c); err != nil {

2
server/kapacitors.go
View File

@ -26,7 +26,7 @@ func (p *postKapacitorRequest) Valid() error {
}
if p.Organization == "" {
return fmt.Errorf("organization must be set")
p.Organization = "0"
}
url, err := url.ParseRequestURI(*p.URL)

4
server/layout.go
View File

@ -191,9 +191,7 @@ func ValidLayoutRequest(l chronograf.Layout) error {
}
if l.Organization == "" {
//TODO: Remove this
l.Organization = "1"
//return fmt.Errorf("organization required")
l.Organization = "0"
}
for _, c := range l.Cells {

20
server/me.go
View File

@ -208,21 +208,6 @@ func (s *Service) Me(w http.ResponseWriter, r *http.Request) {
return
}
// Create default org if no organization exists
// TODO: cleanup
defaultOrgID := uint64(1)
org, err := s.Store.Organizations(ctx).Get(ctx, chronograf.OrganizationQuery{
ID: &defaultOrgID,
})
// Create defaultOrg
if err == chronograf.ErrOrganizationNotFound {
// TODO: check err
org, _ = s.Store.Organizations(ctx).Add(ctx, &chronograf.Organization{
Name: "__default",
})
}
// Because we didnt find a user, making a new one
user := &chronograf.User{
Name: p.Subject,
@ -234,8 +219,9 @@ func (s *Service) Me(w http.ResponseWriter, r *http.Request) {
// TODO: this should be member
Roles: []chronograf.Role{
{
Name: ViewerRoleName,
Organization: fmt.Sprintf("%d", org.ID),
Name: ViewerRoleName,
// This is the ID of the default organization
Organization: "0",
},
},
// TODO: is super admin for now

27
server/mux.go
View File

@ -94,6 +94,15 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
next,
)
}
EnsureSuperAdmin := func(next http.HandlerFunc) http.HandlerFunc {
return AuthorizedUser(
service.Store,
opts.UseAuth,
SuperAdminRoleName,
opts.Logger,
next,
)
}
/* Documentation */
router.GET("/swagger.json", Spec())
@ -101,17 +110,12 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
/* API */
// Organizations
// TODO: Change to SuperAdmin
router.GET("/chronograf/v1/organizations", EnsureAdmin(service.Organizations))
// TODO: Change to SuperAdmin
router.POST("/chronograf/v1/organizations", EnsureAdmin(service.NewOrganization))
router.GET("/chronograf/v1/organizations", EnsureSuperAdmin(service.Organizations))
router.POST("/chronograf/v1/organizations", EnsureSuperAdmin(service.NewOrganization))
// TODO: Change to SuperAdmin
router.GET("/chronograf/v1/organizations/:id", EnsureAdmin(service.OrganizationID))
// TODO: Change to SuperAdmin
router.PATCH("/chronograf/v1/organizations/:id", EnsureAdmin(service.UpdateOrganization))
// TODO: Change to SuperAdmin
router.DELETE("/chronograf/v1/organizations/:id", EnsureAdmin(service.RemoveOrganization))
router.GET("/chronograf/v1/organizations/:id", EnsureSuperAdmin(service.OrganizationID))
router.PATCH("/chronograf/v1/organizations/:id", EnsureSuperAdmin(service.UpdateOrganization))
router.DELETE("/chronograf/v1/organizations/:id", EnsureSuperAdmin(service.RemoveOrganization))
// Sources
router.GET("/chronograf/v1/sources", EnsureViewer(service.Sources))
@ -193,8 +197,9 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
router.GET("/chronograf/v1/me", service.Me)
// Set current chronograf organization the user is logged into
router.PUT("/chronograf/v1/me/organization", service.MeOrganization(opts.Auth))
router.PUT("/chronograf/v1/me", service.MeOrganization(opts.Auth))
// TODO(desa): what to do about admin's being able to set superadmin
router.GET("/chronograf/v1/users", EnsureAdmin(service.Users))
router.POST("/chronograf/v1/users", EnsureAdmin(service.NewUser))

4
server/sources.go
View File

@ -288,9 +288,7 @@ func ValidSourceRequest(s chronograf.Source) error {
}
if s.Organization == "" {
//TODO: Remove this
s.Organization = "1"
//return fmt.Errorf("organization required")
s.Organization = "0"
}
url, err := url.ParseRequestURI(s.URL)

32
server/users.go
View File

@ -12,11 +12,12 @@ import (
)
type userRequest struct {
ID uint64 `json:"id,string"`
Name string `json:"name"`
Provider string `json:"provider"`
Scheme string `json:"scheme"`
Roles []chronograf.Role `json:"roles"`
ID uint64 `json:"id,string"`
Name string `json:"name"`
Provider string `json:"provider"`
Scheme string `json:"scheme"`
SuperAdmin bool `json:"superAdmin"`
Roles []chronograf.Role `json:"roles"`
}
func (r *userRequest) ValidCreate() error {
@ -57,7 +58,6 @@ func (r *userRequest) ValidRoles() error {
if len(r.Roles) > 0 {
for _, r := range r.Roles {
switch r.Name {
// TODO: add SuperAdmin
case ViewerRoleName, EditorRoleName, AdminRoleName:
continue
default:
@ -69,12 +69,13 @@ func (r *userRequest) ValidRoles() error {
}
type userResponse struct {
Links selfLinks `json:"links"`
ID uint64 `json:"id,string"`
Name string `json:"name"`
Provider string `json:"provider"`
Scheme string `json:"scheme"`
Roles []chronograf.Role `json:"roles"`
Links selfLinks `json:"links"`
ID uint64 `json:"id,string"`
Name string `json:"name"`
Provider string `json:"provider"`
Scheme string `json:"scheme"`
SuperAdmin bool `json:"superAdmin"`
Roles []chronograf.Role `json:"roles"`
}
func newUserResponse(u *chronograf.User) *userResponse {
@ -119,9 +120,10 @@ func newUsersResponse(users []chronograf.User) *usersResponse {
// Chronograf User Roles
const (
ViewerRoleName = "viewer"
EditorRoleName = "editor"
AdminRoleName = "admin"
ViewerRoleName = "viewer"
EditorRoleName = "editor"
AdminRoleName = "admin"
SuperAdminRoleName = "superadmin"
)
var (