fixed unmarshall won't work for incorrect json object

UrielCohen456 · UrielCohen456 · commit 9d6d78954df4 · 2022-03-20T00:48:14.000+02:00
diff --git a/internal/argocd-plugin/plugin.go b/internal/argocd-plugin/plugin.go
@@ -36,7 +36,7 @@ func ArgocdPlugin(kubeClient kubernetes.Interface, namespace string) func(w http
 		}
 
 		args := executor.ExecuteTemplateArgs{}
-		if err := json.Unmarshal(body, &args); err != nil {
+		if err := json.Unmarshal(body, &args); err != nil || args.Workflow == nil || args.Template == nil {
 			log.Print(ErrMarshallingBody)
 			http.Error(w, ErrMarshallingBody.Error(), http.StatusBadRequest)
 			return
diff --git a/internal/argocd-plugin/plugin_test.go b/internal/argocd-plugin/plugin_test.go
@@ -63,7 +63,7 @@ func TestArgocdPlugin(t *testing.T) {
 		},
 		{
 			name: "fail marshalling body",
-			body: bytes.NewReader([]byte(`"lol": "test"`)),
+			body: bytes.NewReader([]byte(`{"lol": "test"}`)),
 			headers: headerContentJson,
 			want: ErrMarshallingBody.Error(),
 			status: http.StatusBadRequest,

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ func ArgocdPlugin(kubeClient kubernetes.Interface, namespace string) func(w http`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`args := executor.ExecuteTemplateArgs{}`
`39`		`- if err := json.Unmarshal(body, &args); err != nil {`
	`39`	`+ if err := json.Unmarshal(body, &args); err != nil \|\| args.Workflow == nil \|\| args.Template == nil {`
`40`	`40`	`log.Print(ErrMarshallingBody)`
`41`	`41`	`http.Error(w, ErrMarshallingBody.Error(), http.StatusBadRequest)`
`42`	`42`	`return`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func TestArgocdPlugin(t *testing.T) {`
`63`	`63`	`},`
`64`	`64`	`{`
`65`	`65`	`name: "fail marshalling body",`
`66`		- body: bytes.NewReader([]byte(`"lol": "test"`)),
	`66`	+ body: bytes.NewReader([]byte(`{"lol": "test"}`)),
`67`	`67`	`headers: headerContentJson,`
`68`	`68`	`want: ErrMarshallingBody.Error(),`
`69`	`69`	`status: http.StatusBadRequest,`