diff --git a/protobuffersrc/Captiveportal.proto b/protobuffersrc/Captiveportal.proto index ca2c76f3..516e29f7 100644 --- a/protobuffersrc/Captiveportal.proto +++ b/protobuffersrc/Captiveportal.proto @@ -2,45 +2,6 @@ syntax = "proto3"; package captiveportal; option go_package = "github.com/untangle/golang-shared/structs/protocolbuffers/CaptivePortal"; -// Captive portal condition -message CpRuleCondition { - string Op = 1 [json_name = "op"]; - string Type = 2 [json_name = "type"]; - string Value = 3 [json_name = "value"]; -} - -// Captive portal action -message CpRulesAction { - string Type = 1 [json_name = "type"]; -} - -// Captive portal rule -message CpRules { - string RuleId = 1 [json_name = "rule_id"]; - bool Enabled = 2 [json_name = "enabled"]; - string Description = 3 [json_name = "description"]; - repeated CpRuleCondition Conditions = 4 [json_name = "conditions"]; - CpRulesAction Action = 5 [json_name = "action"]; -} - -message ImageDetails { - string imageName = 2 [json_name = "imageName"]; -} - -message CpSettingType { - bool Enabled = 1 [json_name = "enabled"]; - int32 TimeoutValue = 2 [json_name = "timeoutValue"]; - string TimeoutPeriod = 3 [json_name = "timeoutPeriod"]; - string AcceptText = 4 [json_name = "acceptText"]; - string AcceptButtonText = 5 [json_name = "acceptButtonText"]; - string MessageHeading = 6 [json_name = "messageHeading"]; - string MessageText = 7 [json_name = "messageText"]; - string WelcomeText = 8 [json_name = "welcomeText"]; - string PageTitle = 9 [json_name = "pageTitle"]; - ImageDetails logo = 10 [json_name = "logo"]; - repeated CpRules Rules = 11 [json_name = "rules"]; -} - service CaptivePortalGrpcService { rpc getCaptivePortalUser (UserGetRequest) returns (UserGetResponse) {} rpc setCaptivePortalUser (UserSetRequest) returns (UserSetResponse) {} diff --git a/services/captiveportal/captiveportal.go b/services/captiveportal/captiveportal.go new file mode 100644 index 00000000..ef6d937b --- /dev/null +++ b/services/captiveportal/captiveportal.go @@ -0,0 +1,126 @@ +package captiveportal + +// Captive portal condition +type CpRuleCondition struct { + Op string `json:"Op,omitempty"` + Type string `json:"Type,omitempty"` + Value any `json:"Value,omitempty"` +} + +// Captive portal action + +type CpRulesAction struct { + Type string `json:"Type,omitempty"` +} + +//Captive portal rules + +type CpRules struct { + RuleId string `json:"RuleId,omitempty"` + Enabled bool `json:"Enabled,omitempty"` + Description string `json:"Description,omitempty"` + Conditions []*CpRuleCondition `json:"Conditions,omitempty"` + Action *CpRulesAction `json:"Action,omitempty"` +} + +type ImageDetails struct { + ImageName string `json:"imageName,omitempty"` +} + +func (x *ImageDetails) GetImageName() string { + if x != nil { + return x.ImageName + } + return "" +} + +type CpSettingType struct { + Enabled bool `json:"Enabled,omitempty"` + TimeoutValue int32 `json:"TimeoutValue,omitempty"` + TimeoutPeriod string `json:"TimeoutPeriod,omitempty"` + AcceptText string `json:"AcceptText,omitempty"` + AcceptButtonText string `json:"AcceptButtonText,omitempty"` + MessageHeading string `json:"MessageHeading,omitempty"` + MessageText string `json:"MessageText,omitempty"` + WelcomeText string `json:"WelcomeText,omitempty"` + PageTitle string `json:"PageTitle,omitempty"` + Logo *ImageDetails `json:"logo,omitempty"` + Rules []*CpRules `json:"Rules,omitempty"` +} + +func (x *CpSettingType) GetEnabled() bool { + if x != nil { + return x.Enabled + } + return false +} + +func (x *CpSettingType) GetTimeoutValue() int32 { + if x != nil { + return x.TimeoutValue + } + return 0 +} + +func (x *CpSettingType) GetTimeoutPeriod() string { + if x != nil { + return x.TimeoutPeriod + } + return "" +} + +func (x *CpSettingType) GetAcceptText() string { + if x != nil { + return x.AcceptText + } + return "" +} + +func (x *CpSettingType) GetAcceptButtonText() string { + if x != nil { + return x.AcceptButtonText + } + return "" +} + +func (x *CpSettingType) GetMessageHeading() string { + if x != nil { + return x.MessageHeading + } + return "" +} + +func (x *CpSettingType) GetMessageText() string { + if x != nil { + return x.MessageText + } + return "" +} + +func (x *CpSettingType) GetWelcomeText() string { + if x != nil { + return x.WelcomeText + } + return "" +} + +func (x *CpSettingType) GetPageTitle() string { + if x != nil { + return x.PageTitle + } + return "" +} + +func (x *CpSettingType) GetLogo() *ImageDetails { + if x != nil { + return x.Logo + } + return nil +} + +func (x *CpSettingType) GetRules() []*CpRules { + if x != nil { + return x.Rules + } + return nil +} diff --git a/structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go b/structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go index db501280..406da6e2 100644 --- a/structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go +++ b/structs/protocolbuffers/ActiveSessions/ActiveSessions.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: ActiveSessions.proto @@ -140,6 +140,7 @@ type Session struct { PolicyId string `protobuf:"bytes,68,opt,name=policy_id,json=policyId,proto3" json:"policy_id,omitempty"` PolicyRuleIds string `protobuf:"bytes,69,opt,name=policy_rule_ids,json=policyRuleIds,proto3" json:"policy_rule_ids,omitempty"` ThreatPreventionThreatLevel string `protobuf:"bytes,70,opt,name=threat_prevention_threat_level,json=threatPreventionThreatLevel,proto3" json:"threat_prevention_threat_level,omitempty"` + PolicyConfigIds string `protobuf:"bytes,71,opt,name=policy_config_ids,json=policyConfigIds,proto3" json:"policy_config_ids,omitempty"` } func (x *Session) Reset() { @@ -650,6 +651,13 @@ func (x *Session) GetThreatPreventionThreatLevel() string { return "" } +func (x *Session) GetPolicyConfigIds() string { + if x != nil { + return x.PolicyConfigIds + } + return "" +} + var File_ActiveSessions_proto protoreflect.FileDescriptor var file_ActiveSessions_proto_rawDesc = []byte{ @@ -659,7 +667,7 @@ var file_ActiveSessions_proto_rawDesc = []byte{ 0x73, 0x12, 0x34, 0x0a, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, - 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xb6, 0x17, 0x0a, 0x07, 0x53, 0x65, 0x73, 0x73, + 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x22, 0xe2, 0x17, 0x0a, 0x07, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0f, 0x61, 0x67, 0x65, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x14, @@ -847,12 +855,14 @@ var file_ActiveSessions_proto_rawDesc = []byte{ 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61, 0x74, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x46, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1b, 0x74, 0x68, 0x72, 0x65, 0x61, 0x74, 0x50, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x68, 0x72, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x76, 0x65, 0x6c, - 0x42, 0x4a, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, - 0x6e, 0x74, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2d, 0x73, - 0x68, 0x61, 0x72, 0x65, 0x64, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x73, 0x2f, 0x41, 0x63, - 0x74, 0x69, 0x76, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x2a, 0x0a, 0x11, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x47, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x70, 0x6f, 0x6c, + 0x69, 0x63, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x73, 0x42, 0x4a, 0x5a, 0x48, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x75, 0x6e, 0x74, 0x61, 0x6e, + 0x67, 0x6c, 0x65, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x65, + 0x64, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, + 0x6f, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x73, 0x2f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/structs/protocolbuffers/Alerts/Alerts.pb.go b/structs/protocolbuffers/Alerts/Alerts.pb.go index ac6e9f00..c80640b3 100644 --- a/structs/protocolbuffers/Alerts/Alerts.pb.go +++ b/structs/protocolbuffers/Alerts/Alerts.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: Alerts.proto diff --git a/structs/protocolbuffers/CaptivePortal/Captiveportal.pb.go b/structs/protocolbuffers/CaptivePortal/Captiveportal.pb.go index bfd9d855..25518307 100644 --- a/structs/protocolbuffers/CaptivePortal/Captiveportal.pb.go +++ b/structs/protocolbuffers/CaptivePortal/Captiveportal.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: Captiveportal.proto @@ -20,372 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// Captive portal condition -type CpRuleCondition struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Op string `protobuf:"bytes,1,opt,name=Op,json=op,proto3" json:"Op,omitempty"` - Type string `protobuf:"bytes,2,opt,name=Type,json=type,proto3" json:"Type,omitempty"` - Value string `protobuf:"bytes,3,opt,name=Value,json=value,proto3" json:"Value,omitempty"` -} - -func (x *CpRuleCondition) Reset() { - *x = CpRuleCondition{} - if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CpRuleCondition) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CpRuleCondition) ProtoMessage() {} - -func (x *CpRuleCondition) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[0] - 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 CpRuleCondition.ProtoReflect.Descriptor instead. -func (*CpRuleCondition) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{0} -} - -func (x *CpRuleCondition) GetOp() string { - if x != nil { - return x.Op - } - return "" -} - -func (x *CpRuleCondition) GetType() string { - if x != nil { - return x.Type - } - return "" -} - -func (x *CpRuleCondition) GetValue() string { - if x != nil { - return x.Value - } - return "" -} - -// Captive portal action -type CpRulesAction struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Type string `protobuf:"bytes,1,opt,name=Type,json=type,proto3" json:"Type,omitempty"` -} - -func (x *CpRulesAction) Reset() { - *x = CpRulesAction{} - if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CpRulesAction) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CpRulesAction) ProtoMessage() {} - -func (x *CpRulesAction) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[1] - 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 CpRulesAction.ProtoReflect.Descriptor instead. -func (*CpRulesAction) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{1} -} - -func (x *CpRulesAction) GetType() string { - if x != nil { - return x.Type - } - return "" -} - -// Captive portal rule -type CpRules struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RuleId string `protobuf:"bytes,1,opt,name=RuleId,json=rule_id,proto3" json:"RuleId,omitempty"` - Enabled bool `protobuf:"varint,2,opt,name=Enabled,json=enabled,proto3" json:"Enabled,omitempty"` - Description string `protobuf:"bytes,3,opt,name=Description,json=description,proto3" json:"Description,omitempty"` - Conditions []*CpRuleCondition `protobuf:"bytes,4,rep,name=Conditions,json=conditions,proto3" json:"Conditions,omitempty"` - Action *CpRulesAction `protobuf:"bytes,5,opt,name=Action,json=action,proto3" json:"Action,omitempty"` -} - -func (x *CpRules) Reset() { - *x = CpRules{} - if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CpRules) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CpRules) ProtoMessage() {} - -func (x *CpRules) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[2] - 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 CpRules.ProtoReflect.Descriptor instead. -func (*CpRules) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{2} -} - -func (x *CpRules) GetRuleId() string { - if x != nil { - return x.RuleId - } - return "" -} - -func (x *CpRules) GetEnabled() bool { - if x != nil { - return x.Enabled - } - return false -} - -func (x *CpRules) GetDescription() string { - if x != nil { - return x.Description - } - return "" -} - -func (x *CpRules) GetConditions() []*CpRuleCondition { - if x != nil { - return x.Conditions - } - return nil -} - -func (x *CpRules) GetAction() *CpRulesAction { - if x != nil { - return x.Action - } - return nil -} - -type ImageDetails struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ImageName string `protobuf:"bytes,2,opt,name=imageName,proto3" json:"imageName,omitempty"` -} - -func (x *ImageDetails) Reset() { - *x = ImageDetails{} - if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ImageDetails) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ImageDetails) ProtoMessage() {} - -func (x *ImageDetails) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[3] - 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 ImageDetails.ProtoReflect.Descriptor instead. -func (*ImageDetails) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{3} -} - -func (x *ImageDetails) GetImageName() string { - if x != nil { - return x.ImageName - } - return "" -} - -type CpSettingType struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Enabled bool `protobuf:"varint,1,opt,name=Enabled,json=enabled,proto3" json:"Enabled,omitempty"` - TimeoutValue int32 `protobuf:"varint,2,opt,name=TimeoutValue,json=timeoutValue,proto3" json:"TimeoutValue,omitempty"` - TimeoutPeriod string `protobuf:"bytes,3,opt,name=TimeoutPeriod,json=timeoutPeriod,proto3" json:"TimeoutPeriod,omitempty"` - AcceptText string `protobuf:"bytes,4,opt,name=AcceptText,json=acceptText,proto3" json:"AcceptText,omitempty"` - AcceptButtonText string `protobuf:"bytes,5,opt,name=AcceptButtonText,json=acceptButtonText,proto3" json:"AcceptButtonText,omitempty"` - MessageHeading string `protobuf:"bytes,6,opt,name=MessageHeading,json=messageHeading,proto3" json:"MessageHeading,omitempty"` - MessageText string `protobuf:"bytes,7,opt,name=MessageText,json=messageText,proto3" json:"MessageText,omitempty"` - WelcomeText string `protobuf:"bytes,8,opt,name=WelcomeText,json=welcomeText,proto3" json:"WelcomeText,omitempty"` - PageTitle string `protobuf:"bytes,9,opt,name=PageTitle,json=pageTitle,proto3" json:"PageTitle,omitempty"` - Logo *ImageDetails `protobuf:"bytes,10,opt,name=logo,proto3" json:"logo,omitempty"` - Rules []*CpRules `protobuf:"bytes,11,rep,name=Rules,json=rules,proto3" json:"Rules,omitempty"` -} - -func (x *CpSettingType) Reset() { - *x = CpSettingType{} - if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CpSettingType) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CpSettingType) ProtoMessage() {} - -func (x *CpSettingType) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[4] - 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 CpSettingType.ProtoReflect.Descriptor instead. -func (*CpSettingType) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{4} -} - -func (x *CpSettingType) GetEnabled() bool { - if x != nil { - return x.Enabled - } - return false -} - -func (x *CpSettingType) GetTimeoutValue() int32 { - if x != nil { - return x.TimeoutValue - } - return 0 -} - -func (x *CpSettingType) GetTimeoutPeriod() string { - if x != nil { - return x.TimeoutPeriod - } - return "" -} - -func (x *CpSettingType) GetAcceptText() string { - if x != nil { - return x.AcceptText - } - return "" -} - -func (x *CpSettingType) GetAcceptButtonText() string { - if x != nil { - return x.AcceptButtonText - } - return "" -} - -func (x *CpSettingType) GetMessageHeading() string { - if x != nil { - return x.MessageHeading - } - return "" -} - -func (x *CpSettingType) GetMessageText() string { - if x != nil { - return x.MessageText - } - return "" -} - -func (x *CpSettingType) GetWelcomeText() string { - if x != nil { - return x.WelcomeText - } - return "" -} - -func (x *CpSettingType) GetPageTitle() string { - if x != nil { - return x.PageTitle - } - return "" -} - -func (x *CpSettingType) GetLogo() *ImageDetails { - if x != nil { - return x.Logo - } - return nil -} - -func (x *CpSettingType) GetRules() []*CpRules { - if x != nil { - return x.Rules - } - return nil -} - type UserGetRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -397,7 +31,7 @@ type UserGetRequest struct { func (x *UserGetRequest) Reset() { *x = UserGetRequest{} if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[5] + mi := &file_Captiveportal_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -410,7 +44,7 @@ func (x *UserGetRequest) String() string { func (*UserGetRequest) ProtoMessage() {} func (x *UserGetRequest) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[5] + mi := &file_Captiveportal_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -423,7 +57,7 @@ func (x *UserGetRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetRequest.ProtoReflect.Descriptor instead. func (*UserGetRequest) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{5} + return file_Captiveportal_proto_rawDescGZIP(), []int{0} } func (x *UserGetRequest) GetClientIp() string { @@ -446,7 +80,7 @@ type UserGetResponse struct { func (x *UserGetResponse) Reset() { *x = UserGetResponse{} if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[6] + mi := &file_Captiveportal_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -459,7 +93,7 @@ func (x *UserGetResponse) String() string { func (*UserGetResponse) ProtoMessage() {} func (x *UserGetResponse) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[6] + mi := &file_Captiveportal_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -472,7 +106,7 @@ func (x *UserGetResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetResponse.ProtoReflect.Descriptor instead. func (*UserGetResponse) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{6} + return file_Captiveportal_proto_rawDescGZIP(), []int{1} } func (x *UserGetResponse) GetClientIp() string { @@ -500,7 +134,7 @@ type UserSetRequest struct { func (x *UserSetRequest) Reset() { *x = UserSetRequest{} if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[7] + mi := &file_Captiveportal_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -513,7 +147,7 @@ func (x *UserSetRequest) String() string { func (*UserSetRequest) ProtoMessage() {} func (x *UserSetRequest) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[7] + mi := &file_Captiveportal_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -526,7 +160,7 @@ func (x *UserSetRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UserSetRequest.ProtoReflect.Descriptor instead. func (*UserSetRequest) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{7} + return file_Captiveportal_proto_rawDescGZIP(), []int{2} } func (x *UserSetRequest) GetClientIp() string { @@ -548,7 +182,7 @@ type UserSetResponse struct { func (x *UserSetResponse) Reset() { *x = UserSetResponse{} if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[8] + mi := &file_Captiveportal_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -561,7 +195,7 @@ func (x *UserSetResponse) String() string { func (*UserSetResponse) ProtoMessage() {} func (x *UserSetResponse) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[8] + mi := &file_Captiveportal_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -574,7 +208,7 @@ func (x *UserSetResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use UserSetResponse.ProtoReflect.Descriptor instead. func (*UserSetResponse) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{8} + return file_Captiveportal_proto_rawDescGZIP(), []int{3} } func (x *UserSetResponse) GetDone() bool { @@ -600,7 +234,7 @@ type CpUserEntry struct { func (x *CpUserEntry) Reset() { *x = CpUserEntry{} if protoimpl.UnsafeEnabled { - mi := &file_Captiveportal_proto_msgTypes[9] + mi := &file_Captiveportal_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -613,7 +247,7 @@ func (x *CpUserEntry) String() string { func (*CpUserEntry) ProtoMessage() {} func (x *CpUserEntry) ProtoReflect() protoreflect.Message { - mi := &file_Captiveportal_proto_msgTypes[9] + mi := &file_Captiveportal_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -626,7 +260,7 @@ func (x *CpUserEntry) ProtoReflect() protoreflect.Message { // Deprecated: Use CpUserEntry.ProtoReflect.Descriptor instead. func (*CpUserEntry) Descriptor() ([]byte, []int) { - return file_Captiveportal_proto_rawDescGZIP(), []int{9} + return file_Captiveportal_proto_rawDescGZIP(), []int{4} } func (x *CpUserEntry) GetConfigId() string { @@ -676,103 +310,53 @@ var File_Captiveportal_proto protoreflect.FileDescriptor var file_Captiveportal_proto_rawDesc = []byte{ 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, - 0x72, 0x74, 0x61, 0x6c, 0x22, 0x4b, 0x0a, 0x0f, 0x43, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x43, 0x6f, - 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x4f, 0x70, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x02, 0x6f, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, - 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xd4, 0x01, 0x0a, 0x07, 0x43, 0x70, 0x52, 0x75, 0x6c, - 0x65, 0x73, 0x12, 0x17, 0x0a, 0x06, 0x52, 0x75, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x45, - 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x6e, - 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, - 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3e, 0x0a, 0x0a, 0x43, 0x6f, 0x6e, 0x64, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x63, 0x61, - 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x43, 0x70, 0x52, 0x75, - 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6e, - 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x34, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, - 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x43, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x41, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2c, 0x0a, - 0x0c, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x1c, 0x0a, - 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xa8, 0x03, 0x0a, 0x0d, - 0x43, 0x70, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, - 0x07, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, - 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x54, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x74, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x54, - 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x50, 0x65, 0x72, 0x69, 0x6f, - 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x54, 0x65, 0x78, 0x74, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x54, 0x65, 0x78, - 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x54, 0x65, 0x78, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x61, 0x63, 0x63, - 0x65, 0x70, 0x74, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x54, 0x65, 0x78, 0x74, 0x12, 0x26, 0x0a, - 0x0e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x65, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x65, - 0x61, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x54, 0x65, 0x78, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x54, 0x65, 0x78, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x57, 0x65, 0x6c, 0x63, 0x6f, - 0x6d, 0x65, 0x54, 0x65, 0x78, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x77, 0x65, - 0x6c, 0x63, 0x6f, 0x6d, 0x65, 0x54, 0x65, 0x78, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x67, - 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, - 0x67, 0x65, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x6c, 0x6f, 0x67, 0x6f, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x44, 0x65, 0x74, 0x61, 0x69, - 0x6c, 0x73, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x6f, 0x12, 0x2c, 0x0a, 0x05, 0x52, 0x75, 0x6c, 0x65, - 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, - 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x43, 0x70, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, - 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x2c, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x69, 0x65, - 0x6e, 0x74, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6c, 0x69, 0x65, - 0x6e, 0x74, 0x49, 0x70, 0x22, 0x49, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x49, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x22, - 0x2c, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x70, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x70, 0x22, 0x25, 0x0a, - 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x12, 0x0a, 0x04, 0x44, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, - 0x44, 0x6f, 0x6e, 0x65, 0x22, 0xed, 0x01, 0x0a, 0x0b, 0x43, 0x70, 0x55, 0x73, 0x65, 0x72, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, - 0x12, 0x28, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x44, 0x75, 0x72, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x6f, - 0x75, 0x74, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x15, 0x4c, 0x61, - 0x73, 0x74, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, - 0x61, 0x6d, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x4c, 0x61, 0x73, 0x74, 0x41, - 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, - 0x12, 0x2c, 0x0a, 0x11, 0x4c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, - 0x53, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x4c, 0x61, 0x73, - 0x74, 0x53, 0x65, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x20, - 0x0a, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x12, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, - 0x48, 0x6f, 0x73, 0x74, 0x32, 0xcc, 0x01, 0x0a, 0x18, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, - 0x50, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x57, 0x0a, 0x14, 0x67, 0x65, 0x74, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, - 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x63, 0x61, 0x70, 0x74, - 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, - 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x14, 0x73, 0x65, - 0x74, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x55, 0x73, - 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, - 0x61, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1e, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, - 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x75, 0x6e, 0x74, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, - 0x67, 0x2d, 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x73, - 0x2f, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x74, 0x61, 0x6c, 0x22, 0x2c, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x49, 0x70, 0x22, 0x49, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, + 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x22, 0x2c, 0x0a, + 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x1a, 0x0a, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x70, 0x22, 0x25, 0x0a, 0x0f, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, + 0x0a, 0x04, 0x44, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x44, 0x6f, + 0x6e, 0x65, 0x22, 0xed, 0x01, 0x0a, 0x0b, 0x43, 0x70, 0x55, 0x73, 0x65, 0x72, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x12, 0x28, + 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, + 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x15, 0x4c, 0x61, 0x73, 0x74, + 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, + 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x15, 0x4c, 0x61, 0x73, 0x74, 0x41, 0x63, 0x63, + 0x65, 0x70, 0x74, 0x65, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x2c, + 0x0a, 0x11, 0x4c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, + 0x61, 0x6d, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x4c, 0x61, 0x73, 0x74, 0x53, + 0x65, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x20, 0x0a, 0x0b, + 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, + 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x6f, + 0x73, 0x74, 0x32, 0xcc, 0x01, 0x0a, 0x18, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6f, + 0x72, 0x74, 0x61, 0x6c, 0x47, 0x72, 0x70, 0x63, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, + 0x57, 0x0a, 0x14, 0x67, 0x65, 0x74, 0x43, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6f, 0x72, + 0x74, 0x61, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1d, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, + 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x14, 0x73, 0x65, 0x74, 0x43, + 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x55, 0x73, 0x65, 0x72, + 0x12, 0x1d, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1e, 0x2e, 0x63, 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x42, 0x49, 0x5a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x75, 0x6e, 0x74, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x2f, 0x67, 0x6f, 0x6c, 0x61, 0x6e, 0x67, 0x2d, + 0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x73, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x73, 0x2f, 0x43, + 0x61, 0x70, 0x74, 0x69, 0x76, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -787,33 +371,24 @@ func file_Captiveportal_proto_rawDescGZIP() []byte { return file_Captiveportal_proto_rawDescData } -var file_Captiveportal_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_Captiveportal_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_Captiveportal_proto_goTypes = []interface{}{ - (*CpRuleCondition)(nil), // 0: captiveportal.CpRuleCondition - (*CpRulesAction)(nil), // 1: captiveportal.CpRulesAction - (*CpRules)(nil), // 2: captiveportal.CpRules - (*ImageDetails)(nil), // 3: captiveportal.ImageDetails - (*CpSettingType)(nil), // 4: captiveportal.CpSettingType - (*UserGetRequest)(nil), // 5: captiveportal.UserGetRequest - (*UserGetResponse)(nil), // 6: captiveportal.UserGetResponse - (*UserSetRequest)(nil), // 7: captiveportal.UserSetRequest - (*UserSetResponse)(nil), // 8: captiveportal.UserSetResponse - (*CpUserEntry)(nil), // 9: captiveportal.CpUserEntry + (*UserGetRequest)(nil), // 0: captiveportal.UserGetRequest + (*UserGetResponse)(nil), // 1: captiveportal.UserGetResponse + (*UserSetRequest)(nil), // 2: captiveportal.UserSetRequest + (*UserSetResponse)(nil), // 3: captiveportal.UserSetResponse + (*CpUserEntry)(nil), // 4: captiveportal.CpUserEntry } var file_Captiveportal_proto_depIdxs = []int32{ - 0, // 0: captiveportal.CpRules.Conditions:type_name -> captiveportal.CpRuleCondition - 1, // 1: captiveportal.CpRules.Action:type_name -> captiveportal.CpRulesAction - 3, // 2: captiveportal.CpSettingType.logo:type_name -> captiveportal.ImageDetails - 2, // 3: captiveportal.CpSettingType.Rules:type_name -> captiveportal.CpRules - 5, // 4: captiveportal.CaptivePortalGrpcService.getCaptivePortalUser:input_type -> captiveportal.UserGetRequest - 7, // 5: captiveportal.CaptivePortalGrpcService.setCaptivePortalUser:input_type -> captiveportal.UserSetRequest - 6, // 6: captiveportal.CaptivePortalGrpcService.getCaptivePortalUser:output_type -> captiveportal.UserGetResponse - 8, // 7: captiveportal.CaptivePortalGrpcService.setCaptivePortalUser:output_type -> captiveportal.UserSetResponse - 6, // [6:8] is the sub-list for method output_type - 4, // [4:6] is the sub-list for method input_type - 4, // [4:4] is the sub-list for extension type_name - 4, // [4:4] is the sub-list for extension extendee - 0, // [0:4] is the sub-list for field type_name + 0, // 0: captiveportal.CaptivePortalGrpcService.getCaptivePortalUser:input_type -> captiveportal.UserGetRequest + 2, // 1: captiveportal.CaptivePortalGrpcService.setCaptivePortalUser:input_type -> captiveportal.UserSetRequest + 1, // 2: captiveportal.CaptivePortalGrpcService.getCaptivePortalUser:output_type -> captiveportal.UserGetResponse + 3, // 3: captiveportal.CaptivePortalGrpcService.setCaptivePortalUser:output_type -> captiveportal.UserSetResponse + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name } func init() { file_Captiveportal_proto_init() } @@ -823,66 +398,6 @@ func file_Captiveportal_proto_init() { } if !protoimpl.UnsafeEnabled { file_Captiveportal_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpRuleCondition); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_Captiveportal_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpRulesAction); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_Captiveportal_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpRules); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_Captiveportal_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ImageDetails); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_Captiveportal_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CpSettingType); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_Captiveportal_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserGetRequest); i { case 0: return &v.state @@ -894,7 +409,7 @@ func file_Captiveportal_proto_init() { return nil } } - file_Captiveportal_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_Captiveportal_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserGetResponse); i { case 0: return &v.state @@ -906,7 +421,7 @@ func file_Captiveportal_proto_init() { return nil } } - file_Captiveportal_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_Captiveportal_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserSetRequest); i { case 0: return &v.state @@ -918,7 +433,7 @@ func file_Captiveportal_proto_init() { return nil } } - file_Captiveportal_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_Captiveportal_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserSetResponse); i { case 0: return &v.state @@ -930,7 +445,7 @@ func file_Captiveportal_proto_init() { return nil } } - file_Captiveportal_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_Captiveportal_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CpUserEntry); i { case 0: return &v.state @@ -949,7 +464,7 @@ func file_Captiveportal_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_Captiveportal_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 5, NumExtensions: 0, NumServices: 1, }, diff --git a/structs/protocolbuffers/Discoverd/Discovery.pb.go b/structs/protocolbuffers/Discoverd/Discovery.pb.go index a5a96ecf..8510ef1c 100644 --- a/structs/protocolbuffers/Discoverd/Discovery.pb.go +++ b/structs/protocolbuffers/Discoverd/Discovery.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: Discovery.proto diff --git a/structs/protocolbuffers/InterfaceStatsEvent/InterfaceStatsEvent.pb.go b/structs/protocolbuffers/InterfaceStatsEvent/InterfaceStatsEvent.pb.go index 2e410be1..1738258a 100644 --- a/structs/protocolbuffers/InterfaceStatsEvent/InterfaceStatsEvent.pb.go +++ b/structs/protocolbuffers/InterfaceStatsEvent/InterfaceStatsEvent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: InterfaceStatsEvent.proto diff --git a/structs/protocolbuffers/SessionEvent/SessionEvent.pb.go b/structs/protocolbuffers/SessionEvent/SessionEvent.pb.go index cec576c5..24776d1f 100644 --- a/structs/protocolbuffers/SessionEvent/SessionEvent.pb.go +++ b/structs/protocolbuffers/SessionEvent/SessionEvent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: SessionEvent.proto diff --git a/structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go b/structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go index 8a7b2cfa..0e6dacf2 100644 --- a/structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go +++ b/structs/protocolbuffers/SessionStatsEvent/SessionStatsEvent.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: SessionStatsEvent.proto diff --git a/structs/protocolbuffers/ZMQRequest/ZMQRequest.pb.go b/structs/protocolbuffers/ZMQRequest/ZMQRequest.pb.go index 230f5535..3fd9f45d 100644 --- a/structs/protocolbuffers/ZMQRequest/ZMQRequest.pb.go +++ b/structs/protocolbuffers/ZMQRequest/ZMQRequest.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.30.0 +// protoc-gen-go v1.32.0 // protoc v3.21.12 // source: ZMQRequest.proto