feat(vpn): show available network types via cli && fetch associated user

list from rpc in net list command

api/rpc.go

@@ -244,14 +244,27 @@ func (s *NetworkService) Delete(ctx context.Context, req *pb.NetworkDeleteReques
 
 func (s *NetworkService) GetAllTypes(ctx context.Context, req *pb.NetworkGetAllTypesRequest) (*pb.NetworkGetAllTypesResponse, error) {
 	logrus.Debugf("rpc call: network get-types")
-	var networkTypes []string
+	var networkTypes []*pb.NetworkType
 	for _, nt := range ovpm.GetAllNetworkTypes() {
-		networkTypes = append(networkTypes, nt.String())
+		if nt == ovpm.UNDEFINEDNET {
+			continue
+		}
+		networkTypes = append(networkTypes, &pb.NetworkType{Type: nt.String(), Description: nt.Description()})
 	}
 
 	return &pb.NetworkGetAllTypesResponse{Types: networkTypes}, nil
 }
 
+func (s *NetworkService) GetAssociatedUsers(ctx context.Context, req *pb.NetworkGetAssociatedUsersRequest) (*pb.NetworkGetAssociatedUsersResponse, error) {
+	logrus.Debugf("rpc call: network get-associated-users")
+	network, err := ovpm.GetNetwork(req.Name)
+	if err != nil {
+		return nil, err
+	}
+	usernames := network.GetAssociatedUsernames()
+	return &pb.NetworkGetAssociatedUsersResponse{Usernames: usernames}, nil
+}
+
 func (s *NetworkService) Associate(ctx context.Context, req *pb.NetworkAssociateRequest) (*pb.NetworkAssociateResponse, error) {
 	logrus.Debugf("rpc call: network associate")
 

bindata/bindata.go

@@ -87,7 +87,7 @@ func templateCcdFileTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/ccd.file.tmpl", size: 157, mode: os.FileMode(420), modTime: time.Unix(1503785209, 0)}
+	info := bindataFileInfo{name: "template/ccd.file.tmpl", size: 157, mode: os.FileMode(420), modTime: time.Unix(1503786351, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

cmd/ovpm/main.go

@@ -59,6 +59,7 @@ func main() {
 			Usage: "Network Operations",
 			Subcommands: []cli.Command{
 				netListCommand,
+				netTypesCommand,
 				netDefineCommand,
 				netUndefineCommand,
 				netAssociateCommand,

cmd/ovpm/net.go

@@ -14,8 +14,8 @@ import (
 )
 
 var netDefineCommand = cli.Command{
-	Name:    "define",
-	Aliases: []string{"def", "d"},
+	Name:    "def",
+	Aliases: []string{"d"},
 	Usage:   "Define a network.",
 	Flags: []cli.Flag{
 		cli.StringFlag{
@@ -91,8 +91,8 @@ var netDefineCommand = cli.Command{
 
 var netListCommand = cli.Command{
 	Name:    "list",
-	Aliases: []string{"lis", "l"},
-	Usage:   "List network definitions.",
+	Aliases: []string{"l"},
+	Usage:   "List defined networks.",
 	Action: func(c *cli.Context) error {
 		action = "net:list"
 		conn := getConn(c.GlobalString("daemon-port"))
@@ -105,13 +105,21 @@ var netListCommand = cli.Command{
 			os.Exit(1)
 			return err
 		}
+
 		table := tablewriter.NewWriter(os.Stdout)
 		table.SetHeader([]string{"#", "name", "cidr", "type", "assoc", "created at"})
 		//table.SetBorder(false)
 		for i, network := range resp.Networks {
 			// Create associated user list for this network.
 			var usernameList string
-			usernames := network.GetAssociatedUsernames()
+			assocUsers, err := netSvc.GetAssociatedUsers(context.Background(), &pb.NetworkGetAssociatedUsersRequest{Name: network.Name})
+			if err != nil {
+				logrus.Errorf("assoc users can not be fetched: %v", err)
+				os.Exit(1)
+				return err
+			}
+
+			usernames := assocUsers.Usernames
 			count := len(usernames)
 			for i, uname := range usernames {
 				if i+1 == count {
@@ -137,9 +145,38 @@ var netListCommand = cli.Command{
 	},
 }
 
+var netTypesCommand = cli.Command{
+	Name:    "types",
+	Aliases: []string{"t"},
+	Usage:   "Show available network types.",
+	Action: func(c *cli.Context) error {
+		action = "net:types"
+		conn := getConn(c.GlobalString("daemon-port"))
+		defer conn.Close()
+		netSvc := pb.NewNetworkServiceClient(conn)
+
+		resp, err := netSvc.GetAllTypes(context.Background(), &pb.NetworkGetAllTypesRequest{})
+		if err != nil {
+			logrus.Errorf("networks can not be fetched: %v", err)
+			os.Exit(1)
+			return err
+		}
+		table := tablewriter.NewWriter(os.Stdout)
+		table.SetHeader([]string{"#", "net type", "desc"})
+		//table.SetBorder(false)
+		for i, ntype := range resp.Types {
+			data := []string{fmt.Sprintf("%v", i+1), ntype.Type, ntype.Description}
+			table.Append(data)
+		}
+		table.Render()
+
+		return nil
+	},
+}
+
 var netUndefineCommand = cli.Command{
-	Name:    "undefine",
-	Aliases: []string{"undef", "u"},
+	Name:    "undef",
+	Aliases: []string{"u"},
 	Usage:   "Undefine an existing network.",
 	Flags: []cli.Flag{
 		cli.StringFlag{
@@ -173,8 +210,8 @@ var netUndefineCommand = cli.Command{
 }
 
 var netAssociateCommand = cli.Command{
-	Name:    "associate",
-	Aliases: []string{"assoc", "a"},
+	Name:    "assoc",
+	Aliases: []string{"a"},
 	Usage:   "Associate a user with a network.",
 	Flags: []cli.Flag{
 		cli.StringFlag{
@@ -214,8 +251,8 @@ var netAssociateCommand = cli.Command{
 }
 
 var netDissociateCommand = cli.Command{
-	Name:    "dissociate",
-	Aliases: []string{"dissoc", "d"},
+	Name:    "dissoc",
+	Aliases: []string{"d"},
 	Usage:   "Dissociate a user from a network.",
 	Flags: []cli.Flag{
 		cli.StringFlag{

net.go

@@ -26,12 +26,13 @@ const (
 )
 
 var networkTypes = [...]struct {
-	Type   NetworkType
-	String string
+	Type        NetworkType
+	String      string
+	Description string
 }{
-	{UNDEFINEDNET, "UNDEFINEDNET"},
-	{SERVERNET, "SERVERNET"},
-	{ROUTE, "ROUTE"},
+	{UNDEFINEDNET, "UNDEFINEDNET", "unknown network type"},
+	{SERVERNET, "SERVERNET", "network behind vpn server"},
+	{ROUTE, "ROUTE", "network to be pushed as route"},
 }
 
 // NetworkTypeFromString returns string representation of the network type.
@@ -62,6 +63,15 @@ func (nt NetworkType) String() string {
 	return "UNDEFINEDNET"
 }
 
+func (nt NetworkType) Description() string {
+	for _, v := range networkTypes {
+		if v.Type == nt {
+			return v.Description
+		}
+	}
+	return "UNDEFINEDNET"
+}
+
 // DBNetwork is database model for external networks on the VPN server.
 type DBNetwork struct {
 	gorm.Model

pb/network.pb.go

@@ -137,6 +137,24 @@ func (m *NetworkDissociateRequest) GetUsername() string {
 	return ""
 }
 
+type NetworkGetAssociatedUsersRequest struct {
+	Name string `protobuf:"bytes,1,opt,name=Name" json:"Name,omitempty"`
+}
+
+func (m *NetworkGetAssociatedUsersRequest) Reset()         { *m = NetworkGetAssociatedUsersRequest{} }
+func (m *NetworkGetAssociatedUsersRequest) String() string { return proto.CompactTextString(m) }
+func (*NetworkGetAssociatedUsersRequest) ProtoMessage()    {}
+func (*NetworkGetAssociatedUsersRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor2, []int{6}
+}
+
+func (m *NetworkGetAssociatedUsersRequest) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
 type Network struct {
 	Name                string   `protobuf:"bytes,1,opt,name=Name" json:"Name,omitempty"`
 	CIDR                string   `protobuf:"bytes,2,opt,name=CIDR" json:"CIDR,omitempty"`
@@ -149,7 +167,7 @@ type Network struct {
 func (m *Network) Reset()                    { *m = Network{} }
 func (m *Network) String() string            { return proto.CompactTextString(m) }
 func (*Network) ProtoMessage()               {}
-func (*Network) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{6} }
+func (*Network) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
 
 func (m *Network) GetName() string {
 	if m != nil {
@@ -193,6 +211,30 @@ func (m *Network) GetVia() string {
 	return ""
 }
 
+type NetworkType struct {
+	Type        string `protobuf:"bytes,1,opt,name=Type" json:"Type,omitempty"`
+	Description string `protobuf:"bytes,2,opt,name=Description" json:"Description,omitempty"`
+}
+
+func (m *NetworkType) Reset()                    { *m = NetworkType{} }
+func (m *NetworkType) String() string            { return proto.CompactTextString(m) }
+func (*NetworkType) ProtoMessage()               {}
+func (*NetworkType) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+
+func (m *NetworkType) GetType() string {
+	if m != nil {
+		return m.Type
+	}
+	return ""
+}
+
+func (m *NetworkType) GetDescription() string {
+	if m != nil {
+		return m.Description
+	}
+	return ""
+}
+
 type NetworkCreateResponse struct {
 	Network *Network `protobuf:"bytes,1,opt,name=Network" json:"Network,omitempty"`
 }
@@ -200,7 +242,7 @@ type NetworkCreateResponse struct {
 func (m *NetworkCreateResponse) Reset()                    { *m = NetworkCreateResponse{} }
 func (m *NetworkCreateResponse) String() string            { return proto.CompactTextString(m) }
 func (*NetworkCreateResponse) ProtoMessage()               {}
-func (*NetworkCreateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{7} }
+func (*NetworkCreateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
 
 func (m *NetworkCreateResponse) GetNetwork() *Network {
 	if m != nil {
@@ -216,7 +258,7 @@ type NetworkListResponse struct {
 func (m *NetworkListResponse) Reset()                    { *m = NetworkListResponse{} }
 func (m *NetworkListResponse) String() string            { return proto.CompactTextString(m) }
 func (*NetworkListResponse) ProtoMessage()               {}
-func (*NetworkListResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{8} }
+func (*NetworkListResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
 
 func (m *NetworkListResponse) GetNetworks() []*Network {
 	if m != nil {
@@ -232,7 +274,7 @@ type NetworkDeleteResponse struct {
 func (m *NetworkDeleteResponse) Reset()                    { *m = NetworkDeleteResponse{} }
 func (m *NetworkDeleteResponse) String() string            { return proto.CompactTextString(m) }
 func (*NetworkDeleteResponse) ProtoMessage()               {}
-func (*NetworkDeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{9} }
+func (*NetworkDeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
 
 func (m *NetworkDeleteResponse) GetNetwork() *Network {
 	if m != nil {
@@ -242,15 +284,15 @@ func (m *NetworkDeleteResponse) GetNetwork() *Network {
 }
 
 type NetworkGetAllTypesResponse struct {
-	Types []string `protobuf:"bytes,1,rep,name=Types" json:"Types,omitempty"`
+	Types []*NetworkType `protobuf:"bytes,1,rep,name=Types" json:"Types,omitempty"`
 }
 
 func (m *NetworkGetAllTypesResponse) Reset()                    { *m = NetworkGetAllTypesResponse{} }
 func (m *NetworkGetAllTypesResponse) String() string            { return proto.CompactTextString(m) }
 func (*NetworkGetAllTypesResponse) ProtoMessage()               {}
-func (*NetworkGetAllTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{10} }
+func (*NetworkGetAllTypesResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{12} }
 
-func (m *NetworkGetAllTypesResponse) GetTypes() []string {
+func (m *NetworkGetAllTypesResponse) GetTypes() []*NetworkType {
 	if m != nil {
 		return m.Types
 	}
@@ -263,7 +305,7 @@ type NetworkAssociateResponse struct {
 func (m *NetworkAssociateResponse) Reset()                    { *m = NetworkAssociateResponse{} }
 func (m *NetworkAssociateResponse) String() string            { return proto.CompactTextString(m) }
 func (*NetworkAssociateResponse) ProtoMessage()               {}
-func (*NetworkAssociateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{11} }
+func (*NetworkAssociateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{13} }
 
 type NetworkDissociateResponse struct {
 }
@@ -271,7 +313,25 @@ type NetworkDissociateResponse struct {
 func (m *NetworkDissociateResponse) Reset()                    { *m = NetworkDissociateResponse{} }
 func (m *NetworkDissociateResponse) String() string            { return proto.CompactTextString(m) }
 func (*NetworkDissociateResponse) ProtoMessage()               {}
-func (*NetworkDissociateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{12} }
+func (*NetworkDissociateResponse) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{14} }
+
+type NetworkGetAssociatedUsersResponse struct {
+	Usernames []string `protobuf:"bytes,1,rep,name=Usernames" json:"Usernames,omitempty"`
+}
+
+func (m *NetworkGetAssociatedUsersResponse) Reset()         { *m = NetworkGetAssociatedUsersResponse{} }
+func (m *NetworkGetAssociatedUsersResponse) String() string { return proto.CompactTextString(m) }
+func (*NetworkGetAssociatedUsersResponse) ProtoMessage()    {}
+func (*NetworkGetAssociatedUsersResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor2, []int{15}
+}
+
+func (m *NetworkGetAssociatedUsersResponse) GetUsernames() []string {
+	if m != nil {
+		return m.Usernames
+	}
+	return nil
+}
 
 func init() {
 	proto.RegisterType((*NetworkCreateRequest)(nil), "pb.NetworkCreateRequest")
@@ -280,13 +340,16 @@ func init() {
 	proto.RegisterType((*NetworkGetAllTypesRequest)(nil), "pb.NetworkGetAllTypesRequest")
 	proto.RegisterType((*NetworkAssociateRequest)(nil), "pb.NetworkAssociateRequest")
 	proto.RegisterType((*NetworkDissociateRequest)(nil), "pb.NetworkDissociateRequest")
+	proto.RegisterType((*NetworkGetAssociatedUsersRequest)(nil), "pb.NetworkGetAssociatedUsersRequest")
 	proto.RegisterType((*Network)(nil), "pb.Network")
+	proto.RegisterType((*NetworkType)(nil), "pb.NetworkType")
 	proto.RegisterType((*NetworkCreateResponse)(nil), "pb.NetworkCreateResponse")
 	proto.RegisterType((*NetworkListResponse)(nil), "pb.NetworkListResponse")
 	proto.RegisterType((*NetworkDeleteResponse)(nil), "pb.NetworkDeleteResponse")
 	proto.RegisterType((*NetworkGetAllTypesResponse)(nil), "pb.NetworkGetAllTypesResponse")
 	proto.RegisterType((*NetworkAssociateResponse)(nil), "pb.NetworkAssociateResponse")
 	proto.RegisterType((*NetworkDissociateResponse)(nil), "pb.NetworkDissociateResponse")
+	proto.RegisterType((*NetworkGetAssociatedUsersResponse)(nil), "pb.NetworkGetAssociatedUsersResponse")
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -304,6 +367,7 @@ type NetworkServiceClient interface {
 	List(ctx context.Context, in *NetworkListRequest, opts ...grpc.CallOption) (*NetworkListResponse, error)
 	Delete(ctx context.Context, in *NetworkDeleteRequest, opts ...grpc.CallOption) (*NetworkDeleteResponse, error)
 	GetAllTypes(ctx context.Context, in *NetworkGetAllTypesRequest, opts ...grpc.CallOption) (*NetworkGetAllTypesResponse, error)
+	GetAssociatedUsers(ctx context.Context, in *NetworkGetAssociatedUsersRequest, opts ...grpc.CallOption) (*NetworkGetAssociatedUsersResponse, error)
 	Associate(ctx context.Context, in *NetworkAssociateRequest, opts ...grpc.CallOption) (*NetworkAssociateResponse, error)
 	Dissociate(ctx context.Context, in *NetworkDissociateRequest, opts ...grpc.CallOption) (*NetworkDissociateResponse, error)
 }
@@ -352,6 +416,15 @@ func (c *networkServiceClient) GetAllTypes(ctx context.Context, in *NetworkGetAl
 	return out, nil
 }
 
+func (c *networkServiceClient) GetAssociatedUsers(ctx context.Context, in *NetworkGetAssociatedUsersRequest, opts ...grpc.CallOption) (*NetworkGetAssociatedUsersResponse, error) {
+	out := new(NetworkGetAssociatedUsersResponse)
+	err := grpc.Invoke(ctx, "/pb.NetworkService/GetAssociatedUsers", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *networkServiceClient) Associate(ctx context.Context, in *NetworkAssociateRequest, opts ...grpc.CallOption) (*NetworkAssociateResponse, error) {
 	out := new(NetworkAssociateResponse)
 	err := grpc.Invoke(ctx, "/pb.NetworkService/Associate", in, out, c.cc, opts...)
@@ -377,6 +450,7 @@ type NetworkServiceServer interface {
 	List(context.Context, *NetworkListRequest) (*NetworkListResponse, error)
 	Delete(context.Context, *NetworkDeleteRequest) (*NetworkDeleteResponse, error)
 	GetAllTypes(context.Context, *NetworkGetAllTypesRequest) (*NetworkGetAllTypesResponse, error)
+	GetAssociatedUsers(context.Context, *NetworkGetAssociatedUsersRequest) (*NetworkGetAssociatedUsersResponse, error)
 	Associate(context.Context, *NetworkAssociateRequest) (*NetworkAssociateResponse, error)
 	Dissociate(context.Context, *NetworkDissociateRequest) (*NetworkDissociateResponse, error)
 }
@@ -457,6 +531,24 @@ func _NetworkService_GetAllTypes_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _NetworkService_GetAssociatedUsers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(NetworkGetAssociatedUsersRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(NetworkServiceServer).GetAssociatedUsers(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/pb.NetworkService/GetAssociatedUsers",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(NetworkServiceServer).GetAssociatedUsers(ctx, req.(*NetworkGetAssociatedUsersRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _NetworkService_Associate_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(NetworkAssociateRequest)
 	if err := dec(in); err != nil {
@@ -513,6 +605,10 @@ var _NetworkService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "GetAllTypes",
 			Handler:    _NetworkService_GetAllTypes_Handler,
 		},
+		{
+			MethodName: "GetAssociatedUsers",
+			Handler:    _NetworkService_GetAssociatedUsers_Handler,
+		},
 		{
 			MethodName: "Associate",
 			Handler:    _NetworkService_Associate_Handler,
@@ -529,33 +625,38 @@ var _NetworkService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("network.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 447 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x5d, 0x6f, 0xda, 0x30,
-	0x14, 0x25, 0x04, 0x32, 0x72, 0xd1, 0xa6, 0xc9, 0xb0, 0x61, 0x0c, 0x4c, 0xc8, 0xd2, 0x34, 0xb4,
-	0x07, 0x34, 0xb1, 0xa7, 0xbd, 0x80, 0x10, 0x48, 0x1b, 0xdb, 0xc4, 0x43, 0xfa, 0xf1, 0xce, 0x87,
-	0x1f, 0xa2, 0x52, 0x92, 0xc6, 0x69, 0xab, 0xfe, 0xa2, 0xfe, 0x81, 0xfe, 0xc0, 0xca, 0xb1, 0x63,
-	0x1c, 0x08, 0xad, 0x2a, 0xde, 0x9c, 0x73, 0xae, 0xef, 0xf1, 0x3d, 0xf7, 0xde, 0xc0, 0xfb, 0x2d,
-	0x8b, 0xef, 0x83, 0xe8, 0xaa, 0x1f, 0x46, 0x41, 0x1c, 0xa0, 0x62, 0xb8, 0xa4, 0x6b, 0xa8, 0xcf,
-	0x25, 0x38, 0x89, 0xd8, 0x22, 0x66, 0x1e, 0xbb, 0xb9, 0x65, 0x3c, 0x46, 0x08, 0x4a, 0xf3, 0xc5,
-	0x35, 0xc3, 0x56, 0xd7, 0xea, 0xb9, 0x5e, 0x72, 0x16, 0xd8, 0x64, 0x36, 0xf5, 0x70, 0x51, 0x62,
-	0xe2, 0x2c, 0xb0, 0xf3, 0x87, 0x90, 0x61, 0x5b, 0x62, 0xe2, 0x8c, 0x3e, 0x82, 0x7d, 0xe9, 0x2f,
-	0x70, 0x29, 0x81, 0xc4, 0x91, 0xd6, 0x01, 0x29, 0x95, 0xff, 0x3e, 0x8f, 0x95, 0x06, 0xfd, 0xae,
-	0xb5, 0xa7, 0x6c, 0xc3, 0x5e, 0xd4, 0xa6, 0x2d, 0x68, 0xaa, 0xd8, 0xdf, 0x2c, 0x1e, 0x6f, 0x36,
-	0x42, 0x88, 0xa7, 0x89, 0x66, 0xd0, 0x50, 0xe4, 0x98, 0xf3, 0x60, 0xe5, 0xbf, 0x52, 0x07, 0x81,
-	0xca, 0x05, 0x67, 0xd1, 0x56, 0xe0, 0xb2, 0x16, 0xfd, 0x4d, 0xff, 0x02, 0x4e, 0xdf, 0xe4, 0x9f,
-	0x9a, 0xeb, 0xd1, 0x82, 0x77, 0x2a, 0xd9, 0x49, 0x7e, 0xb6, 0xc1, 0x95, 0xcd, 0x59, 0x8f, 0x63,
-	0xe5, 0xea, 0x0e, 0x40, 0x3f, 0xa0, 0xa6, 0xab, 0x5e, 0xa7, 0xda, 0x1c, 0x97, 0xbb, 0x76, 0xcf,
-	0xf5, 0xf2, 0xa8, 0xb4, 0x3f, 0xce, 0xae, 0x3f, 0x43, 0xf8, 0xb4, 0x37, 0x05, 0x3c, 0x0c, 0xb6,
-	0x9c, 0xa1, 0xaf, 0xba, 0x82, 0xe4, 0xe5, 0xd5, 0x41, 0xb5, 0x1f, 0x2e, 0xfb, 0x0a, 0xf2, 0x52,
-	0x8e, 0x0e, 0xa1, 0x96, 0xe9, 0xaf, 0xba, 0xfd, 0x0d, 0x2a, 0x0a, 0xe6, 0xd8, 0xea, 0xda, 0xfb,
-	0xd7, 0x35, 0x69, 0xe8, 0xa7, 0x93, 0xf0, 0x36, 0xfd, 0x01, 0x90, 0xbc, 0xe9, 0x50, 0x49, 0xea,
-	0x50, 0x4e, 0x80, 0xe4, 0x0d, 0xae, 0x27, 0x3f, 0x28, 0xd1, 0x9d, 0x36, 0x86, 0x46, 0xde, 0x30,
-	0xa6, 0xcd, 0x9c, 0x02, 0x49, 0x0e, 0x9e, 0x6c, 0xf8, 0xa0, 0xd8, 0x33, 0x16, 0xdd, 0xf9, 0x2b,
-	0x86, 0x46, 0xe0, 0x48, 0xe3, 0x10, 0x36, 0xde, 0x97, 0xd9, 0x28, 0xd2, 0xcc, 0x61, 0x94, 0x5c,
-	0x01, 0xfd, 0x82, 0x92, 0x70, 0x0e, 0x7d, 0x36, 0x82, 0x8c, 0x55, 0x21, 0x8d, 0x03, 0x5c, 0x5f,
-	0x1d, 0x81, 0x23, 0x4d, 0xcb, 0x68, 0x67, 0x36, 0x2a, 0xa3, 0x9d, 0x75, 0x98, 0x16, 0xd0, 0x1c,
-	0xaa, 0x86, 0x6b, 0xa8, 0x63, 0xc4, 0x1e, 0xee, 0x1a, 0xf9, 0x72, 0x8c, 0xd6, 0xf9, 0xfe, 0x80,
-	0xab, 0x1d, 0x45, 0x2d, 0x23, 0x7c, 0x7f, 0x39, 0x49, 0x3b, 0x9f, 0xd4, 0x99, 0xfe, 0x01, 0xec,
-	0xfc, 0x47, 0x66, 0xf4, 0xc1, 0x72, 0x92, 0xce, 0x11, 0x36, 0x4d, 0xb6, 0x74, 0x92, 0x9f, 0xde,
-	0xcf, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xb3, 0x16, 0xc9, 0x05, 0x05, 0x00, 0x00,
+	// 519 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0xd3, 0x30,
+	0x14, 0x5d, 0xd6, 0xae, 0x2c, 0x37, 0xe2, 0x43, 0x77, 0x83, 0x65, 0x5e, 0x87, 0x82, 0xc5, 0xc4,
+	0xc4, 0x43, 0x85, 0x86, 0x84, 0xc4, 0xcb, 0xa6, 0xaa, 0x95, 0x60, 0x80, 0xfa, 0x10, 0x3e, 0xde,
+	0xfb, 0xe1, 0x87, 0x88, 0xd2, 0x84, 0x38, 0x80, 0xf8, 0x29, 0xfc, 0x02, 0xfe, 0x26, 0x72, 0x7c,
+	0xed, 0x38, 0x4d, 0xd6, 0x09, 0xf5, 0xcd, 0x3d, 0xc7, 0x3e, 0xe7, 0x24, 0xe7, 0xc6, 0x85, 0xbb,
+	0x2b, 0x51, 0xfc, 0x4a, 0xf3, 0xaf, 0x83, 0x2c, 0x4f, 0x8b, 0x14, 0x77, 0xb3, 0x19, 0x5f, 0xc0,
+	0xe1, 0x44, 0x83, 0xa3, 0x5c, 0x4c, 0x0b, 0x11, 0x8b, 0xef, 0x3f, 0x84, 0x2c, 0x10, 0xa1, 0x3b,
+	0x99, 0x7e, 0x13, 0xa1, 0x17, 0x79, 0xe7, 0x7e, 0x5c, 0xae, 0x15, 0x36, 0xba, 0x1e, 0xc7, 0xe1,
+	0xae, 0xc6, 0xd4, 0x5a, 0x61, 0x9f, 0x7e, 0x67, 0x22, 0xec, 0x68, 0x4c, 0xad, 0xf1, 0x01, 0x74,
+	0xbe, 0x24, 0xd3, 0xb0, 0x5b, 0x42, 0x6a, 0xc9, 0x0f, 0x01, 0xc9, 0xe5, 0x43, 0x22, 0x0b, 0xf2,
+	0xe0, 0xcf, 0xad, 0xf7, 0x58, 0x2c, 0xc5, 0x46, 0x6f, 0x7e, 0x02, 0xc7, 0xb4, 0xf7, 0x8d, 0x28,
+	0x86, 0xcb, 0xa5, 0x32, 0x92, 0x46, 0xe8, 0x1a, 0x8e, 0x88, 0x1c, 0x4a, 0x99, 0xce, 0x93, 0x5b,
+	0x9e, 0x83, 0xc1, 0xfe, 0x67, 0x29, 0xf2, 0x95, 0xc2, 0xf5, 0xb3, 0xd8, 0xdf, 0xfc, 0x1d, 0x84,
+	0x26, 0x53, 0xb2, 0xad, 0xd6, 0x2b, 0x88, 0x9c, 0xcc, 0x46, 0x6d, 0xa1, 0x78, 0xb9, 0xe9, 0x59,
+	0xff, 0x7a, 0x70, 0x87, 0x0e, 0x6e, 0xd5, 0x43, 0x1f, 0x7c, 0x5d, 0xea, 0x62, 0x58, 0x50, 0x1b,
+	0x15, 0x80, 0x2f, 0xe0, 0xa0, 0x9e, 0x49, 0x65, 0x96, 0xe1, 0x5e, 0xd4, 0x39, 0xf7, 0xe3, 0x36,
+	0xca, 0xf4, 0xda, 0xab, 0x7a, 0x1d, 0x41, 0x40, 0x41, 0x4b, 0x43, 0x13, 0xc2, 0x73, 0x42, 0x44,
+	0x10, 0x8c, 0x85, 0x9c, 0xe7, 0x49, 0x56, 0x24, 0xe9, 0x8a, 0x32, 0xbb, 0x10, 0xbf, 0x84, 0x87,
+	0x6b, 0x23, 0x28, 0xb3, 0x74, 0x25, 0x05, 0x9e, 0xd9, 0xd7, 0x50, 0x2a, 0x06, 0x17, 0xc1, 0x20,
+	0x9b, 0x0d, 0x08, 0x8a, 0x0d, 0xc7, 0x2f, 0xe1, 0xa0, 0x36, 0x5c, 0x74, 0xfa, 0x19, 0xec, 0x13,
+	0x2c, 0x43, 0x2f, 0xea, 0xac, 0x1f, 0xb7, 0xa4, 0xe3, 0x6f, 0xc6, 0xf0, 0xff, 0xfc, 0x47, 0xc0,
+	0xda, 0x46, 0xd3, 0x8a, 0xec, 0x95, 0x00, 0x65, 0xb8, 0xef, 0x48, 0x28, 0x3c, 0xd6, 0x2c, 0x67,
+	0x76, 0xee, 0x9c, 0x11, 0xd6, 0x12, 0xce, 0xec, 0xbb, 0x33, 0x49, 0xe4, 0x10, 0x9e, 0x6c, 0x18,
+	0x32, 0x0a, 0xd1, 0x07, 0xbf, 0x6a, 0xd8, 0x2b, 0x1b, 0xae, 0x80, 0x8b, 0x3f, 0x5d, 0xb8, 0x47,
+	0x1a, 0x1f, 0x45, 0xfe, 0x33, 0x99, 0x0b, 0xbc, 0x82, 0x9e, 0x2e, 0x03, 0x43, 0x27, 0x70, 0xed,
+	0x8a, 0x60, 0xc7, 0x2d, 0x0c, 0x85, 0xda, 0xc1, 0xd7, 0xd0, 0x55, 0x6d, 0xe0, 0x23, 0x67, 0x93,
+	0xf3, 0xed, 0xb3, 0xa3, 0x06, 0x6e, 0x8f, 0x5e, 0x41, 0x4f, 0x17, 0x51, 0xf3, 0xae, 0x5d, 0x11,
+	0x35, 0xef, 0x7a, 0x6b, 0x7c, 0x07, 0x27, 0x10, 0x38, 0x4d, 0xe0, 0xa9, 0xb3, 0xb7, 0x79, 0x79,
+	0xb0, 0xc7, 0x37, 0xd1, 0x56, 0x6f, 0x0e, 0xd8, 0x7c, 0xb7, 0xf8, 0x74, 0xed, 0x5c, 0xeb, 0xf7,
+	0xcd, 0xce, 0x6e, 0xd9, 0x65, 0x4d, 0xde, 0x82, 0x6f, 0x49, 0x3c, 0x71, 0x4e, 0xad, 0x5f, 0x69,
+	0xac, 0xdf, 0x4e, 0x5a, 0xa5, 0xf7, 0x00, 0xd5, 0x9c, 0xa0, 0xbb, 0xbb, 0x71, 0xa5, 0xb1, 0xd3,
+	0x1b, 0x58, 0x23, 0x36, 0xeb, 0x95, 0x7f, 0x15, 0x2f, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x97,
+	0x70, 0x5d, 0x7b, 0x3b, 0x06, 0x00, 0x00,
 }

pb/network.proto

@@ -21,11 +21,16 @@ message NetworkDissociateRequest {
   string Name = 1;
   string Username = 2;
 }
+
+message NetworkGetAssociatedUsersRequest {
+  string Name = 1;
+}
 service NetworkService {
   rpc Create (NetworkCreateRequest) returns (NetworkCreateResponse) {}
   rpc List (NetworkListRequest) returns (NetworkListResponse) {}
   rpc Delete (NetworkDeleteRequest) returns (NetworkDeleteResponse) {}
   rpc GetAllTypes(NetworkGetAllTypesRequest) returns (NetworkGetAllTypesResponse) {}
+  rpc GetAssociatedUsers(NetworkGetAssociatedUsersRequest) returns (NetworkGetAssociatedUsersResponse) {}
   rpc Associate (NetworkAssociateRequest) returns (NetworkAssociateResponse) {}
   rpc Dissociate (NetworkDissociateRequest) returns (NetworkDissociateResponse) {}
 }
@@ -37,6 +42,11 @@ message Network {
   repeated string AssociatedUsernames = 5;
   string Via = 6;
 }
+
+message NetworkType {
+  string Type = 1;
+  string Description = 2;
+}
 message NetworkCreateResponse {
   Network Network = 1;
 }
@@ -47,7 +57,10 @@ message NetworkDeleteResponse {
   Network Network = 1;
 }
 message NetworkGetAllTypesResponse {
-  repeated string Types = 1;
+  repeated NetworkType Types = 1;
 }
 message NetworkAssociateResponse {}
 message NetworkDissociateResponse {}
+message NetworkGetAssociatedUsersResponse {
+  repeated string Usernames = 1;
+}

pb/user.pb.go

@@ -28,13 +28,16 @@ It has these top-level messages:
 	NetworkGetAllTypesRequest
 	NetworkAssociateRequest
 	NetworkDissociateRequest
+	NetworkGetAssociatedUsersRequest
 	Network
+	NetworkType
 	NetworkCreateResponse
 	NetworkListResponse
 	NetworkDeleteResponse
 	NetworkGetAllTypesResponse
 	NetworkAssociateResponse
 	NetworkDissociateResponse
+	NetworkGetAssociatedUsersResponse
 */
 package pb