Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4693 from heyitsanthony/etcdctl-fix-lists

Browse Source 
etcdctl: correctly unmarshal list users and list roles
This commit is contained in:
Anthony Romano 2016-03-05 20:04:13 -08:00
commit 1d15c7dd86
3 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/auth_role.go
View File

@ -118,13 +118,17 @@ func (r *httpAuthRoleAPI) ListRoles(ctx context.Context) ([]string, error) {
if err = assertStatusCode(resp.StatusCode, http.StatusOK); err != nil {
return nil, err
}
var userList struct {
Roles []string `json:"roles"`
var roleList struct {
Roles []Role `json:"roles"`
}
if err = json.Unmarshal(body, &userList); err != nil {
if err = json.Unmarshal(body, &roleList); err != nil {
return nil, err
}
return userList.Roles, nil
ret := make([]string, 0, len(roleList.Roles))
for _, r := range roleList.Roles {
ret = append(ret, r.Role)
}
return ret, nil
}
func (r *httpAuthRoleAPI) AddRole(ctx context.Context, rolename string) error {

15
client/auth_user.go
View File

@ -41,6 +41,10 @@ type UserRoles struct {
Roles []Role `json:"roles"`
}
type userName struct {
User string `json:"user"`
}
func v2AuthURL(ep url.URL, action string, name string) *url.URL {
if name != "" {
ep.Path = path.Join(ep.Path, defaultV2AuthPrefix, action, name)
@ -192,13 +196,20 @@ func (u *httpAuthUserAPI) ListUsers(ctx context.Context) ([]string, error) {
}
return nil, sec
}
var userList struct {
Users []string `json:"users"`
Users []User `json:"users"`
}
if err = json.Unmarshal(body, &userList); err != nil {
return nil, err
}
return userList.Users, nil
ret := make([]string, 0, len(userList.Users))
for _, u := range userList.Users {
ret = append(ret, u.User)
}
return ret, nil
}
func (u *httpAuthUserAPI) AddUser(ctx context.Context, username string, password string) error {

60
e2e/etcdctl_test.go
View File

@ -200,7 +200,7 @@ func testCtlV2GetRoleUser(t *testing.T, cfg *etcdProcessClusterConfig) {
// the update loop has a delay of 500ms, so 1s should be enough wait time
time.Sleep(time.Second)
if err := etcdctlAddRole(epc, "foo"); err != nil {
if err := etcdctlRoleAdd(epc, "foo"); err != nil {
t.Fatalf("failed to add role (%v)", err)
}
if err := etcdctlUserAdd(epc, "username", "password"); err != nil {
@ -214,6 +214,52 @@ func testCtlV2GetRoleUser(t *testing.T, cfg *etcdProcessClusterConfig) {
}
}
func TestCtlV2UserList(t *testing.T) {
defer testutil.AfterTest(t)
mustEtcdctl(t)
epc, cerr := newEtcdProcessCluster(&defaultConfigWithProxy)
if cerr != nil {
t.Fatalf("could not start etcd process cluster (%v)", cerr)
}
defer func() {
if err := epc.Close(); err != nil {
t.Fatalf("error closing etcd processes (%v)", err)
}
}()
if err := etcdctlUserAdd(epc, "username", "password"); err != nil {
t.Fatalf("failed to add user (%v)", err)
}
if err := etcdctlUserList(epc, "username"); err != nil {
t.Fatalf("failed to list users (%v)", err)
}
}
func TestCtlV2RoleList(t *testing.T) {
defer testutil.AfterTest(t)
mustEtcdctl(t)
epc, cerr := newEtcdProcessCluster(&defaultConfigWithProxy)
if cerr != nil {
t.Fatalf("could not start etcd process cluster (%v)", cerr)
}
defer func() {
if err := epc.Close(); err != nil {
t.Fatalf("error closing etcd processes (%v)", err)
}
}()
if err := etcdctlRoleAdd(epc, "foo"); err != nil {
t.Fatalf("failed to add role (%v)", err)
}
if err := etcdctlRoleList(epc, "foo"); err != nil {
t.Fatalf("failed to list roles (%v)", err)
}
}
func etcdctlPrefixArgs(clus *etcdProcessCluster, noSync bool) []string {
endpoints := ""
if proxies := clus.proxies(); len(proxies) != 0 {
@ -275,11 +321,16 @@ func etcdctlWatch(clus *etcdProcessCluster, key, value string, noSync bool) <-ch
return errc
}
func etcdctlAddRole(clus *etcdProcessCluster, role string) error {
func etcdctlRoleAdd(clus *etcdProcessCluster, role string) error {
cmdArgs := append(etcdctlPrefixArgs(clus, false), "role", "add", role)
return spawnWithExpectedString(cmdArgs, role)
}
func etcdctlRoleList(clus *etcdProcessCluster, expectedRole string) error {
cmdArgs := append(etcdctlPrefixArgs(clus, false), "role", "list")
return spawnWithExpectedString(cmdArgs, expectedRole)
}
func etcdctlUserAdd(clus *etcdProcessCluster, user, pass string) error {
cmdArgs := append(etcdctlPrefixArgs(clus, false), "user", "add", user+":"+pass)
return spawnWithExpectedString(cmdArgs, "User "+user+" created")
@ -295,6 +346,11 @@ func etcdctlUserGet(clus *etcdProcessCluster, user string) error {
return spawnWithExpectedString(cmdArgs, "User: "+user)
}
func etcdctlUserList(clus *etcdProcessCluster, expectedUser string) error {
cmdArgs := append(etcdctlPrefixArgs(clus, false), "user", "list")
return spawnWithExpectedString(cmdArgs, expectedUser)
}
func mustEtcdctl(t *testing.T) {
if !fileutil.Exist("../bin/etcdctl") {
t.Fatalf("could not find etcdctl binary")