Drop back to use IsAnInteractiveSession for SVC (#15749)

* Drop back to use IsAnInteractiveSession for SVC There is an apparent permission change problem when using IsWindowsService to determine if the SVC manager should be used. This PR simply drops back to using IsAnInteractiveSession as this does not change behaviour. Fix #15454 Signed-off-by: Andrew Thornton <[email protected]> * Yes staticcheck I know this is deprecated Signed-off-by: Andrew Thornton <[email protected]> * Just leave me alone lint Signed-off-by: Andrew Thornton <[email protected]> Co-authored-by: 6543 <[email protected]>
go-gitea · May 7, 2021 · bdc1697 · bdc1697
1 parent 6400668
commit bdc1697
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -110,3 +110,7 @@ issues:
     - text: "exitAfterDefer:"
       linters:
         - gocritic
+    - path: modules/graceful/manager_windows.go
+      linters:
+        - staticcheck
+      text: "svc.IsAnInteractiveSession is deprecated: Use IsWindowsService instead."
diff --git a/modules/graceful/manager_windows.go b/modules/graceful/manager_windows.go
@@ -74,12 +74,14 @@ func (g *Manager) start() {
 
 	// Make SVC process
 	run := svc.Run
-	isWindowsService, err := svc.IsWindowsService()
+
+	//lint:ignore SA1019 We use IsAnInteractiveSession because IsWindowsService has a different permissions profile
+	isAnInteractiveSession, err := svc.IsAnInteractiveSession()
 	if err != nil {
 		log.Error("Unable to ascertain if running as an Windows Service: %v", err)
 		return
 	}
-	if !isWindowsService {
+	if isAnInteractiveSession {
 		log.Trace("Not running a service ... using the debug SVC manager")
 		run = debug.Run
 	}