From 1532eb4278af7489873a4dab7b36896afdf1f6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Fri, 16 Jan 2015 17:00:31 +0100
Subject: [PATCH] Fixed png rendering

---
 grafana                |  2 +-
 pkg/api/render.go      |  2 +-
 pkg/middleware/auth.go | 12 +++++-------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/grafana b/grafana
index 984ece646f8..64f98d24091 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 984ece646f831678c5a8f32e4a69f54fdad914c4
+Subproject commit 64f98d2409152a2bfa34b6f032d21e6bb18b97f8
diff --git a/pkg/api/render.go b/pkg/api/render.go
index b8a141aed3a..d6877679f2f 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -12,7 +12,7 @@ import (
 func RenderToPng(c *middleware.Context) {
 	accountId := c.UsingAccountId
 	queryReader := util.NewUrlQueryReader(c.Req.URL)
-	queryParams := "?render&accountId=" + strconv.FormatInt(accountId, 10) + "&" + c.Req.URL.RawQuery
+	queryParams := "?render=1&accountId=" + strconv.FormatInt(accountId, 10) + "&" + c.Req.URL.RawQuery
 
 	renderOpts := &renderer.RenderOpts{
 		Url:    c.Params("*") + queryParams,
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index f1571668162..ca551abf94f 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -1,7 +1,6 @@
 package middleware
 
 import (
-	"strconv"
 	"strings"
 
 	"github.com/Unknwon/macaron"
@@ -22,12 +21,11 @@ func getRequestAccountId(c *Context) int64 {
 		return accountId.(int64)
 	}
 
-	// localhost render query
-	urlQuery := c.Req.URL.Query()
-	if len(urlQuery["render"]) > 0 {
-		accId, _ := strconv.ParseInt(urlQuery["accountId"][0], 10, 64)
-		c.Session.Set("accountId", accId)
-		accountId = accId
+	// TODO: figure out a way to secure this
+	if c.Query("render") == "1" {
+		accountId := c.QueryInt64("accountId")
+		c.Session.Set("accountId", accountId)
+		return accountId
 	}
 
 	return 0