Ensure COM threading apartment in SMB APIs

Author: laozc

pkg/os/smb/api.go

@@ -28,19 +28,26 @@ func New(requirePrivacy bool) *SmbAPI {
 }
 
 func (*SmbAPI) IsSmbMapped(remotePath string) (bool, error) {
+	var status int32
 	err := cim.WithCOMThread(func() error {
 		inst, err := cim.QuerySmbGlobalMappingByRemotePath(remotePath)
 		if err != nil {
-			return false, cim.IgnoreNotFound(err)
+			return err
 		}
 
-		status, err := inst.GetProperty("Status")
+		statusProp, err := inst.GetProperty("Status")
 		if err != nil {
-			return false, err
+			return err
 		}
+
+		status = statusProp.(int32)
+		return nil
 	})
+	if err != nil {
+		return false, cim.IgnoreNotFound(err)
+	}
 
-	return status.(int32) == cim.SmbMappingStatusOK, nil
+	return status == cim.SmbMappingStatusOK, nil
 }
 
 // NewSmbLink - creates a directory symbolic link to the remote share.
@@ -64,19 +71,23 @@ func (*SmbAPI) NewSmbLink(remotePath, localPath string) error {
 }
 
 func (api *SmbAPI) NewSmbGlobalMapping(remotePath, username, password string) error {
-	result, err := cim.NewSmbGlobalMapping(remotePath, username, password, api.RequirePrivacy)
-	if err != nil {
-		return fmt.Errorf("NewSmbGlobalMapping failed. result: %d, err: %v", result, err)
-	}
+	return cim.WithCOMThread(func() error {
+		result, err := cim.NewSmbGlobalMapping(remotePath, username, password, api.RequirePrivacy)
+		if err != nil {
+			return fmt.Errorf("NewSmbGlobalMapping failed. result: %d, err: %v", result, err)
+		}
 
-	return nil
+		return nil
+	})
 }
 
 func (*SmbAPI) RemoveSmbGlobalMapping(remotePath string) error {
-	err := cim.RemoveSmbGlobalMappingByRemotePath(remotePath)
-	if err != nil {
-		return fmt.Errorf("error remove smb mapping '%s'. err: %v", remotePath, err)
-	}
+	return cim.WithCOMThread(func() error {
+		err := cim.RemoveSmbGlobalMappingByRemotePath(remotePath)
+		if err != nil {
+			return fmt.Errorf("error remove smb mapping '%s'. err: %v", remotePath, err)
+		}
 
-	return nil
+		return nil
+	})
 }