rest of the owl

Makefile

@@ -268,6 +268,8 @@ generate:  ## Generate code for the database and APIs
 	$(GO) generate ./pkg/database/ent
 	$(GO) generate ./pkg/models
 	$(GO) generate ./pkg/modelscapi
+	# TODO: install the protoc-gen-go plugin in CI
+	# $(GO) generate ./pkg/protobufs
 
 .PHONY: testclean
 testclean: bats-clean  ## Remove test artifacts

cmd/notification-dummy/main.go

@@ -9,6 +9,7 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -19,6 +20,7 @@ type PluginConfig struct {
 }
 
 type DummyPlugin struct {
+	protobufs.UnimplementedNotifierServer
 	PluginConfigByName map[string]PluginConfig
 }
 
@@ -84,7 +86,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"dummy": &protobufs.NotifierPlugin{
+			"dummy": &csplugin.NotifierPlugin{
 				Impl: sp,
 			},
 		},

cmd/notification-email/main.go

@@ -12,6 +12,7 @@ import (
 	mail "github.com/xhit/go-simple-mail/v2"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -55,6 +56,7 @@ type PluginConfig struct {
 }
 
 type EmailPlugin struct {
+	protobufs.UnimplementedNotifierServer
 	ConfigByName map[string]PluginConfig
 }
 
@@ -170,7 +172,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"email": &protobufs.NotifierPlugin{
+			"email": &csplugin.NotifierPlugin{
 				Impl: &EmailPlugin{ConfigByName: make(map[string]PluginConfig)},
 			},
 		},

cmd/notification-file/main.go

@@ -15,6 +15,7 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -52,6 +53,7 @@ type LogRotate struct {
 }
 
 type FilePlugin struct {
+	protobufs.UnimplementedNotifierServer
 	PluginConfigByName map[string]PluginConfig
 }
 
@@ -241,7 +243,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"file": &protobufs.NotifierPlugin{
+			"file": &csplugin.NotifierPlugin{
 				Impl: sp,
 			},
 		},

cmd/notification-http/main.go

@@ -16,6 +16,7 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -34,6 +35,7 @@ type PluginConfig struct {
 }
 
 type HTTPPlugin struct {
+	protobufs.UnimplementedNotifierServer
 	PluginConfigByName map[string]PluginConfig
 }
 
@@ -190,7 +192,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"http": &protobufs.NotifierPlugin{
+			"http": &csplugin.NotifierPlugin{
 				Impl: sp,
 			},
 		},

cmd/notification-sentinel/main.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/go-plugin"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -27,6 +28,7 @@ type PluginConfig struct {
 }
 
 type SentinelPlugin struct {
+	protobufs.UnimplementedNotifierServer
 	PluginConfigByName map[string]PluginConfig
 }
 
@@ -122,7 +124,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"sentinel": &protobufs.NotifierPlugin{
+			"sentinel": &csplugin.NotifierPlugin{
 				Impl: sp,
 			},
 		},

cmd/notification-slack/main.go

@@ -10,6 +10,7 @@ import (
 	"github.com/slack-go/slack"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -23,6 +24,7 @@ type PluginConfig struct {
 	LogLevel  *string `yaml:"log_level"`
 }
 type Notify struct {
+	protobufs.UnimplementedNotifierServer
 	ConfigByName map[string]PluginConfig
 }
 
@@ -84,7 +86,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"slack": &protobufs.NotifierPlugin{
+			"slack": &csplugin.NotifierPlugin{
 				Impl: &Notify{ConfigByName: make(map[string]PluginConfig)},
 			},
 		},

cmd/notification-splunk/main.go

@@ -14,6 +14,7 @@ import (
 	plugin "github.com/hashicorp/go-plugin"
 	"gopkg.in/yaml.v3"
 
+	"github.com/crowdsecurity/crowdsec/pkg/csplugin"
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
@@ -32,6 +33,7 @@ type PluginConfig struct {
 }
 
 type Splunk struct {
+	protobufs.UnimplementedNotifierServer
 	PluginConfigByName map[string]PluginConfig
 	Client             http.Client
 }
@@ -117,7 +119,7 @@ func main() {
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: handshake,
 		Plugins: map[string]plugin.Plugin{
-			"splunk": &protobufs.NotifierPlugin{
+			"splunk": &csplugin.NotifierPlugin{
 				Impl: sp,
 			},
 		},

pkg/csplugin/broker.go

@@ -45,7 +45,7 @@ type PluginBroker struct {
 	pluginConfigByName              map[string]PluginConfig
 	pluginMap                       map[string]plugin.Plugin
 	notificationConfigsByPluginType map[string][][]byte // "slack" -> []{config1, config2}
-	notificationPluginByName        map[string]Notifier
+	notificationPluginByName        map[string]protobufs.NotifierServer
 	watcher                         PluginWatcher
 	pluginKillMethods               []func()
 	pluginProcConfig                *csconfig.PluginCfg
@@ -75,7 +75,7 @@ type ProfileAlert struct {
 func (pb *PluginBroker) Init(pluginCfg *csconfig.PluginCfg, profileConfigs []*csconfig.ProfileCfg, configPaths *csconfig.ConfigurationPaths) error {
 	pb.PluginChannel = make(chan ProfileAlert)
 	pb.notificationConfigsByPluginType = make(map[string][][]byte)
-	pb.notificationPluginByName = make(map[string]Notifier)
+	pb.notificationPluginByName = make(map[string]protobufs.NotifierServer)
 	pb.pluginMap = make(map[string]plugin.Plugin)
 	pb.pluginConfigByName = make(map[string]PluginConfig)
 	pb.alertsByPluginName = make(map[string][]*models.Alert)
@@ -276,7 +276,7 @@ func (pb *PluginBroker) loadPlugins(path string) error {
 	return pb.verifyPluginBinaryWithProfile()
 }
 
-func (pb *PluginBroker) loadNotificationPlugin(name string, binaryPath string) (Notifier, error) {
+func (pb *PluginBroker) loadNotificationPlugin(name string, binaryPath string) (protobufs.NotifierServer, error) {
 
 	handshake, err := getHandshake()
 	if err != nil {
@@ -313,7 +313,7 @@ func (pb *PluginBroker) loadNotificationPlugin(name string, binaryPath string) (
 		return nil, err
 	}
 	pb.pluginKillMethods = append(pb.pluginKillMethods, c.Kill)
-	return raw.(Notifier), nil
+	return raw.(protobufs.NotifierServer), nil
 }
 
 func (pb *PluginBroker) pushNotificationsToPlugin(pluginName string, alerts []*models.Alert) error {

pkg/csplugin/notifier.go

@@ -10,17 +10,15 @@ import (
 	"github.com/crowdsecurity/crowdsec/pkg/protobufs"
 )
 
-type Notifier interface {
-	Notify(ctx context.Context, notification *protobufs.Notification) (*protobufs.Empty, error)
-	Configure(ctx context.Context, cfg *protobufs.Config) (*protobufs.Empty, error)
-}
-
 type NotifierPlugin struct {
 	plugin.Plugin
-	Impl Notifier
+	Impl protobufs.NotifierServer
 }
 
-type GRPCClient struct{ client protobufs.NotifierClient }
+type GRPCClient struct{
+	protobufs.UnimplementedNotifierServer
+	client protobufs.NotifierClient 
+}
 
 func (m *GRPCClient) Notify(ctx context.Context, notification *protobufs.Notification) (*protobufs.Empty, error) {
 	done := make(chan error)
@@ -45,7 +43,7 @@ func (m *GRPCClient) Configure(ctx context.Context, config *protobufs.Config) (*
 }
 
 type GRPCServer struct {
-	Impl Notifier
+	Impl protobufs.NotifierServer
 }
 
 func (p *NotifierPlugin) GRPCServer(broker *plugin.GRPCBroker, s *grpc.Server) error {