瀏覽代碼

chore(webui): run npm audit fix

Mustafa Arici 7 年之前
父節點
當前提交
42ca6981a9
共有 6 個文件被更改,包括 151 次插入159 次删除
  1. 11 11
      api/pb/auth.pb.go
  2. 41 41
      api/pb/network.pb.go
  3. 43 43
      api/pb/user.pb.go
  4. 31 31
      api/pb/vpn.pb.go
  5. 10 10
      bindata/bindata.go
  6. 15 23
      webui/ovpm/package-lock.json

+ 11 - 11
api/pb/auth.pb.go

@@ -34,7 +34,7 @@ func (m *AuthStatusRequest) Reset()         { *m = AuthStatusRequest{} }
 func (m *AuthStatusRequest) String() string { return proto.CompactTextString(m) }
 func (m *AuthStatusRequest) String() string { return proto.CompactTextString(m) }
 func (*AuthStatusRequest) ProtoMessage()    {}
 func (*AuthStatusRequest) ProtoMessage()    {}
 func (*AuthStatusRequest) Descriptor() ([]byte, []int) {
 func (*AuthStatusRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_79ec97a74d2b7cf3, []int{0}
+	return fileDescriptor_auth_5d9157b05cb925f8, []int{0}
 }
 }
 func (m *AuthStatusRequest) XXX_Unmarshal(b []byte) error {
 func (m *AuthStatusRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthStatusRequest.Unmarshal(m, b)
 	return xxx_messageInfo_AuthStatusRequest.Unmarshal(m, b)
@@ -55,8 +55,8 @@ func (m *AuthStatusRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_AuthStatusRequest proto.InternalMessageInfo
 var xxx_messageInfo_AuthStatusRequest proto.InternalMessageInfo
 
 
 type AuthAuthenticateRequest struct {
 type AuthAuthenticateRequest struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
-	Password             string   `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	Password             string   `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -66,7 +66,7 @@ func (m *AuthAuthenticateRequest) Reset()         { *m = AuthAuthenticateRequest
 func (m *AuthAuthenticateRequest) String() string { return proto.CompactTextString(m) }
 func (m *AuthAuthenticateRequest) String() string { return proto.CompactTextString(m) }
 func (*AuthAuthenticateRequest) ProtoMessage()    {}
 func (*AuthAuthenticateRequest) ProtoMessage()    {}
 func (*AuthAuthenticateRequest) Descriptor() ([]byte, []int) {
 func (*AuthAuthenticateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_79ec97a74d2b7cf3, []int{1}
+	return fileDescriptor_auth_5d9157b05cb925f8, []int{1}
 }
 }
 func (m *AuthAuthenticateRequest) XXX_Unmarshal(b []byte) error {
 func (m *AuthAuthenticateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthAuthenticateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_AuthAuthenticateRequest.Unmarshal(m, b)
@@ -101,8 +101,8 @@ func (m *AuthAuthenticateRequest) GetPassword() string {
 }
 }
 
 
 type AuthStatusResponse struct {
 type AuthStatusResponse struct {
-	User                 *UserResponse_User `protobuf:"bytes,1,opt,name=user" json:"user,omitempty"`
-	IsRoot               bool               `protobuf:"varint,2,opt,name=is_root,json=isRoot" json:"is_root,omitempty"`
+	User                 *UserResponse_User `protobuf:"bytes,1,opt,name=user,proto3" json:"user,omitempty"`
+	IsRoot               bool               `protobuf:"varint,2,opt,name=is_root,json=isRoot,proto3" json:"is_root,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_unrecognized     []byte             `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
 	XXX_sizecache        int32              `json:"-"`
@@ -112,7 +112,7 @@ func (m *AuthStatusResponse) Reset()         { *m = AuthStatusResponse{} }
 func (m *AuthStatusResponse) String() string { return proto.CompactTextString(m) }
 func (m *AuthStatusResponse) String() string { return proto.CompactTextString(m) }
 func (*AuthStatusResponse) ProtoMessage()    {}
 func (*AuthStatusResponse) ProtoMessage()    {}
 func (*AuthStatusResponse) Descriptor() ([]byte, []int) {
 func (*AuthStatusResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_79ec97a74d2b7cf3, []int{2}
+	return fileDescriptor_auth_5d9157b05cb925f8, []int{2}
 }
 }
 func (m *AuthStatusResponse) XXX_Unmarshal(b []byte) error {
 func (m *AuthStatusResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthStatusResponse.Unmarshal(m, b)
 	return xxx_messageInfo_AuthStatusResponse.Unmarshal(m, b)
@@ -147,7 +147,7 @@ func (m *AuthStatusResponse) GetIsRoot() bool {
 }
 }
 
 
 type AuthAuthenticateResponse struct {
 type AuthAuthenticateResponse struct {
-	Token                string   `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"`
+	Token                string   `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -157,7 +157,7 @@ func (m *AuthAuthenticateResponse) Reset()         { *m = AuthAuthenticateRespon
 func (m *AuthAuthenticateResponse) String() string { return proto.CompactTextString(m) }
 func (m *AuthAuthenticateResponse) String() string { return proto.CompactTextString(m) }
 func (*AuthAuthenticateResponse) ProtoMessage()    {}
 func (*AuthAuthenticateResponse) ProtoMessage()    {}
 func (*AuthAuthenticateResponse) Descriptor() ([]byte, []int) {
 func (*AuthAuthenticateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_auth_79ec97a74d2b7cf3, []int{3}
+	return fileDescriptor_auth_5d9157b05cb925f8, []int{3}
 }
 }
 func (m *AuthAuthenticateResponse) XXX_Unmarshal(b []byte) error {
 func (m *AuthAuthenticateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_AuthAuthenticateResponse.Unmarshal(m, b)
 	return xxx_messageInfo_AuthAuthenticateResponse.Unmarshal(m, b)
@@ -296,9 +296,9 @@ var _AuthService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "auth.proto",
 	Metadata: "auth.proto",
 }
 }
 
 
-func init() { proto.RegisterFile("auth.proto", fileDescriptor_auth_79ec97a74d2b7cf3) }
+func init() { proto.RegisterFile("auth.proto", fileDescriptor_auth_5d9157b05cb925f8) }
 
 
-var fileDescriptor_auth_79ec97a74d2b7cf3 = []byte{
+var fileDescriptor_auth_5d9157b05cb925f8 = []byte{
 	// 306 bytes of a gzipped FileDescriptorProto
 	// 306 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0x41, 0x4e, 0x2a, 0x41,
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0x41, 0x4e, 0x2a, 0x41,
 	0x10, 0xcd, 0x90, 0xff, 0x11, 0x0b, 0x37, 0x36, 0x22, 0x38, 0x10, 0x63, 0x26, 0x2e, 0xd4, 0x05,
 	0x10, 0xcd, 0x90, 0xff, 0x11, 0x0b, 0x37, 0x36, 0x22, 0x38, 0x10, 0x63, 0x26, 0x2e, 0xd4, 0x05,

+ 41 - 41
api/pb/network.pb.go

@@ -25,10 +25,10 @@ var _ = math.Inf
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 
 type NetworkCreateRequest struct {
 type NetworkCreateRequest struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Cidr                 string   `protobuf:"bytes,2,opt,name=cidr" json:"cidr,omitempty"`
-	Type                 string   `protobuf:"bytes,3,opt,name=type" json:"type,omitempty"`
-	Via                  string   `protobuf:"bytes,4,opt,name=via" json:"via,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Cidr                 string   `protobuf:"bytes,2,opt,name=cidr,proto3" json:"cidr,omitempty"`
+	Type                 string   `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
+	Via                  string   `protobuf:"bytes,4,opt,name=via,proto3" json:"via,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -38,7 +38,7 @@ func (m *NetworkCreateRequest) Reset()         { *m = NetworkCreateRequest{} }
 func (m *NetworkCreateRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkCreateRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkCreateRequest) ProtoMessage()    {}
 func (*NetworkCreateRequest) ProtoMessage()    {}
 func (*NetworkCreateRequest) Descriptor() ([]byte, []int) {
 func (*NetworkCreateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{0}
+	return fileDescriptor_network_34cf09007f6526a1, []int{0}
 }
 }
 func (m *NetworkCreateRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkCreateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkCreateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkCreateRequest.Unmarshal(m, b)
@@ -96,7 +96,7 @@ func (m *NetworkListRequest) Reset()         { *m = NetworkListRequest{} }
 func (m *NetworkListRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkListRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkListRequest) ProtoMessage()    {}
 func (*NetworkListRequest) ProtoMessage()    {}
 func (*NetworkListRequest) Descriptor() ([]byte, []int) {
 func (*NetworkListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{1}
+	return fileDescriptor_network_34cf09007f6526a1, []int{1}
 }
 }
 func (m *NetworkListRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkListRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkListRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkListRequest.Unmarshal(m, b)
@@ -117,7 +117,7 @@ func (m *NetworkListRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_NetworkListRequest proto.InternalMessageInfo
 var xxx_messageInfo_NetworkListRequest proto.InternalMessageInfo
 
 
 type NetworkDeleteRequest struct {
 type NetworkDeleteRequest struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -127,7 +127,7 @@ func (m *NetworkDeleteRequest) Reset()         { *m = NetworkDeleteRequest{} }
 func (m *NetworkDeleteRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkDeleteRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkDeleteRequest) ProtoMessage()    {}
 func (*NetworkDeleteRequest) ProtoMessage()    {}
 func (*NetworkDeleteRequest) Descriptor() ([]byte, []int) {
 func (*NetworkDeleteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{2}
+	return fileDescriptor_network_34cf09007f6526a1, []int{2}
 }
 }
 func (m *NetworkDeleteRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkDeleteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkDeleteRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkDeleteRequest.Unmarshal(m, b)
@@ -164,7 +164,7 @@ func (m *NetworkGetAllTypesRequest) Reset()         { *m = NetworkGetAllTypesReq
 func (m *NetworkGetAllTypesRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkGetAllTypesRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkGetAllTypesRequest) ProtoMessage()    {}
 func (*NetworkGetAllTypesRequest) ProtoMessage()    {}
 func (*NetworkGetAllTypesRequest) Descriptor() ([]byte, []int) {
 func (*NetworkGetAllTypesRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{3}
+	return fileDescriptor_network_34cf09007f6526a1, []int{3}
 }
 }
 func (m *NetworkGetAllTypesRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkGetAllTypesRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkGetAllTypesRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkGetAllTypesRequest.Unmarshal(m, b)
@@ -185,8 +185,8 @@ func (m *NetworkGetAllTypesRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_NetworkGetAllTypesRequest proto.InternalMessageInfo
 var xxx_messageInfo_NetworkGetAllTypesRequest proto.InternalMessageInfo
 
 
 type NetworkAssociateRequest struct {
 type NetworkAssociateRequest struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Username             string   `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Username             string   `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -196,7 +196,7 @@ func (m *NetworkAssociateRequest) Reset()         { *m = NetworkAssociateRequest
 func (m *NetworkAssociateRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkAssociateRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkAssociateRequest) ProtoMessage()    {}
 func (*NetworkAssociateRequest) ProtoMessage()    {}
 func (*NetworkAssociateRequest) Descriptor() ([]byte, []int) {
 func (*NetworkAssociateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{4}
+	return fileDescriptor_network_34cf09007f6526a1, []int{4}
 }
 }
 func (m *NetworkAssociateRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkAssociateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkAssociateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkAssociateRequest.Unmarshal(m, b)
@@ -231,8 +231,8 @@ func (m *NetworkAssociateRequest) GetUsername() string {
 }
 }
 
 
 type NetworkDissociateRequest struct {
 type NetworkDissociateRequest struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Username             string   `protobuf:"bytes,2,opt,name=username" json:"username,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Username             string   `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -242,7 +242,7 @@ func (m *NetworkDissociateRequest) Reset()         { *m = NetworkDissociateReque
 func (m *NetworkDissociateRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkDissociateRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkDissociateRequest) ProtoMessage()    {}
 func (*NetworkDissociateRequest) ProtoMessage()    {}
 func (*NetworkDissociateRequest) Descriptor() ([]byte, []int) {
 func (*NetworkDissociateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{5}
+	return fileDescriptor_network_34cf09007f6526a1, []int{5}
 }
 }
 func (m *NetworkDissociateRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkDissociateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkDissociateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkDissociateRequest.Unmarshal(m, b)
@@ -277,7 +277,7 @@ func (m *NetworkDissociateRequest) GetUsername() string {
 }
 }
 
 
 type NetworkGetAssociatedUsersRequest struct {
 type NetworkGetAssociatedUsersRequest struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -287,7 +287,7 @@ func (m *NetworkGetAssociatedUsersRequest) Reset()         { *m = NetworkGetAsso
 func (m *NetworkGetAssociatedUsersRequest) String() string { return proto.CompactTextString(m) }
 func (m *NetworkGetAssociatedUsersRequest) String() string { return proto.CompactTextString(m) }
 func (*NetworkGetAssociatedUsersRequest) ProtoMessage()    {}
 func (*NetworkGetAssociatedUsersRequest) ProtoMessage()    {}
 func (*NetworkGetAssociatedUsersRequest) Descriptor() ([]byte, []int) {
 func (*NetworkGetAssociatedUsersRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{6}
+	return fileDescriptor_network_34cf09007f6526a1, []int{6}
 }
 }
 func (m *NetworkGetAssociatedUsersRequest) XXX_Unmarshal(b []byte) error {
 func (m *NetworkGetAssociatedUsersRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkGetAssociatedUsersRequest.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkGetAssociatedUsersRequest.Unmarshal(m, b)
@@ -315,12 +315,12 @@ func (m *NetworkGetAssociatedUsersRequest) GetName() string {
 }
 }
 
 
 type Network struct {
 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"`
-	Type                 string   `protobuf:"bytes,3,opt,name=type" json:"type,omitempty"`
-	CreatedAt            string   `protobuf:"bytes,4,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
-	AssociatedUsernames  []string `protobuf:"bytes,5,rep,name=associated_usernames,json=associatedUsernames" json:"associated_usernames,omitempty"`
-	Via                  string   `protobuf:"bytes,6,opt,name=via" json:"via,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Cidr                 string   `protobuf:"bytes,2,opt,name=cidr,proto3" json:"cidr,omitempty"`
+	Type                 string   `protobuf:"bytes,3,opt,name=type,proto3" json:"type,omitempty"`
+	CreatedAt            string   `protobuf:"bytes,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	AssociatedUsernames  []string `protobuf:"bytes,5,rep,name=associated_usernames,json=associatedUsernames,proto3" json:"associated_usernames,omitempty"`
+	Via                  string   `protobuf:"bytes,6,opt,name=via,proto3" json:"via,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -330,7 +330,7 @@ func (m *Network) Reset()         { *m = Network{} }
 func (m *Network) String() string { return proto.CompactTextString(m) }
 func (m *Network) String() string { return proto.CompactTextString(m) }
 func (*Network) ProtoMessage()    {}
 func (*Network) ProtoMessage()    {}
 func (*Network) Descriptor() ([]byte, []int) {
 func (*Network) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{7}
+	return fileDescriptor_network_34cf09007f6526a1, []int{7}
 }
 }
 func (m *Network) XXX_Unmarshal(b []byte) error {
 func (m *Network) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Network.Unmarshal(m, b)
 	return xxx_messageInfo_Network.Unmarshal(m, b)
@@ -393,8 +393,8 @@ func (m *Network) GetVia() string {
 }
 }
 
 
 type NetworkType struct {
 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"`
+	Type                 string   `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+	Description          string   `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -404,7 +404,7 @@ func (m *NetworkType) Reset()         { *m = NetworkType{} }
 func (m *NetworkType) String() string { return proto.CompactTextString(m) }
 func (m *NetworkType) String() string { return proto.CompactTextString(m) }
 func (*NetworkType) ProtoMessage()    {}
 func (*NetworkType) ProtoMessage()    {}
 func (*NetworkType) Descriptor() ([]byte, []int) {
 func (*NetworkType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{8}
+	return fileDescriptor_network_34cf09007f6526a1, []int{8}
 }
 }
 func (m *NetworkType) XXX_Unmarshal(b []byte) error {
 func (m *NetworkType) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkType.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkType.Unmarshal(m, b)
@@ -439,7 +439,7 @@ func (m *NetworkType) GetDescription() string {
 }
 }
 
 
 type NetworkCreateResponse struct {
 type NetworkCreateResponse struct {
-	Network              *Network `protobuf:"bytes,1,opt,name=network" json:"network,omitempty"`
+	Network              *Network `protobuf:"bytes,1,opt,name=network,proto3" json:"network,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -449,7 +449,7 @@ func (m *NetworkCreateResponse) Reset()         { *m = NetworkCreateResponse{} }
 func (m *NetworkCreateResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkCreateResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkCreateResponse) ProtoMessage()    {}
 func (*NetworkCreateResponse) ProtoMessage()    {}
 func (*NetworkCreateResponse) Descriptor() ([]byte, []int) {
 func (*NetworkCreateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{9}
+	return fileDescriptor_network_34cf09007f6526a1, []int{9}
 }
 }
 func (m *NetworkCreateResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkCreateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkCreateResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkCreateResponse.Unmarshal(m, b)
@@ -477,7 +477,7 @@ func (m *NetworkCreateResponse) GetNetwork() *Network {
 }
 }
 
 
 type NetworkListResponse struct {
 type NetworkListResponse struct {
-	Networks             []*Network `protobuf:"bytes,1,rep,name=networks" json:"networks,omitempty"`
+	Networks             []*Network `protobuf:"bytes,1,rep,name=networks,proto3" json:"networks,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
 	XXX_sizecache        int32      `json:"-"`
@@ -487,7 +487,7 @@ func (m *NetworkListResponse) Reset()         { *m = NetworkListResponse{} }
 func (m *NetworkListResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkListResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkListResponse) ProtoMessage()    {}
 func (*NetworkListResponse) ProtoMessage()    {}
 func (*NetworkListResponse) Descriptor() ([]byte, []int) {
 func (*NetworkListResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{10}
+	return fileDescriptor_network_34cf09007f6526a1, []int{10}
 }
 }
 func (m *NetworkListResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkListResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkListResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkListResponse.Unmarshal(m, b)
@@ -515,7 +515,7 @@ func (m *NetworkListResponse) GetNetworks() []*Network {
 }
 }
 
 
 type NetworkDeleteResponse struct {
 type NetworkDeleteResponse struct {
-	Network              *Network `protobuf:"bytes,1,opt,name=network" json:"network,omitempty"`
+	Network              *Network `protobuf:"bytes,1,opt,name=network,proto3" json:"network,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -525,7 +525,7 @@ func (m *NetworkDeleteResponse) Reset()         { *m = NetworkDeleteResponse{} }
 func (m *NetworkDeleteResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkDeleteResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkDeleteResponse) ProtoMessage()    {}
 func (*NetworkDeleteResponse) ProtoMessage()    {}
 func (*NetworkDeleteResponse) Descriptor() ([]byte, []int) {
 func (*NetworkDeleteResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{11}
+	return fileDescriptor_network_34cf09007f6526a1, []int{11}
 }
 }
 func (m *NetworkDeleteResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkDeleteResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkDeleteResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkDeleteResponse.Unmarshal(m, b)
@@ -553,7 +553,7 @@ func (m *NetworkDeleteResponse) GetNetwork() *Network {
 }
 }
 
 
 type NetworkGetAllTypesResponse struct {
 type NetworkGetAllTypesResponse struct {
-	Types                []*NetworkType `protobuf:"bytes,1,rep,name=types" json:"types,omitempty"`
+	Types                []*NetworkType `protobuf:"bytes,1,rep,name=types,proto3" json:"types,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_unrecognized     []byte         `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
 	XXX_sizecache        int32          `json:"-"`
@@ -563,7 +563,7 @@ func (m *NetworkGetAllTypesResponse) Reset()         { *m = NetworkGetAllTypesRe
 func (m *NetworkGetAllTypesResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkGetAllTypesResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkGetAllTypesResponse) ProtoMessage()    {}
 func (*NetworkGetAllTypesResponse) ProtoMessage()    {}
 func (*NetworkGetAllTypesResponse) Descriptor() ([]byte, []int) {
 func (*NetworkGetAllTypesResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{12}
+	return fileDescriptor_network_34cf09007f6526a1, []int{12}
 }
 }
 func (m *NetworkGetAllTypesResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkGetAllTypesResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkGetAllTypesResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkGetAllTypesResponse.Unmarshal(m, b)
@@ -600,7 +600,7 @@ func (m *NetworkAssociateResponse) Reset()         { *m = NetworkAssociateRespon
 func (m *NetworkAssociateResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkAssociateResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkAssociateResponse) ProtoMessage()    {}
 func (*NetworkAssociateResponse) ProtoMessage()    {}
 func (*NetworkAssociateResponse) Descriptor() ([]byte, []int) {
 func (*NetworkAssociateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{13}
+	return fileDescriptor_network_34cf09007f6526a1, []int{13}
 }
 }
 func (m *NetworkAssociateResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkAssociateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkAssociateResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkAssociateResponse.Unmarshal(m, b)
@@ -630,7 +630,7 @@ func (m *NetworkDissociateResponse) Reset()         { *m = NetworkDissociateResp
 func (m *NetworkDissociateResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkDissociateResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkDissociateResponse) ProtoMessage()    {}
 func (*NetworkDissociateResponse) ProtoMessage()    {}
 func (*NetworkDissociateResponse) Descriptor() ([]byte, []int) {
 func (*NetworkDissociateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{14}
+	return fileDescriptor_network_34cf09007f6526a1, []int{14}
 }
 }
 func (m *NetworkDissociateResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkDissociateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkDissociateResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkDissociateResponse.Unmarshal(m, b)
@@ -651,7 +651,7 @@ func (m *NetworkDissociateResponse) XXX_DiscardUnknown() {
 var xxx_messageInfo_NetworkDissociateResponse proto.InternalMessageInfo
 var xxx_messageInfo_NetworkDissociateResponse proto.InternalMessageInfo
 
 
 type NetworkGetAssociatedUsersResponse struct {
 type NetworkGetAssociatedUsersResponse struct {
-	Usernames            []string `protobuf:"bytes,1,rep,name=usernames" json:"usernames,omitempty"`
+	Usernames            []string `protobuf:"bytes,1,rep,name=usernames,proto3" json:"usernames,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -661,7 +661,7 @@ func (m *NetworkGetAssociatedUsersResponse) Reset()         { *m = NetworkGetAss
 func (m *NetworkGetAssociatedUsersResponse) String() string { return proto.CompactTextString(m) }
 func (m *NetworkGetAssociatedUsersResponse) String() string { return proto.CompactTextString(m) }
 func (*NetworkGetAssociatedUsersResponse) ProtoMessage()    {}
 func (*NetworkGetAssociatedUsersResponse) ProtoMessage()    {}
 func (*NetworkGetAssociatedUsersResponse) Descriptor() ([]byte, []int) {
 func (*NetworkGetAssociatedUsersResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_network_8219686474e53e94, []int{15}
+	return fileDescriptor_network_34cf09007f6526a1, []int{15}
 }
 }
 func (m *NetworkGetAssociatedUsersResponse) XXX_Unmarshal(b []byte) error {
 func (m *NetworkGetAssociatedUsersResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_NetworkGetAssociatedUsersResponse.Unmarshal(m, b)
 	return xxx_messageInfo_NetworkGetAssociatedUsersResponse.Unmarshal(m, b)
@@ -977,9 +977,9 @@ var _NetworkService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "network.proto",
 	Metadata: "network.proto",
 }
 }
 
 
-func init() { proto.RegisterFile("network.proto", fileDescriptor_network_8219686474e53e94) }
+func init() { proto.RegisterFile("network.proto", fileDescriptor_network_34cf09007f6526a1) }
 
 
-var fileDescriptor_network_8219686474e53e94 = []byte{
+var fileDescriptor_network_34cf09007f6526a1 = []byte{
 	// 640 bytes of a gzipped FileDescriptorProto
 	// 640 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x6f, 0xda, 0x40,
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x6f, 0xda, 0x40,
 	0x10, 0x95, 0x81, 0x90, 0x30, 0xa8, 0x1f, 0xda, 0x50, 0x62, 0x0c, 0xa4, 0x64, 0x0b, 0x6a, 0xc4,
 	0x10, 0x95, 0x81, 0x90, 0x30, 0xa8, 0x1f, 0xda, 0x50, 0x62, 0x0c, 0xa4, 0x64, 0x0b, 0x6a, 0xc4,

+ 43 - 43
api/pb/user.pb.go

@@ -47,7 +47,7 @@ func (x UserUpdateRequest_GWPref) String() string {
 	return proto.EnumName(UserUpdateRequest_GWPref_name, int32(x))
 	return proto.EnumName(UserUpdateRequest_GWPref_name, int32(x))
 }
 }
 func (UserUpdateRequest_GWPref) EnumDescriptor() ([]byte, []int) {
 func (UserUpdateRequest_GWPref) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{2, 0}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{2, 0}
 }
 }
 
 
 type UserUpdateRequest_StaticPref int32
 type UserUpdateRequest_StaticPref int32
@@ -73,7 +73,7 @@ func (x UserUpdateRequest_StaticPref) String() string {
 	return proto.EnumName(UserUpdateRequest_StaticPref_name, int32(x))
 	return proto.EnumName(UserUpdateRequest_StaticPref_name, int32(x))
 }
 }
 func (UserUpdateRequest_StaticPref) EnumDescriptor() ([]byte, []int) {
 func (UserUpdateRequest_StaticPref) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{2, 1}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{2, 1}
 }
 }
 
 
 type UserUpdateRequest_AdminPref int32
 type UserUpdateRequest_AdminPref int32
@@ -99,7 +99,7 @@ func (x UserUpdateRequest_AdminPref) String() string {
 	return proto.EnumName(UserUpdateRequest_AdminPref_name, int32(x))
 	return proto.EnumName(UserUpdateRequest_AdminPref_name, int32(x))
 }
 }
 func (UserUpdateRequest_AdminPref) EnumDescriptor() ([]byte, []int) {
 func (UserUpdateRequest_AdminPref) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{2, 2}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{2, 2}
 }
 }
 
 
 type UserListRequest struct {
 type UserListRequest struct {
@@ -112,7 +112,7 @@ func (m *UserListRequest) Reset()         { *m = UserListRequest{} }
 func (m *UserListRequest) String() string { return proto.CompactTextString(m) }
 func (m *UserListRequest) String() string { return proto.CompactTextString(m) }
 func (*UserListRequest) ProtoMessage()    {}
 func (*UserListRequest) ProtoMessage()    {}
 func (*UserListRequest) Descriptor() ([]byte, []int) {
 func (*UserListRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{0}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{0}
 }
 }
 func (m *UserListRequest) XXX_Unmarshal(b []byte) error {
 func (m *UserListRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserListRequest.Unmarshal(m, b)
 	return xxx_messageInfo_UserListRequest.Unmarshal(m, b)
@@ -133,11 +133,11 @@ func (m *UserListRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_UserListRequest proto.InternalMessageInfo
 var xxx_messageInfo_UserListRequest proto.InternalMessageInfo
 
 
 type UserCreateRequest struct {
 type UserCreateRequest struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
-	Password             string   `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
-	NoGw                 bool     `protobuf:"varint,3,opt,name=no_gw,json=noGw" json:"no_gw,omitempty"`
-	HostId               uint32   `protobuf:"varint,4,opt,name=host_id,json=hostId" json:"host_id,omitempty"`
-	IsAdmin              bool     `protobuf:"varint,5,opt,name=is_admin,json=isAdmin" json:"is_admin,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	Password             string   `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	NoGw                 bool     `protobuf:"varint,3,opt,name=no_gw,json=noGw,proto3" json:"no_gw,omitempty"`
+	HostId               uint32   `protobuf:"varint,4,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
+	IsAdmin              bool     `protobuf:"varint,5,opt,name=is_admin,json=isAdmin,proto3" json:"is_admin,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -147,7 +147,7 @@ func (m *UserCreateRequest) Reset()         { *m = UserCreateRequest{} }
 func (m *UserCreateRequest) String() string { return proto.CompactTextString(m) }
 func (m *UserCreateRequest) String() string { return proto.CompactTextString(m) }
 func (*UserCreateRequest) ProtoMessage()    {}
 func (*UserCreateRequest) ProtoMessage()    {}
 func (*UserCreateRequest) Descriptor() ([]byte, []int) {
 func (*UserCreateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{1}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{1}
 }
 }
 func (m *UserCreateRequest) XXX_Unmarshal(b []byte) error {
 func (m *UserCreateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserCreateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_UserCreateRequest.Unmarshal(m, b)
@@ -203,12 +203,12 @@ func (m *UserCreateRequest) GetIsAdmin() bool {
 }
 }
 
 
 type UserUpdateRequest struct {
 type UserUpdateRequest struct {
-	Username             string                       `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
-	Password             string                       `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
-	Gwpref               UserUpdateRequest_GWPref     `protobuf:"varint,3,opt,name=gwpref,enum=pb.UserUpdateRequest_GWPref" json:"gwpref,omitempty"`
-	HostId               uint32                       `protobuf:"varint,4,opt,name=host_id,json=hostId" json:"host_id,omitempty"`
-	StaticPref           UserUpdateRequest_StaticPref `protobuf:"varint,5,opt,name=static_pref,json=staticPref,enum=pb.UserUpdateRequest_StaticPref" json:"static_pref,omitempty"`
-	AdminPref            UserUpdateRequest_AdminPref  `protobuf:"varint,6,opt,name=admin_pref,json=adminPref,enum=pb.UserUpdateRequest_AdminPref" json:"admin_pref,omitempty"`
+	Username             string                       `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	Password             string                       `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	Gwpref               UserUpdateRequest_GWPref     `protobuf:"varint,3,opt,name=gwpref,proto3,enum=pb.UserUpdateRequest_GWPref" json:"gwpref,omitempty"`
+	HostId               uint32                       `protobuf:"varint,4,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
+	StaticPref           UserUpdateRequest_StaticPref `protobuf:"varint,5,opt,name=static_pref,json=staticPref,proto3,enum=pb.UserUpdateRequest_StaticPref" json:"static_pref,omitempty"`
+	AdminPref            UserUpdateRequest_AdminPref  `protobuf:"varint,6,opt,name=admin_pref,json=adminPref,proto3,enum=pb.UserUpdateRequest_AdminPref" json:"admin_pref,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
 	XXX_NoUnkeyedLiteral struct{}                     `json:"-"`
 	XXX_unrecognized     []byte                       `json:"-"`
 	XXX_unrecognized     []byte                       `json:"-"`
 	XXX_sizecache        int32                        `json:"-"`
 	XXX_sizecache        int32                        `json:"-"`
@@ -218,7 +218,7 @@ func (m *UserUpdateRequest) Reset()         { *m = UserUpdateRequest{} }
 func (m *UserUpdateRequest) String() string { return proto.CompactTextString(m) }
 func (m *UserUpdateRequest) String() string { return proto.CompactTextString(m) }
 func (*UserUpdateRequest) ProtoMessage()    {}
 func (*UserUpdateRequest) ProtoMessage()    {}
 func (*UserUpdateRequest) Descriptor() ([]byte, []int) {
 func (*UserUpdateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{2}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{2}
 }
 }
 func (m *UserUpdateRequest) XXX_Unmarshal(b []byte) error {
 func (m *UserUpdateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserUpdateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_UserUpdateRequest.Unmarshal(m, b)
@@ -281,7 +281,7 @@ func (m *UserUpdateRequest) GetAdminPref() UserUpdateRequest_AdminPref {
 }
 }
 
 
 type UserDeleteRequest struct {
 type UserDeleteRequest struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -291,7 +291,7 @@ func (m *UserDeleteRequest) Reset()         { *m = UserDeleteRequest{} }
 func (m *UserDeleteRequest) String() string { return proto.CompactTextString(m) }
 func (m *UserDeleteRequest) String() string { return proto.CompactTextString(m) }
 func (*UserDeleteRequest) ProtoMessage()    {}
 func (*UserDeleteRequest) ProtoMessage()    {}
 func (*UserDeleteRequest) Descriptor() ([]byte, []int) {
 func (*UserDeleteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{3}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{3}
 }
 }
 func (m *UserDeleteRequest) XXX_Unmarshal(b []byte) error {
 func (m *UserDeleteRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserDeleteRequest.Unmarshal(m, b)
 	return xxx_messageInfo_UserDeleteRequest.Unmarshal(m, b)
@@ -319,7 +319,7 @@ func (m *UserDeleteRequest) GetUsername() string {
 }
 }
 
 
 type UserRenewRequest struct {
 type UserRenewRequest struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -329,7 +329,7 @@ func (m *UserRenewRequest) Reset()         { *m = UserRenewRequest{} }
 func (m *UserRenewRequest) String() string { return proto.CompactTextString(m) }
 func (m *UserRenewRequest) String() string { return proto.CompactTextString(m) }
 func (*UserRenewRequest) ProtoMessage()    {}
 func (*UserRenewRequest) ProtoMessage()    {}
 func (*UserRenewRequest) Descriptor() ([]byte, []int) {
 func (*UserRenewRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{4}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{4}
 }
 }
 func (m *UserRenewRequest) XXX_Unmarshal(b []byte) error {
 func (m *UserRenewRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserRenewRequest.Unmarshal(m, b)
 	return xxx_messageInfo_UserRenewRequest.Unmarshal(m, b)
@@ -357,7 +357,7 @@ func (m *UserRenewRequest) GetUsername() string {
 }
 }
 
 
 type UserGenConfigRequest struct {
 type UserGenConfigRequest struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -367,7 +367,7 @@ func (m *UserGenConfigRequest) Reset()         { *m = UserGenConfigRequest{} }
 func (m *UserGenConfigRequest) String() string { return proto.CompactTextString(m) }
 func (m *UserGenConfigRequest) String() string { return proto.CompactTextString(m) }
 func (*UserGenConfigRequest) ProtoMessage()    {}
 func (*UserGenConfigRequest) ProtoMessage()    {}
 func (*UserGenConfigRequest) Descriptor() ([]byte, []int) {
 func (*UserGenConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{5}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{5}
 }
 }
 func (m *UserGenConfigRequest) XXX_Unmarshal(b []byte) error {
 func (m *UserGenConfigRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserGenConfigRequest.Unmarshal(m, b)
 	return xxx_messageInfo_UserGenConfigRequest.Unmarshal(m, b)
@@ -395,7 +395,7 @@ func (m *UserGenConfigRequest) GetUsername() string {
 }
 }
 
 
 type UserResponse struct {
 type UserResponse struct {
-	Users                []*UserResponse_User `protobuf:"bytes,1,rep,name=users" json:"users,omitempty"`
+	Users                []*UserResponse_User `protobuf:"bytes,1,rep,name=users,proto3" json:"users,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
 	XXX_sizecache        int32                `json:"-"`
@@ -405,7 +405,7 @@ func (m *UserResponse) Reset()         { *m = UserResponse{} }
 func (m *UserResponse) String() string { return proto.CompactTextString(m) }
 func (m *UserResponse) String() string { return proto.CompactTextString(m) }
 func (*UserResponse) ProtoMessage()    {}
 func (*UserResponse) ProtoMessage()    {}
 func (*UserResponse) Descriptor() ([]byte, []int) {
 func (*UserResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{6}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{6}
 }
 }
 func (m *UserResponse) XXX_Unmarshal(b []byte) error {
 func (m *UserResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserResponse.Unmarshal(m, b)
 	return xxx_messageInfo_UserResponse.Unmarshal(m, b)
@@ -433,19 +433,19 @@ func (m *UserResponse) GetUsers() []*UserResponse_User {
 }
 }
 
 
 type UserResponse_User struct {
 type UserResponse_User struct {
-	Username             string   `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
-	ServerSerialNumber   string   `protobuf:"bytes,2,opt,name=server_serial_number,json=serverSerialNumber" json:"server_serial_number,omitempty"`
-	Cert                 string   `protobuf:"bytes,3,opt,name=cert" json:"cert,omitempty"`
-	CreatedAt            string   `protobuf:"bytes,4,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
-	IpNet                string   `protobuf:"bytes,5,opt,name=ip_net,json=ipNet" json:"ip_net,omitempty"`
-	NoGw                 bool     `protobuf:"varint,6,opt,name=no_gw,json=noGw" json:"no_gw,omitempty"`
-	HostId               uint32   `protobuf:"varint,7,opt,name=host_id,json=hostId" json:"host_id,omitempty"`
-	IsAdmin              bool     `protobuf:"varint,8,opt,name=is_admin,json=isAdmin" json:"is_admin,omitempty"`
-	IsConnected          bool     `protobuf:"varint,9,opt,name=is_connected,json=isConnected" json:"is_connected,omitempty"`
-	ConnectedSince       string   `protobuf:"bytes,10,opt,name=connected_since,json=connectedSince" json:"connected_since,omitempty"`
-	BytesSent            uint64   `protobuf:"varint,11,opt,name=bytes_sent,json=bytesSent" json:"bytes_sent,omitempty"`
-	BytesReceived        uint64   `protobuf:"varint,12,opt,name=bytes_received,json=bytesReceived" json:"bytes_received,omitempty"`
-	ExpiresAt            string   `protobuf:"bytes,13,opt,name=expires_at,json=expiresAt" json:"expires_at,omitempty"`
+	Username             string   `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
+	ServerSerialNumber   string   `protobuf:"bytes,2,opt,name=server_serial_number,json=serverSerialNumber,proto3" json:"server_serial_number,omitempty"`
+	Cert                 string   `protobuf:"bytes,3,opt,name=cert,proto3" json:"cert,omitempty"`
+	CreatedAt            string   `protobuf:"bytes,4,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	IpNet                string   `protobuf:"bytes,5,opt,name=ip_net,json=ipNet,proto3" json:"ip_net,omitempty"`
+	NoGw                 bool     `protobuf:"varint,6,opt,name=no_gw,json=noGw,proto3" json:"no_gw,omitempty"`
+	HostId               uint32   `protobuf:"varint,7,opt,name=host_id,json=hostId,proto3" json:"host_id,omitempty"`
+	IsAdmin              bool     `protobuf:"varint,8,opt,name=is_admin,json=isAdmin,proto3" json:"is_admin,omitempty"`
+	IsConnected          bool     `protobuf:"varint,9,opt,name=is_connected,json=isConnected,proto3" json:"is_connected,omitempty"`
+	ConnectedSince       string   `protobuf:"bytes,10,opt,name=connected_since,json=connectedSince,proto3" json:"connected_since,omitempty"`
+	BytesSent            uint64   `protobuf:"varint,11,opt,name=bytes_sent,json=bytesSent,proto3" json:"bytes_sent,omitempty"`
+	BytesReceived        uint64   `protobuf:"varint,12,opt,name=bytes_received,json=bytesReceived,proto3" json:"bytes_received,omitempty"`
+	ExpiresAt            string   `protobuf:"bytes,13,opt,name=expires_at,json=expiresAt,proto3" json:"expires_at,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -455,7 +455,7 @@ func (m *UserResponse_User) Reset()         { *m = UserResponse_User{} }
 func (m *UserResponse_User) String() string { return proto.CompactTextString(m) }
 func (m *UserResponse_User) String() string { return proto.CompactTextString(m) }
 func (*UserResponse_User) ProtoMessage()    {}
 func (*UserResponse_User) ProtoMessage()    {}
 func (*UserResponse_User) Descriptor() ([]byte, []int) {
 func (*UserResponse_User) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{6, 0}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{6, 0}
 }
 }
 func (m *UserResponse_User) XXX_Unmarshal(b []byte) error {
 func (m *UserResponse_User) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserResponse_User.Unmarshal(m, b)
 	return xxx_messageInfo_UserResponse_User.Unmarshal(m, b)
@@ -567,7 +567,7 @@ func (m *UserResponse_User) GetExpiresAt() string {
 }
 }
 
 
 type UserGenConfigResponse struct {
 type UserGenConfigResponse struct {
-	ClientConfig         string   `protobuf:"bytes,1,opt,name=client_config,json=clientConfig" json:"client_config,omitempty"`
+	ClientConfig         string   `protobuf:"bytes,1,opt,name=client_config,json=clientConfig,proto3" json:"client_config,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -577,7 +577,7 @@ func (m *UserGenConfigResponse) Reset()         { *m = UserGenConfigResponse{} }
 func (m *UserGenConfigResponse) String() string { return proto.CompactTextString(m) }
 func (m *UserGenConfigResponse) String() string { return proto.CompactTextString(m) }
 func (*UserGenConfigResponse) ProtoMessage()    {}
 func (*UserGenConfigResponse) ProtoMessage()    {}
 func (*UserGenConfigResponse) Descriptor() ([]byte, []int) {
 func (*UserGenConfigResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_user_df435338153e53fc, []int{7}
+	return fileDescriptor_user_1c80cb0f735644ea, []int{7}
 }
 }
 func (m *UserGenConfigResponse) XXX_Unmarshal(b []byte) error {
 func (m *UserGenConfigResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_UserGenConfigResponse.Unmarshal(m, b)
 	return xxx_messageInfo_UserGenConfigResponse.Unmarshal(m, b)
@@ -856,9 +856,9 @@ var _UserService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "user.proto",
 	Metadata: "user.proto",
 }
 }
 
 
-func init() { proto.RegisterFile("user.proto", fileDescriptor_user_df435338153e53fc) }
+func init() { proto.RegisterFile("user.proto", fileDescriptor_user_1c80cb0f735644ea) }
 
 
-var fileDescriptor_user_df435338153e53fc = []byte{
+var fileDescriptor_user_1c80cb0f735644ea = []byte{
 	// 825 bytes of a gzipped FileDescriptorProto
 	// 825 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xdd, 0x6e, 0xe3, 0x44,
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xdd, 0x6e, 0xe3, 0x44,
 	0x14, 0x80, 0xeb, 0xc4, 0x71, 0xe3, 0x93, 0xb4, 0x75, 0xa7, 0x2d, 0xeb, 0x86, 0x5d, 0xc8, 0x1a,
 	0x14, 0x80, 0xeb, 0xc4, 0x71, 0xe3, 0x93, 0xb4, 0x75, 0xa7, 0x2d, 0xeb, 0x86, 0x5d, 0xc8, 0x1a,

+ 31 - 31
api/pb/vpn.pb.go

@@ -47,7 +47,7 @@ func (x VPNProto) String() string {
 	return proto.EnumName(VPNProto_name, int32(x))
 	return proto.EnumName(VPNProto_name, int32(x))
 }
 }
 func (VPNProto) EnumDescriptor() ([]byte, []int) {
 func (VPNProto) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{0}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{0}
 }
 }
 
 
 type VPNStatusRequest struct {
 type VPNStatusRequest struct {
@@ -60,7 +60,7 @@ func (m *VPNStatusRequest) Reset()         { *m = VPNStatusRequest{} }
 func (m *VPNStatusRequest) String() string { return proto.CompactTextString(m) }
 func (m *VPNStatusRequest) String() string { return proto.CompactTextString(m) }
 func (*VPNStatusRequest) ProtoMessage()    {}
 func (*VPNStatusRequest) ProtoMessage()    {}
 func (*VPNStatusRequest) Descriptor() ([]byte, []int) {
 func (*VPNStatusRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{0}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{0}
 }
 }
 func (m *VPNStatusRequest) XXX_Unmarshal(b []byte) error {
 func (m *VPNStatusRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNStatusRequest.Unmarshal(m, b)
 	return xxx_messageInfo_VPNStatusRequest.Unmarshal(m, b)
@@ -81,11 +81,11 @@ func (m *VPNStatusRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_VPNStatusRequest proto.InternalMessageInfo
 var xxx_messageInfo_VPNStatusRequest proto.InternalMessageInfo
 
 
 type VPNInitRequest struct {
 type VPNInitRequest struct {
-	Hostname             string   `protobuf:"bytes,1,opt,name=hostname" json:"hostname,omitempty"`
-	Port                 string   `protobuf:"bytes,2,opt,name=port" json:"port,omitempty"`
-	ProtoPref            VPNProto `protobuf:"varint,3,opt,name=proto_pref,json=protoPref,enum=pb.VPNProto" json:"proto_pref,omitempty"`
-	IpBlock              string   `protobuf:"bytes,4,opt,name=ip_block,json=ipBlock" json:"ip_block,omitempty"`
-	Dns                  string   `protobuf:"bytes,5,opt,name=dns" json:"dns,omitempty"`
+	Hostname             string   `protobuf:"bytes,1,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	Port                 string   `protobuf:"bytes,2,opt,name=port,proto3" json:"port,omitempty"`
+	ProtoPref            VPNProto `protobuf:"varint,3,opt,name=proto_pref,json=protoPref,proto3,enum=pb.VPNProto" json:"proto_pref,omitempty"`
+	IpBlock              string   `protobuf:"bytes,4,opt,name=ip_block,json=ipBlock,proto3" json:"ip_block,omitempty"`
+	Dns                  string   `protobuf:"bytes,5,opt,name=dns,proto3" json:"dns,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -95,7 +95,7 @@ func (m *VPNInitRequest) Reset()         { *m = VPNInitRequest{} }
 func (m *VPNInitRequest) String() string { return proto.CompactTextString(m) }
 func (m *VPNInitRequest) String() string { return proto.CompactTextString(m) }
 func (*VPNInitRequest) ProtoMessage()    {}
 func (*VPNInitRequest) ProtoMessage()    {}
 func (*VPNInitRequest) Descriptor() ([]byte, []int) {
 func (*VPNInitRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{1}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{1}
 }
 }
 func (m *VPNInitRequest) XXX_Unmarshal(b []byte) error {
 func (m *VPNInitRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNInitRequest.Unmarshal(m, b)
 	return xxx_messageInfo_VPNInitRequest.Unmarshal(m, b)
@@ -151,8 +151,8 @@ func (m *VPNInitRequest) GetDns() string {
 }
 }
 
 
 type VPNUpdateRequest struct {
 type VPNUpdateRequest struct {
-	IpBlock              string   `protobuf:"bytes,1,opt,name=ip_block,json=ipBlock" json:"ip_block,omitempty"`
-	Dns                  string   `protobuf:"bytes,2,opt,name=dns" json:"dns,omitempty"`
+	IpBlock              string   `protobuf:"bytes,1,opt,name=ip_block,json=ipBlock,proto3" json:"ip_block,omitempty"`
+	Dns                  string   `protobuf:"bytes,2,opt,name=dns,proto3" json:"dns,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -162,7 +162,7 @@ func (m *VPNUpdateRequest) Reset()         { *m = VPNUpdateRequest{} }
 func (m *VPNUpdateRequest) String() string { return proto.CompactTextString(m) }
 func (m *VPNUpdateRequest) String() string { return proto.CompactTextString(m) }
 func (*VPNUpdateRequest) ProtoMessage()    {}
 func (*VPNUpdateRequest) ProtoMessage()    {}
 func (*VPNUpdateRequest) Descriptor() ([]byte, []int) {
 func (*VPNUpdateRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{2}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{2}
 }
 }
 func (m *VPNUpdateRequest) XXX_Unmarshal(b []byte) error {
 func (m *VPNUpdateRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNUpdateRequest.Unmarshal(m, b)
 	return xxx_messageInfo_VPNUpdateRequest.Unmarshal(m, b)
@@ -206,7 +206,7 @@ func (m *VPNRestartRequest) Reset()         { *m = VPNRestartRequest{} }
 func (m *VPNRestartRequest) String() string { return proto.CompactTextString(m) }
 func (m *VPNRestartRequest) String() string { return proto.CompactTextString(m) }
 func (*VPNRestartRequest) ProtoMessage()    {}
 func (*VPNRestartRequest) ProtoMessage()    {}
 func (*VPNRestartRequest) Descriptor() ([]byte, []int) {
 func (*VPNRestartRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{3}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{3}
 }
 }
 func (m *VPNRestartRequest) XXX_Unmarshal(b []byte) error {
 func (m *VPNRestartRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNRestartRequest.Unmarshal(m, b)
 	return xxx_messageInfo_VPNRestartRequest.Unmarshal(m, b)
@@ -227,19 +227,19 @@ func (m *VPNRestartRequest) XXX_DiscardUnknown() {
 var xxx_messageInfo_VPNRestartRequest proto.InternalMessageInfo
 var xxx_messageInfo_VPNRestartRequest proto.InternalMessageInfo
 
 
 type VPNStatusResponse struct {
 type VPNStatusResponse struct {
-	Name                 string   `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	SerialNumber         string   `protobuf:"bytes,2,opt,name=serial_number,json=serialNumber" json:"serial_number,omitempty"`
-	Hostname             string   `protobuf:"bytes,3,opt,name=hostname" json:"hostname,omitempty"`
-	Port                 string   `protobuf:"bytes,4,opt,name=port" json:"port,omitempty"`
-	Cert                 string   `protobuf:"bytes,5,opt,name=cert" json:"cert,omitempty"`
-	CaCert               string   `protobuf:"bytes,6,opt,name=ca_cert,json=caCert" json:"ca_cert,omitempty"`
-	Net                  string   `protobuf:"bytes,7,opt,name=net" json:"net,omitempty"`
-	Mask                 string   `protobuf:"bytes,8,opt,name=mask" json:"mask,omitempty"`
-	CreatedAt            string   `protobuf:"bytes,9,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
-	Proto                string   `protobuf:"bytes,10,opt,name=proto" json:"proto,omitempty"`
-	Dns                  string   `protobuf:"bytes,11,opt,name=dns" json:"dns,omitempty"`
-	ExpiresAt            string   `protobuf:"bytes,12,opt,name=expires_at,json=expiresAt" json:"expires_at,omitempty"`
-	CaExpiresAt          string   `protobuf:"bytes,13,opt,name=ca_expires_at,json=caExpiresAt" json:"ca_expires_at,omitempty"`
+	Name                 string   `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	SerialNumber         string   `protobuf:"bytes,2,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
+	Hostname             string   `protobuf:"bytes,3,opt,name=hostname,proto3" json:"hostname,omitempty"`
+	Port                 string   `protobuf:"bytes,4,opt,name=port,proto3" json:"port,omitempty"`
+	Cert                 string   `protobuf:"bytes,5,opt,name=cert,proto3" json:"cert,omitempty"`
+	CaCert               string   `protobuf:"bytes,6,opt,name=ca_cert,json=caCert,proto3" json:"ca_cert,omitempty"`
+	Net                  string   `protobuf:"bytes,7,opt,name=net,proto3" json:"net,omitempty"`
+	Mask                 string   `protobuf:"bytes,8,opt,name=mask,proto3" json:"mask,omitempty"`
+	CreatedAt            string   `protobuf:"bytes,9,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
+	Proto                string   `protobuf:"bytes,10,opt,name=proto,proto3" json:"proto,omitempty"`
+	Dns                  string   `protobuf:"bytes,11,opt,name=dns,proto3" json:"dns,omitempty"`
+	ExpiresAt            string   `protobuf:"bytes,12,opt,name=expires_at,json=expiresAt,proto3" json:"expires_at,omitempty"`
+	CaExpiresAt          string   `protobuf:"bytes,13,opt,name=ca_expires_at,json=caExpiresAt,proto3" json:"ca_expires_at,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -249,7 +249,7 @@ func (m *VPNStatusResponse) Reset()         { *m = VPNStatusResponse{} }
 func (m *VPNStatusResponse) String() string { return proto.CompactTextString(m) }
 func (m *VPNStatusResponse) String() string { return proto.CompactTextString(m) }
 func (*VPNStatusResponse) ProtoMessage()    {}
 func (*VPNStatusResponse) ProtoMessage()    {}
 func (*VPNStatusResponse) Descriptor() ([]byte, []int) {
 func (*VPNStatusResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{4}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{4}
 }
 }
 func (m *VPNStatusResponse) XXX_Unmarshal(b []byte) error {
 func (m *VPNStatusResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNStatusResponse.Unmarshal(m, b)
 	return xxx_messageInfo_VPNStatusResponse.Unmarshal(m, b)
@@ -370,7 +370,7 @@ func (m *VPNInitResponse) Reset()         { *m = VPNInitResponse{} }
 func (m *VPNInitResponse) String() string { return proto.CompactTextString(m) }
 func (m *VPNInitResponse) String() string { return proto.CompactTextString(m) }
 func (*VPNInitResponse) ProtoMessage()    {}
 func (*VPNInitResponse) ProtoMessage()    {}
 func (*VPNInitResponse) Descriptor() ([]byte, []int) {
 func (*VPNInitResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{5}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{5}
 }
 }
 func (m *VPNInitResponse) XXX_Unmarshal(b []byte) error {
 func (m *VPNInitResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNInitResponse.Unmarshal(m, b)
 	return xxx_messageInfo_VPNInitResponse.Unmarshal(m, b)
@@ -400,7 +400,7 @@ func (m *VPNUpdateResponse) Reset()         { *m = VPNUpdateResponse{} }
 func (m *VPNUpdateResponse) String() string { return proto.CompactTextString(m) }
 func (m *VPNUpdateResponse) String() string { return proto.CompactTextString(m) }
 func (*VPNUpdateResponse) ProtoMessage()    {}
 func (*VPNUpdateResponse) ProtoMessage()    {}
 func (*VPNUpdateResponse) Descriptor() ([]byte, []int) {
 func (*VPNUpdateResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{6}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{6}
 }
 }
 func (m *VPNUpdateResponse) XXX_Unmarshal(b []byte) error {
 func (m *VPNUpdateResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNUpdateResponse.Unmarshal(m, b)
 	return xxx_messageInfo_VPNUpdateResponse.Unmarshal(m, b)
@@ -430,7 +430,7 @@ func (m *VPNRestartResponse) Reset()         { *m = VPNRestartResponse{} }
 func (m *VPNRestartResponse) String() string { return proto.CompactTextString(m) }
 func (m *VPNRestartResponse) String() string { return proto.CompactTextString(m) }
 func (*VPNRestartResponse) ProtoMessage()    {}
 func (*VPNRestartResponse) ProtoMessage()    {}
 func (*VPNRestartResponse) Descriptor() ([]byte, []int) {
 func (*VPNRestartResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_vpn_a36938fb10df2565, []int{7}
+	return fileDescriptor_vpn_b99816ad059ec673, []int{7}
 }
 }
 func (m *VPNRestartResponse) XXX_Unmarshal(b []byte) error {
 func (m *VPNRestartResponse) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_VPNRestartResponse.Unmarshal(m, b)
 	return xxx_messageInfo_VPNRestartResponse.Unmarshal(m, b)
@@ -633,9 +633,9 @@ var _VPNService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "vpn.proto",
 	Metadata: "vpn.proto",
 }
 }
 
 
-func init() { proto.RegisterFile("vpn.proto", fileDescriptor_vpn_a36938fb10df2565) }
+func init() { proto.RegisterFile("vpn.proto", fileDescriptor_vpn_b99816ad059ec673) }
 
 
-var fileDescriptor_vpn_a36938fb10df2565 = []byte{
+var fileDescriptor_vpn_b99816ad059ec673 = []byte{
 	// 568 bytes of a gzipped FileDescriptorProto
 	// 568 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0xc7, 0xb1, 0x93, 0xe6, 0x63, 0xfa, 0x81, 0x3b, 0x4d, 0xa9, 0x09, 0x54, 0xaa, 0xcc, 0xa5,
 	0x10, 0xc7, 0xb1, 0x93, 0xe6, 0x63, 0xfa, 0x81, 0x3b, 0x4d, 0xa9, 0x09, 0x54, 0xaa, 0xcc, 0xa5,

+ 10 - 10
bindata/bindata.go

@@ -97,7 +97,7 @@ func templateAuthSwaggerJson() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2916, mode: os.FileMode(420), modTime: time.Unix(1532608372, 0)}
+	info := bindataFileInfo{name: "template/auth.swagger.json", size: 2916, mode: os.FileMode(420), modTime: time.Unix(1541257641, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -117,7 +117,7 @@ func templateBootstrapMinCss() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/bootstrap.min.css", size: 113498, mode: os.FileMode(420), modTime: time.Unix(1532608384, 0)}
+	info := bindataFileInfo{name: "template/bootstrap.min.css", size: 113498, mode: os.FileMode(420), modTime: time.Unix(1541257658, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -137,7 +137,7 @@ func templateBundleJs() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/bundle.js", size: 562042, mode: os.FileMode(420), modTime: time.Unix(1532608384, 0)}
+	info := bindataFileInfo{name: "template/bundle.js", size: 562042, mode: os.FileMode(420), modTime: time.Unix(1541257658, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -217,7 +217,7 @@ func templateGlyphiconsHalflingsRegularWoff() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/glyphicons-halflings-regular.woff", size: 23320, mode: os.FileMode(420), modTime: time.Unix(1532608384, 0)}
+	info := bindataFileInfo{name: "template/glyphicons-halflings-regular.woff", size: 23320, mode: os.FileMode(420), modTime: time.Unix(1541257658, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -237,7 +237,7 @@ func templateIndexHtml() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/index.html", size: 476, mode: os.FileMode(420), modTime: time.Unix(1532608384, 0)}
+	info := bindataFileInfo{name: "template/index.html", size: 476, mode: os.FileMode(420), modTime: time.Unix(1541257658, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -277,7 +277,7 @@ func templateMuiMinCss() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/mui.min.css", size: 43576, mode: os.FileMode(420), modTime: time.Unix(1532608384, 0)}
+	info := bindataFileInfo{name: "template/mui.min.css", size: 43576, mode: os.FileMode(420), modTime: time.Unix(1541257658, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -297,7 +297,7 @@ func templateMuiMinJs() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/mui.min.js", size: 19095, mode: os.FileMode(420), modTime: time.Unix(1532608384, 0)}
+	info := bindataFileInfo{name: "template/mui.min.js", size: 19095, mode: os.FileMode(420), modTime: time.Unix(1541257658, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -317,7 +317,7 @@ func templateNetworkSwaggerJson() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/network.swagger.json", size: 6669, mode: os.FileMode(420), modTime: time.Unix(1532608372, 0)}
+	info := bindataFileInfo{name: "template/network.swagger.json", size: 6669, mode: os.FileMode(420), modTime: time.Unix(1541257641, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -357,7 +357,7 @@ func templateUserSwaggerJson() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/user.swagger.json", size: 6969, mode: os.FileMode(420), modTime: time.Unix(1532608372, 0)}
+	info := bindataFileInfo{name: "template/user.swagger.json", size: 6969, mode: os.FileMode(420), modTime: time.Unix(1541257641, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }
@@ -377,7 +377,7 @@ func templateVpnSwaggerJson() (*asset, error) {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3859, mode: os.FileMode(420), modTime: time.Unix(1532608372, 0)}
+	info := bindataFileInfo{name: "template/vpn.swagger.json", size: 3859, mode: os.FileMode(420), modTime: time.Unix(1541257641, 0)}
 	a := &asset{bytes: bytes, info: info}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 	return a, nil
 }
 }

+ 15 - 23
webui/ovpm/package-lock.json

@@ -5592,22 +5592,22 @@
       }
       }
     },
     },
     "original": {
     "original": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
-      "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
-        "url-parse": "1.0.x"
+        "url-parse": "^1.4.3"
       },
       },
       "dependencies": {
       "dependencies": {
         "url-parse": {
         "url-parse": {
-          "version": "1.0.5",
-          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz",
-          "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=",
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+          "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
           "dev": true,
           "dev": true,
           "requires": {
           "requires": {
-            "querystringify": "0.0.x",
-            "requires-port": "1.0.x"
+            "querystringify": "^2.0.0",
+            "requires-port": "^1.0.0"
           }
           }
         }
         }
       }
       }
@@ -6583,9 +6583,9 @@
       "dev": true
       "dev": true
     },
     },
     "querystringify": {
     "querystringify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz",
-      "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
       "dev": true
       "dev": true
     },
     },
     "randombytes": {
     "randombytes": {
@@ -8249,21 +8249,13 @@
       }
       }
     },
     },
     "url-parse": {
     "url-parse": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz",
-      "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
+      "integrity": "sha512-rh+KuAW36YKo0vClhQzLLveoj8FwPJNu65xLb7Mrt+eZht0IPT0IXgSv8gcMegZ6NvjJUALf6Mf25POlMwD1Fw==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "querystringify": "^2.0.0",
         "querystringify": "^2.0.0",
         "requires-port": "^1.0.0"
         "requires-port": "^1.0.0"
-      },
-      "dependencies": {
-        "querystringify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz",
-          "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
-          "dev": true
-        }
       }
       }
     },
     },
     "url-parse-lax": {
     "url-parse-lax": {