10 files changed, 235 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index e915543..1216dc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@ node_modules/
 package.json
 .npm_update
 *.d
+eventlogging/events.go
 
 #Gebuildete Dateien
 assets/js/*
diff --git a/Makefile b/Makefile
index 12f5f53..754b1e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 include config.mk
 
-BINARY_PATH=./bin
+BINARY_PATH = ./bin
+TARGET = $(BINARY_PATH)/$(NAME)
 IMPORTER_FILES = $(shell find tools/importer/ -type f -name '*.go')
 
 CSS_FILES = $(patsubst assets_src/%, assets/%, $(shell find assets_src/css/ -type f -name '*.css'))
@@ -13,7 +14,7 @@ LESSC := ./node_modules/less/bin/lessc
 
 -include $(DEPFILES)
 
-all: assets app
+all: assets $(TARGET) $(IMPORTER)
 
 print_info:
         @echo $(CSS_FILES)
@@ -21,8 +22,10 @@ print_info:
         @echo $(JS_FILES)
         @echo $(DEPFILES)
 
-app:
-        go build -o $(BINARY_PATH)/$(NAME)
+$(NAME): $(TARGET)
+
+$(TARGET): eventlogging/events.go
+        go build -o $@
 
 .npm_update: package.json
         touch $@
@@ -51,6 +54,9 @@ assets/js/%.js: assets_src/js/%.js assets_src/js/%.d .babelrc .npm_update
         @echo browserify $< -o $@
         @$(BROWSERIFY) --debug $< -o $@ -t babelify
 
+eventlogging/events.go: eventlogging/events.txt
+        ./bin/generate-events < $< > $@
+
 clean:
         -rm -- $(BINARY_PATH)/$(NAME)
         -rm -- $(CSS_FILES)
@@ -58,6 +64,7 @@ clean:
         -rm -- $(JS_FILES)
         -rm -- $(DEPFILES)
         -rm -- importer
+        -rm -- eventlogging/events.go
 
 superclean: clean
         -rm -- .npm_update
@@ -66,11 +73,11 @@ superclean: clean
 ultraclean: superclean
         -rm -r -- node_modules
 
-run: assets
-        go run *.go
+run: assets $(TARGET)
+        $(TARGET)
 
 importer: $(IMPORTER_FILES)
         go build -o importer tools/importer/*.go
 
-.PHONY: all assets app print_info clean superclean ultraclean run
+.PHONY: all assets $(NAME) $(TARGET) print_info clean superclean ultraclean run
 
diff --git a/bin/generate-events b/bin/generate-events
new file mode 100755
index 0000000..c4a0c1c
--- /dev/null
+++ b/bin/generate-events
@@ -0,0 +1,38 @@
+#!/bin/bash
+events=$(cat)
+echo 'package eventlogging
+/*
+ * THIS FILE IS AUTOGENERATED
+ * DO NOT EDIT MANUALLY!!!
+ */
+
+import (
+        "fagott.pw/charakterin"
+)
+
+'
+
+echo "var Events = []string{"
+while read event
+do
+        cat <<EOT
+        "$event",
+EOT
+done <<<"$events"
+echo '}
+'
+
+while read event
+do
+        funcName=$(sed -r 's/(^|_)(.)([^_]*)/\2\L\3/g' <<<$event)
+        cat <<EOT
+func (l *EventLogger) ${funcName}(user *charakterin.User, data ${funcName}Data) {
+        if user != nil {
+                data.User = user.Name
+                data.UserAgent = user.Agent
+        }
+        l.base.Log("$event", data)
+}
+
+EOT
+done <<<"$events"
diff --git a/eventlogging/eventlogger.go b/eventlogging/eventlogger.go
new file mode 100644
index 0000000..e5a1b2b
--- /dev/null
+++ b/eventlogging/eventlogger.go
@@ -0,0 +1,18 @@
+package eventlogging
+
+import "fagott.pw/nsa"
+
+type EventLoggerData struct {
+        User      string `json:"user"`
+        UserAgent string `json:"userAgent"`
+}
+
+type EventLogger struct {
+        base *nsa.Logger
+}
+
+func NewEventLogger(ip string) *EventLogger {
+        return &EventLogger{
+                base: nsa.NewLogger(ip),
+        }
+}
diff --git a/eventlogging/events.txt b/eventlogging/events.txt
new file mode 100644
index 0000000..0e170dc
--- /dev/null
+++ b/eventlogging/events.txt
@@ -0,0 +1,8 @@
+VIEW_GRIL
+VIEW_LIST
+CREATE_LIST
+ADD_GRIL_TO_LIST
+DELETE_GRIL_FROM_LIST
+DELETE_LIST
+EDIT_LIST
+CHANGE_GRIL_ORDER
diff --git a/eventlogging/types.go b/eventlogging/types.go
new file mode 100644
index 0000000..96d0ce0
--- /dev/null
+++ b/eventlogging/types.go
@@ -0,0 +1,52 @@
+package eventlogging
+
+type ViewGrilData struct {
+        EventLoggerData
+        GrilID int
+}
+
+type ViewListData struct {
+        EventLoggerData
+        ListID int
+}
+
+type CreateListData struct {
+        EventLoggerData
+        ListID      int
+        Name        string
+        Description string
+}
+
+type AddGrilToListData struct {
+        EventLoggerData
+        GrilID int
+        ListID int
+}
+
+type DeleteGrilFromListData struct {
+        EventLoggerData
+        ListID int
+        GrilID int
+}
+
+type DeleteListData struct {
+        EventLoggerData
+        ListID int
+}
+
+type EditListData struct {
+        EventLoggerData
+        ListID         int
+        OldName        string
+        OldDescription string
+        NewName        string
+        NewDescription string
+}
+
+type ChangeGrilOrderData struct {
+        EventLoggerData
+        ListID   int
+        GrilID   int
+        OldOrder int
+        NewOrder int
+}
diff --git a/grilist/grilist.go b/grilist/grilist.go
index f9a79b2..aebe45c 100644
--- a/grilist/grilist.go
+++ b/grilist/grilist.go
@@ -2,8 +2,13 @@ package grilist
 
 import (
         "database/sql"
+        "log"
+        "net"
+        "net/http"
+        "strings"
 
         "fagott.pw/charakterin"
+        "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
 
         "github.com/julienschmidt/httprouter"
@@ -20,6 +25,21 @@ type Grilist struct {
         Router      *httprouter.Router
 }
 
+func (g *Grilist) EventLogger(r *http.Request) *eventlogging.EventLogger {
+        forwardedIPs := strings.Split(r.Header.Get("X-Forwarded-For"), ", ")
+        ip := r.RemoteAddr
+        if len(forwardedIPs) > 0 && forwardedIPs[0] != "" {
+                ip = forwardedIPs[0]
+        }
+        host, _, err := net.SplitHostPort(ip)
+        if err != nil {
+                log.Printf("Could not split IP %s\n", ip)
+                log.Println(err)
+                host = "0.0.0.0"
+        }
+        return eventlogging.NewEventLogger(host)
+}
+
 // Module ist ein Modul für Grilist.
 type Module interface {
         Init(*Grilist)
diff --git a/main.go b/main.go
index 7ee05ad..75eee68 100644
--- a/main.go
+++ b/main.go
@@ -5,8 +5,10 @@ import (
         "fmt"
         "log"
         "net/http"
+        "strings"
 
         "fagott.pw/charakterin"
+        "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
         "fagott.pw/grilist/modules/grils"
@@ -15,8 +17,7 @@ import (
         "fagott.pw/grilist/modules/series"
         "fagott.pw/grilist/modules/tags"
         "fagott.pw/grilist/modules/user"
-
-        "strings"
+        "fagott.pw/nsa"
 
         "github.com/julienschmidt/httprouter"
         _ "github.com/lib/pq"
@@ -53,6 +54,13 @@ func main() {
 
         log.Println("database connection established")
 
+        if err := nsa.Init(db); err != nil {
+                panic(err)
+        }
+        if err := nsa.SetEvents(eventlogging.Events); err != nil {
+                panic(err)
+        }
+
         renderer := frontend.New("views")
         login := charakterin.New(db)
         login.UseRenderer(renderer)
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index 1b1bb5f..4a9990f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -11,6 +11,7 @@ import (
 
         "fagott.pw/charakterin"
         "fagott.pw/grilist/cache"
+        "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
         "fagott.pw/grilist/models"
@@ -237,6 +238,7 @@ func (m *GrilsModule) FromIDs(ids []int) ([]*models.Gril, error) {
 
 func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         user, _ := m.g.Charakterin.GetUserFromRequest(r)
+        el := m.g.EventLogger(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -288,6 +290,9 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
         data["SimilarGrils"] = similar
 
         m.g.Renderer.RenderPage("gril", w, data)
+        el.ViewGril(user, eventlogging.ViewGrilData{
+                GrilID: gril.ID,
+        })
 }
 
 func pgArray(array []byte) []string {
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index 5934e9a..65e969f 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -14,6 +14,7 @@ import (
 
         "fagott.pw/charakterin"
         "fagott.pw/grilist/cache"
+        "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
         "fagott.pw/grilist/models"
@@ -260,6 +261,7 @@ func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.Dashboar
 
 func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         user, _ := m.g.Charakterin.GetUserFromRequest(r)
+        el := m.g.EventLogger(r)
         sid := p.ByName("id")
 
         id, err := strconv.Atoi(sid)
@@ -286,9 +288,13 @@ func (m *Module) viewList(w http.ResponseWriter, r *http.Request, p httprouter.P
         }
 
         m.g.Renderer.RenderPage("list", w, data)
+        el.ViewList(user, eventlogging.ViewListData{
+                ListID: list.ID,
+        })
 }
 
 func (m *Module) deleteList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         user, err := m.g.Charakterin.GetUserFromRequest(r)
         if err != nil {
                 log.Println("invalid deleteList user")
@@ -334,6 +340,9 @@ func (m *Module) deleteList(w http.ResponseWriter, r *http.Request, p httprouter
 
         log.Printf("list %d has been deleted by the owner %d(%s)", list.ID, list.Owner.ID, list.Owner.GetName())
         http.Redirect(w, r, "/", 302)
+        el.DeleteList(user, eventlogging.DeleteListData{
+                ListID: list.ID,
+        })
 }
 
 func (m *Module) viewListSettings(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
@@ -372,6 +381,7 @@ func (m *Module) viewListSettings(w http.ResponseWriter, r *http.Request, p http
 }
 
 func (m *Module) updateListSettings(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         user, err := m.g.Charakterin.GetUserFromRequest(r)
         if err != nil {
                 log.Println("invalid updateListSettings user")
@@ -436,6 +446,18 @@ func (m *Module) updateListSettings(w http.ResponseWriter, r *http.Request, p ht
                 return
         }
 
+        rows, err := m.g.DB.Query("SELECT name, description FROM grilist.lists WHERE id = $1;", id)
+        if err != nil {
+                log.Println("could not get list info", id)
+                renderWithError("interner fehler", false, false)
+                return
+        }
+        defer rows.Close()
+
+        var oldName string
+        var oldDescription string
+        rows.Scan(&oldName, &oldDescription)
+
         if list.Name != name && list.Description != description {
                 _, err = m.g.DB.Query(`UPDATE grilist.lists SET name = $2, description = $3 WHERE id = $1`, id, name, description)
                 if err != nil {
@@ -463,9 +485,17 @@ func (m *Module) updateListSettings(w http.ResponseWriter, r *http.Request, p ht
         list.Description = description
 
         m.viewListSettings(w, r, p)
+        el.EditList(user, eventlogging.EditListData{
+                ListID:         id,
+                OldName:        oldName,
+                OldDescription: oldDescription,
+                NewName:        name,
+                NewDescription: description,
+        })
 }
 
 func (m *Module) addGrilToList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         slistID := p.ByName("id")
 
         user, err := m.g.Charakterin.GetUserFromRequest(r)
@@ -532,7 +562,10 @@ func (m *Module) addGrilToList(w http.ResponseWriter, r *http.Request, p httprou
         data["Value"] = value
         list.Grils = append(list.Grils, lg)
         m.g.Renderer.RenderPage("list_gril", w, data)
-        return
+        el.AddGrilToList(user, eventlogging.AddGrilToListData{
+                ListID: list.ID,
+                GrilID: gril.ID,
+        })
 }
 
 func (m *Module) displayCreateList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
@@ -549,6 +582,7 @@ func (m *Module) displayCreateList(w http.ResponseWriter, r *http.Request, p htt
 }
 
 func (m *Module) createList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         user, err := m.g.Charakterin.GetUserFromRequest(r)
         if err != nil {
                 log.Println(err)
@@ -572,9 +606,15 @@ func (m *Module) createList(w http.ResponseWriter, r *http.Request, p httprouter
         }
 
         http.Redirect(w, r, fmt.Sprintf("/list/%d", id), 302)
+        el.CreateList(user, eventlogging.CreateListData{
+                ListID:      id,
+                Name:        values.Get("name"),
+                Description: values.Get("description"),
+        })
 }
 
 func (m *Module) updateGrilOrder(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         slistID := p.ByName("id")
 
         user, err := m.g.Charakterin.GetUserFromRequest(r)
@@ -607,6 +647,16 @@ func (m *Module) updateGrilOrder(w http.ResponseWriter, r *http.Request, p httpr
                 return
         }
 
+        var oldOrder int
+        err = m.g.DB.QueryRow(
+                `SELECT "order" FROM grilist.lists_grils WHERE list_id = $1 AND gril_id = $2;`,
+                listID, grilID).Scan(&oldOrder)
+        if err != nil {
+                log.Println(err)
+                http.Error(w, "Internal Server Error", 500)
+                return
+        }
+
         // rein in die DB damit
         _, err = m.g.DB.Exec(`SELECT grilist.set_gril_order($1, $2, $3, $4)`, user.ID, listID, grilID, pos)
         if err != nil {
@@ -623,17 +673,30 @@ func (m *Module) updateGrilOrder(w http.ResponseWriter, r *http.Request, p httpr
 
         w.WriteHeader(200)
         w.Write([]byte("ok"))
-        return
+        el.ChangeGrilOrder(user, eventlogging.ChangeGrilOrderData{
+                ListID:   listID,
+                GrilID:   grilID,
+                OldOrder: oldOrder,
+                NewOrder: pos,
+        })
 }
 
 func (m *Module) removeGrilFromList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        el := m.g.EventLogger(r)
         slistID := p.ByName("id")
 
+        user, err := m.g.Charakterin.GetUserFromRequest(r)
+        if err != nil {
+                http.Error(w, "Unauthorized", 401)
+                return
+        }
+
         listID, err := strconv.Atoi(slistID)
         if err != nil {
                 http.Error(w, "invalid list ID (type mismatch)", 400)
                 return
         }
+        //TODO: noch mal gucken ob der User Rechte hat
 
         values, err := readBody(r)
         if err != nil {
@@ -667,7 +730,10 @@ func (m *Module) removeGrilFromList(w http.ResponseWriter, r *http.Request, p ht
 
         w.WriteHeader(200)
         w.Write([]byte("ok"))
-        return
+        el.DeleteGrilFromList(user, eventlogging.DeleteGrilFromListData{
+                ListID: listID,
+                GrilID: grilID,
+        })
 }
 
 func (m *Module) APIgetUserLists(w http.ResponseWriter, r *http.Request, p httprouter.Params) {