Skip to content

Fix: Pass Credential to SMB copy functions via New-PSDrive #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 5 commits into
base: main
Choose a base branch
from
+46 −8
Open

Fix: Pass Credential to SMB copy functions via New-PSDrive #624

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3aa5e2a
Initial plan
Copilot Aug 13, 2026
fb201ac
fix: pass Credential to SMB copy functions and use New-PSDrive for au…
Copilot Aug 13, 2026
2b141b4
fix: derive UNC root from path and assign drive name after success
Copilot Aug 13, 2026
d5b46d8
fix: warn when SMB PSDrive cleanup fails
Copilot Aug 13, 2026
d0fb700
fix: trace temporary SMB PSDrive mounts
Copilot Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 46 additions & 8 deletions src/modules/SdnDiag.Utilities.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ function Copy-FileFromRemoteComputer {
else {
# try SMB Copy first and fallback to WinRM
try {
Copy-FileFromRemoteComputerSMB -Path $Path -ComputerName $object -Destination $Destination -Force:($Force.IsPresent) -Recurse:($Recurse.IsPresent) -ErrorAction Stop
Copy-FileFromRemoteComputerSMB -Path $Path -ComputerName $object -Destination $Destination -Credential $Credential -Force:($Force.IsPresent) -Recurse:($Recurse.IsPresent) -ErrorAction Stop
}
catch {
"{0}. Attempting to copy files using WinRM" -f $_ | Trace-Output -Level:Warning
Expand Down Expand Up @@ -585,9 +585,6 @@ function Copy-FileFromRemoteComputerSMB {
'Force' = $Force.IsPresent
'Recurse' = $Recurse.IsPresent
}
if ($Credential -ne [System.Management.Automation.PSCredential]::Empty -and $null -ne $Credential) {
$params.Add('Credential', $Credential)
}

# set this to suppress the information status bar from being displayed
$Global:ProgressPreference = 'SilentlyContinue'
Expand All @@ -599,6 +596,17 @@ function Copy-FileFromRemoteComputerSMB {
$msg = "Unable to establish TCP connection to {0}:445" -f $ComputerName
throw New-Object System.Exception($msg)
}

# if credential is provided, create a PSDrive to the remote computer to authenticate the SMB session
[System.String]$psDriveName = $null
if ($Credential -ne [System.Management.Automation.PSCredential]::Empty -and $null -ne $Credential) {
$driveRoot = [System.IO.Path]::GetPathRoot($Path[0]).Replace(':','$')
$uncRoot = "\\{0}\{1}" -f $ComputerName, $driveRoot
$tempDriveName = "osPsDrive_{0}" -f [guid]::NewGuid().ToString()
$null = New-PSDrive -Name $tempDriveName -PSProvider FileSystem -Root $uncRoot -Credential $Credential -ErrorAction Stop
$psDriveName = $tempDriveName
"Mounted temporary PSDrive {0} to {1}" -f $psDriveName, $uncRoot | Trace-Output -Level:Information
}
}

process {
Expand Down Expand Up @@ -630,6 +638,17 @@ function Copy-FileFromRemoteComputerSMB {
}
}
}

end {
if ($psDriveName) {
try {
Remove-PSDrive -Name $psDriveName -Force -ErrorAction Stop
}
catch {
"Unable to remove temporary PSDrive {0}. {1}" -f $psDriveName, $_.Exception.Message | Trace-Output -Level:Warning
}
}
}
}


Expand Down Expand Up @@ -749,7 +768,7 @@ function Copy-FileToRemoteComputer {
else {
# try SMB Copy first and fallback to WinRM
try {
Copy-FileToRemoteComputerSMB -Path $Path -ComputerName $object -Destination $Destination -Force:($Force.IsPresent) -Recurse:($Recurse.IsPresent) -ErrorAction Stop
Copy-FileToRemoteComputerSMB -Path $Path -ComputerName $object -Destination $Destination -Credential $Credential -Force:($Force.IsPresent) -Recurse:($Recurse.IsPresent) -ErrorAction Stop
}
catch {
"{0}. Attempting to copy files using WinRM" -f $_ | Trace-Output -Level:Warning
Expand Down Expand Up @@ -822,9 +841,6 @@ function Copy-FileToRemoteComputerSMB {
'Force' = $Force.IsPresent
'Recurse' = $Recurse.IsPresent
}
if ($Credential -ne [System.Management.Automation.PSCredential]::Empty -and $null -ne $Credential) {
$params.Add('Credential', $Credential)
}

# set this to suppress the information status bar from being displayed
$Global:ProgressPreference = 'SilentlyContinue'
Expand All @@ -836,6 +852,17 @@ function Copy-FileToRemoteComputerSMB {
throw New-Object System.Exception($msg)
}

# if credential is provided, create a PSDrive to the remote computer to authenticate the SMB session
[System.String]$psDriveName = $null
if ($Credential -ne [System.Management.Automation.PSCredential]::Empty -and $null -ne $Credential) {
$driveRoot = [System.IO.Path]::GetPathRoot($Destination.FullName).Replace(':','$')
$uncRoot = "\\{0}\{1}" -f $ComputerName, $driveRoot
$tempDriveName = "osPsDrive_{0}" -f [guid]::NewGuid().ToString()
$null = New-PSDrive -Name $tempDriveName -PSProvider FileSystem -Root $uncRoot -Credential $Credential -ErrorAction Stop
$psDriveName = $tempDriveName
Comment thread
arudell marked this conversation as resolved.
"Mounted temporary PSDrive {0} to {1}" -f $psDriveName, $uncRoot | Trace-Output -Level:Information
}

[System.IO.FileInfo]$remotePath = Convert-FileSystemPathToUNC -ComputerName $ComputerName -Path $Destination.FullName
$params.Destination = $remotePath.FullName
}
Expand All @@ -862,6 +889,17 @@ function Copy-FileToRemoteComputerSMB {
}
}
}

end {
if ($psDriveName) {
try {
Remove-PSDrive -Name $psDriveName -Force -ErrorAction Stop
}
catch {
"Unable to remove temporary PSDrive {0}. {1}" -f $psDriveName, $_.Exception.Message | Trace-Output -Level:Warning
}
}
}
}

function Copy-FileToRemoteComputerWinRM {
Expand Down