feat(api): expose restart vpn functionality over api

api/pb/user.pb.go

@@ -22,9 +22,11 @@ It has these top-level messages:
 	VPNStatusRequest
 	VPNInitRequest
 	VPNUpdateRequest
+	VPNRestartRequest
 	VPNStatusResponse
 	VPNInitResponse
 	VPNUpdateResponse
+	VPNRestartResponse
 	NetworkCreateRequest
 	NetworkListRequest
 	NetworkDeleteRequest

api/pb/vpn.pb.go

@@ -122,6 +122,14 @@ func (m *VPNUpdateRequest) GetDns() string {
 	return ""
 }
 
+type VPNRestartRequest struct {
+}
+
+func (m *VPNRestartRequest) Reset()                    { *m = VPNRestartRequest{} }
+func (m *VPNRestartRequest) String() string            { return proto.CompactTextString(m) }
+func (*VPNRestartRequest) ProtoMessage()               {}
+func (*VPNRestartRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+
 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"`
@@ -139,7 +147,7 @@ type VPNStatusResponse struct {
 func (m *VPNStatusResponse) Reset()                    { *m = VPNStatusResponse{} }
 func (m *VPNStatusResponse) String() string            { return proto.CompactTextString(m) }
 func (*VPNStatusResponse) ProtoMessage()               {}
-func (*VPNStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
+func (*VPNStatusResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
 
 func (m *VPNStatusResponse) GetName() string {
 	if m != nil {
@@ -224,7 +232,7 @@ type VPNInitResponse struct {
 func (m *VPNInitResponse) Reset()                    { *m = VPNInitResponse{} }
 func (m *VPNInitResponse) String() string            { return proto.CompactTextString(m) }
 func (*VPNInitResponse) ProtoMessage()               {}
-func (*VPNInitResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
+func (*VPNInitResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
 
 type VPNUpdateResponse struct {
 }
@@ -232,15 +240,25 @@ type VPNUpdateResponse struct {
 func (m *VPNUpdateResponse) Reset()                    { *m = VPNUpdateResponse{} }
 func (m *VPNUpdateResponse) String() string            { return proto.CompactTextString(m) }
 func (*VPNUpdateResponse) ProtoMessage()               {}
-func (*VPNUpdateResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
+func (*VPNUpdateResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
+
+type VPNRestartResponse struct {
+}
+
+func (m *VPNRestartResponse) Reset()                    { *m = VPNRestartResponse{} }
+func (m *VPNRestartResponse) String() string            { return proto.CompactTextString(m) }
+func (*VPNRestartResponse) ProtoMessage()               {}
+func (*VPNRestartResponse) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
 
 func init() {
 	proto.RegisterType((*VPNStatusRequest)(nil), "pb.VPNStatusRequest")
 	proto.RegisterType((*VPNInitRequest)(nil), "pb.VPNInitRequest")
 	proto.RegisterType((*VPNUpdateRequest)(nil), "pb.VPNUpdateRequest")
+	proto.RegisterType((*VPNRestartRequest)(nil), "pb.VPNRestartRequest")
 	proto.RegisterType((*VPNStatusResponse)(nil), "pb.VPNStatusResponse")
 	proto.RegisterType((*VPNInitResponse)(nil), "pb.VPNInitResponse")
 	proto.RegisterType((*VPNUpdateResponse)(nil), "pb.VPNUpdateResponse")
+	proto.RegisterType((*VPNRestartResponse)(nil), "pb.VPNRestartResponse")
 	proto.RegisterEnum("pb.VPNProto", VPNProto_name, VPNProto_value)
 }
 
@@ -258,6 +276,7 @@ type VPNServiceClient interface {
 	Status(ctx context.Context, in *VPNStatusRequest, opts ...grpc.CallOption) (*VPNStatusResponse, error)
 	Init(ctx context.Context, in *VPNInitRequest, opts ...grpc.CallOption) (*VPNInitResponse, error)
 	Update(ctx context.Context, in *VPNUpdateRequest, opts ...grpc.CallOption) (*VPNUpdateResponse, error)
+	Restart(ctx context.Context, in *VPNRestartRequest, opts ...grpc.CallOption) (*VPNRestartResponse, error)
 }
 
 type vPNServiceClient struct {
@@ -295,12 +314,22 @@ func (c *vPNServiceClient) Update(ctx context.Context, in *VPNUpdateRequest, opt
 	return out, nil
 }
 
+func (c *vPNServiceClient) Restart(ctx context.Context, in *VPNRestartRequest, opts ...grpc.CallOption) (*VPNRestartResponse, error) {
+	out := new(VPNRestartResponse)
+	err := grpc.Invoke(ctx, "/pb.VPNService/Restart", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // Server API for VPNService service
 
 type VPNServiceServer interface {
 	Status(context.Context, *VPNStatusRequest) (*VPNStatusResponse, error)
 	Init(context.Context, *VPNInitRequest) (*VPNInitResponse, error)
 	Update(context.Context, *VPNUpdateRequest) (*VPNUpdateResponse, error)
+	Restart(context.Context, *VPNRestartRequest) (*VPNRestartResponse, error)
 }
 
 func RegisterVPNServiceServer(s *grpc.Server, srv VPNServiceServer) {
@@ -361,6 +390,24 @@ func _VPNService_Update_Handler(srv interface{}, ctx context.Context, dec func(i
 	return interceptor(ctx, in, info, handler)
 }
 
+func _VPNService_Restart_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(VPNRestartRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(VPNServiceServer).Restart(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/pb.VPNService/Restart",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(VPNServiceServer).Restart(ctx, req.(*VPNRestartRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 var _VPNService_serviceDesc = grpc.ServiceDesc{
 	ServiceName: "pb.VPNService",
 	HandlerType: (*VPNServiceServer)(nil),
@@ -377,6 +424,10 @@ var _VPNService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "Update",
 			Handler:    _VPNService_Update_Handler,
 		},
+		{
+			MethodName: "Restart",
+			Handler:    _VPNService_Restart_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "vpn.proto",
@@ -385,37 +436,39 @@ var _VPNService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("vpn.proto", fileDescriptor1) }
 
 var fileDescriptor1 = []byte{
-	// 502 bytes of a gzipped FileDescriptorProto
+	// 537 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xc1, 0x6e, 0xd3, 0x40,
-	0x10, 0x86, 0xb1, 0x93, 0x3a, 0xc9, 0x50, 0x8a, 0x3b, 0x4d, 0x55, 0x13, 0xa8, 0x54, 0x99, 0x4b,
-	0x14, 0xa4, 0x44, 0x94, 0x5b, 0x2f, 0x08, 0x0a, 0x48, 0x48, 0xc8, 0x98, 0xd0, 0xe6, 0x6a, 0xad,
-	0x9d, 0x6d, 0xb1, 0x9a, 0xec, 0x2e, 0xde, 0x4d, 0x1e, 0x00, 0x1e, 0x01, 0x89, 0x03, 0xaf, 0xc5,
-	0x2b, 0xf0, 0x20, 0xc8, 0xb3, 0x4e, 0x6a, 0x23, 0x7a, 0x9b, 0xfd, 0x67, 0xf7, 0xd7, 0x3f, 0xdf,
-	0x0e, 0xf4, 0xd6, 0x4a, 0x8c, 0x55, 0x21, 0x8d, 0x44, 0x57, 0xa5, 0x83, 0x27, 0xd7, 0x52, 0x5e,
-	0x2f, 0xf8, 0x84, 0xa9, 0x7c, 0xc2, 0x84, 0x90, 0x86, 0x99, 0x5c, 0x0a, 0x6d, 0x6f, 0x84, 0x08,
-	0xfe, 0x2c, 0x8e, 0x3e, 0x1b, 0x66, 0x56, 0x7a, 0xca, 0xbf, 0xae, 0xb8, 0x36, 0xe1, 0x2f, 0x07,
-	0xf6, 0x66, 0x71, 0xf4, 0x5e, 0xe4, 0xa6, 0x92, 0x70, 0x00, 0xdd, 0x2f, 0x52, 0x1b, 0xc1, 0x96,
-	0x3c, 0x70, 0x4e, 0x9c, 0x61, 0x6f, 0xba, 0x3d, 0x23, 0x42, 0x5b, 0xc9, 0xc2, 0x04, 0x2e, 0xe9,
-	0x54, 0xe3, 0x33, 0x00, 0xf2, 0x4f, 0x54, 0xc1, 0xaf, 0x82, 0xd6, 0x89, 0x33, 0xdc, 0x3b, 0xdd,
-	0x1d, 0xab, 0x74, 0x3c, 0x8b, 0xa3, 0xb8, 0x6c, 0x4c, 0x7b, 0xd4, 0x8f, 0x0b, 0x7e, 0x85, 0x8f,
-	0xa0, 0x9b, 0xab, 0x24, 0x5d, 0xc8, 0xec, 0x26, 0x68, 0x93, 0x49, 0x27, 0x57, 0xaf, 0xcb, 0x23,
-	0xfa, 0xd0, 0x9a, 0x0b, 0x1d, 0xec, 0x90, 0x5a, 0x96, 0xe1, 0x4b, 0x0a, 0x7c, 0xa9, 0xe6, 0xcc,
-	0xf0, 0x4d, 0xba, 0xba, 0x81, 0xf3, 0x5f, 0x03, 0xf7, 0xd6, 0xe0, 0xa7, 0x0b, 0xfb, 0xb5, 0x91,
-	0xb5, 0x92, 0x42, 0xd3, 0x10, 0xb5, 0xe1, 0xa8, 0xc6, 0xa7, 0xf0, 0x40, 0xf3, 0x22, 0x67, 0x8b,
-	0x44, 0xac, 0x96, 0x29, 0x2f, 0x2a, 0x97, 0x5d, 0x2b, 0x46, 0xa4, 0x35, 0xc8, 0xb4, 0xee, 0x20,
-	0xd3, 0xae, 0x91, 0x41, 0x68, 0x67, 0xbc, 0x30, 0xd5, 0x48, 0x54, 0xe3, 0x11, 0x74, 0x32, 0x96,
-	0x90, 0xec, 0x91, 0xec, 0x65, 0xec, 0xbc, 0x6c, 0xf8, 0xd0, 0x12, 0xdc, 0x04, 0x1d, 0x9b, 0x5e,
-	0x70, 0x7a, 0xbe, 0x64, 0xfa, 0x26, 0xe8, 0xda, 0xe7, 0x65, 0x8d, 0xc7, 0x00, 0x59, 0xc1, 0x99,
-	0xe1, 0xf3, 0x84, 0x99, 0xa0, 0x47, 0x9d, 0x5e, 0xa5, 0xbc, 0x32, 0xd8, 0x87, 0x1d, 0x62, 0x1d,
-	0x00, 0x75, 0xec, 0x61, 0x03, 0xe6, 0xfe, 0x2d, 0x98, 0x7d, 0x78, 0xb8, 0xfd, 0x75, 0x4b, 0x25,
-	0x3c, 0x20, 0x54, 0x1b, 0xd8, 0x56, 0x1c, 0x0d, 0xa1, 0xbb, 0xf9, 0x45, 0x04, 0xf0, 0xa2, 0x8f,
-	0xf1, 0xf4, 0xed, 0x3b, 0xff, 0x1e, 0x76, 0xa0, 0x75, 0xf9, 0x26, 0xf6, 0x9d, 0xb2, 0xb8, 0x38,
-	0x8f, 0x7d, 0xf7, 0xf4, 0xbb, 0x0b, 0x50, 0xa2, 0xe6, 0xc5, 0x3a, 0xcf, 0x38, 0x7e, 0x02, 0xcf,
-	0x52, 0xc7, 0x7e, 0xb5, 0x0a, 0x8d, 0xbd, 0x1b, 0x1c, 0xfe, 0xa3, 0x56, 0x21, 0x06, 0xdf, 0x7e,
-	0xff, 0xf9, 0xe1, 0xf6, 0x11, 0x69, 0x85, 0xd7, 0xcf, 0x27, 0x6b, 0x25, 0x26, 0xda, 0x1a, 0x7d,
-	0x80, 0x76, 0x19, 0x18, 0xb1, 0x7a, 0x5a, 0xdb, 0xd9, 0xc1, 0x41, 0x43, 0xab, 0xcc, 0x1e, 0x93,
-	0xd9, 0x61, 0xe8, 0xd7, 0xcd, 0x72, 0x91, 0x9b, 0x33, 0x67, 0x84, 0x17, 0xe0, 0xd9, 0x59, 0xb7,
-	0x01, 0x1b, 0x7b, 0xb6, 0x0d, 0xd8, 0x04, 0x12, 0x1e, 0x93, 0xe7, 0x51, 0xd8, 0x08, 0xb8, 0xa2,
-	0x3b, 0x67, 0xce, 0x28, 0xf5, 0x08, 0xf8, 0x8b, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x57,
-	0x61, 0xfa, 0x98, 0x03, 0x00, 0x00,
+	0x10, 0x86, 0xb1, 0x93, 0x3a, 0xc9, 0x50, 0x8a, 0x3b, 0x4d, 0xa9, 0x31, 0x54, 0xaa, 0xcc, 0xa5,
+	0x2a, 0x52, 0x22, 0xca, 0x8d, 0x0b, 0x82, 0x02, 0x12, 0x12, 0x32, 0x26, 0x34, 0xb9, 0x46, 0x1b,
+	0x67, 0x5b, 0xac, 0x26, 0xeb, 0xc5, 0xbb, 0xc9, 0x03, 0xf0, 0x0a, 0x48, 0x1c, 0x78, 0x2d, 0x6e,
+	0x9c, 0x79, 0x10, 0xe4, 0xd9, 0x75, 0x6a, 0x47, 0x70, 0x9b, 0xfd, 0x67, 0xe7, 0xd3, 0xcc, 0x3f,
+	0x03, 0xbd, 0xb5, 0x14, 0x03, 0x59, 0xe4, 0x3a, 0x47, 0x57, 0xce, 0xc2, 0xc7, 0xd7, 0x79, 0x7e,
+	0xbd, 0xe0, 0x43, 0x26, 0xb3, 0x21, 0x13, 0x22, 0xd7, 0x4c, 0x67, 0xb9, 0x50, 0xe6, 0x47, 0x84,
+	0xe0, 0x4f, 0x92, 0xf8, 0xb3, 0x66, 0x7a, 0xa5, 0x46, 0xfc, 0xeb, 0x8a, 0x2b, 0x1d, 0xfd, 0x74,
+	0x60, 0x6f, 0x92, 0xc4, 0xef, 0x45, 0xa6, 0xad, 0x84, 0x21, 0x74, 0xbf, 0xe4, 0x4a, 0x0b, 0xb6,
+	0xe4, 0x81, 0x73, 0xe2, 0x9c, 0xf6, 0x46, 0x9b, 0x37, 0x22, 0xb4, 0x65, 0x5e, 0xe8, 0xc0, 0x25,
+	0x9d, 0x62, 0x7c, 0x0a, 0x40, 0xfc, 0xa9, 0x2c, 0xf8, 0x55, 0xd0, 0x3a, 0x71, 0x4e, 0xf7, 0xce,
+	0x77, 0x07, 0x72, 0x36, 0x98, 0x24, 0x71, 0x52, 0x26, 0x46, 0x3d, 0xca, 0x27, 0x05, 0xbf, 0xc2,
+	0x87, 0xd0, 0xcd, 0xe4, 0x74, 0xb6, 0xc8, 0xd3, 0x9b, 0xa0, 0x4d, 0x90, 0x4e, 0x26, 0x5f, 0x97,
+	0x4f, 0xf4, 0xa1, 0x35, 0x17, 0x2a, 0xd8, 0x21, 0xb5, 0x0c, 0xa3, 0x97, 0xd4, 0xf0, 0x58, 0xce,
+	0x99, 0xe6, 0x55, 0x77, 0x75, 0x80, 0xf3, 0x4f, 0x80, 0x7b, 0x0b, 0x38, 0x80, 0xfd, 0x49, 0x12,
+	0x8f, 0xb8, 0xd2, 0xac, 0xa8, 0xe6, 0x8b, 0x7e, 0xb8, 0xa4, 0x56, 0x3e, 0x28, 0x99, 0x0b, 0x45,
+	0x93, 0xd5, 0x26, 0xa6, 0x18, 0x9f, 0xc0, 0x3d, 0xc5, 0x8b, 0x8c, 0x2d, 0xa6, 0x62, 0xb5, 0x9c,
+	0xf1, 0xc2, 0xa2, 0x77, 0x8d, 0x18, 0x93, 0xd6, 0xb0, 0xab, 0xf5, 0x1f, 0xbb, 0xda, 0x35, 0xbb,
+	0x10, 0xda, 0x29, 0x2f, 0xb4, 0x9d, 0x93, 0x62, 0x3c, 0x82, 0x4e, 0xca, 0xa6, 0x24, 0x7b, 0x24,
+	0x7b, 0x29, 0xbb, 0x28, 0x13, 0x3e, 0xb4, 0x04, 0xd7, 0x41, 0xc7, 0x8c, 0x24, 0x38, 0x95, 0x2f,
+	0x99, 0xba, 0x09, 0xba, 0xa6, 0xbc, 0x8c, 0xf1, 0x18, 0x20, 0x2d, 0x38, 0xd3, 0x7c, 0x3e, 0x65,
+	0x3a, 0xe8, 0x51, 0xa6, 0x67, 0x95, 0x57, 0x1a, 0xfb, 0xb0, 0x43, 0x0b, 0x08, 0x80, 0x32, 0xe6,
+	0x51, 0xb9, 0x75, 0xf7, 0xd6, 0xad, 0x7d, 0xb8, 0xbf, 0x39, 0x05, 0xe3, 0x8a, 0x35, 0xb0, 0xda,
+	0x80, 0x15, 0xfb, 0x80, 0x75, 0x57, 0x8d, 0x7a, 0x76, 0x0a, 0xdd, 0x6a, 0xe1, 0x08, 0xe0, 0xc5,
+	0x1f, 0x93, 0xd1, 0xdb, 0x77, 0xfe, 0x1d, 0xec, 0x40, 0x6b, 0xfc, 0x26, 0xf1, 0x9d, 0x32, 0xb8,
+	0xbc, 0x48, 0x7c, 0xf7, 0xfc, 0xb7, 0x0b, 0x50, 0x2e, 0x80, 0x17, 0xeb, 0x2c, 0xe5, 0xf8, 0x09,
+	0x3c, 0xb3, 0x0b, 0xec, 0xdb, 0xab, 0x69, 0x9c, 0x68, 0x78, 0xb8, 0xa5, 0xda, 0x2e, 0xc2, 0x6f,
+	0xbf, 0xfe, 0x7c, 0x77, 0xfb, 0x88, 0x74, 0xed, 0xeb, 0x67, 0xc3, 0xb5, 0x14, 0x43, 0x65, 0x40,
+	0x1f, 0xa0, 0x5d, 0x8e, 0x81, 0x68, 0x4b, 0x6b, 0xe7, 0x1d, 0x1e, 0x34, 0x34, 0x0b, 0x7b, 0x44,
+	0xb0, 0xc3, 0xc8, 0xaf, 0xc3, 0x32, 0x91, 0xe9, 0x17, 0xce, 0x19, 0x5e, 0x82, 0x67, 0x1c, 0xd8,
+	0x34, 0xd8, 0x38, 0xc9, 0x4d, 0x83, 0x5b, 0x36, 0x1d, 0x13, 0xf3, 0x28, 0x6a, 0x34, 0xb8, 0xa2,
+	0x3f, 0x25, 0x75, 0x0c, 0x1d, 0x6b, 0x21, 0x56, 0x80, 0xe6, 0xa1, 0x86, 0x0f, 0xb6, 0xe5, 0xad,
+	0x66, 0x0f, 0xea, 0xe0, 0xc2, 0x7c, 0x9a, 0x79, 0xb4, 0xdd, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0x04, 0xc8, 0xb8, 0x7c, 0x1a, 0x04, 0x00, 0x00,
 }

api/pb/vpn.pb.gw.go

@@ -63,6 +63,15 @@ func request_VPNService_Update_0(ctx context.Context, marshaler runtime.Marshale
 
 }
 
+func request_VPNService_Restart_0(ctx context.Context, marshaler runtime.Marshaler, client VPNServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq VPNRestartRequest
+	var metadata runtime.ServerMetadata
+
+	msg, err := client.Restart(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
 // RegisterVPNServiceHandlerFromEndpoint is same as RegisterVPNServiceHandler but
 // automatically dials to "endpoint" and closes the connection when "ctx" gets done.
 func RegisterVPNServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) {
@@ -188,6 +197,35 @@ func RegisterVPNServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 
 	})
 
+	mux.Handle("POST", pattern_VPNService_Restart_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(ctx)
+		defer cancel()
+		if cn, ok := w.(http.CloseNotifier); ok {
+			go func(done <-chan struct{}, closed <-chan bool) {
+				select {
+				case <-done:
+				case <-closed:
+					cancel()
+				}
+			}(ctx.Done(), cn.CloseNotify())
+		}
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_VPNService_Restart_0(rctx, inboundMarshaler, client, req, pathParams)
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_VPNService_Restart_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -197,6 +235,8 @@ var (
 	pattern_VPNService_Init_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "vpn", "init"}, ""))
 
 	pattern_VPNService_Update_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "vpn", "update"}, ""))
+
+	pattern_VPNService_Restart_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "vpn", "restart"}, ""))
 )
 
 var (
@@ -205,4 +245,6 @@ var (
 	forward_VPNService_Init_0 = runtime.ForwardResponseMessage
 
 	forward_VPNService_Update_0 = runtime.ForwardResponseMessage
+
+	forward_VPNService_Restart_0 = runtime.ForwardResponseMessage
 )

api/pb/vpn.proto

@@ -23,6 +23,7 @@ message VPNUpdateRequest {
   string ip_block = 1;
   string dns = 2;
 }
+message VPNRestartRequest {}
 
 
 service VPNService {
@@ -41,6 +42,12 @@ service VPNService {
       post: "/api/v1/vpn/update"
       body: "*"
     };}
+  rpc Restart (VPNRestartRequest) returns (VPNRestartResponse) {
+    option (google.api.http) = {
+      post: "/api/v1/vpn/restart"
+      //body: "*"
+    };}
+
 
 }
 
@@ -59,3 +66,4 @@ message VPNStatusResponse {
 }
 message VPNInitResponse {}
 message VPNUpdateResponse {}
+message VPNRestartResponse {}

api/rpc.go

@@ -392,6 +392,21 @@ func (s *VPNService) Update(ctx context.Context, req *pb.VPNUpdateRequest) (*pb.
 	return &pb.VPNUpdateResponse{}, nil
 }
 
+func (s *VPNService) Restart(ctx context.Context, req *pb.VPNRestartRequest) (*pb.VPNRestartResponse, error) {
+	logrus.Debugf("rpc call: vpn restart")
+	perms, err := permset.FromContext(ctx)
+	if err != nil {
+		return nil, grpc.Errorf(codes.Unauthenticated, "Can't get permset from context")
+	}
+
+	if !perms.Contains(ovpm.RestartVPNPerm) {
+		return nil, grpc.Errorf(codes.PermissionDenied, "ovpm.UpdateVPNPerm is required for this operation.")
+	}
+
+	ovpm.RestartVPNProc()
+	return &pb.VPNRestartResponse{}, nil
+}
+
 type NetworkService struct{}
 
 func (s *NetworkService) List(ctx context.Context, req *pb.NetworkListRequest) (*pb.NetworkListResponse, error) {

perms.go

@@ -19,6 +19,7 @@ const (
 	GetVPNStatusPerm
 	InitVPNPerm
 	UpdateVPNPerm
+	RestartVPNPerm
 
 	// Network permissions
 	ListNetworksPerm
@@ -45,6 +46,7 @@ func AdminPerms() []permset.Perm {
 		GetVPNStatusPerm,
 		InitVPNPerm,
 		UpdateVPNPerm,
+		RestartVPNPerm,
 		ListNetworksPerm,
 		CreateNetworkPerm,
 		DeleteNetworkPerm,

template/vpn.swagger.json

@@ -41,6 +41,22 @@
         ]
       }
     },
+    "/api/v1/vpn/restart": {
+      "post": {
+        "operationId": "Restart",
+        "responses": {
+          "200": {
+            "description": "",
+            "schema": {
+              "$ref": "#/definitions/pbVPNRestartResponse"
+            }
+          }
+        },
+        "tags": [
+          "VPNService"
+        ]
+      }
+    },
     "/api/v1/vpn/status": {
       "get": {
         "operationId": "Status",
@@ -117,6 +133,9 @@
       ],
       "default": "NOPREF"
     },
+    "pbVPNRestartResponse": {
+      "type": "object"
+    },
     "pbVPNStatusResponse": {
       "type": "object",
       "properties": {

vpn.go

@@ -436,6 +436,7 @@ func RestartVPNProc() {
 	if vpnProc == nil {
 		panic(fmt.Sprintf("vpnProc is not initialized!"))
 	}
+	Emit()
 	vpnProc.Restart()
 	ensureNatEnabled()
 }