mvp for dpg

Author: mdanidl

examples/permissions/permission_example.go

@@ -22,54 +22,22 @@ func main() {
 		fmt.Println(err)
 	}
 
-	// UPDATE Permissions
-
-	perm := []PermissionItem{}
-	perm = append(perm,PermissionItem{
-		Op: "add",
-		Path: "/connections/1",
-		Value: "READ"
-	})
-
-	// update_user_group := GuacUserGroup{
-	// 	Identifier: "Daniels-group",
-	// 	Attributes: GuacUserGroupAttributes{
-	// 		Disabled: "true",
-	// 	},
-	// }
-	// err = gAPI.UpdateUserGroup(&update_user_group)
-	// if err != nil {
-	// 	fmt.Println(err)
-	// } else {
-	// 	fmt.Println("Updated. Re-reading info: ")
-	// 	update_reread_resp, err := gAPI.ReadUserGroup(&update_user_group)
-	// 	if err != nil {
-	// 		fmt.Println(err)
-	// 	} else {
-	// 		fmt.Println(update_reread_resp.Attributes.Disabled)
-	// 	}
-	// }
+	// READ User ConnectionPermissions
 
-	// DELETE UserGroup
+	resp, err := gAPI.GetUserConnectionPermissions("tf-test-1")
+	if err != nil {
+		fmt.Println("fuck", err)
+	}
+	fmt.Println(resp)
 
-	// delete_user_group := GuacUserGroup{
-	// 	Identifier: "Daniels-group",
-	// }
+	// UPDATE Permissions
 
-	// err = gAPI.DeleteUserGroup(&delete_user_group)
-	// if err != nil {
-	// 	fmt.Println(err)
-	// } else {
-	// 	fmt.Println("Ok")
-	// }
+	// items := []GuacPermissionItem{}
+	// items = append(items, GuacPermissionItem{
+	// 	Op:    "add",
+	// 	Path:  "/connectionPermissions/19",
+	// 	Value: "READ",
+	// })
+	// _ = gAPI.SendUserConnectionPermissionChanges("username", items)
 
-	// LIST User Groups
-	// groups_resp, err := gAPI.ListUserGroups()
-	// if err != nil {
-	// 	fmt.Println(err)
-	// } else {
-	// 	for _, g := range groups_resp {
-	// 		fmt.Println(g.Identifier)
-	// 	}
-	// }
 }

guac_connections.go

@@ -3,6 +3,8 @@ package guacapi
 import (
 	"encoding/json"
 
+	"github.com/imdario/mergo"
+
 	. "github.com/mdanidl/guac-api/types"
 )
 
@@ -18,16 +20,34 @@ func (g *Guac) CreateConnection(conn *GuacConnection) (GuacConnection, error) {
 
 func (g *Guac) ReadConnection(conn *GuacConnection) (GuacConnection, error) {
 	ret := GuacConnection{}
-	resp, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier, nil, nil)
+	retParams := GuacConnectionParameters{}
+
+	connData, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier, nil, nil)
+	if err != nil {
+		return GuacConnection{}, err
+	}
+	err = json.Unmarshal(connData, &ret)
+
+	connParams, err := g.Call("GET", "/api/session/data/mysql/connections/"+conn.Identifier+"/parameters", nil, nil)
+	if err != nil {
+		return GuacConnection{}, err
+	}
+	err = json.Unmarshal(connParams, &retParams)
+	if err != nil {
+		return GuacConnection{}, err
+	}
+	ret2 := GuacConnection{
+		Properties: retParams,
+	}
+	err = mergo.Merge(&ret, &ret2)
 	if err != nil {
 		return GuacConnection{}, err
 	}
-	err = json.Unmarshal(resp, &ret)
 	return ret, nil
 }
 
 func (g *Guac) UpdateConnection(conn *GuacConnection) error {
-	_, err := g.Call("PUT", "/api/session/data/mysql/connections", nil, conn)
+	_, err := g.Call("PUT", "/api/session/data/mysql/connections/"+conn.Identifier, nil, conn)
 	if err != nil {
 		return err
 	}

permissions.go

@@ -1,27 +1,19 @@
 package types
 
-import "errors"
-
-type PermissionItem struct {
+// GuacPermissionItem a
+type GuacPermissionItem struct {
 	Op    string `json:"op"`
 	Path  string `json:"path"`
 	Value string `json:"value"`
 }
 
-type PermissionBlock struct {
-	PermissionItems []PermissionItem
-}
-
-func (p *PermissionBlock) Add(i PermissionItem) {
-	p.PermissionItems = append(p.PermissionItems, i)
-}
-func (p *PermissionBlock) List() ([]PermissionItem, error) {
-	EmptyPermissionBlock := errors.New("No Permissions in the block")
-
-	if len(p.PermissionItems) > 0 {
-		return p.PermissionItems, nil
-	} else {
-		return nil, EmptyPermissionBlock
-	}
-
+// GuacPermissionData a
+type GuacPermissionData struct {
+	ConnectionPermissions       map[string][]string `json:"connectionPermissions"`
+	ConnectionGroupPermissions  map[string][]string `json:"connectionGroupPermissions"`
+	SharingProfilePermissions   map[string][]string `json:"sharingProfilePermissions"`
+	UserPermissions             map[string][]string `json:"userPermissions"`
+	UserGroupPermissions        map[string][]string `json:"userGroupPermissions"`
+	SystemPermissions           []string            `json:"systemPermissions"`
+	ActiveConnectionPermissions map[string][]string `json:"activeConnectionPermissions"`
 }

types/permissions.go

@@ -0,0 +1,31 @@
+package guacapi
+
+import (
+	"encoding/json"
+
+	. "github.com/mdanidl/guac-api/types"
+)
+
+func (g *Guac) SendUserConnectionPermissionChanges(user string, p []GuacPermissionItem) error {
+	url := "/api/session/data/mysql/users/" + user + "/permissions"
+	_, err := g.Call("PATCH", url, nil, p)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (g *Guac) GetUserConnectionPermissions(user string) (GuacPermissionData, error) {
+	ret := GuacPermissionData{}
+	url := "/api/session/data/mysql/users/" + user + "/permissions"
+	resp, err := g.Call("GET", url, nil, nil)
+	if err != nil {
+		return GuacPermissionData{}, err
+	}
+	err = json.Unmarshal(resp, &ret)
+	if err != nil {
+		return GuacPermissionData{}, err
+	}
+
+	return ret, nil
+}