Fix: custom validator when used as module

PhrozenIO · Feb 20, 2022 · baf608e · baf608e
1 parent a52936e
commit baf608e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/PowerRemoteDesktop_Server/PowerRemoteDesktop_Server.psd1 b/PowerRemoteDesktop_Server/PowerRemoteDesktop_Server.psd1
diff --git a/PowerRemoteDesktop_Server/PowerRemoteDesktop_Server.psm1 b/PowerRemoteDesktop_Server/PowerRemoteDesktop_Server.psm1
@@ -83,7 +83,7 @@ Add-Type @"
     }
 "@
 
-$global:PowerRemoteDesktopVersion = "3.1.0"
+$global:PowerRemoteDesktopVersion = "3.1.2"
 
 $global:HostSyncHash = [HashTable]::Synchronized(@{
     host = $host
@@ -2802,14 +2802,9 @@ function Invoke-RemoteDesktopServer
         [int] $ListenPort = 2801,   
 
         [SecureString] $SecurePassword = $null,
-        [string] $Password = "",   
-
-        [ValidateFile()]     
-        [String] $CertificateFile = $null,   
-
-        [ValidateBase64String()]
+        [string] $Password = "",           
+        [String] $CertificateFile = $null,           
         [string] $EncodedCertificate = "",
-
         [switch] $UseTLSv1_3,        
         [switch] $DisableVerbosity,
         [ClipboardMode] $Clipboard = [ClipboardMode]::Both,
@@ -2850,11 +2845,15 @@ function Invoke-RemoteDesktopServer
         if ($CertificateFile -or $EncodedCertificate)
         {
             $Certificate = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2
-
             try
             {
                 if ($CertificateFile)
                 {
+                    if(-not (Test-Path -Path $CertificateFile))
+                    {
+                        throw [System.IO.FileNotFoundException]::new()
+                    }
+
                     $Certificate = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2 $CertificateFile, $CertificatePassword
                 }
                 else

diff --git a/PowerRemoteDesktop_Viewer/PowerRemoteDesktop_Viewer.psd1 b/PowerRemoteDesktop_Viewer/PowerRemoteDesktop_Viewer.psd1
diff --git a/PowerRemoteDesktop_Viewer/PowerRemoteDesktop_Viewer.psm1 b/PowerRemoteDesktop_Viewer/PowerRemoteDesktop_Viewer.psm1
@@ -51,7 +51,7 @@ Add-Type @"
     }    
 "@
 
-$global:PowerRemoteDesktopVersion = "3.1.0"
+$global:PowerRemoteDesktopVersion = "3.1.2"
 
 $global:HostSyncHash = [HashTable]::Synchronized(@{
     host = $host

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Tested on:
 * **Windows 10**
 * **Windows 11**
 
-Current version: **3.0 Stable**
+Current version: **3.1.2 Stable**
 
 ## Performance