From f6dfa5d0043aeaa616c16f8babb64c0d0e8f72dd Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Thu, 21 May 2020 10:52:19 +1000
Subject: Add .golangci.yml linter configuration

As part of https://gitlab.com/gitlab-org/gitlab-pages/-/issues/385
we have introduced the use of a custom `.golangci.yml` file with some
custom rules for linting.

This replaces the need of downloading and using `golint`, `gofmt`
`go vet` and `gocyclo` manually. We take advantage of the custom
`golangci-lint` docker image as stated in the [Automatic lintinb]
(https://docs.gitlab.com/ee/development/go_guide/#automatic-linting)
section of the Go standards and style guidelines.

This iteration enables a subset of linters, with the remaining
of them enabled on a separate MR as described in the issue above.

The main changes introduced by this linter include:

- gosec: potential hardcoded credentials
- goconst: DRY by declaring and using constants
- gosimple: reduce statements complexity and improve return statements
---
 internal/auth/auth.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'internal/auth/auth.go')

diff --git a/internal/auth/auth.go b/internal/auth/auth.go
index c582d96b..a89dd599 100644
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@@ -26,6 +26,9 @@ import (
 	"golang.org/x/crypto/hkdf"
 )
 
+// nolint: gosec
+// gosec: G101: Potential hardcoded credentials
+// auth constants, not credentials
 const (
 	apiURLUserTemplate     = "%s/api/v4/user"
 	apiURLProjectTemplate  = "%s/api/v4/projects/%d/pages_access"
@@ -433,10 +436,7 @@ func destroySession(session *sessions.Session, w http.ResponseWriter, r *http.Re
 
 // IsAuthSupported checks if pages is running with the authentication support
 func (a *Auth) IsAuthSupported() bool {
-	if a == nil {
-		return false
-	}
-	return true
+	return a != nil
 }
 
 func (a *Auth) checkAuthentication(w http.ResponseWriter, r *http.Request, projectID uint64) bool {
@@ -513,11 +513,7 @@ func (a *Auth) GetTokenIfExists(w http.ResponseWriter, r *http.Request) (string,
 
 // RequireAuth will trigger authentication flow if no token exists
 func (a *Auth) RequireAuth(w http.ResponseWriter, r *http.Request) bool {
-	session := a.checkSessionIsValid(w, r)
-	if session == nil {
-		return true
-	}
-	return false
+	return a.checkSessionIsValid(w, r) == nil
 }
 
 // CheckAuthentication checks if user is authenticated and has access to the project
-- 
cgit v1.2.3