fix(api): fix permission coherence (close #4035) (#4044)

Signed-off-by: Benjamin Coenen <[email protected]>
ovh · Mar 19, 2019 · 7b5b7b6 · 7b5b7b6
1 parent 030343c
commit 7b5b7b6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/engine/api/group/node_group.go b/engine/api/group/node_group.go
@@ -21,9 +21,9 @@ func LoadGroupsByNode(db gorp.SqlExecutor, nodeID int64) ([]sdk.GroupPermission,
 	rows, err := db.Query(query, nodeID)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, err
+			return nil, nil
 		}
-		return nil, err
+		return nil, sdk.WithStack(err)
 	}
 	defer rows.Close()
 
@@ -32,7 +32,7 @@ func LoadGroupsByNode(db gorp.SqlExecutor, nodeID int64) ([]sdk.GroupPermission,
 		var group sdk.Group
 		var perm int
 		if err := rows.Scan(&group.ID, &group.Name, &perm); err != nil {
-			return groups, err
+			return groups, sdk.WithStack(err)
 		}
 		groups = append(groups, sdk.GroupPermission{
 			Group:      group,

diff --git a/engine/api/workflow/dao.go b/engine/api/workflow/dao.go
@@ -155,6 +155,15 @@ func (w *Workflow) PostGet(db gorp.SqlExecutor) error {
 		w.WorkflowData = data
 	}
 
+	nodes := w.WorkflowData.Array()
+	for i := range nodes {
+		var err error
+		nodes[i].Groups, err = group.LoadGroupsByNode(db, nodes[i].ID)
+		if err != nil {
+			return sdk.WrapError(err, "cannot load node groups")
+		}
+	}
+
 	return nil
 }
 

diff --git a/engine/api/workflow_group.go b/engine/api/workflow_group.go
@@ -22,16 +22,17 @@ func (api *API) deleteWorkflowGroupHandler() service.Handler {
 		key := vars["key"]
 		name := vars["permWorkflowName"]
 		groupName := vars["groupName"]
+		u := deprecatedGetUser(ctx)
 
-		proj, err := project.Load(api.mustDB(), api.Cache, key, deprecatedGetUser(ctx), project.LoadOptions.WithIntegrations)
+		proj, err := project.Load(api.mustDB(), api.Cache, key, u, project.LoadOptions.WithIntegrations)
 		if err != nil {
 			return sdk.WrapError(err, "unable to load projet")
 		}
 
 		options := workflow.LoadOptions{
 			WithoutNode: true,
 		}
-		wf, err := workflow.Load(ctx, api.mustDB(), api.Cache, proj, name, deprecatedGetUser(ctx), options)
+		wf, err := workflow.Load(ctx, api.mustDB(), api.Cache, proj, name, u, options)
 		if err != nil {
 			return sdk.WrapError(err, "deleteWorkflowGroupHandler")
 		}