Merge pull request #3301 from kobergj/ShareEventsForAuditLogging

Share events for audit logging

.drone.star

@@ -16,6 +16,7 @@ config = {
     "modules": [
         # if you add a module here please also add it to the root level Makefile
         "accounts",
+        "audit",
         "glauth",
         "graph-explorer",
         "graph",

Makefile

@@ -17,6 +17,7 @@ L10N_MODULES := $(shell find . -path '*.tx*' -name 'config' | sed 's|/[^/]*$$||'
 # if you add a module here please also add it to the .drone.star file
 OCIS_MODULES = \
 	accounts \
+	audit \
 	glauth \
 	graph \
 	graph-explorer \

audit/Makefile

@@ -0,0 +1,55 @@
+SHELL := bash
+NAME := audit
+
+include ../.make/recursion.mk
+
+.PHONY: test-acceptance-webui
+test-acceptance-webui:
+	./ui/tests/run-acceptance-test.sh $(FEATURE_PATH)
+
+
+############ tooling ############
+ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
+include ../.bingo/Variables.mk
+endif
+
+############ go tooling ############
+include ../.make/go.mk
+
+############ release ############
+include ../.make/release.mk
+
+############ docs generate ############
+include ../.make/docs.mk
+
+############ l10n ############
+include ../.make/l10n.mk
+
+.PHONY: docs-generate
+docs-generate: config-docs-generate \
+			   grpc-docs-generate
+
+############ generate ############
+include ../.make/generate.mk
+
+.PHONY: ci-go-generate
+ci-go-generate: protobuf # CI runs ci-node-generate automatically before this target
+
+.PHONY: ci-node-generate
+ci-node-generate: yarn-build
+
+.PHONY: yarn-build
+yarn-build: node_modules
+	yarn lint
+	yarn test
+	yarn build
+
+.PHONY: node_modules
+node_modules:
+	yarn install --immutable
+
+############ protobuf ############
+include ../.make/protobuf.mk
+
+.PHONY: protobuf
+protobuf: buf-generate

audit/pkg/service/service.go

@@ -45,6 +45,22 @@ func StartAuditLogger(ctx context.Context, ch <-chan interface{}, log log.Logger
 			switch ev := i.(type) {
 			case events.ShareCreated:
 				auditEvent = types.ShareCreated(ev)
+			case events.LinkCreated:
+				auditEvent = types.LinkCreated(ev)
+			case events.ShareUpdated:
+				auditEvent = types.ShareUpdated(ev)
+			case events.LinkUpdated:
+				auditEvent = types.LinkUpdated(ev)
+			case events.ShareRemoved:
+				auditEvent = types.ShareRemoved(ev)
+			case events.LinkRemoved:
+				auditEvent = types.LinkRemoved(ev)
+			case events.ReceivedShareUpdated:
+				auditEvent = types.ReceivedShareUpdated(ev)
+			case events.LinkAccessed:
+				auditEvent = types.LinkAccessed(ev)
+			case events.LinkAccessFailed:
+				auditEvent = types.LinkAccessFailed(ev)
 			default:
 				log.Error().Interface("event", ev).Msg(fmt.Sprintf("can't handle event of type '%T'", ev))
 				continue
@@ -95,5 +111,20 @@ func Marshal(format string, log log.Logger) Marshaller {
 		return nil
 	case "json":
 		return json.Marshal
+	case "minimal":
+		return func(ev interface{}) ([]byte, error) {
+			b, err := json.Marshal(ev)
+			if err != nil {
+				return nil, err
+			}
+
+			m := make(map[string]interface{})
+			if err := json.Unmarshal(b, &m); err != nil {
+				return nil, err
+			}
+
+			format := fmt.Sprintf("%s)\n   %s", m["Action"], m["Message"])
+			return []byte(format), nil
+		}
 	}
 }