Merge pull request #20 from agreenbhm/patch-1

Added token generation compatibility for Linux & MacOS
UpperM · Dec 1, 2023 · 8de6b6f · 8de6b6f
2 parents b70e349 + 4f8ae95
commit 8de6b6f
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/PSGuacamole/Public/APIConnection/New-GuacToken.ps1 b/PSGuacamole/Public/APIConnection/New-GuacToken.ps1
@@ -39,16 +39,22 @@ Function New-GuacToken()
         if ($Null -eq $Password -or $Password.Length -eq 0)
         {
             $SecurePassword = Read-Host "Enter password" -AsSecureString
-
-            # Decode SecureString to Plain text for Guacamole (https://www.powershelladmin.com/wiki/Powershell_prompt_for_password_convert_securestring_to_plain_text)
-            # Create a "password pointer"
-            $PasswordPointer = [Runtime.InteropServices.Marshal]::SecureStringToBSTR($SecurePassword)
-
-            # Get the plain text version of the password
-            $Password = [Runtime.InteropServices.Marshal]::PtrToStringAuto($PasswordPointer)
-
-            # Free the pointer
-            [Runtime.InteropServices.Marshal]::ZeroFreeBSTR($PasswordPointer)
+            # If running on Windows
+            if ($IsWindows)
+            {
+                # Decode SecureString to Plain text for Guacamole (https://www.powershelladmin.com/wiki/Powershell_prompt_for_password_convert_securestring_to_plain_text)
+                # Create a "password pointer"
+                $PasswordPointer = [Runtime.InteropServices.Marshal]::SecureStringToBSTR($SecurePassword)
+
+                # Get the plain text version of the password
+                $Password = [Runtime.InteropServices.Marshal]::PtrToStringAuto($PasswordPointer)
+
+                # Free the pointer
+                [Runtime.InteropServices.Marshal]::ZeroFreeBSTR($PasswordPointer)
+            # If running on Linux of MacOS
+            } else {
+                $Password = ConvertFrom-SecureString -SecureString $SecurePassword -AsPlaintext
+            }
         }
 
         $Body = @{