user agent up

docker-compose.local.yml

@@ -7,7 +7,14 @@ services:
     command:
       - "--log.level=DEBUG"
       - "--accesslog"
-      - "--accesslog.filepath=/var/log/traefik/access.log"
+      # - "--accesslog.filepath=/var/log/traefik/access.log"
+      # - --accesslog.format=json
+      - --accesslog.fields.defaultmode=keep
+      - --accesslog.fields.names.ClientUsername=drop
+      - --accesslog.fields.headers.defaultmode=keep
+      - --accesslog.fields.headers.names.User-Agent=redact
+      - --accesslog.fields.headers.names.Authorization=drop
+      - --accesslog.fields.headers.names.Content-Type=keep
       - "--api.insecure=true"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
@@ -27,7 +34,8 @@ services:
     container_name: "simple-service"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.cfdevicedetect.plugin.cfdevicedetect.autodetect=true"
+      - "traefik.http.middlewares.cfdevicedetect.plugin.traefik-cf-device-detector.autodetect=true"
+
       - "traefik.http.routers.whoami.rule=Host(`whoami.localhost`)"
       - "traefik.http.routers.whoami.middlewares=cfdevicedetect@docker"
       - "traefik.http.routers.whoami.entrypoints=web"

go.mod

@@ -2,4 +2,4 @@ module github.com/davewhit3/traefik-cf-device-detector
 
 go 1.19
 
-require github.com/mileusna/useragent v1.2.1
+require github.com/mssola/useragent v1.0.0

go.sum

@@ -1,2 +1,2 @@
-github.com/mileusna/useragent v1.2.1 h1:p3RJWhi3LfuI6BHdddojREyK3p6qX67vIfOVMnUIVr0=
-github.com/mileusna/useragent v1.2.1/go.mod h1:3d8TOmwL/5I8pJjyVDteHtgDGcefrFUX4ccGOMKNYYc=
+github.com/mssola/useragent v1.0.0 h1:WRlDpXyxHDNfvZaPEut5Biveq86Ze4o4EMffyMxmH5o=
+github.com/mssola/useragent v1.0.0/go.mod h1:hz9Cqz4RXusgg1EdI4Al0INR62kP7aPSRNHnpU+b85Y=

middleware.go

@@ -3,10 +3,12 @@ package traefik_cf_device_detector
 
 import (
 	"context"
+	"log"
 	"net/http"
+	"os"
 	"strconv"
 
-	"github.com/mileusna/useragent"
+	"github.com/mssola/useragent"
 )
 
 const (
@@ -36,24 +38,30 @@ func CreateConfig() *Config {
 
 // CfDeviceDetector a CfDeviceDetector plugin.
 type CfDeviceDetector struct {
+	log  *log.Logger
 	next http.Handler
 	name string
 }
 
 // New created a new Demo plugin.
 func New(ctx context.Context, next http.Handler, config *Config, name string) (http.Handler, error) {
+	logger := log.New(os.Stdout, "[CfDeviceDetector] ", 0)
+
+	logger.Printf("configured!")
+
 	return &CfDeviceDetector{
+		log:  logger,
 		next: next,
 		name: name,
 	}, nil
 }
 
 func (mw *CfDeviceDetector) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
-	ua := useragent.Parse(req.Header.Get(UserAgentHeader))
+	ua := useragent.New(req.Header.Get(UserAgentHeader))
 
-	req.Header.Set(DeviceIsMobileHeader, strconv.FormatBool(ua.Mobile))
-	req.Header.Set(DeviceIsDesktopHeader, strconv.FormatBool(ua.Desktop))
-	req.Header.Set(DeviceIsTabletHeader, strconv.FormatBool(ua.Tablet))
+	req.Header.Set(DeviceIsMobileHeader, strconv.FormatBool(ua.Mobile()))
+	req.Header.Set(DeviceIsDesktopHeader, strconv.FormatBool(!ua.Mobile()))
+	req.Header.Set(DeviceIsTabletHeader, strconv.FormatBool(false))
 	req.Header.Set(DeviceIsSmartTVHeader, strconv.FormatBool(false))
 
 	mw.next.ServeHTTP(rw, req)