initial import of thirdParty route support

This commit is contained in:
Anthony Woods
2015-10-06 17:20:50 +08:00
parent 0bcda4a2eb
commit cf89b565a6
10 changed files with 238 additions and 6 deletions

View File

@@ -185,5 +185,7 @@ func Register(r *macaron.Macaron) {
// rendering
r.Get("/render/*", reqSignedIn, RenderToPng)
InitThirdPartyRoutes(r)
r.NotFound(NotFoundHandler)
}

View File

@@ -3,6 +3,7 @@ package api
import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/setting"
)
@@ -51,6 +52,25 @@ func setIndexViewData(c *middleware.Context) error {
if setting.GoogleTagManagerId != "" {
c.Data["GoogleTagManagerId"] = setting.GoogleTagManagerId
}
// This can be loaded from the DB/file to allow 3rdParty integration
thirdPartyJs := make([]string, 0)
thirdPartyCss := make([]string, 0)
thirdPartyMenu := make([]*plugins.ThirdPartyMenuItem, 0)
for _, integration := range plugins.Integrations {
for _, js := range integration.Js {
thirdPartyJs = append(thirdPartyJs, js.Src)
}
for _, css := range integration.Css {
thirdPartyCss = append(thirdPartyCss, css.Href)
}
for _, item := range integration.MenuItems {
thirdPartyMenu = append(thirdPartyMenu, item)
}
}
c.Data["ThirdPartyJs"] = thirdPartyJs
c.Data["ThirdPartyCss"] = thirdPartyCss
c.Data["ThirdPartyMenu"] = thirdPartyMenu
return nil
}

75
pkg/api/thirdparty.go Normal file
View File

@@ -0,0 +1,75 @@
package api
import (
"encoding/json"
"github.com/Unknwon/macaron"
"github.com/grafana/grafana/pkg/middleware"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/util"
"log"
"net/http"
"net/http/httputil"
"net/url"
)
func InitThirdPartyRoutes(r *macaron.Macaron) {
/*
// Handle Auth and role requirements
if route.ReqSignedIn {
c.Invoke(middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true}))
}
if route.ReqGrafanaAdmin {
c.Invoke(middleware.Auth(&middleware.AuthOptions{ReqSignedIn: true, ReqGrafanaAdmin: true}))
}
if route.ReqRole != nil {
if *route.ReqRole == m.ROLE_EDITOR {
c.Invoke(middleware.RoleAuth(m.ROLE_EDITOR, m.ROLE_ADMIN))
}
if *route.ReqRole == m.ROLE_ADMIN {
c.Invoke(middleware.RoleAuth(m.ROLE_ADMIN))
}
}
*/
for _, integration := range plugins.Integrations {
log.Printf("adding routes for integration")
for _, route := range integration.Routes {
log.Printf("adding route %s %s", route.Method, route.Path)
r.Route(util.JoinUrlFragments("/thirdparty/", route.Path), route.Method, ThirdParty(route.Url))
}
}
}
func ThirdParty(routeUrl string) macaron.Handler {
return func(c *middleware.Context) {
path := c.Params("*")
//Create a HTTP header with the context in it.
ctx, err := json.Marshal(c.SignedInUser)
if err != nil {
c.JsonApiErr(500, "Not found", err)
return
}
log.Printf(string(ctx))
targetUrl, _ := url.Parse(routeUrl)
proxy := NewThirdPartyProxy(string(ctx), path, targetUrl)
proxy.Transport = dataProxyTransport
proxy.ServeHTTP(c.RW(), c.Req.Request)
}
}
func NewThirdPartyProxy(ctx string, proxyPath string, targetUrl *url.URL) *httputil.ReverseProxy {
director := func(req *http.Request) {
req.URL.Scheme = targetUrl.Scheme
req.URL.Host = targetUrl.Host
req.Host = targetUrl.Host
req.URL.Path = util.JoinUrlFragments(targetUrl.Path, proxyPath)
// clear cookie headers
req.Header.Del("Cookie")
req.Header.Del("Set-Cookie")
req.Header.Add("Grafana-Context", ctx)
}
return &httputil.ReverseProxy{Director: director}
}

31
pkg/models/third_party.go Normal file
View File

@@ -0,0 +1,31 @@
package models
type ThirdPartyRoute struct {
Path string `json:"path"`
Method string `json:"method"`
ReqSignedIn bool `json:"req_signed_in"`
ReqGrafanaAdmin bool `json:"req_grafana_admin"`
ReqRole RoleType `json:"req_role"`
Url string `json:"url"`
}
type ThirdPartyJs struct {
src string `json:"src"`
}
type ThirdPartyMenuItem struct {
Text string `json:"text"`
Icon string `json:"icon"`
Href string `json:"href"`
}
type ThirdPartyCss struct {
Href string `json:"href"`
}
type ThirdPartyIntegration struct {
Routes []*ThirdPartyRoute `json:"routes"`
Js []*ThirdPartyJs `json:"js"`
Css []*ThirdPartyCss `json:"css"`
MenuItems []*ThirdPartyMenuItem `json:"menu_items"`
}

View File

@@ -16,8 +16,44 @@ type PluginMeta struct {
Name string `json:"name"`
}
type ThirdPartyRoute struct {
Path string `json:"path"`
Method string `json:"method"`
ReqSignedIn bool `json:"req_signed_in"`
ReqGrafanaAdmin bool `json:"req_grafana_admin"`
ReqRole string `json:"req_role"`
Url string `json:"url"`
}
type ThirdPartyJs struct {
Src string `json:"src"`
}
type ThirdPartyMenuItem struct {
Text string `json:"text"`
Icon string `json:"icon"`
Href string `json:"href"`
}
type ThirdPartyCss struct {
Href string `json:"href"`
}
type ThirdPartyIntegration struct {
Routes []*ThirdPartyRoute `json:"routes"`
Js []*ThirdPartyJs `json:"js"`
Css []*ThirdPartyCss `json:"css"`
MenuItems []*ThirdPartyMenuItem `json:"menu_items"`
}
type ThirdPartyPlugin struct {
PluginType string `json:"pluginType"`
Integration ThirdPartyIntegration `json:"integration"`
}
var (
DataSources map[string]interface{}
DataSources map[string]interface{}
Integrations []ThirdPartyIntegration
)
type PluginScanner struct {
@@ -31,6 +67,7 @@ func Init() {
func scan(pluginDir string) error {
DataSources = make(map[string]interface{})
Integrations = make([]ThirdPartyIntegration, 0)
scanner := &PluginScanner{
pluginPath: pluginDir,
@@ -94,6 +131,14 @@ func (scanner *PluginScanner) loadPluginJson(path string) error {
DataSources[datasourceType.(string)] = pluginJson
}
if pluginType == "thirdPartyIntegration" {
p := ThirdPartyPlugin{}
reader.Seek(0, 0)
if err := jsonParser.Decode(&p); err != nil {
return err
}
Integrations = append(Integrations, p.Integration)
}
return nil
}