(feat) allow remote URLS for all charts

kevincobain2000 · Jan 3, 2024 · 3036d4e · 3036d4e
1 parent b1ba057
commit 3036d4e
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@
 
 | Common Queries | Required | Description | Default           |
 | :------------- | :------- | :---------- | :---------------- |
-| `data`         | ◯        | JSON        |                   |
+| `data`         | ◯        | JSON or URL |                   |
 | `title`        |          | string      |                   |
 | `subtitle`     |          | string      |                   |
 | `theme`        |          | string      | `light` or `dark` |

diff --git a/pkg/bar_chart_handler.go b/pkg/bar_chart_handler.go
@@ -8,12 +8,14 @@ import (
 )
 
 type BarChartHandler struct {
-	chart *BarChart
+	chart                *BarChart
+	allowedRemoteDomains string
 }
 
-func NewBarChartHandler() *BarChartHandler {
+func NewBarChartHandler(allowedRemoteDomains string) *BarChartHandler {
 	return &BarChartHandler{
-		chart: NewBarChart(),
+		chart:                NewBarChart(),
+		allowedRemoteDomains: allowedRemoteDomains,
 	}
 }
 
@@ -28,6 +30,13 @@ func (h *BarChartHandler) Get(c echo.Context) ([]byte, error) {
 	if err := BindRequest(c, req); err != nil {
 		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, err)
 	}
+	err := SetDataIfRemoteURL(req, h.allowedRemoteDomains)
+	if err != nil {
+		msgs := map[string]string{
+			"data": err.Error(),
+		}
+		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, msgs)
+	}
 
 	var data BarChartData
 	if err := json.Unmarshal([]byte(req.ChartData), &data); err != nil {

diff --git a/pkg/bar_chart_handler_test.go b/pkg/bar_chart_handler_test.go
@@ -14,7 +14,7 @@ func TestGetBarChart(t *testing.T) {
 	e := echo.New()
 
 	e.GET("/bar", func(c echo.Context) error {
-		img, err := NewBarChartHandler().Get(c)
+		img, err := NewBarChartHandler("").Get(c)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/donut_chart_handler.go b/pkg/donut_chart_handler.go
@@ -8,12 +8,14 @@ import (
 )
 
 type DonutChartHandler struct {
-	chart *DonutChart
+	chart                *DonutChart
+	allowedRemoteDomains string
 }
 
-func NewDonutChartHandler() *DonutChartHandler {
+func NewDonutChartHandler(allowedRemoteDomains string) *DonutChartHandler {
 	return &DonutChartHandler{
-		chart: NewDonutChart(),
+		chart:                NewDonutChart(),
+		allowedRemoteDomains: allowedRemoteDomains,
 	}
 }
 
@@ -27,6 +29,13 @@ func (h *DonutChartHandler) Get(c echo.Context) ([]byte, error) {
 	if err := BindRequest(c, req); err != nil {
 		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, err)
 	}
+	err := SetDataIfRemoteURL(req, h.allowedRemoteDomains)
+	if err != nil {
+		msgs := map[string]string{
+			"data": err.Error(),
+		}
+		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, msgs)
+	}
 
 	var data DonutChartData
 	if err := json.Unmarshal([]byte(req.ChartData), &data); err != nil {

diff --git a/pkg/donut_chart_handler_test.go b/pkg/donut_chart_handler_test.go
@@ -14,7 +14,7 @@ func TestGetDonutChart(t *testing.T) {
 	e := echo.New()
 
 	e.GET("/donut", func(c echo.Context) error {
-		img, err := NewDonutChartHandler().Get(c)
+		img, err := NewDonutChartHandler("").Get(c)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/funnel_chart_handler.go b/pkg/funnel_chart_handler.go
@@ -8,12 +8,14 @@ import (
 )
 
 type FunnelChartHandler struct {
-	chart *FunnelChart
+	chart                *FunnelChart
+	allowedRemoteDomains string
 }
 
-func NewFunnelChartHandler() *FunnelChartHandler {
+func NewFunnelChartHandler(allowedRemoteDomains string) *FunnelChartHandler {
 	return &FunnelChartHandler{
-		chart: NewFunnelChart(),
+		chart:                NewFunnelChart(),
+		allowedRemoteDomains: allowedRemoteDomains,
 	}
 }
 
@@ -27,6 +29,13 @@ func (h *FunnelChartHandler) Get(c echo.Context) ([]byte, error) {
 	if err := BindRequest(c, req); err != nil {
 		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, err)
 	}
+	err := SetDataIfRemoteURL(req, h.allowedRemoteDomains)
+	if err != nil {
+		msgs := map[string]string{
+			"data": err.Error(),
+		}
+		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, msgs)
+	}
 
 	var data FunnelChartData
 	if err := json.Unmarshal([]byte(req.ChartData), &data); err != nil {

diff --git a/pkg/funnel_chart_handler_test.go b/pkg/funnel_chart_handler_test.go
@@ -14,7 +14,7 @@ func TestGetFunnelChart(t *testing.T) {
 	e := echo.New()
 
 	e.GET("/funnel", func(c echo.Context) error {
-		img, err := NewFunnelChartHandler().Get(c)
+		img, err := NewFunnelChartHandler("").Get(c)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/pie_chart_handler.go b/pkg/pie_chart_handler.go
@@ -8,12 +8,14 @@ import (
 )
 
 type PieChartHandler struct {
-	chart *PieChart
+	chart                *PieChart
+	allowedRemoteDomains string
 }
 
-func NewPieChartHandler() *PieChartHandler {
+func NewPieChartHandler(allowedRemoteDomains string) *PieChartHandler {
 	return &PieChartHandler{
-		chart: NewPieChart(),
+		chart:                NewPieChart(),
+		allowedRemoteDomains: allowedRemoteDomains,
 	}
 }
 
@@ -27,6 +29,13 @@ func (h *PieChartHandler) Get(c echo.Context) ([]byte, error) {
 	if err := BindRequest(c, req); err != nil {
 		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, err)
 	}
+	err := SetDataIfRemoteURL(req, h.allowedRemoteDomains)
+	if err != nil {
+		msgs := map[string]string{
+			"data": err.Error(),
+		}
+		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, msgs)
+	}
 
 	var data PieChartData
 	if err := json.Unmarshal([]byte(req.ChartData), &data); err != nil {

diff --git a/pkg/pie_chart_handler_test.go b/pkg/pie_chart_handler_test.go
@@ -14,7 +14,7 @@ func TestGetPieChart(t *testing.T) {
 	e := echo.New()
 
 	e.GET("/pie", func(c echo.Context) error {
-		img, err := NewPieChartHandler().Get(c)
+		img, err := NewPieChartHandler("").Get(c)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/radar_chart_handler.go b/pkg/radar_chart_handler.go
@@ -8,12 +8,14 @@ import (
 )
 
 type RadarChartHandler struct {
-	chart *RadarChart
+	chart                *RadarChart
+	allowedRemoteDomains string
 }
 
-func NewRadarChartHandler() *RadarChartHandler {
+func NewRadarChartHandler(allowedRemoteDomains string) *RadarChartHandler {
 	return &RadarChartHandler{
-		chart: NewRadarChart(),
+		chart:                NewRadarChart(),
+		allowedRemoteDomains: allowedRemoteDomains,
 	}
 }
 
@@ -28,6 +30,13 @@ func (h *RadarChartHandler) Get(c echo.Context) ([]byte, error) {
 	if err := BindRequest(c, req); err != nil {
 		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, err)
 	}
+	err := SetDataIfRemoteURL(req, h.allowedRemoteDomains)
+	if err != nil {
+		msgs := map[string]string{
+			"data": err.Error(),
+		}
+		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, msgs)
+	}
 
 	var data RadarChartData
 	if err := json.Unmarshal([]byte(req.ChartData), &data); err != nil {

diff --git a/pkg/radar_chart_handler_test.go b/pkg/radar_chart_handler_test.go
@@ -14,7 +14,7 @@ func TestGetRadarChart(t *testing.T) {
 	e := echo.New()
 
 	e.GET("/radar", func(c echo.Context) error {
-		img, err := NewRadarChartHandler().Get(c)
+		img, err := NewRadarChartHandler("").Get(c)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/routes.go b/pkg/routes.go
@@ -63,47 +63,47 @@ func SetupRoutes(e *echo.Echo, baseURL string, publicDir embed.FS, allowedRemote
 	})
 	// /bar
 	e.GET(baseURL+"bar", func(c echo.Context) error {
-		img, err := NewBarChartHandler().Get(c)
+		img, err := NewBarChartHandler(allowedRemoteDomains).Get(c)
 		if err != nil {
 			return err
 		}
 		return c.Blob(http.StatusOK, "", img)
 	})
 	// /radar
 	e.GET(baseURL+"radar", func(c echo.Context) error {
-		img, err := NewRadarChartHandler().Get(c)
+		img, err := NewRadarChartHandler(allowedRemoteDomains).Get(c)
 		if err != nil {
 			return err
 		}
 		return c.Blob(http.StatusOK, "", img)
 	})
 	// /donut
 	e.GET(baseURL+"donut", func(c echo.Context) error {
-		img, err := NewDonutChartHandler().Get(c)
+		img, err := NewDonutChartHandler(allowedRemoteDomains).Get(c)
 		if err != nil {
 			return err
 		}
 		return c.Blob(http.StatusOK, "", img)
 	})
 	// /pie
 	e.GET(baseURL+"pie", func(c echo.Context) error {
-		img, err := NewPieChartHandler().Get(c)
+		img, err := NewPieChartHandler(allowedRemoteDomains).Get(c)
 		if err != nil {
 			return err
 		}
 		return c.Blob(http.StatusOK, "", img)
 	})
 	// /funnel
 	e.GET(baseURL+"funnel", func(c echo.Context) error {
-		img, err := NewFunnelChartHandler().Get(c)
+		img, err := NewFunnelChartHandler(allowedRemoteDomains).Get(c)
 		if err != nil {
 			return err
 		}
 		return c.Blob(http.StatusOK, "", img)
 	})
 	// /table
 	e.GET(baseURL+"table", func(c echo.Context) error {
-		img, err := NewTableChartHandler().Get(c)
+		img, err := NewTableChartHandler(allowedRemoteDomains).Get(c)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/table_chart_handler.go b/pkg/table_chart_handler.go
@@ -8,12 +8,14 @@ import (
 )
 
 type TableChartHandler struct {
-	chart *TableChart
+	chart                *TableChart
+	allowedRemoteDomains string
 }
 
-func NewTableChartHandler() *TableChartHandler {
+func NewTableChartHandler(allowedRemoteDomains string) *TableChartHandler {
 	return &TableChartHandler{
-		chart: NewTableChart(),
+		chart:                NewTableChart(),
+		allowedRemoteDomains: allowedRemoteDomains,
 	}
 }
 
@@ -27,6 +29,13 @@ func (h *TableChartHandler) Get(c echo.Context) ([]byte, error) {
 	if err := BindRequest(c, req); err != nil {
 		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, err)
 	}
+	err := SetDataIfRemoteURL(req, h.allowedRemoteDomains)
+	if err != nil {
+		msgs := map[string]string{
+			"data": err.Error(),
+		}
+		return nil, echo.NewHTTPError(http.StatusUnprocessableEntity, msgs)
+	}
 
 	var data TableChartData
 	if err := json.Unmarshal([]byte(req.ChartData), &data); err != nil {

diff --git a/pkg/table_chart_handler_test.go b/pkg/table_chart_handler_test.go
@@ -14,7 +14,7 @@ func TestGetTableChart(t *testing.T) {
 	e := echo.New()
 
 	e.GET("/table", func(c echo.Context) error {
-		img, err := NewTableChartHandler().Get(c)
+		img, err := NewTableChartHandler("").Get(c)
 		if err != nil {
 			return err
 		}