CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct Windows API constants to fix domain join detection

Browse Source 
The function was incorrectly identifying domain-joined status due to wrong
constant values, potentially causing false negatives for domain-joined machines.
This commit is contained in:
Cuong Manh Le
2025-08-12 16:48:10 +07:00
committed by Cuong Manh Le
parent 66e2d3a40a
commit 21855df4af
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
nameservers_windows.go
View File

@@ -23,20 +23,17 @@ import (
) )
const ( const (
maxDNSAdapterRetries = 5 maxDNSAdapterRetries = 5
retryDelayDNSAdapter = 1 * time.Second retryDelayDNSAdapter = 1 * time.Second
defaultDNSAdapterTimeout = 10 * time.Second defaultDNSAdapterTimeout = 10 * time.Second
minDNSServers = 1 // Minimum number of DNS servers we want to find minDNSServers = 1 // Minimum number of DNS servers we want to find
NetSetupUnknown uint32 = 0
NetSetupWorkgroup uint32 = 1 DS_FORCE_REDISCOVERY = 0x00000001
NetSetupDomain uint32 = 2 DS_DIRECTORY_SERVICE_REQUIRED = 0x00000010
NetSetupCloudDomain uint32 = 3 DS_BACKGROUND_ONLY = 0x00000100
DS_FORCE_REDISCOVERY = 0x00000001 DS_IP_REQUIRED = 0x00000200
DS_DIRECTORY_SERVICE_REQUIRED = 0x00000010 DS_IS_DNS_NAME = 0x00020000
DS_BACKGROUND_ONLY = 0x00000100 DS_RETURN_DNS_NAME = 0x40000000
DS_IP_REQUIRED = 0x00000200
DS_IS_DNS_NAME = 0x00020000
DS_RETURN_DNS_NAME = 0x40000000
) )
type DomainControllerInfo struct { type DomainControllerInfo struct {
@@ -158,7 +155,7 @@ func getDNSServers(ctx context.Context) ([]string, error) {
0, // DomainGuid - not needed 0, // DomainGuid - not needed
0, // SiteName - not needed 0, // SiteName - not needed
uintptr(flags), // Flags uintptr(flags), // Flags
uintptr(unsafe.Pointer(&info))) // DomainControllerInfo - output uintptr(unsafe.Pointer(&info))) // DomainControllerInfo - output
if ret != 0 { if ret != 0 {
switch ret { switch ret {
@@ -343,27 +340,28 @@ func checkDomainJoined() bool {
var domain *uint16 var domain *uint16
var status uint32 var status uint32
err := windows.NetGetJoinInformation(nil, &domain, &status) if err := windows.NetGetJoinInformation(nil, &domain, &status); err != nil {
if err != nil { Log(context.Background(), logger.Debug(), "Failed to get domain join status: %v", err)
Log(context.Background(), logger.Debug(),
"Failed to get domain join status: %v", err)
return false return false
} }
defer windows.NetApiBufferFree((*byte)(unsafe.Pointer(domain))) defer windows.NetApiBufferFree((*byte)(unsafe.Pointer(domain)))
// NETSETUP_JOIN_STATUS constants from Microsoft Windows API
// See: https://learn.microsoft.com/en-us/windows/win32/api/lmjoin/ne-lmjoin-netsetup_join_status
//
// NetSetupUnknownStatus uint32 = 0 // The status is unknown
// NetSetupUnjoined uint32 = 1 // The computer is not joined to a domain or workgroup
// NetSetupWorkgroupName uint32 = 2 // The computer is joined to a workgroup
// NetSetupDomainName uint32 = 3 // The computer is joined to a domain
//
// We only care about NetSetupDomainName.
domainName := windows.UTF16PtrToString(domain) domainName := windows.UTF16PtrToString(domain)
Log(context.Background(), logger.Debug(), Log(context.Background(), logger.Debug(),
"Domain join status: domain=%s status=%d (Unknown=0, Workgroup=1, Domain=2, CloudDomain=3)", "Domain join status: domain=%s status=%d (UnknownStatus=0, Unjoined=1, WorkgroupName=2, DomainName=3)",
domainName, status) domainName, status)
// Consider domain or cloud domain as domain-joined isDomain := status == syscall.NetSetupDomainName
isDomain := status == NetSetupDomain || status == NetSetupCloudDomain Log(context.Background(), logger.Debug(), "Is domain joined? status=%d, result=%v", status, isDomain)
Log(context.Background(), logger.Debug(),
"Is domain joined? status=%d, traditional=%v, cloud=%v, result=%v",
status,
status == NetSetupDomain,
status == NetSetupCloudDomain,
isDomain)
return isDomain return isDomain
} }