Add Golangci Lint (#676)

Increase golangci timeout

Fix installing golangci-lint in ci

Remove mage targets replaced by golangci

Run golint in ci

Add goheader linter

Enable & fix more linters

Fix lint issues

Add mage target to automagically fix issues found by golangci

golangci-lint run --fix

Add golangci config

Add golangci mage target

Co-authored-by: kolaente <k@knt.li>
Reviewed-on: https://kolaente.dev/vikunja/api/pulls/676
Co-Authored-By: konrad <konrad@kola-entertainments.de>
Co-Committed-By: konrad <konrad@kola-entertainments.de>

.drone1.yml

@@ -83,16 +83,9 @@ steps:
     depends_on: [ build ]
     commands:
       - ./mage-static build:generate
-      - ./mage-static check:lint
-      - ./mage-static check:fmt
       - ./mage-static check:got-swag
-      - ./mage-static check:ineffassign
-      - ./mage-static check:misspell
-      - ./mage-static check:goconst
-      - ./mage-static check:gocyclo
-      - ./mage-static check:static
-      - wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin v2.2.0 # Need to manually install as it does not support being installed via go modules like the rest.
-      - ./mage-static check:gosec
+      - wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0
+      - ./mage-static check:golangci
     when:
       event: [ push, tag, pull_request ]
 

.golangci.yml

@@ -0,0 +1,73 @@
+run:
+  timeout: 5m
+  tests: true
+
+linters:
+  enable:
+    - megacheck
+    - govet
+    - goconst
+    - gocritic
+    - gocyclo
+    - goerr113
+    - goheader
+    - gofmt
+    - goimports
+    - golint
+    - misspell
+  disable:
+    - scopelint # Obsolete, using exportloopref instead
+  presets:
+    - bugs
+    - unused
+  fast: false
+
+linter-settings:
+  nestif:
+    min-complexity: 6
+  goheader:
+    template-path: code-hesader-template.txt
+
+issues:
+  exclude-rules:
+    # Exclude some linters from running on tests files.
+    - path: _test\.go
+      linters:
+        - gocyclo
+        - deadcode
+    - path: pkg/integrations/*
+      linters:
+        - gocyclo
+        - deadcode
+        - varcheck
+        - unparam
+        - bodyclose
+    - path: pkg/integrations/*
+      text: "unlambda"
+      linters:
+        - gocritic
+    - path: pkg/modules/background/unsplash/unsplash\.go
+      linters:
+        - bodyclose
+    - path: pkg/migration/*
+      linters:
+        - exhaustive
+        - goconst
+        - goerr113
+    - path: pkg/models/task_collection_filter\.go
+      linters:
+        - exhaustive
+    - path: pkg/utils/random_string\.go
+      text: "G404:" # We don't care about cryptographically secure randomness when we're using that utility function.
+      linters:
+        - gosec
+    - path: pkg/modules/dump/*
+      linters:
+        - goerr113
+    - path: pkg/
+      text: "err113: do not define dynamic errors, use wrapped static errors instead:"
+      linters:
+        - goerr113
+    - text: "commentFormatting: put a space between `//` and comment text"
+      linters:
+        - gocritic

code-header-template.txt

@@ -0,0 +1,15 @@
+Vikunja is a to-do list application to facilitate your life.
+Copyright 2018-2020 Vikunja and contributors. All rights reserved.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.

go.mod

@@ -33,6 +33,7 @@ require (
 	github.com/fzipp/gocyclo v0.0.0-20150627053110-6acd4345c835
 	github.com/gabriel-vasile/mimetype v1.1.1
 	github.com/getsentry/sentry-go v0.7.0
+	github.com/go-errors/errors v1.0.1
 	github.com/go-redis/redis/v7 v7.4.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-testfixtures/testfixtures/v3 v3.4.0

magefile.go

@@ -59,7 +59,6 @@ var (
 	Aliases = map[string]interface{}{
 		"build":                Build.Build,
 		"do-the-swag":          DoTheSwag,
-		"check:go-sec":         Check.GoSec,
 		"check:got-swag":       Check.GotSwag,
 		"release:os-package":   Release.OsPackage,
 		"dev:create-migration": Dev.CreateMigration,
@@ -330,34 +329,6 @@ func (Test) Integration() {
 
 type Check mg.Namespace
 
-// Checks if the code is properly formatted with go fmt
-func (Check) Fmt() error {
-	mg.Deps(initVars)
-	args := append([]string{"-s", "-d"}, GoFiles...)
-	c := exec.Command("gofmt", args...)
-	out, err := c.Output()
-	if err != nil {
-		return err
-	}
-
-	if len(out) > 0 {
-		fmt.Println("Code is not properly gofmt'ed.")
-		fmt.Println("Please run 'mage fmt' and commit the result:")
-		fmt.Print(string(out))
-		os.Exit(1)
-	}
-
-	return nil
-}
-
-// Runs golint on all packages
-func (Check) Lint() {
-	mg.Deps(initVars)
-	checkAndInstallGoTool("golint", "golang.org/x/lint/golint")
-	args := append([]string{"-set_exit_status"}, ApiPackages...)
-	runAndStreamOutput("golint", args...)
-}
-
 // Checks if the swagger docs need to be re-generated from the code annotations
 func (Check) GotSwag() {
 	mg.Deps(initVars)
@@ -388,65 +359,31 @@ func (Check) GotSwag() {
 	}
 }
 
-// Checks the source code for misspellings
-func (Check) Misspell() {
+func checkGolangCiLintInstalled() {
 	mg.Deps(initVars)
-	checkAndInstallGoTool("misspell", "github.com/client9/misspell/cmd/misspell")
-	runAndStreamOutput("misspell", append([]string{"-error"}, GoFiles...)...)
-}
-
-// Checks the source code for ineffectual assigns
-func (Check) Ineffassign() {
-	mg.Deps(initVars)
-	checkAndInstallGoTool("ineffassign", "github.com/gordonklaus/ineffassign")
-	runAndStreamOutput("ineffassign", GoFiles...)
-}
-
-// Checks for the cyclomatic complexity of the source code
-func (Check) Gocyclo() {
-	mg.Deps(initVars)
-	checkAndInstallGoTool("gocyclo", "github.com/fzipp/gocyclo")
-	runAndStreamOutput("gocyclo", append([]string{"-over", "49"}, GoFiles...)...)
-}
-
-// Statically analyzes the source code about a range of different problems
-func (Check) Static() {
-	mg.Deps(initVars)
-	checkAndInstallGoTool("staticcheck", "honnef.co/go/tools/cmd/staticcheck")
-	runAndStreamOutput("staticcheck", ApiPackages...)
-}
-
-// Checks the source code for potential security issues
-func (Check) GoSec() {
-	mg.Deps(initVars)
-	if err := exec.Command("gosec").Run(); err != nil && strings.Contains(err.Error(), "executable file not found") {
-		fmt.Println("Please manually install gosec by running")
-		fmt.Println("curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | bash -s -- -b $GOPATH/bin v2.2.0")
+	if err := exec.Command("golangci-lint").Run(); err != nil && strings.Contains(err.Error(), "executable file not found") {
+		fmt.Println("Please manually install golangci-lint by running")
+		fmt.Println("curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.31.0")
 		os.Exit(1)
 	}
-	runAndStreamOutput("gosec", "./...")
 }
 
-// Checks for repeated strings that could be replaced by a constant
-func (Check) Goconst() {
-	mg.Deps(initVars)
-	checkAndInstallGoTool("goconst", "github.com/jgautheron/goconst/cmd/goconst")
-	runAndStreamOutput("goconst", ApiPackages...)
+func (Check) Golangci() {
+	checkGolangCiLintInstalled()
+	runAndStreamOutput("golangci-lint", "run")
+}
+
+func (Check) GolangciFix() {
+	checkGolangCiLintInstalled()
+	runAndStreamOutput("golangci-lint", "run", "--fix")
 }
 
 // Runs fmt-check, lint, got-swag, misspell-check, ineffasign-check, gocyclo-check, static-check, gosec-check, goconst-check all in parallel
 func (Check) All() {
 	mg.Deps(initVars)
 	mg.Deps(
-		Check.Fmt,
-		Check.Lint,
+		Check.Golangci,
 		Check.GotSwag,
-		Check.Misspell,
-		Check.Ineffassign,
-		Check.Gocyclo,
-		Check.Static,
-		Check.GoSec,
-		Check.Goconst,
 	)
 }
 

pkg/caldav/caldav.go

@@ -17,13 +17,14 @@
 package caldav
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/api/pkg/utils"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/api/pkg/utils"
 )
 
 // DateFormat ist the caldav date format

pkg/caldav/caldav_test.go

@@ -17,10 +17,11 @@
 package caldav
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseEvents(t *testing.T) {

pkg/cmd/cmd.go

@@ -18,8 +18,9 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"os"
+
+	"github.com/spf13/cobra"
 )
 
 var rootCmd = &cobra.Command{

pkg/cmd/dump.go

@@ -17,11 +17,12 @@
 package cmd
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/dump"
 	"github.com/spf13/cobra"
-	"time"
 )
 
 func init() {

pkg/cmd/user.go

@@ -18,17 +18,18 @@
 package cmd
 
 import (
-	"code.vikunja.io/api/pkg/initialize"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/user"
 	"fmt"
-	"github.com/olekukonko/tablewriter"
-	"github.com/spf13/cobra"
-	"golang.org/x/crypto/ssh/terminal"
 	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"code.vikunja.io/api/pkg/initialize"
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/user"
+	"github.com/olekukonko/tablewriter"
+	"github.com/spf13/cobra"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 var (

pkg/cmd/version.go

@@ -17,10 +17,11 @@
 package cmd
 
 import (
-	"code.vikunja.io/api/pkg/version"
 	"fmt"
-	"github.com/spf13/cobra"
 	"runtime"
+
+	"code.vikunja.io/api/pkg/version"
+	"github.com/spf13/cobra"
 )
 
 func init() {

pkg/cmd/web.go

@@ -17,17 +17,18 @@
 package cmd
 
 import (
+	"context"
+	"os"
+	"os/signal"
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/initialize"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/routes"
 	"code.vikunja.io/api/pkg/swagger"
 	"code.vikunja.io/api/pkg/version"
-	"context"
 	"github.com/spf13/cobra"
-	"os"
-	"os/signal"
-	"time"
 )
 
 func init() {

pkg/db/db.go

@@ -17,16 +17,17 @@
 package db
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/log"
 	"encoding/gob"
 	"fmt"
-	xrc "gitea.com/xorm/xorm-redis-cache"
 	"net/url"
 	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/log"
+	xrc "gitea.com/xorm/xorm-redis-cache"
 	"xorm.io/core"
 	"xorm.io/xorm"
 	"xorm.io/xorm/caches"
@@ -52,23 +53,24 @@ func CreateDBEngine() (engine *xorm.Engine, err error) {
 	}
 
 	// Use Mysql if set
-	if config.DatabaseType.GetString() == "mysql" {
+	switch config.DatabaseType.GetString() {
+	case "mysql":
 		engine, err = initMysqlEngine()
 		if err != nil {
 			return
 		}
-	} else if config.DatabaseType.GetString() == "postgres" {
+	case "postgres":
 		engine, err = initPostgresEngine()
 		if err != nil {
 			return
 		}
-	} else if config.DatabaseType.GetString() == "sqlite" {
+	case "sqlite":
 		// Otherwise use sqlite
 		engine, err = initSqliteEngine()
 		if err != nil {
 			return
 		}
-	} else {
+	default:
 		log.Fatalf("Unknown database type %s", config.DatabaseType.GetString())
 	}
 

pkg/db/test.go

@@ -18,12 +18,13 @@
 package db
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/log"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/log"
+	"github.com/stretchr/testify/assert"
 	"xorm.io/core"
 	"xorm.io/xorm"
 )

pkg/db/test_fixtures.go

@@ -18,12 +18,13 @@
 package db
 
 import (
-	"code.vikunja.io/api/pkg/config"
 	"fmt"
-	"github.com/go-testfixtures/testfixtures/v3"
-	"github.com/stretchr/testify/assert"
 	"path/filepath"
 	"testing"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/go-testfixtures/testfixtures/v3"
+	"github.com/stretchr/testify/assert"
 	"xorm.io/xorm/schemas"
 )
 

pkg/files/filehandling.go

@@ -17,13 +17,14 @@
 package files
 
 import (
+	"os"
+	"testing"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 // This file handles storing and retrieving a file for different backends

pkg/files/files.go

@@ -17,13 +17,14 @@
 package files
 
 import (
+	"io"
+	"strconv"
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/web"
 	"github.com/c2h5oh/datasize"
 	"github.com/spf13/afero"
-	"io"
-	"strconv"
-	"time"
 )
 
 // File holds all information about a file

pkg/files/files_test.go

@@ -18,10 +18,11 @@
 package files
 
 import (
-	"github.com/stretchr/testify/assert"
 	"io"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 type testfile struct {

pkg/integrations/archived_test.go

@@ -18,11 +18,12 @@
 package integrations
 
 import (
+	"net/url"
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/stretchr/testify/assert"
-	"net/url"
-	"testing"
 )
 
 // This tests the following behaviour:

pkg/integrations/integrations.go

@@ -17,6 +17,13 @@
 package integrations
 
 import (
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"strings"
+	"testing"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/files"
@@ -29,12 +36,6 @@ import (
 	"github.com/dgrijalva/jwt-go"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"strings"
-	"testing"
 )
 
 // These are the test users, the same way they are in the test database

pkg/integrations/kanban_test.go

@@ -17,11 +17,12 @@
 package integrations
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestBucket(t *testing.T) {

pkg/integrations/link_sharing_test.go

@@ -17,12 +17,13 @@
 package integrations
 
 import (
+	"net/url"
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/url"
-	"testing"
 )
 
 func TestLinkSharing(t *testing.T) {

pkg/integrations/list_test.go

@@ -17,12 +17,13 @@
 package integrations
 
 import (
+	"net/url"
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/url"
-	"testing"
 )
 
 func TestList(t *testing.T) {

pkg/integrations/login_test.go

@@ -17,11 +17,12 @@
 package integrations
 
 import (
+	"net/http"
+	"testing"
+
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestLogin(t *testing.T) {

pkg/integrations/register_test.go

@@ -17,11 +17,12 @@
 package integrations
 
 import (
+	"net/http"
+	"testing"
+
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestRegister(t *testing.T) {

pkg/integrations/task_collection_test.go

@@ -18,11 +18,12 @@
 package integrations
 
 import (
+	"net/url"
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/stretchr/testify/assert"
-	"net/url"
-	"testing"
 )
 
 func TestTaskCollection(t *testing.T) {

pkg/integrations/task_comment_test.go

@@ -17,11 +17,12 @@
 package integrations
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTaskComments(t *testing.T) {

pkg/integrations/task_test.go

@@ -17,11 +17,12 @@
 package integrations
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTask(t *testing.T) {

pkg/integrations/token_test.go

@@ -17,10 +17,11 @@
 package integrations
 
 import (
-	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestCheckToken(t *testing.T) {

pkg/integrations/user_change_password_test.go

@@ -17,11 +17,12 @@
 package integrations
 
 import (
+	"net/http"
+	"testing"
+
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestUserChangePassword(t *testing.T) {

pkg/integrations/user_confirm_email_test.go

@@ -17,12 +17,13 @@
 package integrations
 
 import (
+	"net/http"
+	"testing"
+
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestUserConfirmEmail(t *testing.T) {

pkg/integrations/user_list_test.go

@@ -17,10 +17,11 @@
 package integrations
 
 import (
-	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUserList(t *testing.T) {

pkg/integrations/user_password_request_token_test.go

@@ -17,12 +17,13 @@
 package integrations
 
 import (
+	"net/http"
+	"testing"
+
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestUserRequestResetPasswordToken(t *testing.T) {

pkg/integrations/user_password_reset_test.go

@@ -17,12 +17,13 @@
 package integrations
 
 import (
+	"net/http"
+	"testing"
+
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func TestUserPasswordReset(t *testing.T) {

pkg/integrations/user_show_test.go

@@ -17,10 +17,11 @@
 package integrations
 
 import (
-	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"testing"
+
+	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUserShow(t *testing.T) {

pkg/log/logging.go

@@ -17,13 +17,14 @@
 package log
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"github.com/op/go-logging"
-	"github.com/spf13/viper"
 	"io"
 	"os"
 	"strings"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/op/go-logging"
+	"github.com/spf13/viper"
 )
 
 // ErrFmt holds the format for all the console logging
@@ -105,7 +106,6 @@ func GetLogger() *logging.Logger {
 	return logInstance
 }
 
-/////
 // The following functions are to be used as an "eye-candy", so one can just write log.Error() instead of log.Log.Error()
 
 // Debug is for debug messages

pkg/log/xorm_logger.go

@@ -17,10 +17,11 @@
 package log
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"github.com/op/go-logging"
 	"strings"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/op/go-logging"
 	"xorm.io/xorm/log"
 )
 

pkg/mail/mail.go

@@ -17,11 +17,12 @@
 package mail
 
 import (
+	"crypto/tls"
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
-	"crypto/tls"
 	"gopkg.in/gomail.v2"
-	"time"
 )
 
 // Queue is the mail queue

pkg/mail/send_mail.go

@@ -18,13 +18,14 @@ package mail
 
 import (
 	"bytes"
+	"html/template"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/static"
 	"code.vikunja.io/api/pkg/utils"
 	"github.com/shurcooL/httpfs/html/vfstemplate"
 	"gopkg.in/gomail.v2"
-	"html/template"
 )
 
 // Opts holds infos for a mail

pkg/metrics/active_users.go

@@ -17,13 +17,14 @@
 package metrics
 
 import (
+	"sync"
+	"time"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	"code.vikunja.io/web"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"sync"
-	"time"
 )
 
 // SecondsUntilInactive defines the seconds until a user is considered inactive

pkg/migration/20200420215928.go

@@ -18,6 +18,7 @@ package migration
 
 import (
 	"math"
+
 	"src.techknowlogick.com/xormigrate"
 	"xorm.io/xorm"
 )

pkg/migration/20200516123847.go

@@ -17,8 +17,9 @@
 package migration
 
 import (
-	"src.techknowlogick.com/xormigrate"
 	"strings"
+
+	"src.techknowlogick.com/xormigrate"
 	"xorm.io/xorm"
 )
 
@@ -55,7 +56,7 @@ func init() {
 				// The general idea here is to take the title and slice it into pieces, until we found a unique piece.
 
 				var exists = true
-				titleSlug := []rune(strings.Replace(strings.ToUpper(l.Title), " ", "", -1))
+				titleSlug := []rune(strings.ReplaceAll(strings.ToUpper(l.Title), " ", ""))
 
 				// We can save at most 10 characters in the db, so we need to ensure it has at most 10 characters
 				if len(titleSlug) > 10 {

pkg/migration/20200621214452.go

@@ -18,8 +18,9 @@ package migration
 
 import (
 	"fmt"
-	"src.techknowlogick.com/xormigrate"
 	"strings"
+
+	"src.techknowlogick.com/xormigrate"
 	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
 )

pkg/migration/20200906184746.go

@@ -17,9 +17,10 @@
 package migration
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/models"
 	"src.techknowlogick.com/xormigrate"
-	"time"
 	"xorm.io/xorm"
 )
 

pkg/migration/migration.go

@@ -17,6 +17,9 @@
 package migration
 
 import (
+	"os"
+	"sort"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/files"
@@ -25,8 +28,6 @@ import (
 	"code.vikunja.io/api/pkg/modules/migration"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/olekukonko/tablewriter"
-	"os"
-	"sort"
 	"src.techknowlogick.com/xormigrate"
 	"xorm.io/xorm"
 )

pkg/models/bulk_task_test.go

@@ -1,9 +1,10 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
-	"testing"
 )
 
 func TestBulkTask_Update(t *testing.T) {

pkg/models/error.go

@@ -17,10 +17,11 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/web"
 	"fmt"
 	"net/http"
+
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/web"
 )
 
 // Generic

pkg/models/kanban.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 	"xorm.io/xorm"
 )
 

pkg/models/kanban_test.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestBucket_ReadAll(t *testing.T) {

pkg/models/label.go

@@ -17,9 +17,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )
 
 // Label represents a label

pkg/models/label_task.go

@@ -17,9 +17,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 	"xorm.io/builder"
 )
 

pkg/models/label_task_test.go

@@ -1,14 +1,15 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
-	"gopkg.in/d4l3k/messagediff.v1"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"gopkg.in/d4l3k/messagediff.v1"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/label_test.go

@@ -17,14 +17,15 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
-	"gopkg.in/d4l3k/messagediff.v1"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"gopkg.in/d4l3k/messagediff.v1"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/link_sharing.go

@@ -18,11 +18,12 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 	"code.vikunja.io/web"
 	"github.com/dgrijalva/jwt-go"
-	"time"
 )
 
 // SharingType holds the sharing type

pkg/models/list.go

@@ -17,12 +17,13 @@
 package models
 
 import (
+	"strings"
+	"time"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"strings"
-	"time"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 )
@@ -450,7 +451,7 @@ func GenerateListIdentifier(l *List, sess *xorm.Engine) (err error) {
 	// The general idea here is to take the title and slice it into pieces, until we found a unique piece.
 
 	var exists = true
-	titleSlug := []rune(strings.Replace(strings.ToUpper(l.Title), " ", "", -1))
+	titleSlug := []rune(strings.ReplaceAll(strings.ToUpper(l.Title), " ", ""))
 
 	// We can save at most 10 characters in the db, so we need to ensure it has at most 10 characters
 	if len(titleSlug) > 10 {

pkg/models/list_duplicate.go

@@ -65,6 +65,7 @@ func (ld *ListDuplicate) CanCreate(a web.Auth) (canCreate bool, err error) {
 // @Failure 403 {object} web.HTTPError "The user does not have access to the list or namespace"
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /lists/{listID}/duplicate [put]
+//nolint:gocyclo
 func (ld *ListDuplicate) Create(a web.Auth) (err error) {
 
 	log.Debugf("Duplicating list %d", ld.ListID)

pkg/models/list_duplicate_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestListDuplicate(t *testing.T) {

pkg/models/list_team.go

@@ -17,8 +17,9 @@
 package models
 
 import (
-	"code.vikunja.io/web"
 	"time"
+
+	"code.vikunja.io/web"
 )
 
 // TeamList defines the relation between a team and a list

pkg/models/list_team_test.go

@@ -17,14 +17,15 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
+
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTeamList_ReadAll(t *testing.T) {

pkg/models/list_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
+	"reflect"
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"reflect"
-	"testing"
 )
 
 func TestList_CreateOrUpdate(t *testing.T) {

pkg/models/list_users.go

@@ -17,9 +17,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )
 
 // ListUser represents a list <-> user relation

pkg/models/list_users_rights_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/list_users_test.go

@@ -17,14 +17,15 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
-	"gopkg.in/d4l3k/messagediff.v1"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"gopkg.in/d4l3k/messagediff.v1"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/main_test.go

@@ -17,13 +17,14 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/files"
-	"code.vikunja.io/api/pkg/user"
 	"fmt"
 	"os"
 	"testing"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/files"
+	"code.vikunja.io/api/pkg/user"
 )
 
 func setupTime() {

pkg/models/models.go

@@ -17,12 +17,13 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/log"
 	_ "github.com/go-sql-driver/mysql" // Because.
 	_ "github.com/lib/pq"              // Because.
-	"time"
 	"xorm.io/xorm"
 
 	_ "github.com/mattn/go-sqlite3" // Because.

pkg/models/namespace.go

@@ -17,12 +17,13 @@
 package models
 
 import (
+	"sort"
+	"time"
+
 	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
 	"github.com/imdario/mergo"
-	"sort"
-	"time"
 	"xorm.io/builder"
 )
 

pkg/models/namespace_team.go

@@ -17,8 +17,9 @@
 package models
 
 import (
-	"code.vikunja.io/web"
 	"time"
+
+	"code.vikunja.io/web"
 )
 
 // TeamNamespace defines the relationship between a Team and a Namespace

pkg/models/namespace_team_rights_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/namespace_team_test.go

@@ -17,14 +17,15 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
+
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTeamNamespace_ReadAll(t *testing.T) {

pkg/models/namespace_test.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestNamespace_Create(t *testing.T) {

pkg/models/namespace_users.go

@@ -17,9 +17,10 @@
 package models
 
 import (
+	"time"
+
 	user2 "code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )
 
 // NamespaceUser represents a namespace <-> user relation

pkg/models/namespace_users_rights_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/namespace_users_test.go

@@ -17,14 +17,15 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/web"
-	"gopkg.in/d4l3k/messagediff.v1"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
+
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web"
+	"gopkg.in/d4l3k/messagediff.v1"
 )
 
 func TestNamespaceUser_Create(t *testing.T) {

pkg/models/saved_filters.go

@@ -17,9 +17,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )
 
 // SavedFilter represents a saved bunch of filters

pkg/models/saved_filters_test.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 	"xorm.io/xorm/schemas"
 )
 

pkg/models/task_assignees.go

@@ -17,9 +17,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 	"xorm.io/xorm"
 )
 

pkg/models/task_attachment.go

@@ -17,11 +17,12 @@
 package models
 
 import (
+	"io"
+	"time"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"io"
-	"time"
 )
 
 // TaskAttachment is the definition of a task attachment

pkg/models/task_attachment_test.go

@@ -18,15 +18,16 @@
 package models
 
 import (
+	"io"
+	"os"
+	"strconv"
+	"testing"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"io"
-	"os"
-	"strconv"
-	"testing"
 )
 
 func TestTaskAttachment_ReadOne(t *testing.T) {

pkg/models/task_collection_filter.go

@@ -18,12 +18,13 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/config"
 	"fmt"
-	"github.com/iancoleman/strcase"
 	"reflect"
 	"strconv"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"github.com/iancoleman/strcase"
 	"xorm.io/xorm/schemas"
 )
 
@@ -112,6 +113,8 @@ func validateTaskFieldComparator(comparator taskFilterComparator) error {
 		taskFilterComparatorLessEquals,
 		taskFilterComparatorNotEquals:
 		return nil
+	case taskFilterComparatorInvalid:
+		fallthrough
 	default:
 		return ErrInvalidTaskFilterComparator{Comparator: comparator}
 	}

pkg/models/task_collection_sort_test.go

@@ -17,8 +17,9 @@
 package models
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSortParamValidation(t *testing.T) {

pkg/models/task_collection_test.go

@@ -17,14 +17,15 @@
 package models
 
 import (
+	"testing"
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
 	"gopkg.in/d4l3k/messagediff.v1"
-	"testing"
-	"time"
 )
 
 func TestTaskCollection_ReadAll(t *testing.T) {

pkg/models/task_comments.go

@@ -18,9 +18,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )
 
 // TaskComment represents a task comment

pkg/models/task_comments_test.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTaskComment_Create(t *testing.T) {

pkg/models/task_relation.go

@@ -18,9 +18,10 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 )
 
 // RelationKind represents a kind of relation between to tasks
@@ -174,6 +175,8 @@ func (rel *TaskRelation) Create(a web.Auth) error {
 		otherRelation.RelationKind = RelationKindCopiedTo
 	case RelationKindCopiedTo:
 		otherRelation.RelationKind = RelationKindCopiedFrom
+	case RelationKindUnknown:
+		// Nothing to do
 	}
 
 	// Finally insert everything

pkg/models/task_relation_test.go

@@ -18,10 +18,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTaskRelation_Create(t *testing.T) {

pkg/models/tasks.go

@@ -17,16 +17,17 @@
 package models
 
 import (
+	"math"
+	"sort"
+	"strconv"
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/api/pkg/utils"
 	"code.vikunja.io/web"
 	"github.com/imdario/mergo"
-	"math"
-	"sort"
-	"strconv"
-	"time"
 	"xorm.io/builder"
 	"xorm.io/xorm"
 	"xorm.io/xorm/schemas"
@@ -168,6 +169,7 @@ func (t *Task) ReadAll(a web.Auth, search string, page int, perPage int) (result
 	return nil, 0, 0, nil
 }
 
+//nolint:gocyclo
 func getRawTasksForLists(lists []*List, a web.Auth, opts *taskOptions) (tasks []*Task, resultCount int, totalItems int64, err error) {
 
 	// If the user does not have any lists, don't try to get any tasks
@@ -258,6 +260,8 @@ func getRawTasksForLists(lists []*List, a web.Auth, opts *taskOptions) (tasks []
 			} else {
 				filters = append(filters, &builder.Lte{f.field: f.value})
 			}
+		case taskFilterComparatorInvalid:
+			// Nothing to do
 		}
 	}
 
@@ -728,6 +732,7 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
 // @Failure 403 {object} web.HTTPError "The user does not have access to the task (aka its list)"
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /tasks/{id} [post]
+//nolint:gocyclo
 func (t *Task) Update() (err error) {
 
 	s := x.NewSession()

pkg/models/tasks_rights.go

@@ -39,7 +39,6 @@ func (t *Task) CanCreate(a web.Auth) (bool, error) {
 
 // CanRead determines if a user can read a task
 func (t *Task) CanRead(a web.Auth) (canRead bool, maxRight int, err error) {
-	//return t.canDoTask(a)
 	// Get the task, error out if it doesn't exist
 	*t, err = GetTaskByIDSimple(t.ID)
 	if err != nil {

pkg/models/tasks_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
+	"testing"
+	"time"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
 )
 
 func TestTask_Create(t *testing.T) {

pkg/models/team_members_test.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestTeamMember_Create(t *testing.T) {

pkg/models/teams.go

@@ -17,10 +17,11 @@
 package models
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
-	"time"
 	"xorm.io/builder"
 )
 

pkg/models/teams_rights_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/user"
 	"testing"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+	"code.vikunja.io/api/pkg/user"
+
 	"code.vikunja.io/web"
 )
 

pkg/models/teams_test.go

@@ -17,11 +17,12 @@
 package models
 
 import (
+	"reflect"
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/stretchr/testify/assert"
-	"reflect"
-	"testing"
 )
 
 func TestTeam_Create(t *testing.T) {

pkg/models/users_list_test.go

@@ -18,10 +18,11 @@
 package models
 
 import (
+	"testing"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"gopkg.in/d4l3k/messagediff.v1"
-	"testing"
 )
 
 func TestListUsersFromList(t *testing.T) {

pkg/modules/avatar/gravatar/gravatar.go

@@ -17,14 +17,16 @@
 package gravatar
 
 import (
-	"code.vikunja.io/api/pkg/config"
-	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/user"
-	"code.vikunja.io/api/pkg/utils"
+	"context"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 	"time"
+
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/api/pkg/utils"
 )
 
 type avatar struct {
@@ -62,10 +64,15 @@ func (g *Provider) GetAvatar(user *user.User, size int64) ([]byte, string, error
 	}
 	if !exists || needsRefetch {
 		log.Debugf("Gravatar for user %d with size %d not cached, requesting from gravatar...", user.ID, size)
-		resp, err := http.Get("https://www.gravatar.com/avatar/" + utils.Md5String(user.Email) + "?s=" + sizeString + "&d=mp")
+		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://www.gravatar.com/avatar/"+utils.Md5String(user.Email)+"?s="+sizeString+"&d=mp", nil)
 		if err != nil {
 			return nil, "", err
 		}
+		resp, err := http.DefaultClient.Do(req)
+		if err != nil {
+			return nil, "", err
+		}
+		defer resp.Body.Close()
 		avatarContent, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
 			return nil, "", err

pkg/modules/avatar/initials/initials.go

@@ -18,6 +18,13 @@ package initials
 
 import (
 	"bytes"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/png"
+	"strconv"
+	"strings"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	e "code.vikunja.io/api/pkg/modules/keyvalue/error"
@@ -27,12 +34,6 @@ import (
 	"golang.org/x/image/font"
 	"golang.org/x/image/font/gofont/goregular"
 	"golang.org/x/image/math/fixed"
-	"image"
-	"image/color"
-	"image/draw"
-	"image/png"
-	"strconv"
-	"strings"
 )
 
 // Provider represents the provider implementation of the initials provider
@@ -41,15 +42,15 @@ type Provider struct {
 
 var (
 	avatarBgColors = []*color.RGBA{
-		{69, 189, 243, 255},
-		{224, 143, 112, 255},
-		{77, 182, 172, 255},
-		{149, 117, 205, 255},
-		{176, 133, 94, 255},
-		{240, 98, 146, 255},
-		{163, 211, 108, 255},
-		{121, 134, 203, 255},
-		{241, 185, 29, 255},
+		{R: 69, G: 189, B: 243, A: 255},
+		{R: 224, G: 143, B: 112, A: 255},
+		{R: 77, G: 182, B: 172, A: 255},
+		{R: 149, G: 117, B: 205, A: 255},
+		{R: 176, G: 133, B: 94, A: 255},
+		{R: 240, G: 98, B: 146, A: 255},
+		{R: 163, G: 211, B: 108, A: 255},
+		{R: 121, G: 134, B: 203, A: 255},
+		{R: 241, G: 185, B: 29, A: 255},
 	}
 )
 

pkg/modules/avatar/upload/upload.go

@@ -18,16 +18,17 @@ package upload
 
 import (
 	"bytes"
+	"image"
+	"image/png"
+	"io/ioutil"
+	"strconv"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	e "code.vikunja.io/api/pkg/modules/keyvalue/error"
 	"code.vikunja.io/api/pkg/user"
 	"github.com/disintegration/imaging"
-	"image"
-	"image/png"
-	"io/ioutil"
-	"strconv"
 )
 
 // Provider represents the upload avatar provider

pkg/modules/background/handler/background.go

@@ -17,6 +17,11 @@
 package handler
 
 import (
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
@@ -27,10 +32,6 @@ import (
 	"code.vikunja.io/web/handler"
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/labstack/echo/v4"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
 )
 
 // BackgroundProvider represents a thing which holds a background provider

pkg/modules/background/unsplash/proxy.go

@@ -17,18 +17,25 @@
 package unsplash
 
 import (
-	"code.vikunja.io/web/handler"
-	"github.com/labstack/echo/v4"
+	"context"
 	"net/http"
 	"strings"
+
+	"code.vikunja.io/web/handler"
+	"github.com/labstack/echo/v4"
 )
 
 func unsplashImage(url string, c echo.Context) error {
 	// Replacing and appending the url for security reasons
-	resp, err := http.Get("https://images.unsplash.com/" + strings.Replace(url, "https://images.unsplash.com/", "", 1))
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://images.unsplash.com/"+strings.Replace(url, "https://images.unsplash.com/", "", 1), nil)
 	if err != nil {
 		return err
 	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
 	if resp.StatusCode > 399 {
 		return echo.ErrNotFound
 	}

pkg/modules/background/unsplash/unsplash.go

@@ -18,6 +18,14 @@ package unsplash
 
 import (
 	"bytes"
+	"context"
+	"encoding/json"
+	"net/http"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/log"
@@ -26,12 +34,6 @@ import (
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	e "code.vikunja.io/api/pkg/modules/keyvalue/error"
 	"code.vikunja.io/web"
-	"encoding/json"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
 )
 
 const (
@@ -89,7 +91,7 @@ type initialCollection struct {
 var emptySearchResult *initialCollection
 
 func doGet(url string, result ...interface{}) (err error) {
-	req, err := http.NewRequest("GET", unsplashAPIURL+url, nil)
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, unsplashAPIURL+url, nil)
 	if err != nil {
 		return
 	}
@@ -100,6 +102,7 @@ func doGet(url string, result ...interface{}) (err error) {
 	if err != nil {
 		return
 	}
+	defer resp.Body.Close()
 
 	if len(result) > 0 {
 		return json.NewDecoder(resp.Body).Decode(result[0])
@@ -250,10 +253,14 @@ func (p *Provider) Set(image *background.Image, list *models.List, auth web.Auth
 
 	// Download the photo from unsplash
 	// The parameters crop the image to a max width of 2560 and a max height of 2048 to save bandwidth and storage.
-	resp, err := http.Get(photo.Urls.Raw + "&w=2560&h=2048&q=90")
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, photo.Urls.Raw+"&w=2560&h=2048&q=90", nil)
 	if err != nil {
 		return
 	}
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode > 399 {
@@ -327,9 +334,13 @@ func Pingback(f *files.File) {
 }
 
 func pingbackByPhotoID(photoID string) {
-	if _, err := http.Get("https://views.unsplash.com/v?app_id=" + config.BackgroundsUnsplashApplicationID.GetString() + "&photo_id=" + photoID); err != nil {
+	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, "https://views.unsplash.com/v?app_id="+config.BackgroundsUnsplashApplicationID.GetString()+"&photo_id="+photoID, nil)
+	if err != nil {
+		log.Errorf("Unsplash Pingback Failed: %s", err.Error())
+	}
+	_, err = http.DefaultClient.Do(req)
+	if err != nil {
 		log.Errorf("Unsplash Pingback Failed: %s", err.Error())
 	}
 	log.Debugf("Pinged unsplash for photo %s", photoID)
-
 }

pkg/modules/background/upload/upload.go

@@ -17,11 +17,12 @@
 package upload
 
 import (
+	"strconv"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/background"
 	"code.vikunja.io/web"
-	"strconv"
 )
 
 // Provider represents an upload provider