From 0884f89431cd26bcc9674b3b7ab628b090f5881e Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Tue, 7 Dec 2021 13:31:39 +0100
Subject: Implement Cobra CLI tooling, Viper config tooling (#336)

* start pulling out + replacing urfave and config

* replace many many instances of config

* move more stuff => viper

* properly remove urfave

* move some flags to root command

* add testrig commands to root

* alias config file keys

* start adding cli parsing tests

* reorder viper init

* remove config path alias

* fmt

* change config file keys to non-nested

* we're more or less in business now

* tidy up the common func

* go fmt

* get tests passing again

* add note about the cliparsing tests

* reorganize

* update docs with changes

* structure cmd dir better

* rename + move some files around

* fix dangling comma
---
 internal/api/s2s/webfinger/webfingerget.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'internal/api/s2s/webfinger/webfingerget.go')

diff --git a/internal/api/s2s/webfinger/webfingerget.go b/internal/api/s2s/webfinger/webfingerget.go
index 3552394f2..b7f3c714d 100644
--- a/internal/api/s2s/webfinger/webfingerget.go
+++ b/internal/api/s2s/webfinger/webfingerget.go
@@ -26,6 +26,8 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/util"
 )
 
@@ -59,16 +61,19 @@ func (m *Module) WebfingerGETRequest(c *gin.Context) {
 	}
 
 	username := strings.ToLower(usernameAndAccountDomain[0])
-	accountDomain := strings.ToLower(usernameAndAccountDomain[1])
-	if username == "" || accountDomain == "" {
+	requestedAccountDomain := strings.ToLower(usernameAndAccountDomain[1])
+	if username == "" || requestedAccountDomain == "" {
 		l.Debug("aborting request because username or domain was empty")
 		c.JSON(http.StatusBadRequest, gin.H{"error": "bad request"})
 		return
 	}
 
-	if accountDomain != m.config.AccountDomain && accountDomain != m.config.Host {
-		l.Debugf("aborting request because accountDomain %s does not belong to this instance", accountDomain)
-		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("accountDomain %s does not belong to this instance", accountDomain)})
+	accountDomain := viper.GetString(config.Keys.AccountDomain)
+	host := viper.GetString(config.Keys.Host)
+
+	if requestedAccountDomain != accountDomain && requestedAccountDomain != host {
+		l.Debugf("aborting request because accountDomain %s does not belong to this instance", requestedAccountDomain)
+		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("accountDomain %s does not belong to this instance", requestedAccountDomain)})
 		return
 	}
 
-- 
cgit v1.2.3