IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1619 Secure PhantomJS Png rendering

Browse Source 
removes auth hack to allow phantomjs to query pages as a user
without auth.  Instead we pass phantomjs the session cookie,
which it then includes in the request.
This commit is contained in:
Anthony Woods
2015-03-21 07:14:13 +08:00
parent 5d6583ef7b
commit 7010df0fe8
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/components/renderer/renderer.go
View File

@@ -14,9 +14,10 @@ import (
)
type RenderOpts struct {
Url string
Width string
Height string
Url string
Width string
Height string
SessionId string
}
func RenderToPng(params *RenderOpts) (string, error) {
@@ -26,7 +27,9 @@ func RenderToPng(params *RenderOpts) (string, error) {
pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, getHash(params.Url)))
pngPath = pngPath + ".png"
cmd := exec.Command(binPath, scriptPath, "url="+params.Url, "width="+params.Width, "height="+params.Height, "png="+pngPath)
cmd := exec.Command(binPath, scriptPath, "url="+params.Url, "width="+params.Width,
"height="+params.Height, "png="+pngPath, "cookiename="+setting.SessionOptions.CookieName,
"domain="+setting.Domain, "sessionid="+params.SessionId)
stdout, err := cmd.StdoutPipe()
if err != nil {