unit test for audit service

Signed-off-by: jkoberg <jkoberg@owncloud.com>

audit/pkg/service/service.go

@@ -1,6 +1,7 @@
 package svc
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -29,33 +30,36 @@ func AuditLoggerFromConfig(cfg config.Auditlog, ch <-chan interface{}, log log.L
 		logs = append(logs, WriteToFile(cfg.FilePath, log))
 	}
 
-	StartAuditLogger(ch, log, Marshal(cfg.Format, log), logs...)
+	StartAuditLogger(context.TODO(), ch, log, Marshal(cfg.Format, log), logs...)
 
 }
 
 // StartAuditLogger will block. run in seperate go routine
-func StartAuditLogger(ch <-chan interface{}, log log.Logger, marshaller Marshaller, logto ...Log) {
+func StartAuditLogger(ctx context.Context, ch <-chan interface{}, log log.Logger, marshaller Marshaller, logto ...Log) {
 	for {
-		i := <-ch
+		select {
+		case <-ctx.Done():
+			return
+		case i := <-ch:
+			var auditEvent interface{}
+			switch ev := i.(type) {
+			case events.ShareCreated:
+				auditEvent = types.ShareCreated(ev)
+			default:
+				log.Error().Interface("event", ev).Msg(fmt.Sprintf("can't handle event of type '%T'", ev))
+				continue
 
-		var auditEvent interface{}
-		switch ev := i.(type) {
-		case events.ShareCreated:
-			auditEvent = types.ShareCreated(ev)
-		default:
-			log.Error().Interface("event", ev).Msg(fmt.Sprintf("can't handle event of type '%T'", ev))
-			continue
+			}
 
-		}
+			b, err := marshaller(auditEvent)
+			if err != nil {
+				log.Error().Err(err).Msg("error marshaling the event")
+				continue
+			}
 
-		b, err := marshaller(auditEvent)
-		if err != nil {
-			log.Error().Err(err).Msg("error marshaling the event")
-			continue
-		}
-
-		for _, l := range logto {
-			l(b)
+			for _, l := range logto {
+				l(b)
+			}
 		}
 	}
 

audit/pkg/service/service_test.go

@@ -0,0 +1,76 @@
+package svc
+
+import (
+	"context"
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/cs3org/reva/v2/pkg/events"
+	"github.com/owncloud/ocis/audit/pkg/types"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/test-go/testify/require"
+
+	group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1"
+	user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
+	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
+	rtypes "github.com/cs3org/go-cs3apis/cs3/types/v1beta1"
+)
+
+var testCases = []struct {
+	Alias           string
+	SystemEvent     interface{}
+	CheckAuditEvent func(t *testing.T) Log
+}{
+	{
+		Alias: "ShareCreated",
+		SystemEvent: events.ShareCreated{
+			Sharer: &user.UserId{
+				OpaqueId: "sharing-userid",
+				Idp:      "idp",
+			},
+			GranteeUserID: &user.UserId{
+				OpaqueId: "beshared-userid",
+				Idp:      "idp",
+			},
+			GranteeGroupID: &group.GroupId{},
+			Sharee:         &provider.Grantee{},
+			ItemID: &provider.ResourceId{
+				StorageId: "storage-1",
+				OpaqueId:  "itemid-1",
+			},
+			CTime: &rtypes.Timestamp{
+				Seconds: 0,
+				Nanos:   0,
+			},
+		},
+		CheckAuditEvent: func(t *testing.T) Log {
+			return func(b []byte) {
+				ev := types.AuditEventShareCreated{}
+				err := json.Unmarshal(b, &ev)
+				require.NoError(t, err)
+
+				require.Equal(t, ev.User, "sharing-userid")
+				require.Equal(t, ev.ShareWith, "beshared-userid")
+				require.Equal(t, ev.FileID, "itemid-1")
+				require.Equal(t, ev.Time, "1970-01-01T01:00:00+01:00")
+
+			}
+		},
+	},
+}
+
+func TestAuditLogging(t *testing.T) {
+	log := log.NewLogger()
+
+	for _, tc := range testCases {
+		ch := make(chan interface{})
+		ctx, cancel := context.WithCancel(context.TODO())
+		go StartAuditLogger(ctx, ch, log, Marshal("json", log), tc.CheckAuditEvent(t))
+		ch <- tc.SystemEvent
+		cancel()
+	}
+
+	// wait for events to be checked
+	time.Sleep(time.Second)
+}

go.mod

@@ -25,7 +25,6 @@ require (
 	github.com/cs3org/reva/v2 v2.0.0-20220304131900-b8be80d1ba81
 	github.com/disintegration/imaging v1.6.2
 	github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733
-	github.com/go-chi/chi v4.0.2+incompatible
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/go-chi/cors v1.2.0
 	github.com/go-chi/render v1.0.1
@@ -62,6 +61,7 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.3.0
 	github.com/stretchr/testify v1.7.0
+	github.com/test-go/testify v1.1.4
 	github.com/thejerf/suture/v4 v4.0.2
 	github.com/urfave/cli/v2 v2.3.0
 	go-micro.dev/v4 v4.6.0