From 1ede54ddf6dfd2d4ba039eb7e23b74bcac65b643 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 8 Jun 2022 20:38:03 +0200
Subject: [feature] More consistent API error handling (#637)

* update templates

* start reworking api error handling

* update template

* return AP status at web endpoint if negotiated

* start making api error handling much more consistent

* update account endpoints to new error handling

* use new api error handling in admin endpoints

* go fmt ./...

* use api error logic in app

* use generic error handling in auth

* don't export generic error handler

* don't defer clearing session

* user nicer error handling on oidc callback handler

* tidy up the sign in handler

* tidy up the token handler

* use nicer error handling in blocksget

* auth emojis endpoint

* fix up remaining api endpoints

* fix whoopsie during login flow

* regenerate swagger docs

* change http error logging to debug
---
 internal/api/security/useragentblock.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'internal/api/security/useragentblock.go')

diff --git a/internal/api/security/useragentblock.go b/internal/api/security/useragentblock.go
index acbdeae58..b117e8608 100644
--- a/internal/api/security/useragentblock.go
+++ b/internal/api/security/useragentblock.go
@@ -19,21 +19,17 @@
 package security
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 )
 
-// UserAgentBlock blocks requests with undesired, empty, or invalid user-agent strings.
+// UserAgentBlock aborts requests with empty user agent strings.
 func (m *Module) UserAgentBlock(c *gin.Context) {
-	l := logrus.WithFields(logrus.Fields{
-		"func": "UserAgentBlock",
-	})
-
 	if ua := c.Request.UserAgent(); ua == "" {
-		l.Debug("aborting request because there's no user-agent set")
-		c.AbortWithStatus(http.StatusTeapot)
-		return
+		code := http.StatusTeapot
+		err := errors.New(http.StatusText(code) + ": no user-agent sent with request")
+		c.AbortWithStatusJSON(code, gin.H{"error": err.Error()})
 	}
 }
-- 
cgit v1.2.3