take flash error message back and fix more windows lint error

Author: lunny

.drone.yml

@@ -28,6 +28,7 @@ steps:
     image: golang:1.15
     commands:
       - make lint-backend
+      - GOOS=windows make golangci-lint vet
     environment:
       GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
       GOSUMDB: sum.golang.org

modules/auth/sso/sspi_windows.go

@@ -5,11 +5,12 @@
 package sso
 
 import (
-	"code.gitea.io/gitea/modules/templates"
 	"errors"
 	"net/http"
 	"strings"
 
+	"code.gitea.io/gitea/modules/templates"
+
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
@@ -82,7 +83,9 @@ func (s *SSPI) VerifyAuthData(req *http.Request, w http.ResponseWriter, store Da
 		// Include the user login page in the 401 response to allow the user
 		// to login with another authentication method if SSPI authentication
 		// fails
-		//addFlashErr(ctx, ctx.Tr("auth.sspi_auth_failed"))
+		store.GetData()["Flash"] = map[string]string{
+			"ErrMsg": err.Error(),
+		}
 
 		store.GetData()["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn
 		store.GetData()["EnableSSPI"] = true
@@ -229,24 +232,6 @@ func sanitizeUsername(username string, cfg *models.SSPIConfig) string {
 	return username
 }
 
-/*
-// TODO flash err not implemented for chi
-// addFlashErr adds an error message to the Flash object mapped to a macaron.Context
-func addFlashErr(ctx *macaron.Context, err string) {
-	fv := ctx.GetVal(reflect.TypeOf(&session.Flash{}))
-	if !fv.IsValid() {
-		return
-	}
-	flash, ok := fv.Interface().(*session.Flash)
-	if !ok {
-		return
-	}
-	flash.Error(err)
-	ctx.Data["Flash"] = flash
-}
-
-*/
-
 // init registers the SSPI auth method as the last method in the list.
 // The SSPI plugin is expected to be executed last, as it returns 401 status code if negotiation
 // fails (or if negotiation should continue), which would prevent other authentication methods

modules/graceful/manager_windows.go

@@ -73,15 +73,17 @@ func (g *Manager) start() {
 
 	// Make SVC process
 	run := svc.Run
-	isInteractive, err := svc.IsAnInteractiveSession()
+	isInteractive, err := svc.IsWindowsService()
 	if err != nil {
 		log.Error("Unable to ascertain if running as an Interactive Session: %v", err)
 		return
 	}
 	if isInteractive {
 		run = debug.Run
 	}
-	go run(WindowsServiceName, g)
+	go func() {
+		_ = run(WindowsServiceName, g)
+	}()
 }
 
 // Execute makes Manager implement svc.Handler

modules/log/console_windows.go

@@ -23,7 +23,7 @@ func enableVTMode(console windows.Handle) bool {
 	// https://docs.microsoft.com/en-us/windows/console/setconsolemode
 	// It only works on windows 10. Earlier terminals will fail with an err which we will
 	// handle to say don't color
-	mode = mode | windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING
+	mode |= windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING
 	err = windows.SetConsoleMode(console, mode)
 	return err == nil
 }