Add remote_user parsing (#26)

* add test make target * add failing test for remote_user field * add remote_user field
facundoolano · Sep 14, 2024 · 6440e5f · 6440e5f
1 parent 50bcea4
commit 6440e5f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -6,6 +6,9 @@ pull:
 run:
 	NGTOP_LOGS_PATH=./logs/access.log* go run .
 
+test:
+	go test ./...
+
 db:
 	sqlite3 -cmd ".open ngtop.db"
 

diff --git a/main_test.go b/main_test.go
@@ -100,8 +100,8 @@ const SAMPLE_LOGS = `xx.xx.xx.xx - - [24/Jul/2024:00:00:28 +0000] "GET /feed HTT
 xx.xx.xx.xx - - [24/Jul/2024:00:00:30 +0000] "GET /feed HTTP/1.1" 301 169 "-" "feedi/0.1.0 (+https://github.com/facundoolano/feedi)"
 xx.xx.xx.xx - - [24/Jul/2024:00:00:56 +0000] "GET /blog/deconstructing-the-role-playing-videogame/ HTTP/1.1" 200 14224 "-" "feedi/0.1.0 (+https://github.com/facundoolano/feedi)"
 xx.xx.xx.xx - - [24/Jul/2024:00:01:18 +0000] "GET /feed.xml HTTP/1.1" 200 9641 "https://olano.dev/feed.xml" "FreshRSS/1.24.0 (Linux; https://freshrss.org)"
-xx.xx.xx.xx - - [24/Jul/2024:00:01:20 +0000] "GET /feed.xml HTTP/1.1" 200 9641 "https://olano.dev/feed.xml" "FreshRSS/1.24.0 (Linux; https://freshrss.org)"
-xx.xx.xx.xx - - [24/Jul/2024:00:01:51 +0000] "GET /feed.xml HTTP/1.1" 200 9641 "https://olano.dev/feed.xml" "FreshRSS/1.24.0 (Linux; https://freshrss.org)"
+xx.xx.xx.xx - facundo [24/Jul/2024:00:01:20 +0000] "GET /feed.xml HTTP/1.1" 200 9641 "https://olano.dev/feed.xml" "FreshRSS/1.24.0 (Linux; https://freshrss.org)"
+xx.xx.xx.xx - facundo [24/Jul/2024:00:01:51 +0000] "GET /feed.xml HTTP/1.1" 200 9641 "https://olano.dev/feed.xml" "FreshRSS/1.24.0 (Linux; https://freshrss.org)"
 xx.xx.xx.xx - - [24/Jul/2024:00:02:17 +0000] "GET / HTTP/1.1" 200 1120 "https://olano.dev/" "SimplePie/1.8.0 (Feed Parser; http://simplepie.org; Allow like Gecko) Build/1674203855"
 xx.xx.xx.xx - - [24/Jul/2024:00:04:49 +0000] "GET /blog/mi-descubrimiento-de-america HTTP/1.1" 301 169 "-" "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.6478.126 Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
 xx.xx.xx.xx - - [24/Jul/2024:00:06:41 +0000] "GET /blog/a-few-more-things-you-can-do-on-your-website HTTP/1.1" 301 169 "-" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_2) AppleWebKit/601.3.9 (KHTML, like Gecko) Version/9.0.2 Safari/601.3.9"
@@ -179,6 +179,12 @@ func TestMultiField(t *testing.T) {
 	assertEqual(t, len(rows), 2)
 	assertEqual(t, rows[0], []string{"301", "GET", "6"})
 	assertEqual(t, rows[1], []string{"200", "GET", "5"})
+
+	columns, rows = runCommand(t, DEFAULT_LOG_FORMAT, SAMPLE_LOGS, []string{"user"})
+	assertEqual(t, columns, []string{"user", "#reqs"})
+	assertEqual(t, len(rows), 2)
+	assertEqual(t, rows[0], []string{"", "9"})
+	assertEqual(t, rows[1], []string{"facundo", "2"})
 }
 
 func TestWhereFilter(t *testing.T) {

diff --git a/ngtop/fields.go b/ngtop/fields.go
@@ -72,6 +72,12 @@ var KNOWN_FIELDS = []LogField{
 		ColumnName:   "ip",
 		ColumnSpec:   "TEXT",
 	},
+	{
+		LogFormatVar: "remote_user",
+		CLINames:     []string{"user", "username", "remote_user", "remoteuser"},
+		ColumnName:   "user",
+		ColumnSpec:   "TEXT",
+	},
 	{
 		LogFormatVar: "status",
 		CLINames:     []string{"status"},