Merge branch 'main' into feature-idle-time-in-cpu-utilization

Author: sni

.golangci.yml

@@ -58,6 +58,7 @@ linters:
     lll:
       line-length: 200
   exclusions:
+    #warn-unused: true
     generated: lax
     presets:
       - comments
@@ -73,14 +74,10 @@ linters:
       - linters:
           - nolintlint
         path: (check_tcp|check_dns|nameserver.*)\.go
-      - path: (.+)\.go$
-        text: '`noCopy` is unused'
       - path: (.+)\.go$
         text: 'Magic number: 0.1, in'
       - path: (.+)\.go$
         text: 'Magic number: 0.01, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 0.001, in'
       - path: (.+)\.go$
         text: 'Magic number: 2, in'
       - path: (.+)\.go$
@@ -109,8 +106,6 @@ linters:
         text: 'Magic number: 22, in'
       - path: (.+)\.go$
         text: 'Magic number: 23, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 24, in'
       - path: (.+)\.go$
         text: 'Magic number: 31, in'
       - path: (.+)\.go$
@@ -121,8 +116,6 @@ linters:
         text: 'Magic number: 59, in'
       - path: (.+)\.go$
         text: 'Magic number: 60, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 64, in'
       - path: (.+)\.go$
         text: 'Magic number: 100, in'
       - path: (.+)\.go$
@@ -133,8 +126,6 @@ linters:
         text: 'Magic number: 365, in'
       - path: (.+)\.go$
         text: 'Magic number: 500, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 512, in'
       - path: (.+)\.go$
         text: 'Magic number: 600, in'
       - path: (.+)\.go$
@@ -151,40 +142,16 @@ linters:
         text: 'Magic number: 1e6, in'
       - path: (.+)\.go$
         text: 'Magic number: 1e7, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 1e9, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 1e12, in'
-      - path: (.+)\.go$
-        text: 'Magic number: 1e15, in'
       - path: (.+)\.go$
         text: 'Magic number: 0o600, in'
       - path: (.+)\.go$
         text: 'Magic number: 0o700, in'
-      - path: (.+)\.go$
-        text: noCopy is missing in
       - path: (.+)\.go$
         text: variable name 'ok' is too short
       - path: (.+)\.go$
         text: Function 'setListenTLSConfig' has too many statements
-      - path: (.+)\.go$
-        text: Function 'parseAnyArg' has too many statements
-      - path: (.+)\.go$
-        text: complexity.*setListenTLSConfig
-      - path: (.+)\.go$
-        text: complexity.*checkFlags
-      - path: (.+)\.go$
-        text: Function 'readConfiguration' has too many statements
-      - path: (.+)\.go$
-        text: complexity.*readConfiguration
-      - path: (.+)\.go$
-        text: Function 'Check' has too many statements
       - path: (.+)\.go$
         text: Function 'Check' is too long
-      - path: (.+)\.go$
-        text: Function 'fetchProcs' is too long
-      - path: (.+)\.go$
-        text: Function 'buildListMacros' is too long
       - path: (.+)\.go$
         text: Function 'fetchProcs' has too many statements
       - path: (.+)\.go$
@@ -195,8 +162,6 @@ linters:
         text: cognitive complexity .* of func .*conditionAdd
       - path: (.+)\.go$
         text: cognitive complexity .* of func .*.matchSingle
-      - path: (.+)\.go$
-        text: cognitive complexity .* of func .*splitToken
       - path: (.+)\.go$
         text: cognitive complexity .* of func .*ReplaceConditionals
       - path: (.+)\.go$
@@ -223,8 +188,6 @@ linters:
         text: parameter name 'a' is too short for the scope of its usage
       - path: (.+)\.go$
         text: parameter name 'b' is too short for the scope of its usage
-      - path: (.+)\.go$
-        text: .execCommand` - `timeout` always receives `DefaultCmdTimeout
       - path: (.+)\.go$
         text: 'fieldalignment: struct'
       - path: (.+)(utils|utils_test|fieldsn|asciiTable)\.go$
@@ -241,11 +204,10 @@ linters:
         text: 'string literal contains rune in Han script'
       - path: (.+)condition\.go$
         text: 'stringscutprefix:'
+      - path: (.+)/(check_files|check_tasksched)\.go$
+        text: 'SA4023'
     paths:
       - pkg/pdh/pdh.go
-      - third_party$
-      - builtin$
-      - examples$
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
@@ -255,8 +217,3 @@ formatters:
     - goimports
   exclusions:
     generated: lax
-    paths:
-      - pkg/pdh/pdh.go
-      - third_party$
-      - builtin$
-      - examples$

Changes

@@ -1,6 +1,6 @@
 This file documents the revision history for the SNClient agent.
 
-next:
+0.41     Fri Dec 19 19:16:59 CET 2025
          - fix windows disk/mount checks showing only the first drive
 
 0.40     Wed Dec 17 14:07:35 CET 2025

docs/configuration/_index.md

@@ -210,15 +210,26 @@ Supported macro variants:
 - `%(macro name)`
 - all variants of `$` / `%` and `{}` / `()` are interchangeable
 
-Available macros are:
-
-- `${exe-path}`
-- `${shared-path}`
-- `${scripts}`
-- `${certificate-path}`
-- `${hostname}`
-
-Basically the values from the `[/paths]` section and the hostname.
+### Available Macros
+
+Basically all the values from the `[/paths]` section are available as macros
+plus some more.
+
+List of available macros:
+
+| Suffix                | Example                                    | Description                                     |
+| --------------------- | ------------------------------------------ | ------------------------------------------------|
+| `${certificate-path}` | usually `${shared-path}`                   | Directory of certificates (set by snclient.ini) |
+| `${exe-file}`         | snclient or snclient.exe                   | Basename of executable                          |
+| `${exe-full}`         | /usr/bin/snclient                          | Full path to executable                         |
+| `${exe-path}`         | /usr/bin or c:\Program Files\snclient      | Directory of executable                         |
+| `${file-ext}`         | .exe or empty                              | File extension of agents executable file        |
+| `${goarch}`           | x86_64, aarch64, i386, ...                 | The value of Golangs runtime.GOARCH             |
+| `${goos}`             | linux, windows, darwin, ...                | The value of Golangs runtime.GOOS               |
+| `${hostname}`         | machine.local                              | Name of the host running the agent              |
+| `${pkgarch}`          | amd64, arm64, 386, ...                     | Architecture as used in package file names      |
+| `${scripts}`          | usually `${shared-path}/scripts`           | Directory of script files (set by snclient.ini) |
+| `${shared-path}`      | /etc/snclient or c:\Program Files\snclient | Directory of shared files (set by snclient.ini) |
 
 ## On Demand Macros
 

pkg/pdh/pdh.go

@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build windows
-// +build windows
 
 package pdh
 

pkg/snclient/check_drivesize_windows.go

@@ -251,14 +251,14 @@ func (l *CheckDrivesize) setDeviceInfo(drive map[string]string) {
 		drive["removable"] = "1"
 	}
 
-	volumeName := make([]uint16, 512)
+	volumeName := make([]uint16, windows.MAX_PATH+1)
 	volumeNameLen, err := convert.UInt32E(len(volumeName))
 	if err != nil {
 		drive["_error"] = fmt.Sprintf("cannot set length of volume name: %s", err.Error())
 
 		return
 	}
-	fileSystemName := make([]uint16, 512)
+	fileSystemName := make([]uint16, windows.MAX_PATH+1)
 	fileSystemNameLen, err := convert.UInt32E(len(fileSystemName))
 	if err != nil {
 		drive["_error"] = fmt.Sprintf("cannot set length of filesystem name: %s", err.Error())

pkg/snclient/check_files.go

@@ -418,9 +418,12 @@ func (l *CheckFiles) normalizePath(path string) string {
 	// Files directly under the drive do not have seperators, e.g: C:pagefile.sys
 	// This confuses the depth calculation
 	if runtime.GOOS == "windows" {
+		// C: -> C:\
+		if len(path) == 2 && unicode.IsUpper(rune(path[0])) && path[1] == ':' {
+			// Ensure drive letters always have a backslash: "C:" -> "C:\"
+			return path + string(os.PathSeparator)
+		}
 		// "C:example" -> "C:\example".
-		// Do not change if its just the drive letter. D: -> D:
-		// Otherwise 'D:\' and 'D:\example' would have the same number of seperators, even though the file is under the D: "directory" and should have increased depth
 		if len(path) >= 3 && unicode.IsUpper(rune(path[0])) && path[1] == ':' && path[2] != '\\' {
 			winBasePath := path[:2] + string('\\') + path[2:]
 
@@ -434,6 +437,7 @@ func (l *CheckFiles) normalizePath(path string) string {
 // getDepth returns path depth starting at 0 with for the basePath
 func (l *CheckFiles) getDepth(path, basePath string) int64 {
 	// both the path and BasePath are normalized once according to CheckFiles.normalizePath()
+
 	// Windows example:
 	// basePath: C:\foo
 	// path: C:\foo -> 0
@@ -452,9 +456,21 @@ func (l *CheckFiles) getDepth(path, basePath string) int64 {
 
 	subPath := strings.TrimPrefix(path, basePath)
 	seperatorCount := int64(strings.Count(subPath, string(os.PathSeparator)))
-	depth := seperatorCount
+	depthCorrection := 0
+
+	// On Windows specifically, the paths have a problem when basePath is a drive letter.
+	// basePath: C:\
+	// path: C:\pagefile.sys -> 0 seperators , even though it is under the drive.
+	// path: C:\Windows\notepad.exe -> 1 seperators, even though it is under the Windows folder.
+	// If you consider the drive itself as a folder, stuff under it should have depth
+	if runtime.GOOS == "windows" && len(basePath) == 3 && unicode.IsUpper(rune(path[0])) && path[1] == ':' && path[2] == '\\' {
+		depthCorrection++
+	}
+	// Implement something similar in Unixes?
+
+	depth := seperatorCount + int64(depthCorrection)
 
-	log.Tracef("path: %s, basePath: %s, subPath: %s, seperatorCount: %d, depth: %d", path, basePath, subPath, seperatorCount, depth)
+	log.Tracef("path: %s, basePath: %s, subPath: %s, seperatorCount: %d, depthCorrection: %d, depth: %d", path, basePath, subPath, seperatorCount, depthCorrection, depth)
 
 	return depth
 }

pkg/snclient/check_files_helper_lin.go pkg/snclient/check_files_helper_linux.gopkg/snclient/check_files_helper_lin.go renamed to pkg/snclient/check_files_helper_linux.go

@@ -1,5 +1,3 @@
-//go:build linux
-
 package snclient
 
 import (