From b4288f3c47a9ff9254b933dcb9ee7274d4a4135c Mon Sep 17 00:00:00 2001
From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 13 Jun 2021 18:42:28 +0200
Subject: Timeline manager (#40)

* start messing about with timeline manager

* i have no idea what i'm doing

* i continue to not know what i'm doing

* it's coming along

* bit more progress

* update timeline with new posts as they come in

* lint and fmt

* Select accounts where empty string

* restructure a bunch, get unfaves working

* moving stuff around

* federate status deletes properly

* mention regex better but not 100% there

* fix regex

* some more hacking away at the timeline code phew

* fix up some little things

* i can't even

* more timeline stuff

* move to ulid

* fiddley

* some lil fixes for kibou compatibility

* timelines working pretty alright!

* tidy + lint
---
 internal/api/s2s/webfinger/webfingerget.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'internal/api/s2s/webfinger')

diff --git a/internal/api/s2s/webfinger/webfingerget.go b/internal/api/s2s/webfinger/webfingerget.go
index 44d60670d..30e089162 100644
--- a/internal/api/s2s/webfinger/webfingerget.go
+++ b/internal/api/s2s/webfinger/webfingerget.go
@@ -24,42 +24,53 @@ import (
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
 )
 
 // WebfingerGETRequest handles requests to, for example, https://example.org/.well-known/webfinger?resource=acct:some_user@example.org
 func (m *Module) WebfingerGETRequest(c *gin.Context) {
+	l := m.log.WithFields(logrus.Fields{
+		"func":       "WebfingerGETRequest",
+		"user-agent": c.Request.UserAgent(),
+	})
 
 	q, set := c.GetQuery("resource")
 	if !set || q == "" {
+		l.Debug("aborting request because no resource was set in query")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "no 'resource' in request query"})
 		return
 	}
 
 	withAcct := strings.Split(q, "acct:")
 	if len(withAcct) != 2 {
+		l.Debugf("aborting request because resource query %s could not be split by 'acct:'", q)
 		c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"})
 		return
 	}
 
 	usernameDomain := strings.Split(withAcct[1], "@")
 	if len(usernameDomain) != 2 {
+		l.Debugf("aborting request because username and domain could not be parsed from %s", withAcct[1])
 		c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"})
 		return
 	}
 	username := strings.ToLower(usernameDomain[0])
 	domain := strings.ToLower(usernameDomain[1])
 	if username == "" || domain == "" {
+		l.Debug("aborting request because username or domain was empty")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"})
 		return
 	}
 
 	if domain != m.config.Host {
+		l.Debugf("aborting request because domain %s does not belong to this instance", domain)
 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("domain %s does not belong to this instance", domain)})
 		return
 	}
 
 	resp, err := m.processor.GetWebfingerAccount(username, c.Request)
 	if err != nil {
+		l.Debugf("aborting request with an error: %s", err.Error())
 		c.JSON(err.Code(), gin.H{"error": err.Safe()})
 		return
 	}
-- 
cgit v1.2.3