diff options
Diffstat (limited to 'internal/api/security')
-rw-r--r-- | internal/api/security/extraheaders.go | 18 | ||||
-rw-r--r-- | internal/api/security/useragentblock.go | 14 |
2 files changed, 23 insertions, 9 deletions
diff --git a/internal/api/security/extraheaders.go b/internal/api/security/extraheaders.go index bcb41e0c0..f66ac43b4 100644 --- a/internal/api/security/extraheaders.go +++ b/internal/api/security/extraheaders.go @@ -1,3 +1,21 @@ +/* + GoToSocial + Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + package security import "github.com/gin-gonic/gin" 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()}) } } |