From 1d25a4f4491f7155ccaa5aafee1167b8de2fdafc Mon Sep 17 00:00:00 2001 From: Zhang Xinghao Date: Mon, 9 Aug 2021 21:08:40 +0800 Subject: [PATCH] fix: update to casbin v2.35.0 Signed-off-by: Zhang Xinghao --- command/command.pb.go | 246 ++++++++---- command/command.proto | 9 +- dispatcher.go | 25 +- go.mod | 2 +- go.sum | 2 + http/mocks/mock_store.go | 153 +++---- http/service.go | 36 ++ store/engine.go | 49 +++ store/fsm.go | 28 ++ store/mocks/mock_distributed_enforcer.go | 485 +++++++++++++---------- store/store.go | 13 + 11 files changed, 697 insertions(+), 351 deletions(-) diff --git a/command/command.pb.go b/command/command.pb.go index 34e5b75..30e17cd 100644 --- a/command/command.pb.go +++ b/command/command.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0-devel -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.3 // source: command/command.proto package command @@ -23,12 +23,13 @@ const ( type Command_Type int32 const ( - Command_COMMAND_TYPE_ADD_POLICIES Command_Type = 0 - Command_COMMAND_TYPE_REMOVE_POLICIES Command_Type = 1 - Command_COMMAND_TYPE_REMOVE_FILTERED_POLICY Command_Type = 2 - Command_COMMAND_TYPE_UPDATE_POLICY Command_Type = 3 - Command_COMMAND_TYPE_UPDATE_POLICIES Command_Type = 4 - Command_COMMAND_TYPE_CLEAR_POLICY Command_Type = 5 + Command_COMMAND_TYPE_ADD_POLICIES Command_Type = 0 + Command_COMMAND_TYPE_REMOVE_POLICIES Command_Type = 1 + Command_COMMAND_TYPE_REMOVE_FILTERED_POLICY Command_Type = 2 + Command_COMMAND_TYPE_UPDATE_POLICY Command_Type = 3 + Command_COMMAND_TYPE_UPDATE_POLICIES Command_Type = 4 + Command_COMMAND_TYPE_CLEAR_POLICY Command_Type = 5 + Command_COMMAND_TYPE_UPDATE_FILTERED_POLICIES Command_Type = 6 ) // Enum value maps for Command_Type. @@ -40,14 +41,16 @@ var ( 3: "COMMAND_TYPE_UPDATE_POLICY", 4: "COMMAND_TYPE_UPDATE_POLICIES", 5: "COMMAND_TYPE_CLEAR_POLICY", + 6: "COMMAND_TYPE_UPDATE_FILTERED_POLICIES", } Command_Type_value = map[string]int32{ - "COMMAND_TYPE_ADD_POLICIES": 0, - "COMMAND_TYPE_REMOVE_POLICIES": 1, - "COMMAND_TYPE_REMOVE_FILTERED_POLICY": 2, - "COMMAND_TYPE_UPDATE_POLICY": 3, - "COMMAND_TYPE_UPDATE_POLICIES": 4, - "COMMAND_TYPE_CLEAR_POLICY": 5, + "COMMAND_TYPE_ADD_POLICIES": 0, + "COMMAND_TYPE_REMOVE_POLICIES": 1, + "COMMAND_TYPE_REMOVE_FILTERED_POLICY": 2, + "COMMAND_TYPE_UPDATE_POLICY": 3, + "COMMAND_TYPE_UPDATE_POLICIES": 4, + "COMMAND_TYPE_CLEAR_POLICY": 5, + "COMMAND_TYPE_UPDATE_FILTERED_POLICIES": 6, } ) @@ -75,7 +78,7 @@ func (x Command_Type) Number() protoreflect.EnumNumber { // Deprecated: Use Command_Type.Descriptor instead. func (Command_Type) EnumDescriptor() ([]byte, []int) { - return file_command_command_proto_rawDescGZIP(), []int{6, 0} + return file_command_command_proto_rawDescGZIP(), []int{7, 0} } type StringArray struct { @@ -464,6 +467,77 @@ func (x *UpdatePoliciesRequest) GetOldRules() []*StringArray { return nil } +type UpdateFilteredPoliciesRequest struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Sec string `protobuf:"bytes,1,opt,name=sec,proto3" json:"sec,omitempty"` + PType string `protobuf:"bytes,2,opt,name=pType,proto3" json:"pType,omitempty"` + NewRules []*StringArray `protobuf:"bytes,3,rep,name=newRules,proto3" json:"newRules,omitempty"` + OldRules []*StringArray `protobuf:"bytes,4,rep,name=oldRules,proto3" json:"oldRules,omitempty"` +} + +func (x *UpdateFilteredPoliciesRequest) Reset() { + *x = UpdateFilteredPoliciesRequest{} + if protoimpl.UnsafeEnabled { + mi := &file_command_command_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UpdateFilteredPoliciesRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateFilteredPoliciesRequest) ProtoMessage() {} + +func (x *UpdateFilteredPoliciesRequest) ProtoReflect() protoreflect.Message { + mi := &file_command_command_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateFilteredPoliciesRequest.ProtoReflect.Descriptor instead. +func (*UpdateFilteredPoliciesRequest) Descriptor() ([]byte, []int) { + return file_command_command_proto_rawDescGZIP(), []int{6} +} + +func (x *UpdateFilteredPoliciesRequest) GetSec() string { + if x != nil { + return x.Sec + } + return "" +} + +func (x *UpdateFilteredPoliciesRequest) GetPType() string { + if x != nil { + return x.PType + } + return "" +} + +func (x *UpdateFilteredPoliciesRequest) GetNewRules() []*StringArray { + if x != nil { + return x.NewRules + } + return nil +} + +func (x *UpdateFilteredPoliciesRequest) GetOldRules() []*StringArray { + if x != nil { + return x.OldRules + } + return nil +} + type Command struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -476,7 +550,7 @@ type Command struct { func (x *Command) Reset() { *x = Command{} if protoimpl.UnsafeEnabled { - mi := &file_command_command_proto_msgTypes[6] + mi := &file_command_command_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -489,7 +563,7 @@ func (x *Command) String() string { func (*Command) ProtoMessage() {} func (x *Command) ProtoReflect() protoreflect.Message { - mi := &file_command_command_proto_msgTypes[6] + mi := &file_command_command_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -502,7 +576,7 @@ func (x *Command) ProtoReflect() protoreflect.Message { // Deprecated: Use Command.ProtoReflect.Descriptor instead. func (*Command) Descriptor() ([]byte, []int) { - return file_command_command_proto_rawDescGZIP(), []int{6} + return file_command_command_proto_rawDescGZIP(), []int{7} } func (x *Command) GetType() Command_Type { @@ -531,7 +605,7 @@ type AddNodeRequest struct { func (x *AddNodeRequest) Reset() { *x = AddNodeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_command_command_proto_msgTypes[7] + mi := &file_command_command_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -544,7 +618,7 @@ func (x *AddNodeRequest) String() string { func (*AddNodeRequest) ProtoMessage() {} func (x *AddNodeRequest) ProtoReflect() protoreflect.Message { - mi := &file_command_command_proto_msgTypes[7] + mi := &file_command_command_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -557,7 +631,7 @@ func (x *AddNodeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AddNodeRequest.ProtoReflect.Descriptor instead. func (*AddNodeRequest) Descriptor() ([]byte, []int) { - return file_command_command_proto_rawDescGZIP(), []int{7} + return file_command_command_proto_rawDescGZIP(), []int{8} } func (x *AddNodeRequest) GetId() string { @@ -585,7 +659,7 @@ type RemoveNodeRequest struct { func (x *RemoveNodeRequest) Reset() { *x = RemoveNodeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_command_command_proto_msgTypes[8] + mi := &file_command_command_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -598,7 +672,7 @@ func (x *RemoveNodeRequest) String() string { func (*RemoveNodeRequest) ProtoMessage() {} func (x *RemoveNodeRequest) ProtoReflect() protoreflect.Message { - mi := &file_command_command_proto_msgTypes[8] + mi := &file_command_command_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -611,7 +685,7 @@ func (x *RemoveNodeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RemoveNodeRequest.ProtoReflect.Descriptor instead. func (*RemoveNodeRequest) Descriptor() ([]byte, []int) { - return file_command_command_proto_rawDescGZIP(), []int{8} + return file_command_command_proto_rawDescGZIP(), []int{9} } func (x *RemoveNodeRequest) GetId() string { @@ -668,34 +742,47 @@ var file_command_command_proto_rawDesc = []byte{ 0x08, 0x6f, 0x6c, 0x64, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, - 0x9c, 0x02, 0x0a, 0x07, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x29, 0x0a, 0x04, 0x74, - 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x61, 0x6e, 0x64, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x2e, 0x54, 0x79, 0x70, 0x65, - 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xd1, 0x01, 0x0a, 0x04, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, - 0x59, 0x50, 0x45, 0x5f, 0x41, 0x44, 0x44, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x49, 0x45, 0x53, - 0x10, 0x00, 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, - 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x49, - 0x45, 0x53, 0x10, 0x01, 0x12, 0x27, 0x0a, 0x23, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, - 0x54, 0x59, 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x54, - 0x45, 0x52, 0x45, 0x44, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x02, 0x12, 0x1e, 0x0a, - 0x1a, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x50, - 0x44, 0x41, 0x54, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x03, 0x12, 0x20, 0x0a, - 0x1c, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x50, - 0x44, 0x41, 0x54, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x49, 0x45, 0x53, 0x10, 0x04, 0x12, - 0x1d, 0x0a, 0x19, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, - 0x43, 0x4c, 0x45, 0x41, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x05, 0x22, 0x3a, - 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x23, 0x0a, 0x11, 0x52, 0x65, - 0x6d, 0x6f, 0x76, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, - 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x61, - 0x73, 0x62, 0x69, 0x6e, 0x2f, 0x68, 0x72, 0x61, 0x66, 0x74, 0x2d, 0x64, 0x69, 0x73, 0x70, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xab, 0x01, 0x0a, 0x1d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, + 0x65, 0x64, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x73, 0x65, 0x63, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x30, 0x0a, 0x08, 0x6e, 0x65, 0x77, + 0x52, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x6f, + 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, + 0x79, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x08, 0x6f, + 0x6c, 0x64, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x41, 0x72, + 0x72, 0x61, 0x79, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x22, 0xc7, 0x02, + 0x0a, 0x07, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x29, 0x0a, 0x04, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, + 0x64, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, + 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xfc, 0x01, 0x0a, 0x04, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x1d, 0x0a, 0x19, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, + 0x45, 0x5f, 0x41, 0x44, 0x44, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x49, 0x45, 0x53, 0x10, 0x00, + 0x12, 0x20, 0x0a, 0x1c, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, + 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x49, 0x45, 0x53, + 0x10, 0x01, 0x12, 0x27, 0x0a, 0x23, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, + 0x50, 0x45, 0x5f, 0x52, 0x45, 0x4d, 0x4f, 0x56, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x54, 0x45, 0x52, + 0x45, 0x44, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x02, 0x12, 0x1e, 0x0a, 0x1a, 0x43, + 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x50, 0x44, 0x41, + 0x54, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x03, 0x12, 0x20, 0x0a, 0x1c, 0x43, + 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x50, 0x44, 0x41, + 0x54, 0x45, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x49, 0x45, 0x53, 0x10, 0x04, 0x12, 0x1d, 0x0a, + 0x19, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x4c, + 0x45, 0x41, 0x52, 0x5f, 0x50, 0x4f, 0x4c, 0x49, 0x43, 0x59, 0x10, 0x05, 0x12, 0x29, 0x0a, 0x25, + 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x50, 0x44, + 0x41, 0x54, 0x45, 0x5f, 0x46, 0x49, 0x4c, 0x54, 0x45, 0x52, 0x45, 0x44, 0x5f, 0x50, 0x4f, 0x4c, + 0x49, 0x43, 0x49, 0x45, 0x53, 0x10, 0x06, 0x22, 0x3a, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x4e, 0x6f, + 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x22, 0x23, 0x0a, 0x11, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4e, 0x6f, 0x64, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x61, 0x73, 0x62, 0x69, 0x6e, 0x2f, 0x68, 0x72, + 0x61, 0x66, 0x74, 0x2d, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -711,30 +798,33 @@ func file_command_command_proto_rawDescGZIP() []byte { } var file_command_command_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_command_command_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_command_command_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_command_command_proto_goTypes = []interface{}{ - (Command_Type)(0), // 0: command.Command.Type - (*StringArray)(nil), // 1: command.StringArray - (*AddPoliciesRequest)(nil), // 2: command.AddPoliciesRequest - (*RemovePoliciesRequest)(nil), // 3: command.RemovePoliciesRequest - (*RemoveFilteredPolicyRequest)(nil), // 4: command.RemoveFilteredPolicyRequest - (*UpdatePolicyRequest)(nil), // 5: command.UpdatePolicyRequest - (*UpdatePoliciesRequest)(nil), // 6: command.UpdatePoliciesRequest - (*Command)(nil), // 7: command.Command - (*AddNodeRequest)(nil), // 8: command.AddNodeRequest - (*RemoveNodeRequest)(nil), // 9: command.RemoveNodeRequest + (Command_Type)(0), // 0: command.Command.Type + (*StringArray)(nil), // 1: command.StringArray + (*AddPoliciesRequest)(nil), // 2: command.AddPoliciesRequest + (*RemovePoliciesRequest)(nil), // 3: command.RemovePoliciesRequest + (*RemoveFilteredPolicyRequest)(nil), // 4: command.RemoveFilteredPolicyRequest + (*UpdatePolicyRequest)(nil), // 5: command.UpdatePolicyRequest + (*UpdatePoliciesRequest)(nil), // 6: command.UpdatePoliciesRequest + (*UpdateFilteredPoliciesRequest)(nil), // 7: command.UpdateFilteredPoliciesRequest + (*Command)(nil), // 8: command.Command + (*AddNodeRequest)(nil), // 9: command.AddNodeRequest + (*RemoveNodeRequest)(nil), // 10: command.RemoveNodeRequest } var file_command_command_proto_depIdxs = []int32{ 1, // 0: command.AddPoliciesRequest.rules:type_name -> command.StringArray 1, // 1: command.RemovePoliciesRequest.rules:type_name -> command.StringArray 1, // 2: command.UpdatePoliciesRequest.newRules:type_name -> command.StringArray 1, // 3: command.UpdatePoliciesRequest.oldRules:type_name -> command.StringArray - 0, // 4: command.Command.type:type_name -> command.Command.Type - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 1, // 4: command.UpdateFilteredPoliciesRequest.newRules:type_name -> command.StringArray + 1, // 5: command.UpdateFilteredPoliciesRequest.oldRules:type_name -> command.StringArray + 0, // 6: command.Command.type:type_name -> command.Command.Type + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_command_command_proto_init() } @@ -816,7 +906,7 @@ func file_command_command_proto_init() { } } file_command_command_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Command); i { + switch v := v.(*UpdateFilteredPoliciesRequest); i { case 0: return &v.state case 1: @@ -828,7 +918,7 @@ func file_command_command_proto_init() { } } file_command_command_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AddNodeRequest); i { + switch v := v.(*Command); i { case 0: return &v.state case 1: @@ -840,6 +930,18 @@ func file_command_command_proto_init() { } } file_command_command_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*AddNodeRequest); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_command_command_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RemoveNodeRequest); i { case 0: return &v.state @@ -858,7 +960,7 @@ func file_command_command_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_command_command_proto_rawDesc, NumEnums: 1, - NumMessages: 9, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/command/command.proto b/command/command.proto index 2e9f754..f5d6b65 100644 --- a/command/command.proto +++ b/command/command.proto @@ -41,6 +41,13 @@ message UpdatePoliciesRequest { repeated StringArray oldRules = 4; } +message UpdateFilteredPoliciesRequest { + string sec = 1; + string pType = 2; + repeated StringArray newRules = 3; + repeated StringArray oldRules = 4; +} + message Command { enum Type { COMMAND_TYPE_ADD_POLICIES = 0; @@ -48,8 +55,8 @@ message Command { COMMAND_TYPE_REMOVE_FILTERED_POLICY = 2; COMMAND_TYPE_UPDATE_POLICY = 3; COMMAND_TYPE_UPDATE_POLICIES = 4; - COMMAND_TYPE_CLEAR_POLICY = 5; + COMMAND_TYPE_UPDATE_FILTERED_POLICIES = 6; } Type type = 1; diff --git a/dispatcher.go b/dispatcher.go index dd99007..5b7a04a 100644 --- a/dispatcher.go +++ b/dispatcher.go @@ -4,9 +4,10 @@ import ( "context" "crypto/tls" "fmt" - "github.com/soheilhy/cmux" "net" + "github.com/soheilhy/cmux" + "github.com/hashicorp/go-multierror" "github.com/casbin/casbin/v2/persist" @@ -253,6 +254,28 @@ func (h *HRaftDispatcher) UpdatePolicy(sec string, pType string, oldRule, newRul return h.httpService.DoUpdatePolicyRequest(request) } +// UpdateFilteredPolicies implements the persist.Dispatcher interface. +func (h *HRaftDispatcher) UpdateFilteredPolicies(sec string, pType string, oldRules, newRules [][]string) error { + var olds []*command.StringArray + for _, rule := range oldRules { + var item = &command.StringArray{Items: rule} + olds = append(olds, item) + } + + var news []*command.StringArray + for _, rule := range newRules { + var item = &command.StringArray{Items: rule} + news = append(news, item) + } + request := &command.UpdateFilteredPoliciesRequest{ + Sec: sec, + PType: pType, + OldRules: olds, + NewRules: news, + } + return h.httpService.DoUpdateFilteredPoliciesRequest(request) +} + // UpdatePolicies implements the persist.Dispatcher interface. func (h *HRaftDispatcher) UpdatePolicies(sec string, pType string, oldRules, newRules [][]string) error { var olds []*command.StringArray diff --git a/go.mod b/go.mod index eb42ef6..5a36746 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible - github.com/casbin/casbin/v2 v2.24.0 + github.com/casbin/casbin/v2 v2.35.0 github.com/cenkalti/backoff/v4 v4.1.0 github.com/go-chi/chi v1.5.1 github.com/golang/mock v1.4.4 diff --git a/go.sum b/go.sum index 343191c..2f3b06d 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,8 @@ github.com/casbin/casbin/v2 v2.23.4 h1:izvAG3KA49C3/m1zpYfkLcZlkYQO5VeHj7dhwurwZ github.com/casbin/casbin/v2 v2.23.4/go.mod h1:wUgota0cQbTXE6Vd+KWpg41726jFRi7upxio0sR+Xd0= github.com/casbin/casbin/v2 v2.24.0 h1:peiFTw+PNpAMSz7hDDz768nEwzUsBMMZNV4yFGCayI8= github.com/casbin/casbin/v2 v2.24.0/go.mod h1:wUgota0cQbTXE6Vd+KWpg41726jFRi7upxio0sR+Xd0= +github.com/casbin/casbin/v2 v2.35.0 h1:f0prVg9LgTJTihjAxWEZhfJptXvah1GpZh12sb5KXNA= +github.com/casbin/casbin/v2 v2.35.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc= github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= diff --git a/http/mocks/mock_store.go b/http/mocks/mock_store.go index 99dca1a..655d238 100644 --- a/http/mocks/mock_store.go +++ b/http/mocks/mock_store.go @@ -5,35 +5,36 @@ package mocks import ( + reflect "reflect" + command "github.com/casbin/hraft-dispatcher/command" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockStore is a mock of Store interface +// MockStore is a mock of Store interface. type MockStore struct { ctrl *gomock.Controller recorder *MockStoreMockRecorder } -// MockStoreMockRecorder is the mock recorder for MockStore +// MockStoreMockRecorder is the mock recorder for MockStore. type MockStoreMockRecorder struct { mock *MockStore } -// NewMockStore creates a new mock instance +// NewMockStore creates a new mock instance. func NewMockStore(ctrl *gomock.Controller) *MockStore { mock := &MockStore{ctrl: ctrl} mock.recorder = &MockStoreMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockStore) EXPECT() *MockStoreMockRecorder { return m.recorder } -// AddPolicies mocks base method +// AddPolicies mocks base method. func (m *MockStore) AddPolicies(request *command.AddPoliciesRequest) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddPolicies", request) @@ -41,136 +42,150 @@ func (m *MockStore) AddPolicies(request *command.AddPoliciesRequest) error { return ret0 } -// AddPolicies indicates an expected call of AddPolicies +// AddPolicies indicates an expected call of AddPolicies. func (mr *MockStoreMockRecorder) AddPolicies(request interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddPolicies", reflect.TypeOf((*MockStore)(nil).AddPolicies), request) } -// RemovePolicies mocks base method -func (m *MockStore) RemovePolicies(request *command.RemovePoliciesRequest) error { +// ClearPolicy mocks base method. +func (m *MockStore) ClearPolicy() error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RemovePolicies", request) + ret := m.ctrl.Call(m, "ClearPolicy") ret0, _ := ret[0].(error) return ret0 } -// RemovePolicies indicates an expected call of RemovePolicies -func (mr *MockStoreMockRecorder) RemovePolicies(request interface{}) *gomock.Call { +// ClearPolicy indicates an expected call of ClearPolicy. +func (mr *MockStoreMockRecorder) ClearPolicy() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemovePolicies", reflect.TypeOf((*MockStore)(nil).RemovePolicies), request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearPolicy", reflect.TypeOf((*MockStore)(nil).ClearPolicy)) } -// RemoveFilteredPolicy mocks base method -func (m *MockStore) RemoveFilteredPolicy(request *command.RemoveFilteredPolicyRequest) error { +// JoinNode mocks base method. +func (m *MockStore) JoinNode(serverID, address string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RemoveFilteredPolicy", request) + ret := m.ctrl.Call(m, "JoinNode", serverID, address) ret0, _ := ret[0].(error) return ret0 } -// RemoveFilteredPolicy indicates an expected call of RemoveFilteredPolicy -func (mr *MockStoreMockRecorder) RemoveFilteredPolicy(request interface{}) *gomock.Call { +// JoinNode indicates an expected call of JoinNode. +func (mr *MockStoreMockRecorder) JoinNode(serverID, address interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredPolicy", reflect.TypeOf((*MockStore)(nil).RemoveFilteredPolicy), request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "JoinNode", reflect.TypeOf((*MockStore)(nil).JoinNode), serverID, address) } -// UpdatePolicy mocks base method -func (m *MockStore) UpdatePolicy(request *command.UpdatePolicyRequest) error { +// Leader mocks base method. +func (m *MockStore) Leader() (bool, string) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdatePolicy", request) - ret0, _ := ret[0].(error) - return ret0 + ret := m.ctrl.Call(m, "Leader") + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(string) + return ret0, ret1 } -// UpdatePolicy indicates an expected call of UpdatePolicy -func (mr *MockStoreMockRecorder) UpdatePolicy(request interface{}) *gomock.Call { +// Leader indicates an expected call of Leader. +func (mr *MockStoreMockRecorder) Leader() *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicy", reflect.TypeOf((*MockStore)(nil).UpdatePolicy), request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Leader", reflect.TypeOf((*MockStore)(nil).Leader)) } -// UpdatePolicies mocks base method -func (m *MockStore) UpdatePolicies(request *command.UpdatePoliciesRequest) error { +// RemoveFilteredPolicy mocks base method. +func (m *MockStore) RemoveFilteredPolicy(request *command.RemoveFilteredPolicyRequest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdatePolicies", request) + ret := m.ctrl.Call(m, "RemoveFilteredPolicy", request) ret0, _ := ret[0].(error) return ret0 } -// UpdatePolicies indicates an expected call of UpdatePolicies -func (mr *MockStoreMockRecorder) UpdatePolicies(request interface{}) *gomock.Call { +// RemoveFilteredPolicy indicates an expected call of RemoveFilteredPolicy. +func (mr *MockStoreMockRecorder) RemoveFilteredPolicy(request interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicies", reflect.TypeOf((*MockStore)(nil).UpdatePolicies), request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredPolicy", reflect.TypeOf((*MockStore)(nil).RemoveFilteredPolicy), request) } -// ClearPolicy mocks base method -func (m *MockStore) ClearPolicy() error { +// RemoveNode mocks base method. +func (m *MockStore) RemoveNode(serverID string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ClearPolicy") + ret := m.ctrl.Call(m, "RemoveNode", serverID) ret0, _ := ret[0].(error) return ret0 } -// ClearPolicy indicates an expected call of ClearPolicy -func (mr *MockStoreMockRecorder) ClearPolicy() *gomock.Call { +// RemoveNode indicates an expected call of RemoveNode. +func (mr *MockStoreMockRecorder) RemoveNode(serverID interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearPolicy", reflect.TypeOf((*MockStore)(nil).ClearPolicy)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveNode", reflect.TypeOf((*MockStore)(nil).RemoveNode), serverID) } -// JoinNode mocks base method -func (m *MockStore) JoinNode(serverID, address string) error { +// RemovePolicies mocks base method. +func (m *MockStore) RemovePolicies(request *command.RemovePoliciesRequest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "JoinNode", serverID, address) + ret := m.ctrl.Call(m, "RemovePolicies", request) ret0, _ := ret[0].(error) return ret0 } -// JoinNode indicates an expected call of JoinNode -func (mr *MockStoreMockRecorder) JoinNode(serverID, address interface{}) *gomock.Call { +// RemovePolicies indicates an expected call of RemovePolicies. +func (mr *MockStoreMockRecorder) RemovePolicies(request interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "JoinNode", reflect.TypeOf((*MockStore)(nil).JoinNode), serverID, address) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemovePolicies", reflect.TypeOf((*MockStore)(nil).RemovePolicies), request) } -// RemoveNode mocks base method -func (m *MockStore) RemoveNode(serverID string) error { +// Stats mocks base method. +func (m *MockStore) Stats() (map[string]interface{}, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RemoveNode", serverID) + ret := m.ctrl.Call(m, "Stats") + ret0, _ := ret[0].(map[string]interface{}) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// Stats indicates an expected call of Stats. +func (mr *MockStoreMockRecorder) Stats() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stats", reflect.TypeOf((*MockStore)(nil).Stats)) +} + +// UpdateFilteredPolicies mocks base method. +func (m *MockStore) UpdateFilteredPolicies(request *command.UpdateFilteredPoliciesRequest) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "UpdateFilteredPolicies", request) ret0, _ := ret[0].(error) return ret0 } -// RemoveNode indicates an expected call of RemoveNode -func (mr *MockStoreMockRecorder) RemoveNode(serverID interface{}) *gomock.Call { +// UpdateFilteredPolicies indicates an expected call of UpdateFilteredPolicies. +func (mr *MockStoreMockRecorder) UpdateFilteredPolicies(request interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveNode", reflect.TypeOf((*MockStore)(nil).RemoveNode), serverID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFilteredPolicies", reflect.TypeOf((*MockStore)(nil).UpdateFilteredPolicies), request) } -// Leader mocks base method -func (m *MockStore) Leader() (bool, string) { +// UpdatePolicies mocks base method. +func (m *MockStore) UpdatePolicies(request *command.UpdatePoliciesRequest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Leader") - ret0, _ := ret[0].(bool) - ret1, _ := ret[1].(string) - return ret0, ret1 + ret := m.ctrl.Call(m, "UpdatePolicies", request) + ret0, _ := ret[0].(error) + return ret0 } -// Leader indicates an expected call of Leader -func (mr *MockStoreMockRecorder) Leader() *gomock.Call { +// UpdatePolicies indicates an expected call of UpdatePolicies. +func (mr *MockStoreMockRecorder) UpdatePolicies(request interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Leader", reflect.TypeOf((*MockStore)(nil).Leader)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicies", reflect.TypeOf((*MockStore)(nil).UpdatePolicies), request) } -// Stats mocks base method -func (m *MockStore) Stats() (map[string]interface{}, error) { +// UpdatePolicy mocks base method. +func (m *MockStore) UpdatePolicy(request *command.UpdatePolicyRequest) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stats") - ret0, _ := ret[0].(map[string]interface{}) - ret1, _ := ret[1].(error) - return ret0, ret1 + ret := m.ctrl.Call(m, "UpdatePolicy", request) + ret0, _ := ret[0].(error) + return ret0 } -// Stats indicates an expected call of Stats -func (mr *MockStoreMockRecorder) Stats() *gomock.Call { +// UpdatePolicy indicates an expected call of UpdatePolicy. +func (mr *MockStoreMockRecorder) UpdatePolicy(request interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stats", reflect.TypeOf((*MockStore)(nil).Stats)) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicy", reflect.TypeOf((*MockStore)(nil).UpdatePolicy), request) } diff --git a/http/service.go b/http/service.go index 02147fa..f518396 100644 --- a/http/service.go +++ b/http/service.go @@ -41,6 +41,8 @@ type Store interface { UpdatePolicy(request *command.UpdatePolicyRequest) error // UpdatePolicies updates a set of rules of policy. UpdatePolicies(request *command.UpdatePoliciesRequest) error + // UpdateFilteredPolicies updates a set of rules of policy. + UpdateFilteredPolicies(request *command.UpdateFilteredPoliciesRequest) error // ClearPolicy clears all policies. ClearPolicy() error @@ -290,6 +292,20 @@ func (s *Service) handleUpdatePolicy(w http.ResponseWriter, r *http.Request) { } err = s.store.UpdatePolicies(&cmd) s.handleStoreResponse(err, w, r) + case "filtered": + data, err := ioutil.ReadAll(r.Body) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + var cmd command.UpdateFilteredPoliciesRequest + err = jsoniter.Unmarshal(data, &cmd) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + err = s.store.UpdateFilteredPolicies(&cmd) + s.handleStoreResponse(err, w, r) case "": data, err := ioutil.ReadAll(r.Body) if err != nil { @@ -448,6 +464,26 @@ func (s *Service) DoUpdatePolicyRequest(request *command.UpdatePolicyRequest) er return nil } +func (s *Service) DoUpdateFilteredPoliciesRequest(request *command.UpdateFilteredPoliciesRequest) error { + b, err := jsoniter.Marshal(request) + if err != nil { + return err + } + r, err := http.NewRequest(http.MethodPut, fmt.Sprintf("%s://%s/policies/update?type=filtered", s.GetScheme(), s.Addr()), bytes.NewBuffer(b)) + if err != nil { + return err + } + + resp, err := s.httpClient.Do(r) + if err != nil { + return err + } + if resp.StatusCode != http.StatusOK { + return errors.New(http.StatusText(http.StatusServiceUnavailable)) + } + return nil +} + func (s *Service) DoUpdatePoliciesRequest(request *command.UpdatePoliciesRequest) error { b, err := jsoniter.Marshal(request) if err != nil { diff --git a/store/engine.go b/store/engine.go index 45b98a7..9d4eb75 100644 --- a/store/engine.go +++ b/store/engine.go @@ -383,6 +383,55 @@ func (p *PolicyOperator) UpdatePolicies(sec, pType string, oldRules, newRules [] return nil } +//UpdateFilteredPolicies replaces a set of existing rule. +func (p *PolicyOperator) UpdateFilteredPolicies(sec, pType string, oldRules, newRules [][]string) error { + p.l.Lock() + defer p.l.Unlock() + + effected, err := p.enforcer.UpdatePoliciesSelf(nil, sec, pType, oldRules, newRules) + if err != nil { + p.logger.Error("failed to call UpdatePoliciesSelf", zap.Error(err)) + return err + } + if effected == false { + return nil + } + + err = p.db.Update(func(tx *bolt.Tx) error { + bkt := tx.Bucket(policyBucketName) + + for _, newRule := range newRules { + newKey, err := newRuleBytes(sec, pType, newRule) + if err != nil { + return err + } + value, err := bkt.NextSequence() + if err != nil { + return err + } + + err = bkt.Put(newKey, []byte(strconv.FormatUint(value, 10))) + if err != nil { + return err + } + } + + for _, oldRule := range oldRules { + oldKey, err := newRuleBytes(sec, pType, oldRule) + if err != nil { + return err + } + return bkt.Delete(oldKey) + } + return nil + }) + if err != nil { + p.logger.Error("failed to persist to database", zap.Error(err)) + } + + return nil +} + // ClearPolicy clears all rules. func (p *PolicyOperator) ClearPolicy() error { p.l.Lock() diff --git a/store/fsm.go b/store/fsm.go index 68dce00..3dcd624 100644 --- a/store/fsm.go +++ b/store/fsm.go @@ -153,6 +153,34 @@ func (f *FSM) Apply(log *raft.Log) interface{} { ) } return err + case command.Command_COMMAND_TYPE_UPDATE_FILTERED_POLICIES: + var request command.UpdateFilteredPoliciesRequest + err := proto.Unmarshal(cmd.Data, &request) + if err != nil { + f.logger.Error("cannot to unmarshal the request", zap.Error(err), zap.ByteString("request", cmd.Data)) + return err + } + var oldRules [][]string + for _, rule := range request.OldRules { + oldRules = append(oldRules, rule.GetItems()) + } + var newRules [][]string + for _, rule := range request.NewRules { + newRules = append(newRules, rule.GetItems()) + } + + err = f.policyOperator.UpdateFilteredPolicies(request.Sec, request.PType, oldRules, newRules) + if err != nil { + f.logger.Error("apply the update policies request failed", zap.Error(err), zap.String("request", request.String())) + } else { + f.logger.Info("update policies request applied", + zap.String("sec", request.Sec), + zap.String("pType", request.PType), + zap.Any("oldRules", request.OldRules), + zap.Any("newRules", request.NewRules), + ) + } + return err case command.Command_COMMAND_TYPE_CLEAR_POLICY: err := f.policyOperator.ClearPolicy() if err != nil { diff --git a/store/mocks/mock_distributed_enforcer.go b/store/mocks/mock_distributed_enforcer.go index 7c00d8c..9b3695f 100644 --- a/store/mocks/mock_distributed_enforcer.go +++ b/store/mocks/mock_distributed_enforcer.go @@ -5,51 +5,52 @@ package mocks import ( + reflect "reflect" + govaluate "github.com/Knetic/govaluate" - effect "github.com/casbin/casbin/v2/effect" + effector "github.com/casbin/casbin/v2/effector" model "github.com/casbin/casbin/v2/model" persist "github.com/casbin/casbin/v2/persist" rbac "github.com/casbin/casbin/v2/rbac" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockIDistributedEnforcer is a mock of IDistributedEnforcer interface +// MockIDistributedEnforcer is a mock of IDistributedEnforcer interface. type MockIDistributedEnforcer struct { ctrl *gomock.Controller recorder *MockIDistributedEnforcerMockRecorder } -// MockIDistributedEnforcerMockRecorder is the mock recorder for MockIDistributedEnforcer +// MockIDistributedEnforcerMockRecorder is the mock recorder for MockIDistributedEnforcer. type MockIDistributedEnforcerMockRecorder struct { mock *MockIDistributedEnforcer } -// NewMockIDistributedEnforcer creates a new mock instance +// NewMockIDistributedEnforcer creates a new mock instance. func NewMockIDistributedEnforcer(ctrl *gomock.Controller) *MockIDistributedEnforcer { mock := &MockIDistributedEnforcer{ctrl: ctrl} mock.recorder = &MockIDistributedEnforcerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockIDistributedEnforcer) EXPECT() *MockIDistributedEnforcerMockRecorder { return m.recorder } -// AddFunction mocks base method +// AddFunction mocks base method. func (m *MockIDistributedEnforcer) AddFunction(arg0 string, arg1 govaluate.ExpressionFunction) { m.ctrl.T.Helper() m.ctrl.Call(m, "AddFunction", arg0, arg1) } -// AddFunction indicates an expected call of AddFunction +// AddFunction indicates an expected call of AddFunction. func (mr *MockIDistributedEnforcerMockRecorder) AddFunction(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddFunction", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddFunction), arg0, arg1) } -// AddGroupingPolicies mocks base method +// AddGroupingPolicies mocks base method. func (m *MockIDistributedEnforcer) AddGroupingPolicies(arg0 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddGroupingPolicies", arg0) @@ -58,13 +59,13 @@ func (m *MockIDistributedEnforcer) AddGroupingPolicies(arg0 [][]string) (bool, e return ret0, ret1 } -// AddGroupingPolicies indicates an expected call of AddGroupingPolicies +// AddGroupingPolicies indicates an expected call of AddGroupingPolicies. func (mr *MockIDistributedEnforcerMockRecorder) AddGroupingPolicies(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddGroupingPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddGroupingPolicies), arg0) } -// AddGroupingPolicy mocks base method +// AddGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) AddGroupingPolicy(arg0 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -77,13 +78,13 @@ func (m *MockIDistributedEnforcer) AddGroupingPolicy(arg0 ...interface{}) (bool, return ret0, ret1 } -// AddGroupingPolicy indicates an expected call of AddGroupingPolicy +// AddGroupingPolicy indicates an expected call of AddGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) AddGroupingPolicy(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddGroupingPolicy), arg0...) } -// AddNamedGroupingPolicies mocks base method +// AddNamedGroupingPolicies mocks base method. func (m *MockIDistributedEnforcer) AddNamedGroupingPolicies(arg0 string, arg1 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddNamedGroupingPolicies", arg0, arg1) @@ -92,13 +93,13 @@ func (m *MockIDistributedEnforcer) AddNamedGroupingPolicies(arg0 string, arg1 [] return ret0, ret1 } -// AddNamedGroupingPolicies indicates an expected call of AddNamedGroupingPolicies +// AddNamedGroupingPolicies indicates an expected call of AddNamedGroupingPolicies. func (mr *MockIDistributedEnforcerMockRecorder) AddNamedGroupingPolicies(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNamedGroupingPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddNamedGroupingPolicies), arg0, arg1) } -// AddNamedGroupingPolicy mocks base method +// AddNamedGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) AddNamedGroupingPolicy(arg0 string, arg1 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -111,14 +112,14 @@ func (m *MockIDistributedEnforcer) AddNamedGroupingPolicy(arg0 string, arg1 ...i return ret0, ret1 } -// AddNamedGroupingPolicy indicates an expected call of AddNamedGroupingPolicy +// AddNamedGroupingPolicy indicates an expected call of AddNamedGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) AddNamedGroupingPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNamedGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddNamedGroupingPolicy), varargs...) } -// AddNamedPolicies mocks base method +// AddNamedPolicies mocks base method. func (m *MockIDistributedEnforcer) AddNamedPolicies(arg0 string, arg1 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddNamedPolicies", arg0, arg1) @@ -127,13 +128,13 @@ func (m *MockIDistributedEnforcer) AddNamedPolicies(arg0 string, arg1 [][]string return ret0, ret1 } -// AddNamedPolicies indicates an expected call of AddNamedPolicies +// AddNamedPolicies indicates an expected call of AddNamedPolicies. func (mr *MockIDistributedEnforcerMockRecorder) AddNamedPolicies(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNamedPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddNamedPolicies), arg0, arg1) } -// AddNamedPolicy mocks base method +// AddNamedPolicy mocks base method. func (m *MockIDistributedEnforcer) AddNamedPolicy(arg0 string, arg1 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -146,14 +147,14 @@ func (m *MockIDistributedEnforcer) AddNamedPolicy(arg0 string, arg1 ...interface return ret0, ret1 } -// AddNamedPolicy indicates an expected call of AddNamedPolicy +// AddNamedPolicy indicates an expected call of AddNamedPolicy. func (mr *MockIDistributedEnforcerMockRecorder) AddNamedPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddNamedPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddNamedPolicy), varargs...) } -// AddPermissionForUser mocks base method +// AddPermissionForUser mocks base method. func (m *MockIDistributedEnforcer) AddPermissionForUser(arg0 string, arg1 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -166,14 +167,14 @@ func (m *MockIDistributedEnforcer) AddPermissionForUser(arg0 string, arg1 ...str return ret0, ret1 } -// AddPermissionForUser indicates an expected call of AddPermissionForUser +// AddPermissionForUser indicates an expected call of AddPermissionForUser. func (mr *MockIDistributedEnforcerMockRecorder) AddPermissionForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddPermissionForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddPermissionForUser), varargs...) } -// AddPolicies mocks base method +// AddPolicies mocks base method. func (m *MockIDistributedEnforcer) AddPolicies(arg0 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddPolicies", arg0) @@ -182,13 +183,13 @@ func (m *MockIDistributedEnforcer) AddPolicies(arg0 [][]string) (bool, error) { return ret0, ret1 } -// AddPolicies indicates an expected call of AddPolicies +// AddPolicies indicates an expected call of AddPolicies. func (mr *MockIDistributedEnforcerMockRecorder) AddPolicies(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddPolicies), arg0) } -// AddPoliciesSelf mocks base method +// AddPoliciesSelf mocks base method. func (m *MockIDistributedEnforcer) AddPoliciesSelf(arg0 func() bool, arg1, arg2 string, arg3 [][]string) ([][]string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddPoliciesSelf", arg0, arg1, arg2, arg3) @@ -197,13 +198,13 @@ func (m *MockIDistributedEnforcer) AddPoliciesSelf(arg0 func() bool, arg1, arg2 return ret0, ret1 } -// AddPoliciesSelf indicates an expected call of AddPoliciesSelf +// AddPoliciesSelf indicates an expected call of AddPoliciesSelf. func (mr *MockIDistributedEnforcerMockRecorder) AddPoliciesSelf(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddPoliciesSelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddPoliciesSelf), arg0, arg1, arg2, arg3) } -// AddPolicy mocks base method +// AddPolicy mocks base method. func (m *MockIDistributedEnforcer) AddPolicy(arg0 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -216,13 +217,13 @@ func (m *MockIDistributedEnforcer) AddPolicy(arg0 ...interface{}) (bool, error) return ret0, ret1 } -// AddPolicy indicates an expected call of AddPolicy +// AddPolicy indicates an expected call of AddPolicy. func (mr *MockIDistributedEnforcerMockRecorder) AddPolicy(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddPolicy), arg0...) } -// AddRoleForUser mocks base method +// AddRoleForUser mocks base method. func (m *MockIDistributedEnforcer) AddRoleForUser(arg0, arg1 string, arg2 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -235,14 +236,14 @@ func (m *MockIDistributedEnforcer) AddRoleForUser(arg0, arg1 string, arg2 ...str return ret0, ret1 } -// AddRoleForUser indicates an expected call of AddRoleForUser +// AddRoleForUser indicates an expected call of AddRoleForUser. func (mr *MockIDistributedEnforcerMockRecorder) AddRoleForUser(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRoleForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddRoleForUser), varargs...) } -// AddRoleForUserInDomain mocks base method +// AddRoleForUserInDomain mocks base method. func (m *MockIDistributedEnforcer) AddRoleForUserInDomain(arg0, arg1, arg2 string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AddRoleForUserInDomain", arg0, arg1, arg2) @@ -251,13 +252,43 @@ func (m *MockIDistributedEnforcer) AddRoleForUserInDomain(arg0, arg1, arg2 strin return ret0, ret1 } -// AddRoleForUserInDomain indicates an expected call of AddRoleForUserInDomain +// AddRoleForUserInDomain indicates an expected call of AddRoleForUserInDomain. func (mr *MockIDistributedEnforcerMockRecorder) AddRoleForUserInDomain(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRoleForUserInDomain", reflect.TypeOf((*MockIDistributedEnforcer)(nil).AddRoleForUserInDomain), arg0, arg1, arg2) } -// BuildRoleLinks mocks base method +// BatchEnforce mocks base method. +func (m *MockIDistributedEnforcer) BatchEnforce(arg0 [][]interface{}) ([]bool, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BatchEnforce", arg0) + ret0, _ := ret[0].([]bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchEnforce indicates an expected call of BatchEnforce. +func (mr *MockIDistributedEnforcerMockRecorder) BatchEnforce(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchEnforce", reflect.TypeOf((*MockIDistributedEnforcer)(nil).BatchEnforce), arg0) +} + +// BatchEnforceWithMatcher mocks base method. +func (m *MockIDistributedEnforcer) BatchEnforceWithMatcher(arg0 string, arg1 [][]interface{}) ([]bool, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "BatchEnforceWithMatcher", arg0, arg1) + ret0, _ := ret[0].([]bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// BatchEnforceWithMatcher indicates an expected call of BatchEnforceWithMatcher. +func (mr *MockIDistributedEnforcerMockRecorder) BatchEnforceWithMatcher(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BatchEnforceWithMatcher", reflect.TypeOf((*MockIDistributedEnforcer)(nil).BatchEnforceWithMatcher), arg0, arg1) +} + +// BuildRoleLinks mocks base method. func (m *MockIDistributedEnforcer) BuildRoleLinks() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "BuildRoleLinks") @@ -265,25 +296,25 @@ func (m *MockIDistributedEnforcer) BuildRoleLinks() error { return ret0 } -// BuildRoleLinks indicates an expected call of BuildRoleLinks +// BuildRoleLinks indicates an expected call of BuildRoleLinks. func (mr *MockIDistributedEnforcerMockRecorder) BuildRoleLinks() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BuildRoleLinks", reflect.TypeOf((*MockIDistributedEnforcer)(nil).BuildRoleLinks)) } -// ClearPolicy mocks base method +// ClearPolicy mocks base method. func (m *MockIDistributedEnforcer) ClearPolicy() { m.ctrl.T.Helper() m.ctrl.Call(m, "ClearPolicy") } -// ClearPolicy indicates an expected call of ClearPolicy +// ClearPolicy indicates an expected call of ClearPolicy. func (mr *MockIDistributedEnforcerMockRecorder) ClearPolicy() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).ClearPolicy)) } -// ClearPolicySelf mocks base method +// ClearPolicySelf mocks base method. func (m *MockIDistributedEnforcer) ClearPolicySelf(arg0 func() bool) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ClearPolicySelf", arg0) @@ -291,13 +322,13 @@ func (m *MockIDistributedEnforcer) ClearPolicySelf(arg0 func() bool) error { return ret0 } -// ClearPolicySelf indicates an expected call of ClearPolicySelf +// ClearPolicySelf indicates an expected call of ClearPolicySelf. func (mr *MockIDistributedEnforcerMockRecorder) ClearPolicySelf(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClearPolicySelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).ClearPolicySelf), arg0) } -// DeletePermission mocks base method +// DeletePermission mocks base method. func (m *MockIDistributedEnforcer) DeletePermission(arg0 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -310,13 +341,13 @@ func (m *MockIDistributedEnforcer) DeletePermission(arg0 ...string) (bool, error return ret0, ret1 } -// DeletePermission indicates an expected call of DeletePermission +// DeletePermission indicates an expected call of DeletePermission. func (mr *MockIDistributedEnforcerMockRecorder) DeletePermission(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePermission", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeletePermission), arg0...) } -// DeletePermissionForUser mocks base method +// DeletePermissionForUser mocks base method. func (m *MockIDistributedEnforcer) DeletePermissionForUser(arg0 string, arg1 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -329,14 +360,14 @@ func (m *MockIDistributedEnforcer) DeletePermissionForUser(arg0 string, arg1 ... return ret0, ret1 } -// DeletePermissionForUser indicates an expected call of DeletePermissionForUser +// DeletePermissionForUser indicates an expected call of DeletePermissionForUser. func (mr *MockIDistributedEnforcerMockRecorder) DeletePermissionForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePermissionForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeletePermissionForUser), varargs...) } -// DeletePermissionsForUser mocks base method +// DeletePermissionsForUser mocks base method. func (m *MockIDistributedEnforcer) DeletePermissionsForUser(arg0 string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeletePermissionsForUser", arg0) @@ -345,13 +376,13 @@ func (m *MockIDistributedEnforcer) DeletePermissionsForUser(arg0 string) (bool, return ret0, ret1 } -// DeletePermissionsForUser indicates an expected call of DeletePermissionsForUser +// DeletePermissionsForUser indicates an expected call of DeletePermissionsForUser. func (mr *MockIDistributedEnforcerMockRecorder) DeletePermissionsForUser(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePermissionsForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeletePermissionsForUser), arg0) } -// DeleteRole mocks base method +// DeleteRole mocks base method. func (m *MockIDistributedEnforcer) DeleteRole(arg0 string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteRole", arg0) @@ -360,13 +391,13 @@ func (m *MockIDistributedEnforcer) DeleteRole(arg0 string) (bool, error) { return ret0, ret1 } -// DeleteRole indicates an expected call of DeleteRole +// DeleteRole indicates an expected call of DeleteRole. func (mr *MockIDistributedEnforcerMockRecorder) DeleteRole(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRole", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeleteRole), arg0) } -// DeleteRoleForUser mocks base method +// DeleteRoleForUser mocks base method. func (m *MockIDistributedEnforcer) DeleteRoleForUser(arg0, arg1 string, arg2 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -379,14 +410,14 @@ func (m *MockIDistributedEnforcer) DeleteRoleForUser(arg0, arg1 string, arg2 ... return ret0, ret1 } -// DeleteRoleForUser indicates an expected call of DeleteRoleForUser +// DeleteRoleForUser indicates an expected call of DeleteRoleForUser. func (mr *MockIDistributedEnforcerMockRecorder) DeleteRoleForUser(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRoleForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeleteRoleForUser), varargs...) } -// DeleteRoleForUserInDomain mocks base method +// DeleteRoleForUserInDomain mocks base method. func (m *MockIDistributedEnforcer) DeleteRoleForUserInDomain(arg0, arg1, arg2 string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteRoleForUserInDomain", arg0, arg1, arg2) @@ -395,13 +426,13 @@ func (m *MockIDistributedEnforcer) DeleteRoleForUserInDomain(arg0, arg1, arg2 st return ret0, ret1 } -// DeleteRoleForUserInDomain indicates an expected call of DeleteRoleForUserInDomain +// DeleteRoleForUserInDomain indicates an expected call of DeleteRoleForUserInDomain. func (mr *MockIDistributedEnforcerMockRecorder) DeleteRoleForUserInDomain(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRoleForUserInDomain", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeleteRoleForUserInDomain), arg0, arg1, arg2) } -// DeleteRolesForUser mocks base method +// DeleteRolesForUser mocks base method. func (m *MockIDistributedEnforcer) DeleteRolesForUser(arg0 string, arg1 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -414,14 +445,14 @@ func (m *MockIDistributedEnforcer) DeleteRolesForUser(arg0 string, arg1 ...strin return ret0, ret1 } -// DeleteRolesForUser indicates an expected call of DeleteRolesForUser +// DeleteRolesForUser indicates an expected call of DeleteRolesForUser. func (mr *MockIDistributedEnforcerMockRecorder) DeleteRolesForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRolesForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeleteRolesForUser), varargs...) } -// DeleteUser mocks base method +// DeleteUser mocks base method. func (m *MockIDistributedEnforcer) DeleteUser(arg0 string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteUser", arg0) @@ -430,73 +461,73 @@ func (m *MockIDistributedEnforcer) DeleteUser(arg0 string) (bool, error) { return ret0, ret1 } -// DeleteUser indicates an expected call of DeleteUser +// DeleteUser indicates an expected call of DeleteUser. func (mr *MockIDistributedEnforcerMockRecorder) DeleteUser(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).DeleteUser), arg0) } -// EnableAutoBuildRoleLinks mocks base method +// EnableAutoBuildRoleLinks mocks base method. func (m *MockIDistributedEnforcer) EnableAutoBuildRoleLinks(arg0 bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "EnableAutoBuildRoleLinks", arg0) } -// EnableAutoBuildRoleLinks indicates an expected call of EnableAutoBuildRoleLinks +// EnableAutoBuildRoleLinks indicates an expected call of EnableAutoBuildRoleLinks. func (mr *MockIDistributedEnforcerMockRecorder) EnableAutoBuildRoleLinks(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableAutoBuildRoleLinks", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnableAutoBuildRoleLinks), arg0) } -// EnableAutoNotifyWatcher mocks base method +// EnableAutoNotifyWatcher mocks base method. func (m *MockIDistributedEnforcer) EnableAutoNotifyWatcher(arg0 bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "EnableAutoNotifyWatcher", arg0) } -// EnableAutoNotifyWatcher indicates an expected call of EnableAutoNotifyWatcher +// EnableAutoNotifyWatcher indicates an expected call of EnableAutoNotifyWatcher. func (mr *MockIDistributedEnforcerMockRecorder) EnableAutoNotifyWatcher(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableAutoNotifyWatcher", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnableAutoNotifyWatcher), arg0) } -// EnableAutoSave mocks base method +// EnableAutoSave mocks base method. func (m *MockIDistributedEnforcer) EnableAutoSave(arg0 bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "EnableAutoSave", arg0) } -// EnableAutoSave indicates an expected call of EnableAutoSave +// EnableAutoSave indicates an expected call of EnableAutoSave. func (mr *MockIDistributedEnforcerMockRecorder) EnableAutoSave(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableAutoSave", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnableAutoSave), arg0) } -// EnableEnforce mocks base method +// EnableEnforce mocks base method. func (m *MockIDistributedEnforcer) EnableEnforce(arg0 bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "EnableEnforce", arg0) } -// EnableEnforce indicates an expected call of EnableEnforce +// EnableEnforce indicates an expected call of EnableEnforce. func (mr *MockIDistributedEnforcerMockRecorder) EnableEnforce(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableEnforce", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnableEnforce), arg0) } -// EnableLog mocks base method +// EnableLog mocks base method. func (m *MockIDistributedEnforcer) EnableLog(arg0 bool) { m.ctrl.T.Helper() m.ctrl.Call(m, "EnableLog", arg0) } -// EnableLog indicates an expected call of EnableLog +// EnableLog indicates an expected call of EnableLog. func (mr *MockIDistributedEnforcerMockRecorder) EnableLog(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnableLog", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnableLog), arg0) } -// Enforce mocks base method +// Enforce mocks base method. func (m *MockIDistributedEnforcer) Enforce(arg0 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -509,13 +540,13 @@ func (m *MockIDistributedEnforcer) Enforce(arg0 ...interface{}) (bool, error) { return ret0, ret1 } -// Enforce indicates an expected call of Enforce +// Enforce indicates an expected call of Enforce. func (mr *MockIDistributedEnforcerMockRecorder) Enforce(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Enforce", reflect.TypeOf((*MockIDistributedEnforcer)(nil).Enforce), arg0...) } -// EnforceEx mocks base method +// EnforceEx mocks base method. func (m *MockIDistributedEnforcer) EnforceEx(arg0 ...interface{}) (bool, []string, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -529,13 +560,13 @@ func (m *MockIDistributedEnforcer) EnforceEx(arg0 ...interface{}) (bool, []strin return ret0, ret1, ret2 } -// EnforceEx indicates an expected call of EnforceEx +// EnforceEx indicates an expected call of EnforceEx. func (mr *MockIDistributedEnforcerMockRecorder) EnforceEx(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnforceEx", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnforceEx), arg0...) } -// EnforceExWithMatcher mocks base method +// EnforceExWithMatcher mocks base method. func (m *MockIDistributedEnforcer) EnforceExWithMatcher(arg0 string, arg1 ...interface{}) (bool, []string, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -549,14 +580,14 @@ func (m *MockIDistributedEnforcer) EnforceExWithMatcher(arg0 string, arg1 ...int return ret0, ret1, ret2 } -// EnforceExWithMatcher indicates an expected call of EnforceExWithMatcher +// EnforceExWithMatcher indicates an expected call of EnforceExWithMatcher. func (mr *MockIDistributedEnforcerMockRecorder) EnforceExWithMatcher(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnforceExWithMatcher", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnforceExWithMatcher), varargs...) } -// EnforceWithMatcher mocks base method +// EnforceWithMatcher mocks base method. func (m *MockIDistributedEnforcer) EnforceWithMatcher(arg0 string, arg1 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -569,14 +600,14 @@ func (m *MockIDistributedEnforcer) EnforceWithMatcher(arg0 string, arg1 ...inter return ret0, ret1 } -// EnforceWithMatcher indicates an expected call of EnforceWithMatcher +// EnforceWithMatcher indicates an expected call of EnforceWithMatcher. func (mr *MockIDistributedEnforcerMockRecorder) EnforceWithMatcher(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EnforceWithMatcher", reflect.TypeOf((*MockIDistributedEnforcer)(nil).EnforceWithMatcher), varargs...) } -// GetAdapter mocks base method +// GetAdapter mocks base method. func (m *MockIDistributedEnforcer) GetAdapter() persist.Adapter { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAdapter") @@ -584,13 +615,13 @@ func (m *MockIDistributedEnforcer) GetAdapter() persist.Adapter { return ret0 } -// GetAdapter indicates an expected call of GetAdapter +// GetAdapter indicates an expected call of GetAdapter. func (mr *MockIDistributedEnforcerMockRecorder) GetAdapter() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAdapter", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAdapter)) } -// GetAllActions mocks base method +// GetAllActions mocks base method. func (m *MockIDistributedEnforcer) GetAllActions() []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllActions") @@ -598,13 +629,13 @@ func (m *MockIDistributedEnforcer) GetAllActions() []string { return ret0 } -// GetAllActions indicates an expected call of GetAllActions +// GetAllActions indicates an expected call of GetAllActions. func (mr *MockIDistributedEnforcerMockRecorder) GetAllActions() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllActions", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllActions)) } -// GetAllNamedActions mocks base method +// GetAllNamedActions mocks base method. func (m *MockIDistributedEnforcer) GetAllNamedActions(arg0 string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllNamedActions", arg0) @@ -612,13 +643,13 @@ func (m *MockIDistributedEnforcer) GetAllNamedActions(arg0 string) []string { return ret0 } -// GetAllNamedActions indicates an expected call of GetAllNamedActions +// GetAllNamedActions indicates an expected call of GetAllNamedActions. func (mr *MockIDistributedEnforcerMockRecorder) GetAllNamedActions(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllNamedActions", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllNamedActions), arg0) } -// GetAllNamedObjects mocks base method +// GetAllNamedObjects mocks base method. func (m *MockIDistributedEnforcer) GetAllNamedObjects(arg0 string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllNamedObjects", arg0) @@ -626,13 +657,13 @@ func (m *MockIDistributedEnforcer) GetAllNamedObjects(arg0 string) []string { return ret0 } -// GetAllNamedObjects indicates an expected call of GetAllNamedObjects +// GetAllNamedObjects indicates an expected call of GetAllNamedObjects. func (mr *MockIDistributedEnforcerMockRecorder) GetAllNamedObjects(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllNamedObjects", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllNamedObjects), arg0) } -// GetAllNamedRoles mocks base method +// GetAllNamedRoles mocks base method. func (m *MockIDistributedEnforcer) GetAllNamedRoles(arg0 string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllNamedRoles", arg0) @@ -640,13 +671,13 @@ func (m *MockIDistributedEnforcer) GetAllNamedRoles(arg0 string) []string { return ret0 } -// GetAllNamedRoles indicates an expected call of GetAllNamedRoles +// GetAllNamedRoles indicates an expected call of GetAllNamedRoles. func (mr *MockIDistributedEnforcerMockRecorder) GetAllNamedRoles(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllNamedRoles", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllNamedRoles), arg0) } -// GetAllNamedSubjects mocks base method +// GetAllNamedSubjects mocks base method. func (m *MockIDistributedEnforcer) GetAllNamedSubjects(arg0 string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllNamedSubjects", arg0) @@ -654,13 +685,13 @@ func (m *MockIDistributedEnforcer) GetAllNamedSubjects(arg0 string) []string { return ret0 } -// GetAllNamedSubjects indicates an expected call of GetAllNamedSubjects +// GetAllNamedSubjects indicates an expected call of GetAllNamedSubjects. func (mr *MockIDistributedEnforcerMockRecorder) GetAllNamedSubjects(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllNamedSubjects", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllNamedSubjects), arg0) } -// GetAllObjects mocks base method +// GetAllObjects mocks base method. func (m *MockIDistributedEnforcer) GetAllObjects() []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllObjects") @@ -668,13 +699,13 @@ func (m *MockIDistributedEnforcer) GetAllObjects() []string { return ret0 } -// GetAllObjects indicates an expected call of GetAllObjects +// GetAllObjects indicates an expected call of GetAllObjects. func (mr *MockIDistributedEnforcerMockRecorder) GetAllObjects() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllObjects", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllObjects)) } -// GetAllRoles mocks base method +// GetAllRoles mocks base method. func (m *MockIDistributedEnforcer) GetAllRoles() []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllRoles") @@ -682,13 +713,13 @@ func (m *MockIDistributedEnforcer) GetAllRoles() []string { return ret0 } -// GetAllRoles indicates an expected call of GetAllRoles +// GetAllRoles indicates an expected call of GetAllRoles. func (mr *MockIDistributedEnforcerMockRecorder) GetAllRoles() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllRoles", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllRoles)) } -// GetAllSubjects mocks base method +// GetAllSubjects mocks base method. func (m *MockIDistributedEnforcer) GetAllSubjects() []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllSubjects") @@ -696,13 +727,13 @@ func (m *MockIDistributedEnforcer) GetAllSubjects() []string { return ret0 } -// GetAllSubjects indicates an expected call of GetAllSubjects +// GetAllSubjects indicates an expected call of GetAllSubjects. func (mr *MockIDistributedEnforcerMockRecorder) GetAllSubjects() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAllSubjects", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetAllSubjects)) } -// GetFilteredGroupingPolicy mocks base method +// GetFilteredGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) GetFilteredGroupingPolicy(arg0 int, arg1 ...string) [][]string { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -714,14 +745,14 @@ func (m *MockIDistributedEnforcer) GetFilteredGroupingPolicy(arg0 int, arg1 ...s return ret0 } -// GetFilteredGroupingPolicy indicates an expected call of GetFilteredGroupingPolicy +// GetFilteredGroupingPolicy indicates an expected call of GetFilteredGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetFilteredGroupingPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFilteredGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetFilteredGroupingPolicy), varargs...) } -// GetFilteredNamedGroupingPolicy mocks base method +// GetFilteredNamedGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) GetFilteredNamedGroupingPolicy(arg0 string, arg1 int, arg2 ...string) [][]string { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -733,14 +764,14 @@ func (m *MockIDistributedEnforcer) GetFilteredNamedGroupingPolicy(arg0 string, a return ret0 } -// GetFilteredNamedGroupingPolicy indicates an expected call of GetFilteredNamedGroupingPolicy +// GetFilteredNamedGroupingPolicy indicates an expected call of GetFilteredNamedGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetFilteredNamedGroupingPolicy(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFilteredNamedGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetFilteredNamedGroupingPolicy), varargs...) } -// GetFilteredNamedPolicy mocks base method +// GetFilteredNamedPolicy mocks base method. func (m *MockIDistributedEnforcer) GetFilteredNamedPolicy(arg0 string, arg1 int, arg2 ...string) [][]string { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -752,14 +783,14 @@ func (m *MockIDistributedEnforcer) GetFilteredNamedPolicy(arg0 string, arg1 int, return ret0 } -// GetFilteredNamedPolicy indicates an expected call of GetFilteredNamedPolicy +// GetFilteredNamedPolicy indicates an expected call of GetFilteredNamedPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetFilteredNamedPolicy(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFilteredNamedPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetFilteredNamedPolicy), varargs...) } -// GetFilteredPolicy mocks base method +// GetFilteredPolicy mocks base method. func (m *MockIDistributedEnforcer) GetFilteredPolicy(arg0 int, arg1 ...string) [][]string { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -771,14 +802,14 @@ func (m *MockIDistributedEnforcer) GetFilteredPolicy(arg0 int, arg1 ...string) [ return ret0 } -// GetFilteredPolicy indicates an expected call of GetFilteredPolicy +// GetFilteredPolicy indicates an expected call of GetFilteredPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetFilteredPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFilteredPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetFilteredPolicy), varargs...) } -// GetGroupingPolicy mocks base method +// GetGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) GetGroupingPolicy() [][]string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetGroupingPolicy") @@ -786,13 +817,13 @@ func (m *MockIDistributedEnforcer) GetGroupingPolicy() [][]string { return ret0 } -// GetGroupingPolicy indicates an expected call of GetGroupingPolicy +// GetGroupingPolicy indicates an expected call of GetGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetGroupingPolicy() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetGroupingPolicy)) } -// GetImplicitPermissionsForUser mocks base method +// GetImplicitPermissionsForUser mocks base method. func (m *MockIDistributedEnforcer) GetImplicitPermissionsForUser(arg0 string, arg1 ...string) ([][]string, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -805,14 +836,14 @@ func (m *MockIDistributedEnforcer) GetImplicitPermissionsForUser(arg0 string, ar return ret0, ret1 } -// GetImplicitPermissionsForUser indicates an expected call of GetImplicitPermissionsForUser +// GetImplicitPermissionsForUser indicates an expected call of GetImplicitPermissionsForUser. func (mr *MockIDistributedEnforcerMockRecorder) GetImplicitPermissionsForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImplicitPermissionsForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetImplicitPermissionsForUser), varargs...) } -// GetImplicitRolesForUser mocks base method +// GetImplicitRolesForUser mocks base method. func (m *MockIDistributedEnforcer) GetImplicitRolesForUser(arg0 string, arg1 ...string) ([]string, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -825,14 +856,14 @@ func (m *MockIDistributedEnforcer) GetImplicitRolesForUser(arg0 string, arg1 ... return ret0, ret1 } -// GetImplicitRolesForUser indicates an expected call of GetImplicitRolesForUser +// GetImplicitRolesForUser indicates an expected call of GetImplicitRolesForUser. func (mr *MockIDistributedEnforcerMockRecorder) GetImplicitRolesForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImplicitRolesForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetImplicitRolesForUser), varargs...) } -// GetImplicitUsersForPermission mocks base method +// GetImplicitUsersForPermission mocks base method. func (m *MockIDistributedEnforcer) GetImplicitUsersForPermission(arg0 ...string) ([]string, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -845,13 +876,13 @@ func (m *MockIDistributedEnforcer) GetImplicitUsersForPermission(arg0 ...string) return ret0, ret1 } -// GetImplicitUsersForPermission indicates an expected call of GetImplicitUsersForPermission +// GetImplicitUsersForPermission indicates an expected call of GetImplicitUsersForPermission. func (mr *MockIDistributedEnforcerMockRecorder) GetImplicitUsersForPermission(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetImplicitUsersForPermission", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetImplicitUsersForPermission), arg0...) } -// GetModel mocks base method +// GetModel mocks base method. func (m *MockIDistributedEnforcer) GetModel() model.Model { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetModel") @@ -859,13 +890,13 @@ func (m *MockIDistributedEnforcer) GetModel() model.Model { return ret0 } -// GetModel indicates an expected call of GetModel +// GetModel indicates an expected call of GetModel. func (mr *MockIDistributedEnforcerMockRecorder) GetModel() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetModel", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetModel)) } -// GetNamedGroupingPolicy mocks base method +// GetNamedGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) GetNamedGroupingPolicy(arg0 string) [][]string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetNamedGroupingPolicy", arg0) @@ -873,13 +904,13 @@ func (m *MockIDistributedEnforcer) GetNamedGroupingPolicy(arg0 string) [][]strin return ret0 } -// GetNamedGroupingPolicy indicates an expected call of GetNamedGroupingPolicy +// GetNamedGroupingPolicy indicates an expected call of GetNamedGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetNamedGroupingPolicy(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNamedGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetNamedGroupingPolicy), arg0) } -// GetNamedPolicy mocks base method +// GetNamedPolicy mocks base method. func (m *MockIDistributedEnforcer) GetNamedPolicy(arg0 string) [][]string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetNamedPolicy", arg0) @@ -887,13 +918,13 @@ func (m *MockIDistributedEnforcer) GetNamedPolicy(arg0 string) [][]string { return ret0 } -// GetNamedPolicy indicates an expected call of GetNamedPolicy +// GetNamedPolicy indicates an expected call of GetNamedPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetNamedPolicy(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetNamedPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetNamedPolicy), arg0) } -// GetPermissionsForUser mocks base method +// GetPermissionsForUser mocks base method. func (m *MockIDistributedEnforcer) GetPermissionsForUser(arg0 string, arg1 ...string) [][]string { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -905,14 +936,14 @@ func (m *MockIDistributedEnforcer) GetPermissionsForUser(arg0 string, arg1 ...st return ret0 } -// GetPermissionsForUser indicates an expected call of GetPermissionsForUser +// GetPermissionsForUser indicates an expected call of GetPermissionsForUser. func (mr *MockIDistributedEnforcerMockRecorder) GetPermissionsForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPermissionsForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetPermissionsForUser), varargs...) } -// GetPermissionsForUserInDomain mocks base method +// GetPermissionsForUserInDomain mocks base method. func (m *MockIDistributedEnforcer) GetPermissionsForUserInDomain(arg0, arg1 string) [][]string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetPermissionsForUserInDomain", arg0, arg1) @@ -920,13 +951,13 @@ func (m *MockIDistributedEnforcer) GetPermissionsForUserInDomain(arg0, arg1 stri return ret0 } -// GetPermissionsForUserInDomain indicates an expected call of GetPermissionsForUserInDomain +// GetPermissionsForUserInDomain indicates an expected call of GetPermissionsForUserInDomain. func (mr *MockIDistributedEnforcerMockRecorder) GetPermissionsForUserInDomain(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPermissionsForUserInDomain", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetPermissionsForUserInDomain), arg0, arg1) } -// GetPolicy mocks base method +// GetPolicy mocks base method. func (m *MockIDistributedEnforcer) GetPolicy() [][]string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetPolicy") @@ -934,13 +965,13 @@ func (m *MockIDistributedEnforcer) GetPolicy() [][]string { return ret0 } -// GetPolicy indicates an expected call of GetPolicy +// GetPolicy indicates an expected call of GetPolicy. func (mr *MockIDistributedEnforcerMockRecorder) GetPolicy() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetPolicy)) } -// GetRoleManager mocks base method +// GetRoleManager mocks base method. func (m *MockIDistributedEnforcer) GetRoleManager() rbac.RoleManager { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetRoleManager") @@ -948,13 +979,13 @@ func (m *MockIDistributedEnforcer) GetRoleManager() rbac.RoleManager { return ret0 } -// GetRoleManager indicates an expected call of GetRoleManager +// GetRoleManager indicates an expected call of GetRoleManager. func (mr *MockIDistributedEnforcerMockRecorder) GetRoleManager() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRoleManager", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetRoleManager)) } -// GetRolesForUser mocks base method +// GetRolesForUser mocks base method. func (m *MockIDistributedEnforcer) GetRolesForUser(arg0 string, arg1 ...string) ([]string, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -967,14 +998,14 @@ func (m *MockIDistributedEnforcer) GetRolesForUser(arg0 string, arg1 ...string) return ret0, ret1 } -// GetRolesForUser indicates an expected call of GetRolesForUser +// GetRolesForUser indicates an expected call of GetRolesForUser. func (mr *MockIDistributedEnforcerMockRecorder) GetRolesForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRolesForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetRolesForUser), varargs...) } -// GetRolesForUserInDomain mocks base method +// GetRolesForUserInDomain mocks base method. func (m *MockIDistributedEnforcer) GetRolesForUserInDomain(arg0, arg1 string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetRolesForUserInDomain", arg0, arg1) @@ -982,13 +1013,13 @@ func (m *MockIDistributedEnforcer) GetRolesForUserInDomain(arg0, arg1 string) [] return ret0 } -// GetRolesForUserInDomain indicates an expected call of GetRolesForUserInDomain +// GetRolesForUserInDomain indicates an expected call of GetRolesForUserInDomain. func (mr *MockIDistributedEnforcerMockRecorder) GetRolesForUserInDomain(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRolesForUserInDomain", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetRolesForUserInDomain), arg0, arg1) } -// GetUsersForRole mocks base method +// GetUsersForRole mocks base method. func (m *MockIDistributedEnforcer) GetUsersForRole(arg0 string, arg1 ...string) ([]string, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1001,14 +1032,14 @@ func (m *MockIDistributedEnforcer) GetUsersForRole(arg0 string, arg1 ...string) return ret0, ret1 } -// GetUsersForRole indicates an expected call of GetUsersForRole +// GetUsersForRole indicates an expected call of GetUsersForRole. func (mr *MockIDistributedEnforcerMockRecorder) GetUsersForRole(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUsersForRole", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetUsersForRole), varargs...) } -// GetUsersForRoleInDomain mocks base method +// GetUsersForRoleInDomain mocks base method. func (m *MockIDistributedEnforcer) GetUsersForRoleInDomain(arg0, arg1 string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUsersForRoleInDomain", arg0, arg1) @@ -1016,13 +1047,13 @@ func (m *MockIDistributedEnforcer) GetUsersForRoleInDomain(arg0, arg1 string) [] return ret0 } -// GetUsersForRoleInDomain indicates an expected call of GetUsersForRoleInDomain +// GetUsersForRoleInDomain indicates an expected call of GetUsersForRoleInDomain. func (mr *MockIDistributedEnforcerMockRecorder) GetUsersForRoleInDomain(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUsersForRoleInDomain", reflect.TypeOf((*MockIDistributedEnforcer)(nil).GetUsersForRoleInDomain), arg0, arg1) } -// HasGroupingPolicy mocks base method +// HasGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) HasGroupingPolicy(arg0 ...interface{}) bool { m.ctrl.T.Helper() varargs := []interface{}{} @@ -1034,13 +1065,13 @@ func (m *MockIDistributedEnforcer) HasGroupingPolicy(arg0 ...interface{}) bool { return ret0 } -// HasGroupingPolicy indicates an expected call of HasGroupingPolicy +// HasGroupingPolicy indicates an expected call of HasGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) HasGroupingPolicy(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).HasGroupingPolicy), arg0...) } -// HasNamedGroupingPolicy mocks base method +// HasNamedGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) HasNamedGroupingPolicy(arg0 string, arg1 ...interface{}) bool { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1052,14 +1083,14 @@ func (m *MockIDistributedEnforcer) HasNamedGroupingPolicy(arg0 string, arg1 ...i return ret0 } -// HasNamedGroupingPolicy indicates an expected call of HasNamedGroupingPolicy +// HasNamedGroupingPolicy indicates an expected call of HasNamedGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) HasNamedGroupingPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasNamedGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).HasNamedGroupingPolicy), varargs...) } -// HasNamedPolicy mocks base method +// HasNamedPolicy mocks base method. func (m *MockIDistributedEnforcer) HasNamedPolicy(arg0 string, arg1 ...interface{}) bool { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1071,14 +1102,14 @@ func (m *MockIDistributedEnforcer) HasNamedPolicy(arg0 string, arg1 ...interface return ret0 } -// HasNamedPolicy indicates an expected call of HasNamedPolicy +// HasNamedPolicy indicates an expected call of HasNamedPolicy. func (mr *MockIDistributedEnforcerMockRecorder) HasNamedPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasNamedPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).HasNamedPolicy), varargs...) } -// HasPermissionForUser mocks base method +// HasPermissionForUser mocks base method. func (m *MockIDistributedEnforcer) HasPermissionForUser(arg0 string, arg1 ...string) bool { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1090,14 +1121,14 @@ func (m *MockIDistributedEnforcer) HasPermissionForUser(arg0 string, arg1 ...str return ret0 } -// HasPermissionForUser indicates an expected call of HasPermissionForUser +// HasPermissionForUser indicates an expected call of HasPermissionForUser. func (mr *MockIDistributedEnforcerMockRecorder) HasPermissionForUser(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasPermissionForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).HasPermissionForUser), varargs...) } -// HasPolicy mocks base method +// HasPolicy mocks base method. func (m *MockIDistributedEnforcer) HasPolicy(arg0 ...interface{}) bool { m.ctrl.T.Helper() varargs := []interface{}{} @@ -1109,13 +1140,13 @@ func (m *MockIDistributedEnforcer) HasPolicy(arg0 ...interface{}) bool { return ret0 } -// HasPolicy indicates an expected call of HasPolicy +// HasPolicy indicates an expected call of HasPolicy. func (mr *MockIDistributedEnforcerMockRecorder) HasPolicy(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).HasPolicy), arg0...) } -// HasRoleForUser mocks base method +// HasRoleForUser mocks base method. func (m *MockIDistributedEnforcer) HasRoleForUser(arg0, arg1 string, arg2 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -1128,14 +1159,14 @@ func (m *MockIDistributedEnforcer) HasRoleForUser(arg0, arg1 string, arg2 ...str return ret0, ret1 } -// HasRoleForUser indicates an expected call of HasRoleForUser +// HasRoleForUser indicates an expected call of HasRoleForUser. func (mr *MockIDistributedEnforcerMockRecorder) HasRoleForUser(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HasRoleForUser", reflect.TypeOf((*MockIDistributedEnforcer)(nil).HasRoleForUser), varargs...) } -// InitWithAdapter mocks base method +// InitWithAdapter mocks base method. func (m *MockIDistributedEnforcer) InitWithAdapter(arg0 string, arg1 persist.Adapter) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InitWithAdapter", arg0, arg1) @@ -1143,13 +1174,13 @@ func (m *MockIDistributedEnforcer) InitWithAdapter(arg0 string, arg1 persist.Ada return ret0 } -// InitWithAdapter indicates an expected call of InitWithAdapter +// InitWithAdapter indicates an expected call of InitWithAdapter. func (mr *MockIDistributedEnforcerMockRecorder) InitWithAdapter(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InitWithAdapter", reflect.TypeOf((*MockIDistributedEnforcer)(nil).InitWithAdapter), arg0, arg1) } -// InitWithFile mocks base method +// InitWithFile mocks base method. func (m *MockIDistributedEnforcer) InitWithFile(arg0, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InitWithFile", arg0, arg1) @@ -1157,13 +1188,13 @@ func (m *MockIDistributedEnforcer) InitWithFile(arg0, arg1 string) error { return ret0 } -// InitWithFile indicates an expected call of InitWithFile +// InitWithFile indicates an expected call of InitWithFile. func (mr *MockIDistributedEnforcerMockRecorder) InitWithFile(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InitWithFile", reflect.TypeOf((*MockIDistributedEnforcer)(nil).InitWithFile), arg0, arg1) } -// InitWithModelAndAdapter mocks base method +// InitWithModelAndAdapter mocks base method. func (m *MockIDistributedEnforcer) InitWithModelAndAdapter(arg0 model.Model, arg1 persist.Adapter) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "InitWithModelAndAdapter", arg0, arg1) @@ -1171,13 +1202,13 @@ func (m *MockIDistributedEnforcer) InitWithModelAndAdapter(arg0 model.Model, arg return ret0 } -// InitWithModelAndAdapter indicates an expected call of InitWithModelAndAdapter +// InitWithModelAndAdapter indicates an expected call of InitWithModelAndAdapter. func (mr *MockIDistributedEnforcerMockRecorder) InitWithModelAndAdapter(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InitWithModelAndAdapter", reflect.TypeOf((*MockIDistributedEnforcer)(nil).InitWithModelAndAdapter), arg0, arg1) } -// IsFiltered mocks base method +// IsFiltered mocks base method. func (m *MockIDistributedEnforcer) IsFiltered() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsFiltered") @@ -1185,13 +1216,13 @@ func (m *MockIDistributedEnforcer) IsFiltered() bool { return ret0 } -// IsFiltered indicates an expected call of IsFiltered +// IsFiltered indicates an expected call of IsFiltered. func (mr *MockIDistributedEnforcerMockRecorder) IsFiltered() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsFiltered", reflect.TypeOf((*MockIDistributedEnforcer)(nil).IsFiltered)) } -// LoadFilteredPolicy mocks base method +// LoadFilteredPolicy mocks base method. func (m *MockIDistributedEnforcer) LoadFilteredPolicy(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LoadFilteredPolicy", arg0) @@ -1199,13 +1230,13 @@ func (m *MockIDistributedEnforcer) LoadFilteredPolicy(arg0 interface{}) error { return ret0 } -// LoadFilteredPolicy indicates an expected call of LoadFilteredPolicy +// LoadFilteredPolicy indicates an expected call of LoadFilteredPolicy. func (mr *MockIDistributedEnforcerMockRecorder) LoadFilteredPolicy(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadFilteredPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).LoadFilteredPolicy), arg0) } -// LoadIncrementalFilteredPolicy mocks base method +// LoadIncrementalFilteredPolicy mocks base method. func (m *MockIDistributedEnforcer) LoadIncrementalFilteredPolicy(arg0 interface{}) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LoadIncrementalFilteredPolicy", arg0) @@ -1213,13 +1244,13 @@ func (m *MockIDistributedEnforcer) LoadIncrementalFilteredPolicy(arg0 interface{ return ret0 } -// LoadIncrementalFilteredPolicy indicates an expected call of LoadIncrementalFilteredPolicy +// LoadIncrementalFilteredPolicy indicates an expected call of LoadIncrementalFilteredPolicy. func (mr *MockIDistributedEnforcerMockRecorder) LoadIncrementalFilteredPolicy(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadIncrementalFilteredPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).LoadIncrementalFilteredPolicy), arg0) } -// LoadModel mocks base method +// LoadModel mocks base method. func (m *MockIDistributedEnforcer) LoadModel() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LoadModel") @@ -1227,13 +1258,13 @@ func (m *MockIDistributedEnforcer) LoadModel() error { return ret0 } -// LoadModel indicates an expected call of LoadModel +// LoadModel indicates an expected call of LoadModel. func (mr *MockIDistributedEnforcerMockRecorder) LoadModel() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadModel", reflect.TypeOf((*MockIDistributedEnforcer)(nil).LoadModel)) } -// LoadPolicy mocks base method +// LoadPolicy mocks base method. func (m *MockIDistributedEnforcer) LoadPolicy() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LoadPolicy") @@ -1241,13 +1272,13 @@ func (m *MockIDistributedEnforcer) LoadPolicy() error { return ret0 } -// LoadPolicy indicates an expected call of LoadPolicy +// LoadPolicy indicates an expected call of LoadPolicy. func (mr *MockIDistributedEnforcerMockRecorder) LoadPolicy() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoadPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).LoadPolicy)) } -// RemoveFilteredGroupingPolicy mocks base method +// RemoveFilteredGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveFilteredGroupingPolicy(arg0 int, arg1 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1260,14 +1291,14 @@ func (m *MockIDistributedEnforcer) RemoveFilteredGroupingPolicy(arg0 int, arg1 . return ret0, ret1 } -// RemoveFilteredGroupingPolicy indicates an expected call of RemoveFilteredGroupingPolicy +// RemoveFilteredGroupingPolicy indicates an expected call of RemoveFilteredGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveFilteredGroupingPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveFilteredGroupingPolicy), varargs...) } -// RemoveFilteredNamedGroupingPolicy mocks base method +// RemoveFilteredNamedGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveFilteredNamedGroupingPolicy(arg0 string, arg1 int, arg2 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -1280,14 +1311,14 @@ func (m *MockIDistributedEnforcer) RemoveFilteredNamedGroupingPolicy(arg0 string return ret0, ret1 } -// RemoveFilteredNamedGroupingPolicy indicates an expected call of RemoveFilteredNamedGroupingPolicy +// RemoveFilteredNamedGroupingPolicy indicates an expected call of RemoveFilteredNamedGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveFilteredNamedGroupingPolicy(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredNamedGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveFilteredNamedGroupingPolicy), varargs...) } -// RemoveFilteredNamedPolicy mocks base method +// RemoveFilteredNamedPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveFilteredNamedPolicy(arg0 string, arg1 int, arg2 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1} @@ -1300,14 +1331,14 @@ func (m *MockIDistributedEnforcer) RemoveFilteredNamedPolicy(arg0 string, arg1 i return ret0, ret1 } -// RemoveFilteredNamedPolicy indicates an expected call of RemoveFilteredNamedPolicy +// RemoveFilteredNamedPolicy indicates an expected call of RemoveFilteredNamedPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveFilteredNamedPolicy(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1}, arg2...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredNamedPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveFilteredNamedPolicy), varargs...) } -// RemoveFilteredPolicy mocks base method +// RemoveFilteredPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveFilteredPolicy(arg0 int, arg1 ...string) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1320,14 +1351,14 @@ func (m *MockIDistributedEnforcer) RemoveFilteredPolicy(arg0 int, arg1 ...string return ret0, ret1 } -// RemoveFilteredPolicy indicates an expected call of RemoveFilteredPolicy +// RemoveFilteredPolicy indicates an expected call of RemoveFilteredPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveFilteredPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveFilteredPolicy), varargs...) } -// RemoveFilteredPolicySelf mocks base method +// RemoveFilteredPolicySelf mocks base method. func (m *MockIDistributedEnforcer) RemoveFilteredPolicySelf(arg0 func() bool, arg1, arg2 string, arg3 int, arg4 ...string) ([][]string, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0, arg1, arg2, arg3} @@ -1340,14 +1371,14 @@ func (m *MockIDistributedEnforcer) RemoveFilteredPolicySelf(arg0 func() bool, ar return ret0, ret1 } -// RemoveFilteredPolicySelf indicates an expected call of RemoveFilteredPolicySelf +// RemoveFilteredPolicySelf indicates an expected call of RemoveFilteredPolicySelf. func (mr *MockIDistributedEnforcerMockRecorder) RemoveFilteredPolicySelf(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveFilteredPolicySelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveFilteredPolicySelf), varargs...) } -// RemoveGroupingPolicies mocks base method +// RemoveGroupingPolicies mocks base method. func (m *MockIDistributedEnforcer) RemoveGroupingPolicies(arg0 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveGroupingPolicies", arg0) @@ -1356,13 +1387,13 @@ func (m *MockIDistributedEnforcer) RemoveGroupingPolicies(arg0 [][]string) (bool return ret0, ret1 } -// RemoveGroupingPolicies indicates an expected call of RemoveGroupingPolicies +// RemoveGroupingPolicies indicates an expected call of RemoveGroupingPolicies. func (mr *MockIDistributedEnforcerMockRecorder) RemoveGroupingPolicies(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveGroupingPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveGroupingPolicies), arg0) } -// RemoveGroupingPolicy mocks base method +// RemoveGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveGroupingPolicy(arg0 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -1375,13 +1406,13 @@ func (m *MockIDistributedEnforcer) RemoveGroupingPolicy(arg0 ...interface{}) (bo return ret0, ret1 } -// RemoveGroupingPolicy indicates an expected call of RemoveGroupingPolicy +// RemoveGroupingPolicy indicates an expected call of RemoveGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveGroupingPolicy(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveGroupingPolicy), arg0...) } -// RemoveNamedGroupingPolicies mocks base method +// RemoveNamedGroupingPolicies mocks base method. func (m *MockIDistributedEnforcer) RemoveNamedGroupingPolicies(arg0 string, arg1 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveNamedGroupingPolicies", arg0, arg1) @@ -1390,13 +1421,13 @@ func (m *MockIDistributedEnforcer) RemoveNamedGroupingPolicies(arg0 string, arg1 return ret0, ret1 } -// RemoveNamedGroupingPolicies indicates an expected call of RemoveNamedGroupingPolicies +// RemoveNamedGroupingPolicies indicates an expected call of RemoveNamedGroupingPolicies. func (mr *MockIDistributedEnforcerMockRecorder) RemoveNamedGroupingPolicies(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveNamedGroupingPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveNamedGroupingPolicies), arg0, arg1) } -// RemoveNamedGroupingPolicy mocks base method +// RemoveNamedGroupingPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveNamedGroupingPolicy(arg0 string, arg1 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1409,14 +1440,14 @@ func (m *MockIDistributedEnforcer) RemoveNamedGroupingPolicy(arg0 string, arg1 . return ret0, ret1 } -// RemoveNamedGroupingPolicy indicates an expected call of RemoveNamedGroupingPolicy +// RemoveNamedGroupingPolicy indicates an expected call of RemoveNamedGroupingPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveNamedGroupingPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveNamedGroupingPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveNamedGroupingPolicy), varargs...) } -// RemoveNamedPolicies mocks base method +// RemoveNamedPolicies mocks base method. func (m *MockIDistributedEnforcer) RemoveNamedPolicies(arg0 string, arg1 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemoveNamedPolicies", arg0, arg1) @@ -1425,13 +1456,13 @@ func (m *MockIDistributedEnforcer) RemoveNamedPolicies(arg0 string, arg1 [][]str return ret0, ret1 } -// RemoveNamedPolicies indicates an expected call of RemoveNamedPolicies +// RemoveNamedPolicies indicates an expected call of RemoveNamedPolicies. func (mr *MockIDistributedEnforcerMockRecorder) RemoveNamedPolicies(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveNamedPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveNamedPolicies), arg0, arg1) } -// RemoveNamedPolicy mocks base method +// RemoveNamedPolicy mocks base method. func (m *MockIDistributedEnforcer) RemoveNamedPolicy(arg0 string, arg1 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{arg0} @@ -1444,14 +1475,14 @@ func (m *MockIDistributedEnforcer) RemoveNamedPolicy(arg0 string, arg1 ...interf return ret0, ret1 } -// RemoveNamedPolicy indicates an expected call of RemoveNamedPolicy +// RemoveNamedPolicy indicates an expected call of RemoveNamedPolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemoveNamedPolicy(arg0 interface{}, arg1 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() varargs := append([]interface{}{arg0}, arg1...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveNamedPolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemoveNamedPolicy), varargs...) } -// RemovePolicies mocks base method +// RemovePolicies mocks base method. func (m *MockIDistributedEnforcer) RemovePolicies(arg0 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemovePolicies", arg0) @@ -1460,13 +1491,13 @@ func (m *MockIDistributedEnforcer) RemovePolicies(arg0 [][]string) (bool, error) return ret0, ret1 } -// RemovePolicies indicates an expected call of RemovePolicies +// RemovePolicies indicates an expected call of RemovePolicies. func (mr *MockIDistributedEnforcerMockRecorder) RemovePolicies(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemovePolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemovePolicies), arg0) } -// RemovePoliciesSelf mocks base method +// RemovePoliciesSelf mocks base method. func (m *MockIDistributedEnforcer) RemovePoliciesSelf(arg0 func() bool, arg1, arg2 string, arg3 [][]string) ([][]string, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RemovePoliciesSelf", arg0, arg1, arg2, arg3) @@ -1475,13 +1506,13 @@ func (m *MockIDistributedEnforcer) RemovePoliciesSelf(arg0 func() bool, arg1, ar return ret0, ret1 } -// RemovePoliciesSelf indicates an expected call of RemovePoliciesSelf +// RemovePoliciesSelf indicates an expected call of RemovePoliciesSelf. func (mr *MockIDistributedEnforcerMockRecorder) RemovePoliciesSelf(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemovePoliciesSelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemovePoliciesSelf), arg0, arg1, arg2, arg3) } -// RemovePolicy mocks base method +// RemovePolicy mocks base method. func (m *MockIDistributedEnforcer) RemovePolicy(arg0 ...interface{}) (bool, error) { m.ctrl.T.Helper() varargs := []interface{}{} @@ -1494,13 +1525,13 @@ func (m *MockIDistributedEnforcer) RemovePolicy(arg0 ...interface{}) (bool, erro return ret0, ret1 } -// RemovePolicy indicates an expected call of RemovePolicy +// RemovePolicy indicates an expected call of RemovePolicy. func (mr *MockIDistributedEnforcerMockRecorder) RemovePolicy(arg0 ...interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemovePolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).RemovePolicy), arg0...) } -// SavePolicy mocks base method +// SavePolicy mocks base method. func (m *MockIDistributedEnforcer) SavePolicy() error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SavePolicy") @@ -1508,73 +1539,73 @@ func (m *MockIDistributedEnforcer) SavePolicy() error { return ret0 } -// SavePolicy indicates an expected call of SavePolicy +// SavePolicy indicates an expected call of SavePolicy. func (mr *MockIDistributedEnforcerMockRecorder) SavePolicy() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SavePolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SavePolicy)) } -// SetAdapter mocks base method +// SetAdapter mocks base method. func (m *MockIDistributedEnforcer) SetAdapter(arg0 persist.Adapter) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetAdapter", arg0) } -// SetAdapter indicates an expected call of SetAdapter +// SetAdapter indicates an expected call of SetAdapter. func (mr *MockIDistributedEnforcerMockRecorder) SetAdapter(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAdapter", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SetAdapter), arg0) } -// SetDispatcher mocks base method +// SetDispatcher mocks base method. func (m *MockIDistributedEnforcer) SetDispatcher(arg0 persist.Dispatcher) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetDispatcher", arg0) } -// SetDispatcher indicates an expected call of SetDispatcher +// SetDispatcher indicates an expected call of SetDispatcher. func (mr *MockIDistributedEnforcerMockRecorder) SetDispatcher(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDispatcher", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SetDispatcher), arg0) } -// SetEffector mocks base method -func (m *MockIDistributedEnforcer) SetEffector(arg0 effect.Effector) { +// SetEffector mocks base method. +func (m *MockIDistributedEnforcer) SetEffector(arg0 effector.Effector) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetEffector", arg0) } -// SetEffector indicates an expected call of SetEffector +// SetEffector indicates an expected call of SetEffector. func (mr *MockIDistributedEnforcerMockRecorder) SetEffector(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetEffector", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SetEffector), arg0) } -// SetModel mocks base method +// SetModel mocks base method. func (m *MockIDistributedEnforcer) SetModel(arg0 model.Model) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetModel", arg0) } -// SetModel indicates an expected call of SetModel +// SetModel indicates an expected call of SetModel. func (mr *MockIDistributedEnforcerMockRecorder) SetModel(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetModel", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SetModel), arg0) } -// SetRoleManager mocks base method +// SetRoleManager mocks base method. func (m *MockIDistributedEnforcer) SetRoleManager(arg0 rbac.RoleManager) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetRoleManager", arg0) } -// SetRoleManager indicates an expected call of SetRoleManager +// SetRoleManager indicates an expected call of SetRoleManager. func (mr *MockIDistributedEnforcerMockRecorder) SetRoleManager(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRoleManager", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SetRoleManager), arg0) } -// SetWatcher mocks base method +// SetWatcher mocks base method. func (m *MockIDistributedEnforcer) SetWatcher(arg0 persist.Watcher) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetWatcher", arg0) @@ -1582,13 +1613,53 @@ func (m *MockIDistributedEnforcer) SetWatcher(arg0 persist.Watcher) error { return ret0 } -// SetWatcher indicates an expected call of SetWatcher +// SetWatcher indicates an expected call of SetWatcher. func (mr *MockIDistributedEnforcerMockRecorder) SetWatcher(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWatcher", reflect.TypeOf((*MockIDistributedEnforcer)(nil).SetWatcher), arg0) } -// UpdatePolicies mocks base method +// UpdateFilteredPolicies mocks base method. +func (m *MockIDistributedEnforcer) UpdateFilteredPolicies(arg0 [][]string, arg1 int, arg2 ...string) (bool, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1} + for _, a := range arg2 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "UpdateFilteredPolicies", varargs...) + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// UpdateFilteredPolicies indicates an expected call of UpdateFilteredPolicies. +func (mr *MockIDistributedEnforcerMockRecorder) UpdateFilteredPolicies(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1}, arg2...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFilteredPolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).UpdateFilteredPolicies), varargs...) +} + +// UpdateFilteredPoliciesSelf mocks base method. +func (m *MockIDistributedEnforcer) UpdateFilteredPoliciesSelf(arg0 func() bool, arg1, arg2 string, arg3 [][]string, arg4 int, arg5 ...string) (bool, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1, arg2, arg3, arg4} + for _, a := range arg5 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "UpdateFilteredPoliciesSelf", varargs...) + ret0, _ := ret[0].(bool) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// UpdateFilteredPoliciesSelf indicates an expected call of UpdateFilteredPoliciesSelf. +func (mr *MockIDistributedEnforcerMockRecorder) UpdateFilteredPoliciesSelf(arg0, arg1, arg2, arg3, arg4 interface{}, arg5 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1, arg2, arg3, arg4}, arg5...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateFilteredPoliciesSelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).UpdateFilteredPoliciesSelf), varargs...) +} + +// UpdatePolicies mocks base method. func (m *MockIDistributedEnforcer) UpdatePolicies(arg0, arg1 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdatePolicies", arg0, arg1) @@ -1597,13 +1668,13 @@ func (m *MockIDistributedEnforcer) UpdatePolicies(arg0, arg1 [][]string) (bool, return ret0, ret1 } -// UpdatePolicies indicates an expected call of UpdatePolicies +// UpdatePolicies indicates an expected call of UpdatePolicies. func (mr *MockIDistributedEnforcerMockRecorder) UpdatePolicies(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicies", reflect.TypeOf((*MockIDistributedEnforcer)(nil).UpdatePolicies), arg0, arg1) } -// UpdatePoliciesSelf mocks base method +// UpdatePoliciesSelf mocks base method. func (m *MockIDistributedEnforcer) UpdatePoliciesSelf(arg0 func() bool, arg1, arg2 string, arg3, arg4 [][]string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdatePoliciesSelf", arg0, arg1, arg2, arg3, arg4) @@ -1612,13 +1683,13 @@ func (m *MockIDistributedEnforcer) UpdatePoliciesSelf(arg0 func() bool, arg1, ar return ret0, ret1 } -// UpdatePoliciesSelf indicates an expected call of UpdatePoliciesSelf +// UpdatePoliciesSelf indicates an expected call of UpdatePoliciesSelf. func (mr *MockIDistributedEnforcerMockRecorder) UpdatePoliciesSelf(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePoliciesSelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).UpdatePoliciesSelf), arg0, arg1, arg2, arg3, arg4) } -// UpdatePolicy mocks base method +// UpdatePolicy mocks base method. func (m *MockIDistributedEnforcer) UpdatePolicy(arg0, arg1 []string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdatePolicy", arg0, arg1) @@ -1627,13 +1698,13 @@ func (m *MockIDistributedEnforcer) UpdatePolicy(arg0, arg1 []string) (bool, erro return ret0, ret1 } -// UpdatePolicy indicates an expected call of UpdatePolicy +// UpdatePolicy indicates an expected call of UpdatePolicy. func (mr *MockIDistributedEnforcerMockRecorder) UpdatePolicy(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicy", reflect.TypeOf((*MockIDistributedEnforcer)(nil).UpdatePolicy), arg0, arg1) } -// UpdatePolicySelf mocks base method +// UpdatePolicySelf mocks base method. func (m *MockIDistributedEnforcer) UpdatePolicySelf(arg0 func() bool, arg1, arg2 string, arg3, arg4 []string) (bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UpdatePolicySelf", arg0, arg1, arg2, arg3, arg4) @@ -1642,7 +1713,7 @@ func (m *MockIDistributedEnforcer) UpdatePolicySelf(arg0 func() bool, arg1, arg2 return ret0, ret1 } -// UpdatePolicySelf indicates an expected call of UpdatePolicySelf +// UpdatePolicySelf indicates an expected call of UpdatePolicySelf. func (mr *MockIDistributedEnforcerMockRecorder) UpdatePolicySelf(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePolicySelf", reflect.TypeOf((*MockIDistributedEnforcer)(nil).UpdatePolicySelf), arg0, arg1, arg2, arg3, arg4) diff --git a/store/store.go b/store/store.go index 20a4580..d50663b 100644 --- a/store/store.go +++ b/store/store.go @@ -311,6 +311,19 @@ func (s *Store) UpdatePolicies(request *command.UpdatePoliciesRequest) error { return s.applyProtoMessage(cmd) } +// UpdateFilteredPolicies implements the http.Store interface. +func (s *Store) UpdateFilteredPolicies(request *command.UpdateFilteredPoliciesRequest) error { + data, err := proto.Marshal(request) + if err != nil { + return err + } + cmd := &command.Command{ + Type: command.Command_COMMAND_TYPE_UPDATE_FILTERED_POLICIES, + Data: data, + } + return s.applyProtoMessage(cmd) +} + // ClearPolicy implements the http.Store interface. func (s *Store) ClearPolicy() error { cmd := &command.Command{