mirror of
https://github.com/jech/galene.git
synced 2024-11-21 16:15:57 +01:00
Rework permissions formatting in galenectl.
This commit is contained in:
parent
7fe6a5da91
commit
8de77fe417
2 changed files with 54 additions and 1 deletions
|
@ -681,6 +681,29 @@ func parsePermissions(p string, expand bool) (any, error) {
|
|||
return pp.Permissions(nil), nil
|
||||
}
|
||||
|
||||
func formatRawPermissions(permissions []string) string {
|
||||
var perms []byte
|
||||
for _, p := range permissions {
|
||||
if len(p) > 0 {
|
||||
perms = append(perms, p[0])
|
||||
} else {
|
||||
perms = append(perms, '?')
|
||||
}
|
||||
}
|
||||
sort.Slice(perms, func(i, j int) bool {
|
||||
return perms[i] < perms[j]
|
||||
})
|
||||
return fmt.Sprintf("[%s]", perms)
|
||||
}
|
||||
|
||||
func formatPermissions(permissions group.Permissions) string {
|
||||
s := permissions.String()
|
||||
if len(s) > 0 && s[0] != '[' {
|
||||
return s
|
||||
}
|
||||
return formatRawPermissions(permissions.Permissions(nil))
|
||||
}
|
||||
|
||||
func listUsersCmd(cmdname string, args []string) {
|
||||
var groupname string
|
||||
var long bool
|
||||
|
@ -732,7 +755,9 @@ func listUsersCmd(cmdname string, args []string) {
|
|||
fmt.Printf("%-12s (ERROR=%v)\n", user, err)
|
||||
continue
|
||||
}
|
||||
fmt.Printf("%-12s %v\n", user, d.Permissions)
|
||||
fmt.Printf("%-12s %v\n",
|
||||
user, formatPermissions(d.Permissions),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
|
||||
"github.com/jech/galene/group"
|
||||
|
@ -38,3 +39,30 @@ func TestMakePassword(t *testing.T) {
|
|||
t.Errorf("Wildcard didn't match")
|
||||
}
|
||||
}
|
||||
|
||||
func TestFormatPermissions(t *testing.T) {
|
||||
tests := []struct{ j, v, p string }{
|
||||
{`"op"`, "op", "[mopt]"},
|
||||
{`"present"`, "present", "[mp]"},
|
||||
{`"observe"`, "observe", "[]"},
|
||||
{`"admin"`, "admin", "[a]"},
|
||||
{`["message", "present", "token"]`, "[mpt]", "[mpt]"},
|
||||
{`[]`, "[]", "[]"},
|
||||
}
|
||||
for _, test := range tests {
|
||||
var p group.Permissions
|
||||
err := json.Unmarshal([]byte(test.j), &p)
|
||||
if err != nil {
|
||||
t.Errorf("Unmarshal %#v: %v", test.j, err)
|
||||
continue
|
||||
}
|
||||
v := formatPermissions(p)
|
||||
if v != test.v {
|
||||
t.Errorf("Expected %v, got %v", test.v, v)
|
||||
}
|
||||
pp := formatRawPermissions(p.Permissions(nil))
|
||||
if pp != test.p {
|
||||
t.Errorf("Expected %v, got %v", test.p, pp)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue