Logs
Patchsets
Range Diff ↕ rd-77
1: 77aaa29 ! 1: 8d56535 reactor(metric-drain): use caddy json format
-: ------- > 2: a336041 wip
-: ------- > 3: 7ae45b3 chore: wrap
-: ------- > 4: bfa5c4f done
Range Diff ↕ rd-78
1: 8d56535 < -: ------- reactor(metric-drain): use caddy json format
3: 7ae45b3 ! 1: c7eeb12 reactor(metric-drain): use caddy access logs
2: a336041 < -: ------- wip
4: bfa5c4f < -: ------- done
Range Diff ↕ rd-79
1: c7eeb12 ! 1: 4e0839a reactor(metric-drain): use caddy access logs
Range-diff rd-77
- title
- reactor(metric-drain): use caddy json format
- description
-
Patch changed
- old #1
77aaa29
- new #1
8d56535
- title
- wip
- description
-
Patch added
- old #0
(none)
- new #2
a336041
- title
- chore: wrap
- description
-
Patch added
- old #0
(none)
- new #3
7ae45b3
- title
- done
- description
-
Patch added
- old #0
(none)
- new #4
bfa5c4f
1: 77aaa29 ! 1: 8d56535 reactor(metric-drain): use caddy json format
auth/api.go
+ "strings" } } +type AccessLogReq struct { + RemoteIP string `json:"remote_ip"` + RemotePort string `json:"remote_port"` + ClientIP string `json:"client_ip"` + Method string `json:"method"` + Host string `json:"host"` + Uri string `json:"uri"` + Headers struct { + UserAgent string `json:"User-Agent"` + Referer string `json:"Referer"` + } `json:"headers"` + Tls struct { + ServerName string `json:"server_name"` + } `json:"tls"` +} + +type CaddyAccessLog struct { + Request AccessLogReq `json:"request"` + Status int `json:"status"` +} + +func deserializeCaddyAccessLog(dbpool db.DB, access *CaddyAccessLog) (*db.AnalyticsVisits, error) { + spaceRaw := strings.SplitN(access.Request.Tls.ServerName, ".", 2) + space := spaceRaw[0] + host := access.Request.Host + path := access.Request.Uri + subdomain := "" + + // grab subdomain based on host + if strings.HasSuffix(host, "tuns.sh") { + subdomain = strings.TrimSuffix(host, ".tuns.sh") + } else if strings.HasSuffix(host, "pgs.sh") { + subdomain = strings.TrimSuffix(host, ".pgs.sh") + } else if strings.HasSuffix(host, "prose.sh") { + subdomain = strings.TrimSuffix(host, ".prose.sh") + } else { + subdomain = shared.GetCustomDomain(host, space) + } + + // get user and namespace details from subdomain + props, err := shared.GetProjectFromSubdomain(subdomain) + if err != nil { + return nil, err + } + // get user ID + user, err := dbpool.FindUserForName(props.Username) + if err != nil { + return nil, err + } + + projectID := "" + postID := "" + if space == "pgs" { // figure out project ID + project, err := dbpool.FindProjectByName(user.ID, props.ProjectName) + if err != nil { + return nil, err + } + projectID = project.ID + } else if space == "prose" { // figure out post ID + if path == "" || path == "/" { + } else { + post, err := dbpool.FindPostWithSlug(path, user.ID, space) + if err != nil { + return nil, err + } + postID = post.ID + } + } + + return &db.AnalyticsVisits{ + UserID: user.ID, + ProjectID: projectID, + PostID: postID, + Namespace: space, + Host: host, + Path: path, + IpAddress: access.Request.ClientIP, + UserAgent: access.Request.Headers.UserAgent, + Referer: access.Request.Headers.Referer, // TODO: I don't see referer in the access log + Status: access.Status, + }, nil +} + func metricDrainSub(ctx context.Context, dbpool db.DB, logger *slog.Logger, secret string) { conn := shared.NewPicoPipeClient() stdoutPipe, err := pubsub.RemoteSub("sub metric-drain -k", ctx, conn) scanner := bufio.NewScanner(stdoutPipe) for scanner.Scan() { line := scanner.Text() - visit := db.AnalyticsVisits{} - err := json.Unmarshal([]byte(line), &visit) - for { - scanner := bufio.NewScanner(drain) - for scanner.Scan() { - line := scanner.Text() - visit := db.AnalyticsVisits{} - err := json.Unmarshal([]byte(line), &visit) - if err != nil { - logger.Error("json unmarshal", "err", err) - continue - } - - user := slog.Any("userId", visit.UserID) - - err = shared.AnalyticsVisitFromVisit(&visit, dbpool, secret) - if err != nil { - if !errors.Is(err, shared.ErrAnalyticsDisabled) { - logger.Info("could not record analytics visit", "reason", err, "visit", visit, user) - continue - } - } + scanner := bufio.NewScanner(drain) + for scanner.Scan() { + line := scanner.Text() + accessLog := CaddyAccessLog{} + err := json.Unmarshal([]byte(line), &accessLog) if err != nil { logger.Error("json unmarshal", "err", err) continue } + if err != nil { + logger.Error("json unmarshal", "err", err) + continue + } - err = shared.AnalyticsVisitFromVisit(&visit, dbpool, secret) - logger.Info("inserting visit", "visit", visit, user) - err = dbpool.InsertVisit(&visit) - if err != nil { - logger.Error("could not insert visit record", "err", err, "visit", visit, user) + visit, err := deserializeCaddyAccessLog(dbpool, &accessLog) + if err != nil { + logger.Error("cannot deserialize access log", "err", err) + continue + } + err = shared.AnalyticsVisitFromVisit(visit, dbpool, secret) if err != nil { if !errors.Is(err, shared.ErrAnalyticsDisabled) { logger.Info("could not record analytics visit", "reason", err) + if err != nil { + if !errors.Is(err, shared.ErrAnalyticsDisabled) { + logger.Info("could not record analytics visit", "reason", err) } logger.Info("inserting visit", "visit", visit) - err = dbpool.InsertVisit(&visit) - if scanner.Err() != nil { - logger.Error("scanner error", "err", scanner.Err()) + logger.Info("inserting visit", "visit", visit) + err = dbpool.InsertVisit(visit) if err != nil { logger.Error("could not insert visit record", "err", err) + if err != nil { + logger.Error("could not insert visit record", "err", err) }
auth/api.go
"log/slog" "net/http" "net/url" + "strings" "time" "github.com/gorilla/feeds" } } +type AccessLogReq struct { + RemoteIP string `json:"remote_ip"` + RemotePort string `json:"remote_port"` + ClientIP string `json:"client_ip"` + Method string `json:"method"` + Host string `json:"host"` + Uri string `json:"uri"` + Headers struct { + UserAgent string `json:"User-Agent"` + Referer string `json:"Referer"` + } `json:"headers"` + Tls struct { + ServerName string `json:"server_name"` + } `json:"tls"` +} + +type CaddyAccessLog struct { + Request AccessLogReq `json:"request"` + Status int `json:"status"` +} + +func deserializeCaddyAccessLog(dbpool db.DB, access *CaddyAccessLog) (*db.AnalyticsVisits, error) { + spaceRaw := strings.SplitN(access.Request.Tls.ServerName, ".", 2) + space := spaceRaw[0] + host := access.Request.Host + path := access.Request.Uri + subdomain := "" + + // grab subdomain based on host + if strings.HasSuffix(host, "tuns.sh") { + subdomain = strings.TrimSuffix(host, ".tuns.sh") + } else if strings.HasSuffix(host, "pgs.sh") { + subdomain = strings.TrimSuffix(host, ".pgs.sh") + } else if strings.HasSuffix(host, "prose.sh") { + subdomain = strings.TrimSuffix(host, ".prose.sh") + } else { + subdomain = shared.GetCustomDomain(host, space) + } + + // get user and namespace details from subdomain + props, err := shared.GetProjectFromSubdomain(subdomain) + if err != nil { + return nil, err + } + // get user ID + user, err := dbpool.FindUserForName(props.Username) + if err != nil { + return nil, err + } + + projectID := "" + postID := "" + if space == "pgs" { // figure out project ID + project, err := dbpool.FindProjectByName(user.ID, props.ProjectName) + if err != nil { + return nil, err + } + projectID = project.ID + } else if space == "prose" { // figure out post ID + if path == "" || path == "/" { + } else { + post, err := dbpool.FindPostWithSlug(path, user.ID, space) + if err != nil { + return nil, err + } + postID = post.ID + } + } + + return &db.AnalyticsVisits{ + UserID: user.ID, + ProjectID: projectID, + PostID: postID, + Namespace: space, + Host: host, + Path: path, + IpAddress: access.Request.ClientIP, + UserAgent: access.Request.Headers.UserAgent, + Referer: access.Request.Headers.Referer, // TODO: I don't see referer in the access log + Status: access.Status, + }, nil +} + func metricDrainSub(ctx context.Context, dbpool db.DB, logger *slog.Logger, secret string) { - visit := db.AnalyticsVisits{} - err := json.Unmarshal([]byte(line), &visit) drain := metrics.ReconnectReadMetrics( ctx, -1, ) - for { - scanner := bufio.NewScanner(drain) - for scanner.Scan() { - line := scanner.Text() - visit := db.AnalyticsVisits{} - err := json.Unmarshal([]byte(line), &visit) - if err != nil { - logger.Error("json unmarshal", "err", err) - continue - } - - user := slog.Any("userId", visit.UserID) - - err = shared.AnalyticsVisitFromVisit(&visit, dbpool, secret) - if err != nil { - if !errors.Is(err, shared.ErrAnalyticsDisabled) { - logger.Info("could not record analytics visit", "reason", err, "visit", visit, user) - continue - } - } + scanner := bufio.NewScanner(drain) + for scanner.Scan() { + line := scanner.Text() + accessLog := CaddyAccessLog{} + err := json.Unmarshal([]byte(line), &accessLog) + if err != nil { + logger.Error("json unmarshal", "err", err) + continue + } - err = shared.AnalyticsVisitFromVisit(&visit, dbpool, secret) - logger.Info("inserting visit", "visit", visit, user) - err = dbpool.InsertVisit(&visit) - if err != nil { - logger.Error("could not insert visit record", "err", err, "visit", visit, user) + visit, err := deserializeCaddyAccessLog(dbpool, &accessLog) + if err != nil { + logger.Error("cannot deserialize access log", "err", err) + continue + } + err = shared.AnalyticsVisitFromVisit(visit, dbpool, secret) + if err != nil { + if !errors.Is(err, shared.ErrAnalyticsDisabled) { + logger.Info("could not record analytics visit", "reason", err) } } - err = dbpool.InsertVisit(&visit) - if scanner.Err() != nil { - logger.Error("scanner error", "err", scanner.Err()) + logger.Info("inserting visit", "visit", visit) + err = dbpool.InsertVisit(visit) + if err != nil { + logger.Error("could not insert visit record", "err", err) } } }
-: ------- > 2: a336041 wip
-: ------- > 3: 7ae45b3 chore: wrap
-: ------- > 4: bfa5c4f done