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

Add routes for oauth providers

pull/922/head
Chris Goller 2017-02-15 14:07:33 -06:00
parent 6d601d527f
commit 7e28642e8c
2 changed files with 93 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
server/mux.go
View File

@ -34,6 +34,25 @@ type MuxOpts struct {
PublicURL string // PublicURL is the public facing URL for the server
}
func (m *MuxOpts) UseGithub() bool {
return m.TokenSecret != "" && m.GithubClientID != "" && m.GithubClientSecret != ""
}
func (m *MuxOpts) UseGoogle() bool {
return m.TokenSecret != "" && m.GoogleClientID != "" && m.GoogleClientSecret != "" && m.PublicURL != ""
}
func (m *MuxOpts) Routes() []AuthRoute {
routes := []AuthRoute{}
if m.UseGithub() {
routes = append(routes, NewGithubRoute())
}
if m.UseGoogle() {
routes = append(routes, NewGoogleRoute())
}
return routes
}
// NewMux attaches all the route handlers; handler returned servers chronograf.
func NewMux(opts MuxOpts, service Service) http.Handler {
router := httprouter.New()
@ -60,10 +79,6 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
router.GET("/docs", Redoc("/swagger.json"))
/* API */
// Root Routes returns all top-level routes in the API
router.GET("/chronograf/v1/", AllRoutes(opts.Logger))
router.GET("/chronograf/v1", AllRoutes(opts.Logger))
// Sources
router.GET("/chronograf/v1/sources", service.Sources)
router.POST("/chronograf/v1/sources", service.NewSource)
@ -125,6 +140,12 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
router.DELETE("/chronograf/v1/dashboards/:id", service.RemoveDashboard)
router.PUT("/chronograf/v1/dashboards/:id", service.UpdateDashboard)
authRoutes := opts.Routes()
// Root Routes returns all top-level routes in the API and
// optional authentication routes
router.GET("/chronograf/v1/", AllRoutes(authRoutes, opts.Logger))
router.GET("/chronograf/v1", AllRoutes(authRoutes, opts.Logger))
/* Authentication */
if opts.UseAuth {
auth := AuthAPI(opts, router)
@ -137,32 +158,36 @@ func NewMux(opts MuxOpts, service Service) http.Handler {
// AuthAPI adds the OAuth routes if auth is enabled.
func AuthAPI(opts MuxOpts, router *httprouter.Router) http.Handler {
gh := oauth2.Github{
ClientID: opts.GithubClientID,
ClientSecret: opts.GithubClientSecret,
Orgs: opts.GithubOrgs,
Logger: opts.Logger,
}
auth := oauth2.NewJWT(opts.TokenSecret)
ghMux := oauth2.NewJWTMux(&gh, &auth, opts.Logger)
router.Handler("GET", "/oauth/github/login", ghMux.Login())
router.Handler("GET", "/oauth/github/logout", ghMux.Logout())
router.Handler("GET", "/oauth/github/callback", ghMux.Callback())
if opts.UseGithub() {
gh := oauth2.Github{
ClientID: opts.GithubClientID,
ClientSecret: opts.GithubClientSecret,
Orgs: opts.GithubOrgs,
Logger: opts.Logger,
}
redirectURL := opts.PublicURL + opts.Basepath + "/oauth/google/callback"
google := oauth2.Google{
ClientID: opts.GoogleClientID,
ClientSecret: opts.GoogleClientSecret,
Domains: opts.GoogleDomains,
RedirectURL: redirectURL,
Logger: opts.Logger,
ghMux := oauth2.NewJWTMux(&gh, &auth, opts.Logger)
router.Handler("GET", "/oauth/github/login", ghMux.Login())
router.Handler("GET", "/oauth/github/logout", ghMux.Logout())
router.Handler("GET", "/oauth/github/callback", ghMux.Callback())
}
goMux := oauth2.NewJWTMux(&google, &auth, opts.Logger)
router.Handler("GET", "/oauth/google/login", goMux.Login())
router.Handler("GET", "/oauth/google/logout", goMux.Logout())
router.Handler("GET", "/oauth/google/callback", goMux.Callback())
if opts.UseGoogle() {
redirectURL := opts.PublicURL + opts.Basepath + "/oauth/google/callback"
google := oauth2.Google{
ClientID: opts.GoogleClientID,
ClientSecret: opts.GoogleClientSecret,
Domains: opts.GoogleDomains,
RedirectURL: redirectURL,
Logger: opts.Logger,
}
goMux := oauth2.NewJWTMux(&google, &auth, opts.Logger)
router.Handler("GET", "/oauth/google/login", goMux.Login())
router.Handler("GET", "/oauth/google/logout", goMux.Logout())
router.Handler("GET", "/oauth/google/callback", goMux.Callback())
}
tokenMiddleware := oauth2.AuthorizedToken(&auth, &oauth2.CookieExtractor{Name: "session"}, opts.Logger, router)
// Wrap the API with token validation middleware.

49
server/routes.go
View File

@ -6,17 +6,27 @@ import (
"github.com/influxdata/chronograf"
)
// AuthRoute are the routes for each type of OAuth2 provider
type AuthRoute struct {
Name string `json:"name"` // Name uniquely identifies the provider
Label string `json:"label"` // Label is a user-facing string to present in the UI
Login string `json:"login"` // Login is the route to the login redirect path
Logout string `json:"logout"` // Logout is the route to the logout redirect path
Callback string `json:"callback"` // Callback is the route the provider calls to exchange the code/state
}
type getRoutesResponse struct {
Layouts string `json:"layouts"` // Location of the layouts endpoint
Mappings string `json:"mappings"` // Location of the application mappings endpoint
Sources string `json:"sources"` // Location of the sources endpoint
Users string `json:"users"` // Location of the users endpoint
Me string `json:"me"` // Location of the me endpoint
Dashboards string `json:"dashboards"` // Location of the dashboards endpoint
Layouts string `json:"layouts"` // Location of the layouts endpoint
Mappings string `json:"mappings"` // Location of the application mappings endpoint
Sources string `json:"sources"` // Location of the sources endpoint
Users string `json:"users"` // Location of the users endpoint
Me string `json:"me"` // Location of the me endpoint
Dashboards string `json:"dashboards"` // Location of the dashboards endpoint
Auth []AuthRoute `json:"auth"` // Location of all auth routes.
}
// AllRoutes returns all top level routes within chronograf
func AllRoutes(logger chronograf.Logger) http.HandlerFunc {
func AllRoutes(authRoutes []AuthRoute, logger chronograf.Logger) http.HandlerFunc {
routes := getRoutesResponse{
Sources: "/chronograf/v1/sources",
Layouts: "/chronograf/v1/layouts",
@ -24,6 +34,11 @@ func AllRoutes(logger chronograf.Logger) http.HandlerFunc {
Me: "/chronograf/v1/me",
Mappings: "/chronograf/v1/mappings",
Dashboards: "/chronograf/v1/dashboards",
Auth: make([]AuthRoute, len(authRoutes)),
}
for i, route := range authRoutes {
routes.Auth[i] = route
}
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@ -31,3 +46,23 @@ func AllRoutes(logger chronograf.Logger) http.HandlerFunc {
return
})
}
func NewGithubRoute() AuthRoute {
return AuthRoute{
Name: "github",
Label: "GitHub",
Login: "/oauth/github/login",
Logout: "/oauth/github/logout",
Callback: "/oauth/github/callback",
}
}
func NewGoogleRoute() AuthRoute {
return AuthRoute{
Name: "google",
Label: "Google",
Login: "/oauth/google/login",
Logout: "/oauth/google/logout",
Callback: "/oauth/google/callback",
}
}