chore: Fix golangci-lint configuration and patch errors (#34)

* chore: Fix golangci-lint configuration and patch errors

Due to misconfiguration of a linting rules directory, our linter has not been
working properly. This change fixes the configuration issue, and all remaining
linting errors.

* Fix race in peer logging

* Fix race and return

* Lock on bufferred amount low

* Fix mutex lock

coderd/coderd.go

@@ -39,7 +39,7 @@ func New(options *Options) http.Handler {
 				httpmw.ExtractAPIKey(options.Database, nil),
 				httpmw.ExtractUser(options.Database),
 			)
-			r.Get("/user", users.getAuthenticatedUser)
+			r.Get("/user", users.authenticatedUser)
 		})
 	})
 	r.NotFound(site.Handler().ServeHTTP)

coderd/coderdtest/coderdtest.go

@@ -32,11 +32,11 @@ func New(t *testing.T) Server {
 		Database: db,
 	})
 	srv := httptest.NewServer(handler)
-	u, err := url.Parse(srv.URL)
+	serverURL, err := url.Parse(srv.URL)
 	require.NoError(t, err)
 	t.Cleanup(srv.Close)
 
-	client := codersdk.New(u)
+	client := codersdk.New(serverURL)
 	_, err = client.CreateInitialUser(context.Background(), coderd.CreateUserRequest{
 		Email:    "testuser@coder.com",
 		Username: "testuser",
@@ -54,6 +54,6 @@ func New(t *testing.T) Server {
 
 	return Server{
 		Client: client,
-		URL:    u,
+		URL:    serverURL,
 	}
 }

coderd/userpassword/userpassword.go

@@ -35,14 +35,14 @@ func Compare(hashed string, password string) (bool, error) {
 	if len(parts[0]) != 0 {
 		return false, xerrors.Errorf("hash prefix is invalid")
 	}
-	if string(parts[1]) != hashScheme {
+	if parts[1] != hashScheme {
 		return false, xerrors.Errorf("hash isn't %q scheme: %q", hashScheme, parts[1])
 	}
-	iter, err := strconv.Atoi(string(parts[2]))
+	iter, err := strconv.Atoi(parts[2])
 	if err != nil {
 		return false, xerrors.Errorf("parse iter from hash: %w", err)
 	}
-	salt, err := base64.RawStdEncoding.DecodeString(string(parts[3]))
+	salt, err := base64.RawStdEncoding.DecodeString(parts[3])
 	if err != nil {
 		return false, xerrors.Errorf("decode salt: %w", err)
 	}

coderd/users.go

@@ -70,7 +70,7 @@ func (users *users) createInitialUser(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
-	user, err := users.Database.GetUserByEmailOrUsername(r.Context(), database.GetUserByEmailOrUsernameParams{
+	_, err = users.Database.GetUserByEmailOrUsername(r.Context(), database.GetUserByEmailOrUsernameParams{
 		Email:    createUser.Email,
 		Username: createUser.Username,
 	})
@@ -91,7 +91,7 @@ func (users *users) createInitialUser(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	user, err = users.Database.InsertUser(context.Background(), database.InsertUserParams{
+	user, err := users.Database.InsertUser(context.Background(), database.InsertUserParams{
 		ID:             uuid.NewString(),
 		Email:          createUser.Email,
 		HashedPassword: []byte(hashedPassword),
@@ -111,7 +111,7 @@ func (users *users) createInitialUser(rw http.ResponseWriter, r *http.Request) {
 }
 
 // Returns the currently authenticated user.
-func (users *users) getAuthenticatedUser(rw http.ResponseWriter, r *http.Request) {
+func (*users) authenticatedUser(rw http.ResponseWriter, r *http.Request) {
 	user := httpmw.User(r)
 
 	render.JSON(rw, r, User{
@@ -158,11 +158,17 @@ func (users *users) loginWithPassword(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	id, secret, err := generateAPIKeyIDSecret()
-	hashed := sha256.Sum256([]byte(secret))
+	keyID, keySecret, err := generateAPIKeyIDSecret()
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: fmt.Sprintf("generate api key parts: %s", err.Error()),
+		})
+		return
+	}
+	hashed := sha256.Sum256([]byte(keySecret))
 
 	_, err = users.Database.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{
-		ID:           id,
+		ID:           keyID,
 		UserID:       user.ID,
 		ExpiresAt:    database.Now().Add(24 * time.Hour),
 		CreatedAt:    database.Now(),
@@ -178,7 +184,7 @@ func (users *users) loginWithPassword(rw http.ResponseWriter, r *http.Request) {
 	}
 
 	// This format is consumed by the APIKey middleware.
-	sessionToken := fmt.Sprintf("%s-%s", id, secret)
+	sessionToken := fmt.Sprintf("%s-%s", keyID, keySecret)
 	http.SetCookie(rw, &http.Cookie{
 		Name:     httpmw.AuthCookie,
 		Value:    sessionToken,
@@ -194,14 +200,14 @@ func (users *users) loginWithPassword(rw http.ResponseWriter, r *http.Request) {
 }
 
 // Generates a new ID and secret for an API key.
-func generateAPIKeyIDSecret() (string, string, error) {
+func generateAPIKeyIDSecret() (id string, secret string, err error) {
 	// Length of an API Key ID.
-	id, err := cryptorand.String(10)
+	id, err = cryptorand.String(10)
 	if err != nil {
 		return "", "", err
 	}
 	// Length of an API Key secret.
-	secret, err := cryptorand.String(22)
+	secret, err = cryptorand.String(22)
 	if err != nil {
 		return "", "", err
 	}

coderd/users_test.go

@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/coder/coder/coderd"
 	"github.com/coder/coder/coderd/coderdtest"
-	"github.com/stretchr/testify/require"
 )
 
 func TestUsers(t *testing.T) {