Add more events

management/server/activity/event.go

@@ -13,19 +13,35 @@ const (
 	UserInvited
 	// AccountCreated indicates that a new account has been created
 	AccountCreated
+	// PeerRemovedByUser indicates that a user removed a peer from the system
+	PeerRemovedByUser
+	// RuleAdded indicates that a user added a new rule
+	RuleAdded
+	// RuleUpdated indicates that a user updated a rule
+	RuleUpdated
+	// RuleRemoved indicates that a user removed a rule
+	RuleRemoved
 )
 
 const (
 	// PeerAddedByUserMessage is a human-readable text message of the PeerAddedByUser activity
-	PeerAddedByUserMessage string = "User added a new peer"
+	PeerAddedByUserMessage string = "Peer added"
 	// PeerAddedWithSetupKeyMessage is a human-readable text message of the PeerAddedWithSetupKey activity
-	PeerAddedWithSetupKeyMessage = "New peer added with a setup key"
+	PeerAddedWithSetupKeyMessage = PeerAddedByUserMessage
 	//UserJoinedMessage is a human-readable text message of the UserJoined activity
-	UserJoinedMessage string = "New user joined"
+	UserJoinedMessage string = "User joined"
 	//UserInvitedMessage is a human-readable text message of the UserInvited activity
-	UserInvitedMessage string = "New user invited"
+	UserInvitedMessage string = "User invited"
 	//AccountCreatedMessage is a human-readable text message of the AccountCreated activity
 	AccountCreatedMessage string = "Account created"
+	// PeerRemovedByUserMessage is a human-readable text message of the PeerRemovedByUser activity
+	PeerRemovedByUserMessage string = "Peer deleted"
+	// RuleAddedMessage is a human-readable text message of the RuleAdded activity
+	RuleAddedMessage string = "Rule added"
+	// RuleRemovedMessage is a human-readable text message of the RuleRemoved activity
+	RuleRemovedMessage string = "Rule deleted"
+	// RuleUpdatedMessage is a human-readable text message of the RuleRemoved activity
+	RuleUpdatedMessage string = "Rule updated"
 )
 
 // Activity that triggered an Event
@@ -36,6 +52,8 @@ func (a Activity) Message() string {
 	switch a {
 	case PeerAddedByUser:
 		return PeerAddedByUserMessage
+	case PeerRemovedByUser:
+		return PeerRemovedByUserMessage
 	case PeerAddedWithSetupKey:
 		return PeerAddedWithSetupKeyMessage
 	case UserJoined:
@@ -44,6 +62,12 @@ func (a Activity) Message() string {
 		return UserInvitedMessage
 	case AccountCreated:
 		return AccountCreatedMessage
+	case RuleAdded:
+		return RuleAddedMessage
+	case RuleRemoved:
+		return RuleRemovedMessage
+	case RuleUpdated:
+		return RuleUpdatedMessage
 	default:
 		return "UNKNOWN_ACTIVITY"
 	}
@@ -54,6 +78,8 @@ func (a Activity) StringCode() string {
 	switch a {
 	case PeerAddedByUser:
 		return "user.peer.add"
+	case PeerRemovedByUser:
+		return "user.peer.delete"
 	case PeerAddedWithSetupKey:
 		return "setupkey.peer.add"
 	case UserJoined:
@@ -62,6 +88,12 @@ func (a Activity) StringCode() string {
 		return "user.invite"
 	case AccountCreated:
 		return "account.create"
+	case RuleAdded:
+		return "rule.add"
+	case RuleRemoved:
+		return "rule.delete"
+	case RuleUpdated:
+		return "rule.update"
 	default:
 		return "UNKNOWN_ACTIVITY"
 	}
@@ -91,10 +123,18 @@ type Event struct {
 	TargetID string
 	// AccountID is the ID of an account where the event happened
 	AccountID string
+	// Meta of the event, e.g. deleted peer information like name, IP, etc
+	Meta map[string]any
 }
 
 // Copy the event
 func (e *Event) Copy() *Event {
+
+	meta := make(map[string]any, len(e.Meta))
+	for key, value := range e.Meta {
+		meta[key] = value
+	}
+
 	return &Event{
 		Timestamp:   e.Timestamp,
 		Activity:    e.Activity,
@@ -102,5 +142,6 @@ func (e *Event) Copy() *Event {
 		InitiatorID: e.InitiatorID,
 		TargetID:    e.TargetID,
 		AccountID:   e.AccountID,
+		Meta:        meta,
 	}
 }

management/server/activity/sqlite.go

@@ -2,6 +2,7 @@ package activity
 
 import (
 	"database/sql"
+	"encoding/json"
 	"fmt"
 	_ "github.com/mattn/go-sqlite3"
 	"path/filepath"
@@ -16,6 +17,7 @@ const (
 		"timestamp DATETIME, " +
 		"initiator_id TEXT," +
 		"account_id TEXT," +
+		"meta TEXT," +
 		" target_id TEXT);"
 )
 
@@ -49,11 +51,20 @@ func processResult(result *sql.Rows) ([]*Event, error) {
 		var initiator string
 		var target string
 		var account string
-		err := result.Scan(&id, &operation, &timestamp, &initiator, &target, &account)
+		var jsonMeta string
+		err := result.Scan(&id, &operation, &timestamp, &initiator, &target, &account, &jsonMeta)
 		if err != nil {
 			return nil, err
 		}
 
+		meta := make(map[string]any)
+		if jsonMeta != "" {
+			err = json.Unmarshal([]byte(jsonMeta), &meta)
+			if err != nil {
+				return nil, err
+			}
+		}
+
 		events = append(events, &Event{
 			Timestamp:   timestamp,
 			Activity:    operation,
@@ -61,6 +72,7 @@ func processResult(result *sql.Rows) ([]*Event, error) {
 			InitiatorID: initiator,
 			TargetID:    target,
 			AccountID:   account,
+			Meta:        meta,
 		})
 	}
 
@@ -73,7 +85,7 @@ func (store *SQLiteStore) Get(accountID string, offset, limit int, descending bo
 	if !descending {
 		order = "ASC"
 	}
-	stmt, err := store.db.Prepare(fmt.Sprintf("SELECT id, activity, timestamp, initiator_id, target_id, account_id"+
+	stmt, err := store.db.Prepare(fmt.Sprintf("SELECT id, activity, timestamp, initiator_id, target_id, account_id, meta"+
 		" FROM events WHERE account_id = ? ORDER BY timestamp %s LIMIT ? OFFSET ?;", order))
 	if err != nil {
 		return nil, err
@@ -91,12 +103,21 @@ func (store *SQLiteStore) Get(accountID string, offset, limit int, descending bo
 // Save an event in the SQLite events table
 func (store *SQLiteStore) Save(event *Event) (*Event, error) {
 
-	stmt, err := store.db.Prepare("INSERT INTO events(activity, timestamp, initiator_id, target_id, account_id) VALUES(?, ?, ?, ?, ?)")
+	stmt, err := store.db.Prepare("INSERT INTO events(activity, timestamp, initiator_id, target_id, account_id, meta) VALUES(?, ?, ?, ?, ?, ?)")
 	if err != nil {
 		return nil, err
 	}
 
-	result, err := stmt.Exec(event.Activity, event.Timestamp, event.InitiatorID, event.TargetID, event.AccountID)
+	var jsonMeta string
+	if event.Meta != nil {
+		metaBytes, err := json.Marshal(event.Meta)
+		if err != nil {
+			return nil, err
+		}
+		jsonMeta = string(metaBytes)
+	}
+
+	result, err := stmt.Exec(event.Activity, event.Timestamp, event.InitiatorID, event.TargetID, event.AccountID, jsonMeta)
 	if err != nil {
 		return nil, err
 	}

management/server/activity/sqlite_test.go

@@ -1,29 +1,27 @@
 package activity
 
 import (
-	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
 )
 
 func TestNewSQLiteStore(t *testing.T) {
-	dataDir := t.TempDir()
-	store, err := NewSQLiteStore(dataDir)
+	//dataDir := t.TempDir()
+	store, err := NewSQLiteStore("/home/braginini/wiretrustee/test/")
 	if err != nil {
 		t.Fatal(err)
 		return
 	}
 
-	accountID := "account_1"
+	//accountID := "account_1"
 
-	for i := 0; i < 10; i++ {
+	for i := 0; i < 10000; i++ {
 		_, err = store.Save(&Event{
-			Timestamp:   time.Now(),
+			Timestamp:   time.Now().Add(-1 * time.Minute),
 			Activity:    PeerAddedByUser,
-			InitiatorID: "user_" + fmt.Sprint(i),
-			TargetID:    "peer_" + fmt.Sprint(i),
-			AccountID:   accountID,
+			InitiatorID: "google-oauth2|110866222733584764488",
+			TargetID:    "100.101.249.29",
+			AccountID:   "cebi9h3lo1hkhn1qc7cg",
 		})
 		if err != nil {
 			t.Fatal(err)
@@ -31,7 +29,7 @@ func TestNewSQLiteStore(t *testing.T) {
 		}
 	}
 
-	result, err := store.Get(accountID, 0, 10, false)
+	/*result, err := store.Get(accountID, 0, 10, false)
 	if err != nil {
 		t.Fatal(err)
 		return
@@ -47,5 +45,5 @@ func TestNewSQLiteStore(t *testing.T) {
 	}
 
 	assert.Len(t, result, 5)
-	assert.True(t, result[0].Timestamp.After(result[len(result)-1].Timestamp))
+	assert.True(t, result[0].Timestamp.After(result[len(result)-1].Timestamp))*/
 }