feat(pgs): record metrics for compressed file types

Commit `532a539`

Eric Bower · 2026-04-20 20:20:50 -0400 EDT

parent 1c474b9

feat(pgs): record metrics for compressed file types

3 files changed, +19, -2

M pkg/apps/auth/api.go

M pkg/shared/mime/mime.go

M pkg/shared/router/analytics.go

M pkg/apps/auth/api.go

+14, -2

......@@ -13,6 +13,7 @@ import (
	"log/slog"
	"net/http"
	"net/url"
	"slices"
	"strings"
	"time"

......@@ -749,6 +750,18 @@ func accessLogToVisit(dbpool db.DB, line string) (*db.AnalyticsVisits, error) {
	return deserializeCaddyAccessLog(dbpool, &accessLog)
}

var allowedMime = []string{
	"application/gzip",
	"application/vnd.rar",
	"application/x-7z-compressed",
	"application/x-bzip",
	"application/x-bzip2",
	"application/x-freearc",
	"application/x-tar",
	"application/zip",
	"text/html",
}

func metricDrainSub(ctx context.Context, dbpool db.DB, logger *slog.Logger, secret string) {
	drain := metrics.ReconnectReadMetrics(
		ctx,

......@@ -778,8 +791,7 @@ func metricDrainSub(ctx context.Context, dbpool db.DB, logger *slog.Logger, secr
				continue
			}

			if !strings.HasPrefix(visit.ContentType, "text/html") {
				logger.Info("invalid content type", "contentType", visit.ContentType)
			if !slices.Contains(allowedMime, visit.ContentType) {
				continue
			}

M pkg/shared/mime/mime.go

+4, -0

......@@ -84,6 +84,8 @@ func GetMimeType(fpath string) string {
		return "application/vnd.rar"
	case ".gz":
		return "application/gzip"
	case ".bz":
		return "application/x-bzip"
	case ".bz2":
		return "application/x-bzip2"
	case ".xz":

......@@ -92,6 +94,8 @@ func GetMimeType(fpath string) string {
		return "application/x-7z-compressed"
	case ".tar":
		return "application/x-tar"
	case ".arc":
		return "application/x-freearc"
	case ".txt":
		return "text/plain"
	}

M pkg/shared/router/analytics.go

+1, -0

......@@ -185,6 +185,7 @@ func AnalyticsVisitFromVisit(visit *db.AnalyticsVisits, dbpool db.DB, secret str
	}
	visit.Host = hostname
	visit.UserAgent = CleanUserAgent(visit.UserAgent)
	visit.ContentType = strings.ToLower(visit.ContentType)

	return nil
}

...	...		@@ -749,6 +750,18 @@ func accessLogToVisit(dbpool db.DB, line string) (*db.AnalyticsVisits, error) {
749	750		return deserializeCaddyAccessLog(dbpool, &accessLog)
750	751		}
751	752
	753	+	var allowedMime = []string{
	754	+	"application/gzip",
	755	+	"application/vnd.rar",
	756	+	"application/x-7z-compressed",
	757	+	"application/x-bzip",
	758	+	"application/x-bzip2",
	759	+	"application/x-freearc",
	760	+	"application/x-tar",
	761	+	"application/zip",
	762	+	"text/html",
	763	+	}
	764	+
752	765		func metricDrainSub(ctx context.Context, dbpool db.DB, logger *slog.Logger, secret string) {
753	766		drain := metrics.ReconnectReadMetrics(
754	767		ctx,

...	...		@@ -778,8 +791,7 @@ func metricDrainSub(ctx context.Context, dbpool db.DB, logger *slog.Logger, secr
778	791		continue
779	792		}
780	793
781		-	if !strings.HasPrefix(visit.ContentType, "text/html") {
782		-	logger.Info("invalid content type", "contentType", visit.ContentType)
	794	+	if !slices.Contains(allowedMime, visit.ContentType) {
783	795		continue
784	796		}
785	797

...	...		@@ -185,6 +185,7 @@ func AnalyticsVisitFromVisit(visit *db.AnalyticsVisits, dbpool db.DB, secret str
185	185		}
186	186		visit.Host = hostname
187	187		visit.UserAgent = CleanUserAgent(visit.UserAgent)
	188	+	visit.ContentType = strings.ToLower(visit.ContentType)
188	189
189	190		return nil
190	191		}

...	...		@@ -13,6 +13,7 @@ import (
13	13		"log/slog"
14	14		"net/http"
15	15		"net/url"
	16	+	"slices"
16	17		"strings"
17	18		"time"
18	19

...	...		@@ -84,6 +84,8 @@ func GetMimeType(fpath string) string {
84	84		return "application/vnd.rar"
85	85		case ".gz":
86	86		return "application/gzip"
	87	+	case ".bz":
	88	+	return "application/x-bzip"
87	89		case ".bz2":
88	90		return "application/x-bzip2"
89	91		case ".xz":

...	...		@@ -92,6 +94,8 @@ func GetMimeType(fpath string) string {
92	94		return "application/x-7z-compressed"
93	95		case ".tar":
94	96		return "application/x-tar"
	97	+	case ".arc":
	98	+	return "application/x-freearc"
95	99		case ".txt":
96	100		return "text/plain"
97	101		}

Commit 532a539

Commit `532a539`