diff --git a/daemon/ui/notifications.go b/daemon/ui/notifications.go index 4f0fb24a..e907d2cf 100644 --- a/daemon/ui/notifications.go +++ b/daemon/ui/notifications.go @@ -1,49 +1,146 @@ package ui import ( + "fmt" "io" "io/ioutil" "strings" "time" + "github.com/gustavo-iniguez-goya/opensnitch/daemon/core" "github.com/gustavo-iniguez-goya/opensnitch/daemon/firewall" "github.com/gustavo-iniguez-goya/opensnitch/daemon/log" "github.com/gustavo-iniguez-goya/opensnitch/daemon/procmon" + "github.com/gustavo-iniguez-goya/opensnitch/daemon/rule" "github.com/gustavo-iniguez-goya/opensnitch/daemon/ui/protocol" "golang.org/x/net/context" ) -func (c *Client) getClientConfig() *protocol.ClientConfig { - raw, _ := ioutil.ReadFile(configFile) - nodeName, _ := ioutil.ReadFile("/proc/sys/kernel/hostname") - nodeVersion, _ := ioutil.ReadFile("/proc/sys/kernel/version") - var ts time.Time - return &protocol.ClientConfig{ - Id: uint64(ts.UnixNano()), - Name: strings.Replace(string(nodeName), "\n", "", -1), - Version: strings.Replace(string(nodeVersion), "\n", "", -1), - IsFirewallRunning: firewall.IsRunning(), - Config: strings.Replace(string(raw), "\n", "", -1), - LogLevel: uint32(log.MinLevel), - // TODO - Rules: nil, +// NewReply constructs a new protocol notification reply +func NewReply(rID uint64, replyCode protocol.NotificationReplyCode, data string) *protocol.NotificationReply { + return &protocol.NotificationReply{ + Id: rID, + Code: replyCode, + Data: data, } } -func (c *Client) handleNotification(notification *protocol.Notification) { +func (c *Client) getClientConfig() *protocol.ClientConfig { + raw, _ := ioutil.ReadFile(configFile) + nodeName := core.GetHostname() + nodeVersion := core.GetKernelVersion() + var ts time.Time + rulesTotal := len(c.rules.GetAll()) + ruleList := make([]*protocol.Rule, rulesTotal) + idx := 0 + for _, r := range c.rules.GetAll() { + ruleList[idx] = r.Serialize() + idx++ + } + return &protocol.ClientConfig{ + Id: uint64(ts.UnixNano()), + Name: nodeName, + Version: nodeVersion, + IsFirewallRunning: firewall.IsRunning(), + Config: strings.Replace(string(raw), "\n", "", -1), + LogLevel: uint32(log.MinLevel), + Rules: ruleList, + } +} + +func (c *Client) handleNotification(stream protocol.UI_NotificationsClient, notification *protocol.Notification) { switch { case notification.Type == protocol.Action_CHANGE_CONFIG: log.Info("[notification] Reloading configuration") // this save operation triggers a re-loadConfiguration() - c.saveConfiguration(notification.Data) + err := c.saveConfiguration(notification.Data) + if err != nil { + log.Warning("[notification] CHANGE_CONFIG not applied") + } // XXX: can the Reload() happen before finishing loading conf? procmon.Reload() + c.sendNotificationReply(stream, notification.Id, err) + case notification.Type == protocol.Action_LOAD_FIREWALL: log.Info("[notification] starting firewall") firewall.Init(nil) + c.sendNotificationReply(stream, notification.Id, nil) + case notification.Type == protocol.Action_UNLOAD_FIREWALL: log.Info("[notification] stopping firewall") firewall.Stop(nil) + c.sendNotificationReply(stream, notification.Id, nil) + + // ENABLE_RULE just replaces the rule on disk + case notification.Type == protocol.Action_ENABLE_RULE: + var rErr error + for _, rul := range notification.Rules { + log.Info("[notification] enable rule: ", rul.Name) + // protocol.Rule(protobuf) != rule.Rule(json) + r := rule.Deserialize(rul) + r.Enabled = true + // save to disk only if the duration is rule.Always + if err := c.rules.Replace(r, r.Duration == rule.Always); err != nil { + rErr = err + } + } + c.sendNotificationReply(stream, notification.Id, rErr) + + case notification.Type == protocol.Action_DISABLE_RULE: + var rErr error + for _, rul := range notification.Rules { + log.Info("[notification] disable: ", rul) + r := rule.Deserialize(rul) + r.Enabled = false + if err := c.rules.Replace(r, r.Duration == rule.Always); err != nil { + rErr = err + } + } + c.sendNotificationReply(stream, notification.Id, rErr) + + case notification.Type == protocol.Action_DELETE_RULE: + var rErr error + for _, rul := range notification.Rules { + log.Info("[notification] delete rule: ", rul.Name, notification.Id) + r := rule.Deserialize(rul) + if r == nil { + rErr = fmt.Errorf("Invalid rule") + continue + } + if err := c.rules.Delete(r.Name); err != nil { + log.Error("deleting rule: ", err, r) + rErr = err + } + } + c.sendNotificationReply(stream, notification.Id, rErr) + + // CHANGE_RULE can add() or replace) an existing rule. + case notification.Type == protocol.Action_CHANGE_RULE: + var rErr error + for _, rul := range notification.Rules { + r := rule.Deserialize(rul) + if r == nil { + rErr = fmt.Errorf("Invalid rule") + continue + } + log.Info("[notification] change rule: ", r, notification.Id) + if err := c.rules.Replace(r, r.Duration == rule.Always); err != nil { + log.Error("[notification] Error changing rule: ", err, r) + rErr = err + } + } + c.sendNotificationReply(stream, notification.Id, rErr) + } +} + +func (c *Client) sendNotificationReply(stream protocol.UI_NotificationsClient, nID uint64, err error) { + reply := NewReply(nID, protocol.NotificationReplyCode_OK, "") + if err != nil { + reply.Code = protocol.NotificationReplyCode_ERROR + reply.Data = fmt.Sprint(err) + } + if err := stream.Send(reply); err != nil { + log.Error("Error replying to notification:", err, reply.Id) } } @@ -51,16 +148,33 @@ func (c *Client) handleNotification(notification *protocol.Notification) { // receiving notifications. // It firstly sends the daemon status and configuration. func (c *Client) Subscribe() { - log.Info("Subscribe") ctx, cancel := context.WithCancel(context.Background()) defer cancel() + if _, err := c.client.Subscribe(ctx, c.getClientConfig()); err != nil { + log.Error("Subscribing to GUI", err) + return + } + c.listenForNotifications() +} + +// Notifications is the channel where the daemon receives messages from the server. +// It consists of 2 grpc streams (send/receive) that are never closed, +// this way we can share messages in realtime. +// If the GUI is closed, we'll receive an error reading from the channel. +func (c *Client) listenForNotifications() { + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + // open the stream channel + streamReply := &protocol.NotificationReply{Id: 0, Code: protocol.NotificationReplyCode_OK} notisStream, err := c.client.Notifications(ctx) if err != nil { log.Error("establishing notifications channel", err) return } - if err := notisStream.Send(c.getClientConfig()); err != nil { + // send the first notification + if err := notisStream.Send(streamReply); err != nil { log.Error("sending notfication HELLO", err) return } @@ -75,10 +189,7 @@ func (c *Client) Subscribe() { log.Error("getting notifications: ", err, noti) break } - c.handleNotification(noti) - //if err := notisStream.Send(c.getNotificationConfig()); err != nil { - // log.Error("Error Subscribe()2 sending initial packet") - //} + c.handleNotification(notisStream, noti) } notisStream.CloseSend() diff --git a/daemon/ui/protocol/ui.pb.go b/daemon/ui/protocol/ui.pb.go index 2573863d..d4fd4a40 100644 --- a/daemon/ui/protocol/ui.pb.go +++ b/daemon/ui/protocol/ui.pb.go @@ -33,8 +33,10 @@ const ( Action_CHANGE_CONFIG Action = 3 Action_ENABLE_RULE Action = 4 Action_DISABLE_RULE Action = 5 - Action_LOG_LEVEL Action = 6 - Action_STOP Action = 7 + Action_DELETE_RULE Action = 6 + Action_CHANGE_RULE Action = 7 + Action_LOG_LEVEL Action = 8 + Action_STOP Action = 9 ) var Action_name = map[int32]string{ @@ -44,8 +46,10 @@ var Action_name = map[int32]string{ 3: "CHANGE_CONFIG", 4: "ENABLE_RULE", 5: "DISABLE_RULE", - 6: "LOG_LEVEL", - 7: "STOP", + 6: "DELETE_RULE", + 7: "CHANGE_RULE", + 8: "LOG_LEVEL", + 9: "STOP", } var Action_value = map[string]int32{ @@ -55,8 +59,10 @@ var Action_value = map[string]int32{ "CHANGE_CONFIG": 3, "ENABLE_RULE": 4, "DISABLE_RULE": 5, - "LOG_LEVEL": 6, - "STOP": 7, + "DELETE_RULE": 6, + "CHANGE_RULE": 7, + "LOG_LEVEL": 8, + "STOP": 9, } func (x Action) String() string { @@ -67,6 +73,31 @@ func (Action) EnumDescriptor() ([]byte, []int) { return fileDescriptor_63867a62624c1283, []int{0} } +type NotificationReplyCode int32 + +const ( + NotificationReplyCode_OK NotificationReplyCode = 0 + NotificationReplyCode_ERROR NotificationReplyCode = 1 +) + +var NotificationReplyCode_name = map[int32]string{ + 0: "OK", + 1: "ERROR", +} + +var NotificationReplyCode_value = map[string]int32{ + "OK": 0, + "ERROR": 1, +} + +func (x NotificationReplyCode) String() string { + return proto.EnumName(NotificationReplyCode_name, int32(x)) +} + +func (NotificationReplyCode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_63867a62624c1283, []int{1} +} + type Event struct { Time string `protobuf:"bytes,1,opt,name=time,proto3" json:"time,omitempty"` Connection *Connection `protobuf:"bytes,2,opt,name=connection,proto3" json:"connection,omitempty"` @@ -417,9 +448,10 @@ func (m *Operator) GetData() string { type Rule struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Action string `protobuf:"bytes,2,opt,name=action,proto3" json:"action,omitempty"` - Duration string `protobuf:"bytes,3,opt,name=duration,proto3" json:"duration,omitempty"` - Operator *Operator `protobuf:"bytes,4,opt,name=operator,proto3" json:"operator,omitempty"` + Enabled bool `protobuf:"varint,2,opt,name=enabled,proto3" json:"enabled,omitempty"` + Action string `protobuf:"bytes,3,opt,name=action,proto3" json:"action,omitempty"` + Duration string `protobuf:"bytes,4,opt,name=duration,proto3" json:"duration,omitempty"` + Operator *Operator `protobuf:"bytes,5,opt,name=operator,proto3" json:"operator,omitempty"` } func (m *Rule) Reset() { *m = Rule{} } @@ -436,6 +468,13 @@ func (m *Rule) GetName() string { return "" } +func (m *Rule) GetEnabled() bool { + if m != nil { + return m.Enabled + } + return false +} + func (m *Rule) GetAction() string { if m != nil { return m.Action @@ -457,12 +496,13 @@ func (m *Rule) GetOperator() *Operator { return nil } +// client configuration sent on Subscribe() type ClientConfig struct { Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` IsFirewallRunning bool `protobuf:"varint,4,opt,name=isFirewallRunning,proto3" json:"isFirewallRunning,omitempty"` - // json string + // daemon configuration as json string Config string `protobuf:"bytes,5,opt,name=config,proto3" json:"config,omitempty"` LogLevel uint32 `protobuf:"varint,6,opt,name=logLevel,proto3" json:"logLevel,omitempty"` Rules []*Rule `protobuf:"bytes,7,rep,name=rules,proto3" json:"rules,omitempty"` @@ -524,6 +564,7 @@ func (m *ClientConfig) GetRules() []*Rule { return nil } +// notification sent to the clients (daemons) type Notification struct { Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` ClientName string `protobuf:"bytes,2,opt,name=clientName,proto3" json:"clientName,omitempty"` @@ -583,8 +624,44 @@ func (m *Notification) GetRules() []*Rule { return nil } +// notification reply sent to the server (GUI) +type NotificationReply struct { + Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Code NotificationReplyCode `protobuf:"varint,2,opt,name=code,proto3,enum=protocol.NotificationReplyCode" json:"code,omitempty"` + Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` +} + +func (m *NotificationReply) Reset() { *m = NotificationReply{} } +func (m *NotificationReply) String() string { return proto.CompactTextString(m) } +func (*NotificationReply) ProtoMessage() {} +func (*NotificationReply) Descriptor() ([]byte, []int) { + return fileDescriptor_63867a62624c1283, []int{9} +} + +func (m *NotificationReply) GetId() uint64 { + if m != nil { + return m.Id + } + return 0 +} + +func (m *NotificationReply) GetCode() NotificationReplyCode { + if m != nil { + return m.Code + } + return NotificationReplyCode_OK +} + +func (m *NotificationReply) GetData() string { + if m != nil { + return m.Data + } + return "" +} + func init() { proto.RegisterEnum("protocol.Action", Action_name, Action_value) + proto.RegisterEnum("protocol.NotificationReplyCode", NotificationReplyCode_name, NotificationReplyCode_value) proto.RegisterType((*Event)(nil), "protocol.Event") proto.RegisterType((*Statistics)(nil), "protocol.Statistics") proto.RegisterType((*PingRequest)(nil), "protocol.PingRequest") @@ -594,6 +671,7 @@ func init() { proto.RegisterType((*Rule)(nil), "protocol.Rule") proto.RegisterType((*ClientConfig)(nil), "protocol.ClientConfig") proto.RegisterType((*Notification)(nil), "protocol.Notification") + proto.RegisterType((*NotificationReply)(nil), "protocol.NotificationReply") } func init() { @@ -601,77 +679,83 @@ func init() { } var fileDescriptor_63867a62624c1283 = []byte{ - // 1120 bytes of a gzipped FileDescriptorProto + // 1213 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xdb, 0x6e, 0xdb, 0x46, - 0x13, 0xb6, 0x4e, 0x14, 0x35, 0x3a, 0x58, 0xde, 0xc4, 0xf9, 0xf9, 0x2b, 0x68, 0xe3, 0x30, 0x69, - 0x6b, 0x04, 0x85, 0xd1, 0xba, 0x41, 0x91, 0x04, 0x01, 0x0a, 0xd9, 0xa1, 0x6d, 0xa1, 0xaa, 0x64, - 0xd0, 0x75, 0x7a, 0x49, 0xf0, 0xb0, 0x91, 0x89, 0xd0, 0x24, 0xbb, 0xbb, 0x74, 0xcb, 0x9b, 0xde, - 0xf7, 0x41, 0xfa, 0x06, 0xbd, 0xee, 0x6d, 0x5f, 0xa0, 0x0f, 0x54, 0xec, 0x2c, 0x29, 0x32, 0x76, - 0x1d, 0xc0, 0x57, 0xe2, 0x7c, 0xdf, 0x7c, 0xb3, 0xb3, 0xb3, 0xb3, 0xb3, 0x02, 0x3d, 0x0b, 0xf7, - 0x52, 0x96, 0x88, 0x84, 0xe8, 0xf8, 0xe3, 0x27, 0x91, 0x99, 0x41, 0xc7, 0xba, 0xa2, 0xb1, 0x20, - 0x04, 0xda, 0x22, 0xbc, 0xa4, 0x46, 0x63, 0xa7, 0xb1, 0xdb, 0xb3, 0xf1, 0x9b, 0x3c, 0x07, 0xf0, - 0x93, 0x38, 0xa6, 0xbe, 0x08, 0x93, 0xd8, 0x68, 0xee, 0x34, 0x76, 0xfb, 0xfb, 0xf7, 0xf7, 0x4a, - 0xed, 0xde, 0xe1, 0x9a, 0xb3, 0x6b, 0x7e, 0xc4, 0x84, 0x36, 0xcb, 0x22, 0x6a, 0xb4, 0xd0, 0x7f, - 0x54, 0xf9, 0xdb, 0x59, 0x44, 0x6d, 0xe4, 0xcc, 0xbf, 0x75, 0x80, 0x33, 0xe1, 0x8a, 0x90, 0x8b, - 0xd0, 0xe7, 0xe4, 0x33, 0x18, 0x05, 0x2e, 0xbd, 0x4c, 0x62, 0xe7, 0x8a, 0x32, 0x2e, 0x17, 0x53, - 0x69, 0x0c, 0x15, 0xfa, 0x56, 0x81, 0xe4, 0x3e, 0x74, 0xa4, 0x9a, 0x63, 0x2a, 0x6d, 0x5b, 0x19, - 0xe4, 0x01, 0x68, 0x59, 0x8a, 0xb9, 0xb7, 0x10, 0x2e, 0x2c, 0xf2, 0x04, 0x86, 0x41, 0xcc, 0x1d, - 0x46, 0x79, 0x9a, 0xc4, 0x9c, 0x72, 0xa3, 0x8d, 0xf4, 0x20, 0x88, 0xb9, 0x5d, 0x62, 0x64, 0x07, - 0xfa, 0x55, 0xea, 0xdc, 0xe8, 0xa0, 0x4b, 0x1d, 0x22, 0x06, 0x74, 0xc3, 0x55, 0x9c, 0x30, 0x1a, - 0x18, 0x1a, 0xb2, 0xa5, 0x49, 0x26, 0xa0, 0xbb, 0xbe, 0x4f, 0x53, 0x41, 0x03, 0xa3, 0x8b, 0xd4, - 0xda, 0x96, 0xaa, 0x80, 0x25, 0x69, 0x4a, 0x03, 0x43, 0x57, 0xaa, 0xc2, 0x24, 0x0f, 0xa1, 0x27, - 0xf3, 0x76, 0x2e, 0x42, 0xc1, 0x8d, 0x9e, 0x92, 0x49, 0xe0, 0x24, 0x14, 0x9c, 0x3c, 0x82, 0x3e, - 0x92, 0x97, 0x21, 0x97, 0x19, 0x03, 0xd2, 0x20, 0xa1, 0x1f, 0x10, 0x21, 0xaf, 0x41, 0xf7, 0x72, - 0x07, 0x4b, 0x6a, 0xf4, 0x77, 0x5a, 0xbb, 0xfd, 0xfd, 0xc7, 0x55, 0x81, 0xab, 0x8a, 0xee, 0x1d, - 0xe4, 0xa7, 0x12, 0xb5, 0x62, 0xc1, 0x72, 0xbb, 0xeb, 0x29, 0x8b, 0x1c, 0x00, 0x78, 0xb9, 0xe3, - 0x06, 0x01, 0xa3, 0x9c, 0x1b, 0x03, 0xd4, 0x3f, 0xb9, 0x45, 0x3f, 0x55, 0x5e, 0x2a, 0x42, 0xcf, - 0x2b, 0x6d, 0xf2, 0x12, 0xba, 0x5e, 0xee, 0x5c, 0x24, 0x5c, 0x18, 0x43, 0x0c, 0xb0, 0x73, 0x4b, - 0x80, 0x93, 0x84, 0x0b, 0xa5, 0xd6, 0x3c, 0x34, 0x0a, 0x69, 0x9a, 0x30, 0x61, 0x8c, 0x3e, 0x2a, - 0x3d, 0x4d, 0x58, 0x25, 0x95, 0x06, 0xf9, 0x16, 0x34, 0x2f, 0x77, 0xb2, 0x30, 0x30, 0x36, 0x51, - 0xf9, 0xe8, 0x16, 0xe5, 0x79, 0x18, 0x28, 0x61, 0xc7, 0x93, 0xdf, 0xe4, 0x7b, 0x18, 0x7a, 0xb9, - 0x43, 0x7f, 0xa5, 0x7e, 0x26, 0x5c, 0x2f, 0xa2, 0xc6, 0x18, 0xe5, 0x9f, 0xdf, 0x22, 0xb7, 0xd6, - 0x8e, 0x2a, 0xca, 0xc0, 0xab, 0x41, 0xe4, 0x0b, 0xd0, 0xa8, 0xbc, 0x2c, 0xdc, 0xd8, 0xc2, 0x28, - 0x9b, 0x55, 0x14, 0xbc, 0x44, 0x76, 0x41, 0x4f, 0x5e, 0xc1, 0xa0, 0x7e, 0x00, 0x64, 0x0c, 0xad, - 0xf7, 0x34, 0x2f, 0x9a, 0x5a, 0x7e, 0xca, 0x56, 0xbe, 0x72, 0xa3, 0x8c, 0x96, 0xad, 0x8c, 0xc6, - 0xab, 0xe6, 0x8b, 0xc6, 0xe4, 0x35, 0x8c, 0x3e, 0x2c, 0xfe, 0x9d, 0xd4, 0x2f, 0xa1, 0x5f, 0xab, - 0xfc, 0xdd, 0xa5, 0xeb, 0xca, 0xdf, 0x49, 0xfa, 0x02, 0xa0, 0x2a, 0xfd, 0x9d, 0x94, 0xdf, 0xc1, - 0xd6, 0x8d, 0xaa, 0xdf, 0x25, 0x80, 0x39, 0x83, 0xfe, 0x69, 0x18, 0xaf, 0x6c, 0xfa, 0x73, 0x46, - 0xb9, 0x20, 0x23, 0x68, 0x86, 0x01, 0x2a, 0xdb, 0x76, 0x33, 0x0c, 0xc8, 0x33, 0xe8, 0x70, 0xe1, - 0x0a, 0x7e, 0x73, 0x7a, 0x55, 0xe7, 0x6e, 0x2b, 0x17, 0xf3, 0x21, 0xf4, 0x54, 0xa8, 0x34, 0xca, - 0xaf, 0x07, 0x32, 0xff, 0x68, 0x02, 0x54, 0x03, 0x4f, 0xde, 0xfd, 0x32, 0x52, 0x91, 0xe7, 0xda, - 0x26, 0xdb, 0xa0, 0x71, 0xe6, 0x3b, 0x61, 0x8a, 0x8b, 0xf6, 0xec, 0x0e, 0x67, 0xfe, 0x2c, 0x25, - 0xff, 0x07, 0x5d, 0xc2, 0xd8, 0xfe, 0x72, 0x52, 0x0d, 0xed, 0x2e, 0x67, 0x3e, 0x76, 0xf7, 0x36, - 0x68, 0x01, 0x17, 0x52, 0xd1, 0x56, 0x8a, 0x80, 0x0b, 0xa5, 0x90, 0x30, 0xde, 0xb5, 0x0e, 0x12, - 0xdd, 0x80, 0x0b, 0xbc, 0x4a, 0x05, 0x85, 0xc1, 0x34, 0x15, 0x2c, 0xe0, 0x02, 0x83, 0xfd, 0x0f, - 0xba, 0x19, 0xa7, 0xcc, 0x09, 0xd5, 0x54, 0x1a, 0xda, 0x9a, 0x34, 0x67, 0x01, 0xf9, 0x04, 0x20, - 0x65, 0x89, 0x4f, 0x39, 0x97, 0x9c, 0x8e, 0x5c, 0xaf, 0x40, 0x66, 0x01, 0x79, 0x0c, 0x83, 0x92, - 0x4e, 0x5d, 0x71, 0x81, 0xb3, 0xa9, 0x67, 0xf7, 0x0b, 0xec, 0xd4, 0x15, 0x17, 0x75, 0x17, 0x97, - 0xad, 0xe4, 0x7c, 0x6a, 0xd5, 0x5c, 0xa6, 0x6c, 0xc5, 0xcd, 0x39, 0xe8, 0xcb, 0x94, 0x32, 0x57, - 0x24, 0x0c, 0xdf, 0x94, 0x3c, 0xad, 0xde, 0x94, 0x3c, 0xa5, 0x72, 0x30, 0x26, 0x92, 0x8f, 0x83, - 0xa2, 0x3a, 0xa5, 0x29, 0xbd, 0x03, 0x57, 0xb8, 0x58, 0x9b, 0x9e, 0x8d, 0xdf, 0xe6, 0x6f, 0xd0, - 0x96, 0xaf, 0x86, 0xe4, 0x62, 0xb7, 0x7a, 0x9d, 0xe4, 0xb7, 0x9c, 0xfb, 0x6e, 0xf5, 0x32, 0xf5, - 0xec, 0xc2, 0x92, 0x47, 0x13, 0x64, 0xcc, 0x45, 0x46, 0xc5, 0x5a, 0xdb, 0x64, 0x0f, 0xf4, 0xa4, - 0xc8, 0x0e, 0x4b, 0xdd, 0xdf, 0x27, 0x55, 0x47, 0x94, 0x79, 0xdb, 0x6b, 0x1f, 0xf3, 0x9f, 0x06, - 0x0c, 0x0e, 0xa3, 0x90, 0xc6, 0xe2, 0x30, 0x89, 0xdf, 0x85, 0xab, 0x1b, 0xfd, 0x55, 0x26, 0xd6, - 0xac, 0x25, 0x66, 0x40, 0xb7, 0x7c, 0xc6, 0xd4, 0xfa, 0xa5, 0x49, 0xbe, 0x84, 0xad, 0x90, 0x1f, - 0x85, 0x8c, 0xfe, 0xe2, 0x46, 0x91, 0x9d, 0xc5, 0x71, 0x18, 0xaf, 0x30, 0x0f, 0xdd, 0xbe, 0x49, - 0xc8, 0x0d, 0xfa, 0xb8, 0x6a, 0x71, 0xf8, 0x85, 0x25, 0x37, 0x18, 0x25, 0xab, 0x39, 0xbd, 0xa2, - 0x51, 0x71, 0xf6, 0x6b, 0x9b, 0x3c, 0x2d, 0x9f, 0xc8, 0x2e, 0x4e, 0xa8, 0xeb, 0xaf, 0xaf, 0x22, - 0xcd, 0xbf, 0x1a, 0x30, 0x58, 0x24, 0x22, 0x7c, 0x17, 0xfa, 0xaa, 0x2e, 0xd7, 0xb7, 0xf5, 0x29, - 0x80, 0x8f, 0xdb, 0x5e, 0x54, 0x9b, 0xab, 0x21, 0x92, 0xe7, 0x94, 0x5d, 0x51, 0x86, 0xbc, 0xda, - 0x65, 0x0d, 0x21, 0x4f, 0x8b, 0x93, 0x97, 0x7b, 0x1b, 0xed, 0x8f, 0xab, 0x2c, 0xa6, 0xea, 0xff, - 0x82, 0xea, 0x85, 0xf2, 0xc4, 0x3b, 0xd5, 0x89, 0x57, 0x1b, 0xd0, 0x3e, 0xb2, 0x81, 0x67, 0xbf, - 0x37, 0x40, 0x53, 0xa1, 0x88, 0x0e, 0xed, 0xc5, 0x72, 0x61, 0x8d, 0x37, 0xc8, 0x16, 0x0c, 0xe7, - 0xcb, 0xe9, 0x1b, 0xe7, 0x68, 0x66, 0x5b, 0x3f, 0x4d, 0xe7, 0xf3, 0x71, 0x83, 0xdc, 0x83, 0xcd, - 0xf3, 0xc5, 0x87, 0x60, 0x53, 0xfa, 0x1d, 0x9e, 0x4c, 0x17, 0xc7, 0x96, 0x73, 0xb8, 0x5c, 0x1c, - 0xcd, 0x8e, 0xc7, 0x2d, 0xb2, 0x09, 0x7d, 0x6b, 0x31, 0x3d, 0x98, 0x5b, 0x8e, 0x7d, 0x3e, 0xb7, - 0xc6, 0x6d, 0x32, 0x86, 0xc1, 0x9b, 0xd9, 0x59, 0x85, 0x74, 0xc8, 0x10, 0x7a, 0xf3, 0xe5, 0xb1, - 0x33, 0xb7, 0xde, 0x5a, 0xf3, 0xb1, 0x26, 0x97, 0x3d, 0xfb, 0x71, 0x79, 0x3a, 0xee, 0xee, 0xff, - 0xd9, 0x80, 0xe6, 0xf9, 0x8c, 0x3c, 0x87, 0xb6, 0x9c, 0x1e, 0x64, 0xbb, 0xca, 0xb8, 0x36, 0x98, - 0x26, 0xf7, 0xae, 0xc3, 0x69, 0x94, 0x9b, 0x1b, 0xe4, 0x6b, 0xe8, 0x4e, 0xf9, 0x7b, 0xec, 0xf1, - 0xff, 0xfc, 0x67, 0x35, 0xb9, 0x56, 0x00, 0x73, 0x83, 0x58, 0x30, 0xac, 0x9f, 0x1d, 0x27, 0x0f, - 0x6a, 0xc2, 0x5a, 0xaf, 0x4e, 0x6a, 0x78, 0x5d, 0x60, 0x6e, 0xec, 0x36, 0xbe, 0x6a, 0x78, 0x1a, - 0x92, 0xdf, 0xfc, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xda, 0x87, 0x08, 0x47, 0x16, 0x0a, 0x00, 0x00, + 0x13, 0x36, 0x65, 0x89, 0x22, 0x47, 0x07, 0xcb, 0x9b, 0x38, 0x3f, 0x7f, 0x07, 0x6d, 0x1c, 0x26, + 0x6d, 0x0d, 0xa3, 0x30, 0x5a, 0x27, 0x28, 0x92, 0x20, 0x45, 0xa1, 0x38, 0x4c, 0xa2, 0x46, 0x95, + 0x8c, 0x75, 0x9c, 0x5e, 0x12, 0x3c, 0x6c, 0x64, 0x22, 0x0c, 0xc9, 0x72, 0x97, 0x6e, 0xf5, 0x26, + 0x7d, 0x81, 0x5e, 0xf5, 0x1d, 0x7a, 0xdb, 0x17, 0xe8, 0xc3, 0xf4, 0xb2, 0xd8, 0x59, 0x52, 0x64, + 0x7c, 0x08, 0xe0, 0x2b, 0x71, 0xbe, 0x6f, 0xbe, 0xe1, 0xcc, 0x70, 0x76, 0x47, 0x60, 0x14, 0xd1, + 0x7e, 0x96, 0xa7, 0x22, 0x25, 0x06, 0xfe, 0x04, 0x69, 0x6c, 0x17, 0xd0, 0x71, 0xce, 0x58, 0x22, + 0x08, 0x81, 0xb6, 0x88, 0x3e, 0x30, 0x4b, 0xdb, 0xd1, 0x76, 0x4d, 0x8a, 0xcf, 0xe4, 0x21, 0x40, + 0x90, 0x26, 0x09, 0x0b, 0x44, 0x94, 0x26, 0x56, 0x6b, 0x47, 0xdb, 0xed, 0x1d, 0xdc, 0xdc, 0xaf, + 0xb4, 0xfb, 0x87, 0x2b, 0x8e, 0x36, 0xfc, 0x88, 0x0d, 0xed, 0xbc, 0x88, 0x99, 0xb5, 0x8e, 0xfe, + 0xc3, 0xda, 0x9f, 0x16, 0x31, 0xa3, 0xc8, 0xd9, 0x7f, 0x1b, 0x00, 0xc7, 0xc2, 0x13, 0x11, 0x17, + 0x51, 0xc0, 0xc9, 0x17, 0x30, 0x0c, 0x3d, 0xf6, 0x21, 0x4d, 0xdc, 0x33, 0x96, 0x73, 0xf9, 0x32, + 0x95, 0xc6, 0x40, 0xa1, 0x6f, 0x15, 0x48, 0x6e, 0x42, 0x47, 0xaa, 0x39, 0xa6, 0xd2, 0xa6, 0xca, + 0x20, 0xb7, 0x40, 0x2f, 0x32, 0xcc, 0x7d, 0x1d, 0xe1, 0xd2, 0x22, 0xf7, 0x60, 0x10, 0x26, 0xdc, + 0xcd, 0x19, 0xcf, 0xd2, 0x84, 0x33, 0x6e, 0xb5, 0x91, 0xee, 0x87, 0x09, 0xa7, 0x15, 0x46, 0x76, + 0xa0, 0x57, 0xa7, 0xce, 0xad, 0x0e, 0xba, 0x34, 0x21, 0x62, 0x41, 0x37, 0x5a, 0x24, 0x69, 0xce, + 0x42, 0x4b, 0x47, 0xb6, 0x32, 0xc9, 0x36, 0x18, 0x5e, 0x10, 0xb0, 0x4c, 0xb0, 0xd0, 0xea, 0x22, + 0xb5, 0xb2, 0xa5, 0x2a, 0xcc, 0xd3, 0x2c, 0x63, 0xa1, 0x65, 0x28, 0x55, 0x69, 0x92, 0xdb, 0x60, + 0xca, 0xbc, 0xdd, 0xd3, 0x48, 0x70, 0xcb, 0x54, 0x32, 0x09, 0xbc, 0x8a, 0x04, 0x27, 0x77, 0xa0, + 0x87, 0xe4, 0x87, 0x88, 0xcb, 0x8c, 0x01, 0x69, 0x90, 0xd0, 0x4f, 0x88, 0x90, 0xa7, 0x60, 0xf8, + 0x4b, 0x17, 0x5b, 0x6a, 0xf5, 0x76, 0xd6, 0x77, 0x7b, 0x07, 0x77, 0xeb, 0x06, 0xd7, 0x1d, 0xdd, + 0x7f, 0xb6, 0x3c, 0x92, 0xa8, 0x93, 0x88, 0x7c, 0x49, 0xbb, 0xbe, 0xb2, 0xc8, 0x33, 0x00, 0x7f, + 0xe9, 0x7a, 0x61, 0x98, 0x33, 0xce, 0xad, 0x3e, 0xea, 0xef, 0x5d, 0xa1, 0x1f, 0x2b, 0x2f, 0x15, + 0xc1, 0xf4, 0x2b, 0x9b, 0x3c, 0x86, 0xae, 0xbf, 0x74, 0x4f, 0x53, 0x2e, 0xac, 0x01, 0x06, 0xd8, + 0xb9, 0x22, 0xc0, 0xab, 0x94, 0x0b, 0xa5, 0xd6, 0x7d, 0x34, 0x4a, 0x69, 0x96, 0xe6, 0xc2, 0x1a, + 0x7e, 0x52, 0x7a, 0x94, 0xe6, 0xb5, 0x54, 0x1a, 0xe4, 0x3b, 0xd0, 0xfd, 0xa5, 0x5b, 0x44, 0xa1, + 0xb5, 0x81, 0xca, 0x3b, 0x57, 0x28, 0x4f, 0xa2, 0x50, 0x09, 0x3b, 0xbe, 0x7c, 0x26, 0xaf, 0x61, + 0xe0, 0x2f, 0x5d, 0xf6, 0x1b, 0x0b, 0x0a, 0xe1, 0xf9, 0x31, 0xb3, 0x46, 0x28, 0xff, 0xf2, 0x0a, + 0xb9, 0xb3, 0x72, 0x54, 0x51, 0xfa, 0x7e, 0x03, 0x22, 0x5f, 0x81, 0xce, 0xe4, 0x61, 0xe1, 0xd6, + 0x26, 0x46, 0xd9, 0xa8, 0xa3, 0xe0, 0x21, 0xa2, 0x25, 0xbd, 0xfd, 0x04, 0xfa, 0xcd, 0x0f, 0x40, + 0x46, 0xb0, 0xfe, 0x9e, 0x2d, 0xcb, 0xa1, 0x96, 0x8f, 0x72, 0x94, 0xcf, 0xbc, 0xb8, 0x60, 0xd5, + 0x28, 0xa3, 0xf1, 0xa4, 0xf5, 0x48, 0xdb, 0x7e, 0x0a, 0xc3, 0x8f, 0x9b, 0x7f, 0x2d, 0xf5, 0x63, + 0xe8, 0x35, 0x3a, 0x7f, 0x7d, 0xe9, 0xaa, 0xf3, 0xd7, 0x92, 0x3e, 0x02, 0xa8, 0x5b, 0x7f, 0x2d, + 0xe5, 0x0f, 0xb0, 0x79, 0xa1, 0xeb, 0xd7, 0x09, 0x60, 0x4f, 0xa0, 0x77, 0x14, 0x25, 0x0b, 0xca, + 0x7e, 0x29, 0x18, 0x17, 0x64, 0x08, 0xad, 0x28, 0x44, 0x65, 0x9b, 0xb6, 0xa2, 0x90, 0xec, 0x41, + 0x87, 0x0b, 0x4f, 0xf0, 0x8b, 0xb7, 0x57, 0xfd, 0xdd, 0xa9, 0x72, 0xb1, 0x6f, 0x83, 0xa9, 0x42, + 0x65, 0xf1, 0xf2, 0x7c, 0x20, 0xfb, 0x8f, 0x16, 0x40, 0x7d, 0xe1, 0xc9, 0xb3, 0x5f, 0x45, 0x2a, + 0xf3, 0x5c, 0xd9, 0x64, 0x0b, 0x74, 0x9e, 0x07, 0x6e, 0x94, 0xe1, 0x4b, 0x4d, 0xda, 0xe1, 0x79, + 0x30, 0xc9, 0xc8, 0xff, 0xc1, 0x90, 0x30, 0x8e, 0xbf, 0xbc, 0xa9, 0x06, 0xb4, 0xcb, 0xf3, 0x00, + 0xa7, 0x7b, 0x0b, 0xf4, 0x90, 0x0b, 0xa9, 0x68, 0x2b, 0x45, 0xc8, 0x85, 0x52, 0x48, 0x18, 0xcf, + 0x5a, 0x07, 0x89, 0x6e, 0xc8, 0x05, 0x1e, 0xa5, 0x92, 0xc2, 0x60, 0xba, 0x0a, 0x16, 0x72, 0x81, + 0xc1, 0xfe, 0x07, 0xdd, 0x82, 0xb3, 0xdc, 0x8d, 0xd4, 0xad, 0x34, 0xa0, 0xba, 0x34, 0x27, 0x21, + 0xf9, 0x0c, 0x20, 0xcb, 0xd3, 0x80, 0x71, 0x2e, 0x39, 0x03, 0x39, 0xb3, 0x44, 0x26, 0x21, 0xb9, + 0x0b, 0xfd, 0x8a, 0xce, 0x3c, 0x71, 0x8a, 0x77, 0x93, 0x49, 0x7b, 0x25, 0x76, 0xe4, 0x89, 0xd3, + 0xa6, 0x8b, 0x97, 0x2f, 0xe4, 0xfd, 0xb4, 0xde, 0x70, 0x19, 0xe7, 0x0b, 0x6e, 0x4f, 0xc1, 0x98, + 0x67, 0x2c, 0xf7, 0x44, 0x9a, 0xe3, 0x4e, 0x59, 0x66, 0xf5, 0x4e, 0x59, 0x66, 0x4c, 0x5e, 0x8c, + 0xa9, 0xe4, 0x93, 0xb0, 0xec, 0x4e, 0x65, 0x4a, 0xef, 0xd0, 0x13, 0x1e, 0xf6, 0xc6, 0xa4, 0xf8, + 0x6c, 0xff, 0xae, 0x41, 0x5b, 0xae, 0x0d, 0x49, 0x26, 0x5e, 0xbd, 0x9e, 0xe4, 0xb3, 0x0c, 0xc5, + 0x12, 0x39, 0x35, 0x2a, 0x94, 0x41, 0x2b, 0x53, 0xae, 0x04, 0x4f, 0x2d, 0x2d, 0x15, 0xac, 0xb4, + 0xe4, 0x57, 0x0b, 0x8b, 0xdc, 0x43, 0x46, 0x75, 0x7a, 0x65, 0x93, 0x7d, 0x30, 0xd2, 0x32, 0x71, + 0x6c, 0x76, 0xef, 0x80, 0xd4, 0xc3, 0x52, 0x95, 0x44, 0x57, 0x3e, 0xf6, 0x3f, 0x1a, 0xf4, 0x0f, + 0xe3, 0x88, 0x25, 0xe2, 0x30, 0x4d, 0xde, 0x45, 0x8b, 0x0b, 0xa3, 0x57, 0xa5, 0xdc, 0xfa, 0x38, + 0xe5, 0x6a, 0xc3, 0xa9, 0xcc, 0x2a, 0x93, 0x7c, 0x0d, 0x9b, 0x11, 0x7f, 0x11, 0xe5, 0xec, 0x57, + 0x2f, 0x8e, 0x69, 0x91, 0x24, 0x51, 0xb2, 0xc0, 0x1c, 0x0d, 0x7a, 0x91, 0x90, 0x05, 0x06, 0xf8, + 0xd6, 0x72, 0x2e, 0x4a, 0x4b, 0x16, 0x18, 0xa7, 0x8b, 0x29, 0x3b, 0x63, 0x71, 0x39, 0x16, 0x2b, + 0x9b, 0xdc, 0xaf, 0xb6, 0x67, 0x17, 0x2f, 0xaf, 0xf3, 0x8b, 0x59, 0x91, 0xf6, 0x5f, 0x1a, 0xf4, + 0x67, 0xa9, 0x88, 0xde, 0x45, 0x81, 0xea, 0xcb, 0xf9, 0xb2, 0x3e, 0x07, 0x08, 0xb0, 0xec, 0x59, + 0x5d, 0x5c, 0x03, 0x91, 0x3c, 0x67, 0xf9, 0x19, 0xcb, 0x91, 0x57, 0x55, 0x36, 0x10, 0x72, 0xbf, + 0x1c, 0x0a, 0x59, 0xdb, 0xf0, 0x60, 0x54, 0x67, 0x31, 0x56, 0x7f, 0x25, 0xd4, 0x98, 0x54, 0xc3, + 0xd0, 0xa9, 0x87, 0xa1, 0x2e, 0x40, 0xff, 0x54, 0x01, 0x31, 0x6c, 0x36, 0xf3, 0xbf, 0xf4, 0x34, + 0x93, 0x07, 0xd0, 0x0e, 0xd2, 0x50, 0xa5, 0x3f, 0x6c, 0x2e, 0x93, 0x0b, 0xd2, 0xc3, 0x34, 0x64, + 0x14, 0x9d, 0x2f, 0x1b, 0xd0, 0xbd, 0x3f, 0x35, 0xd0, 0x55, 0xe2, 0xc4, 0x80, 0xf6, 0x6c, 0x3e, + 0x73, 0x46, 0x6b, 0x64, 0x13, 0x06, 0xd3, 0xf9, 0xf8, 0xb9, 0xfb, 0x62, 0x42, 0x9d, 0x9f, 0xc7, + 0xd3, 0xe9, 0x48, 0x23, 0x37, 0x60, 0xe3, 0x64, 0xf6, 0x31, 0xd8, 0x92, 0x7e, 0x87, 0xaf, 0xc6, + 0xb3, 0x97, 0x8e, 0x7b, 0x38, 0x9f, 0xbd, 0x98, 0xbc, 0x1c, 0xad, 0x93, 0x0d, 0xe8, 0x39, 0xb3, + 0xf1, 0xb3, 0xa9, 0xe3, 0xd2, 0x93, 0xa9, 0x33, 0x6a, 0x93, 0x11, 0xf4, 0x9f, 0x4f, 0x8e, 0x6b, + 0xa4, 0x23, 0x5d, 0x9e, 0x3b, 0x53, 0xe7, 0x4d, 0x09, 0xe8, 0x12, 0x28, 0xc3, 0x20, 0xd0, 0x25, + 0x03, 0x30, 0xa7, 0xf3, 0x97, 0xee, 0xd4, 0x79, 0xeb, 0x4c, 0x47, 0x86, 0x4c, 0xec, 0xf8, 0xcd, + 0xfc, 0x68, 0x64, 0xee, 0xed, 0xc1, 0xd6, 0xa5, 0x05, 0x12, 0x1d, 0x5a, 0xf3, 0xd7, 0xa3, 0x35, + 0x62, 0x42, 0xc7, 0xa1, 0x74, 0x4e, 0x47, 0xda, 0xc1, 0xbf, 0x1a, 0xb4, 0x4e, 0x26, 0xe4, 0x21, + 0xb4, 0xe5, 0xa5, 0x48, 0xb6, 0xea, 0x1e, 0x35, 0xee, 0xdb, 0xed, 0x1b, 0xe7, 0xe1, 0x2c, 0x5e, + 0xda, 0x6b, 0xe4, 0x5b, 0xe8, 0x8e, 0xf9, 0x7b, 0x3c, 0xb9, 0x97, 0xfe, 0x61, 0xdc, 0x3e, 0xf7, + 0xf1, 0xec, 0x35, 0xf2, 0x3d, 0x98, 0xc7, 0x85, 0xcf, 0x83, 0x3c, 0xf2, 0x19, 0xb9, 0xd5, 0x10, + 0x35, 0xce, 0xd8, 0xf6, 0x15, 0xb8, 0xbd, 0x46, 0x7e, 0x84, 0x41, 0xb3, 0x34, 0x4e, 0x6e, 0x7f, + 0xe2, 0xa3, 0x36, 0xe3, 0x34, 0x49, 0x7b, 0x6d, 0x57, 0xfb, 0x46, 0xf3, 0x75, 0x24, 0x1f, 0xfc, + 0x17, 0x00, 0x00, 0xff, 0xff, 0x75, 0x04, 0xb2, 0x3f, 0x31, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -688,6 +772,7 @@ const _ = grpc.SupportPackageIsVersion4 type UIClient interface { Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PingReply, error) AskRule(ctx context.Context, in *Connection, opts ...grpc.CallOption) (*Rule, error) + Subscribe(ctx context.Context, in *ClientConfig, opts ...grpc.CallOption) (*ClientConfig, error) Notifications(ctx context.Context, opts ...grpc.CallOption) (UI_NotificationsClient, error) } @@ -717,6 +802,15 @@ func (c *uIClient) AskRule(ctx context.Context, in *Connection, opts ...grpc.Cal return out, nil } +func (c *uIClient) Subscribe(ctx context.Context, in *ClientConfig, opts ...grpc.CallOption) (*ClientConfig, error) { + out := new(ClientConfig) + err := c.cc.Invoke(ctx, "/protocol.UI/Subscribe", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *uIClient) Notifications(ctx context.Context, opts ...grpc.CallOption) (UI_NotificationsClient, error) { stream, err := c.cc.NewStream(ctx, &_UI_serviceDesc.Streams[0], "/protocol.UI/Notifications", opts...) if err != nil { @@ -727,7 +821,7 @@ func (c *uIClient) Notifications(ctx context.Context, opts ...grpc.CallOption) ( } type UI_NotificationsClient interface { - Send(*ClientConfig) error + Send(*NotificationReply) error Recv() (*Notification, error) grpc.ClientStream } @@ -736,7 +830,7 @@ type uINotificationsClient struct { grpc.ClientStream } -func (x *uINotificationsClient) Send(m *ClientConfig) error { +func (x *uINotificationsClient) Send(m *NotificationReply) error { return x.ClientStream.SendMsg(m) } @@ -752,6 +846,7 @@ func (x *uINotificationsClient) Recv() (*Notification, error) { type UIServer interface { Ping(context.Context, *PingRequest) (*PingReply, error) AskRule(context.Context, *Connection) (*Rule, error) + Subscribe(context.Context, *ClientConfig) (*ClientConfig, error) Notifications(UI_NotificationsServer) error } @@ -765,6 +860,9 @@ func (*UnimplementedUIServer) Ping(ctx context.Context, req *PingRequest) (*Ping func (*UnimplementedUIServer) AskRule(ctx context.Context, req *Connection) (*Rule, error) { return nil, status.Errorf(codes.Unimplemented, "method AskRule not implemented") } +func (*UnimplementedUIServer) Subscribe(ctx context.Context, req *ClientConfig) (*ClientConfig, error) { + return nil, status.Errorf(codes.Unimplemented, "method Subscribe not implemented") +} func (*UnimplementedUIServer) Notifications(srv UI_NotificationsServer) error { return status.Errorf(codes.Unimplemented, "method Notifications not implemented") } @@ -809,13 +907,31 @@ func _UI_AskRule_Handler(srv interface{}, ctx context.Context, dec func(interfac return interceptor(ctx, in, info, handler) } +func _UI_Subscribe_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ClientConfig) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(UIServer).Subscribe(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/protocol.UI/Subscribe", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(UIServer).Subscribe(ctx, req.(*ClientConfig)) + } + return interceptor(ctx, in, info, handler) +} + func _UI_Notifications_Handler(srv interface{}, stream grpc.ServerStream) error { return srv.(UIServer).Notifications(&uINotificationsServer{stream}) } type UI_NotificationsServer interface { Send(*Notification) error - Recv() (*ClientConfig, error) + Recv() (*NotificationReply, error) grpc.ServerStream } @@ -827,8 +943,8 @@ func (x *uINotificationsServer) Send(m *Notification) error { return x.ServerStream.SendMsg(m) } -func (x *uINotificationsServer) Recv() (*ClientConfig, error) { - m := new(ClientConfig) +func (x *uINotificationsServer) Recv() (*NotificationReply, error) { + m := new(NotificationReply) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err } @@ -847,6 +963,10 @@ var _UI_serviceDesc = grpc.ServiceDesc{ MethodName: "AskRule", Handler: _UI_AskRule_Handler, }, + { + MethodName: "Subscribe", + Handler: _UI_Subscribe_Handler, + }, }, Streams: []grpc.StreamDesc{ { diff --git a/proto/ui.proto b/proto/ui.proto index 06b73c96..1f603c7e 100644 --- a/proto/ui.proto +++ b/proto/ui.proto @@ -5,7 +5,8 @@ package protocol; service UI { rpc Ping(PingRequest) returns (PingReply) {} rpc AskRule (Connection) returns (Rule) {} - rpc Notifications (stream ClientConfig) returns (stream Notification) {} + rpc Subscribe (ClientConfig) returns (ClientConfig) {} + rpc Notifications (stream NotificationReply) returns (stream Notification) {} } message Event { @@ -64,9 +65,10 @@ message Operator { message Rule { string name = 1; - string action = 2; - string duration = 3; - Operator operator = 4; + bool enabled = 2; + string action = 3; + string duration = 4; + Operator operator = 5; } enum Action { @@ -76,10 +78,13 @@ enum Action { CHANGE_CONFIG = 3; ENABLE_RULE = 4; DISABLE_RULE = 5; - LOG_LEVEL = 6; - STOP = 7; + DELETE_RULE = 6; + CHANGE_RULE = 7; + LOG_LEVEL = 8; + STOP = 9; } +// client configuration sent on Subscribe() message ClientConfig { uint64 id = 1; string name = 2; @@ -91,6 +96,7 @@ message ClientConfig { repeated Rule rules = 7; } +// notification sent to the clients (daemons) message Notification { uint64 id = 1; string clientName = 2; @@ -100,3 +106,15 @@ message Notification { string data = 5; repeated Rule rules = 6; } + +// notification reply sent to the server (GUI) +message NotificationReply { + uint64 id = 1; + NotificationReplyCode code = 2; + string data = 3; +} + +enum NotificationReplyCode { + OK = 0; + ERROR = 1; +}