Merge pull request #3 from Walmann/VPN-Password-Fixes

Fix for parameters with Spaces

Author: Walmann

Tools/Create New Connection.ps1

@@ -12,7 +12,9 @@ if ($a.ToLower() -eq "e" -or $null -eq $a) {
 
     $New_VPN_Config_Name    = "RDP_TO_VPN_$New_VPN_Name"
 
-
+    if ([string]::IsNullOrEmpty($New_RDP_Username)){
+        $New_RDP_Username = $New_VPN_Username
+    }
 
     if ($New_VPN_And_RDP_PW_Same.ToLower -eq "y"){
         $New_VPN_And_RDP_PW_Same = $true
@@ -41,7 +43,7 @@ if ($a.ToLower() -eq "e" -or $null -eq $a) {
 
     [System.Collections.ArrayList]$Template_Content_mid = @()
     if (![string]::IsNullOrEmpty($New_VPN_Name)){
-        $Template_Content_mid.Add(' VPN_Name                   = ' + "`"$New_VPN_Name`"" + "`n")
+        $Template_Content_mid.Add(' VPN_Name                   = ' + "`"`'$New_VPN_Name`'`"" + "`n")
         }
     if (![string]::IsNullOrEmpty($New_RDP_Server_IP)){
         $Template_Content_mid.Add(' RDP_Server_IP              = ' + "`"$New_RDP_Server_IP`"" + "`n")
@@ -59,7 +61,7 @@ if ($a.ToLower() -eq "e" -or $null -eq $a) {
         $Template_Content_mid.Add(' VPN_And_RDP_PW_Same        = ' + "`"$New_VPN_And_RDP_PW_Same`"" + "`n")
         }
     if (![string]::IsNullOrEmpty($New_VPN_Config_Name)){
-        $Template_Content_mid.Add(' VPN_Config_Name            = ' + "`"$New_VPN_Config_Name`"" + "`n")
+        $Template_Content_mid.Add(' VPN_Config_Name            = ' + "`"`'$New_VPN_Config_Name`'`"" + "`n")
         }
     $Template_Content_end = @"
 

dep/_MainConnect.ps1

@@ -31,29 +31,28 @@ param (
 
 #Debug:
 # $VPN_Name                   = ""
-# $RDP_Server_IP              = ""
 # $VPN_User                   = ""
 # $VPN_And_RDP_PW_Same        = ""
 # $VPN_Config_Name            = ""
+# $RDP_Server_IP              = ""
 #Debug End
 
 
 $PhoneBookLocation  = ".\dep\Phonebooks\$VPN_Config_Name.pbk"
+if ($VPN_And_RDP_PW_Same -eq "n"){
+    $VPN_And_RDP_PW_Same = $false
+}
+if ($VPN_And_RDP_PW_Same -eq "y"){
+    $VPN_And_RDP_PW_Same = $true
+}
+
+
 function New-Credidential {
 
     #RDP Passord
-    $RDPPasswordsec = Read-Host -Prompt "Passord for $VPN_Name (RDP og VPN)" -AsSecureString
+    $RDPPasswordsec = Read-Host -Prompt "Passord for $VPN_Name (RDP)" -AsSecureString
     $RDPPassword = [Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($RDPPasswordsec))
-    New-StoredCredential -Target $RDP_Server_IP -UserName $RDP_Username -Password $RDPPassword -Persist 'LocalMachine' -Comment $VPN_Name
-
-    # # #VPN Passord
-    # $VPNPWSameAsRDP = Read-Host -Prompt "Er passordet for VPN det samme som RDP? Y/N"
-    # if (($VPNPWSameAsRDP.ToLower -eq "n") -or $VPNPWSameAsRDP.ToLower -eq "no") {
-
-    #     $RDPPasswordsec = Read-Host -Prompt "Passord for $VPN_Name (VPN)" -AsSecureString
-    #     $RDPPassword = [Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($RDPPasswordsec))
-    #     New-StoredCredential -Target $RDP_Server_IP -UserName $RDP_Username -Password $RDPPassword -Persist 'LocalMachine' -Comment $VPN_Name
-    # }
+    New-StoredCredential -Target $RDP_Server_IP -UserName "$RDP_Username" -Password $RDPPassword -Persist 'LocalMachine' -Comment "$VPN_Name"
 
     Return $RDPPassword
 }
@@ -96,13 +95,7 @@ if ([string]::IsNullOrEmpty($VPN_User) -or [string]::IsNullOrEmpty($VPNPassword)
         Write-Host "Using RDP Username as VPN Username"
     }
     # if ([string]::IsNullOrEmpty($VPNPassword)) {
-    if ($New_VPN_And_RDP_PW_Same -eq $true) {
-        $VPNPassword = Get-StoredCredential -Target $RDP_Server_IP -AsCredentialObject
-        # $VPNPassword = [Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($VPNPassword.Password))
-        $VPNPassword = $VPNPassword.Password
-        Write-Host "Using RDP Password as VPN Password"
-    }
-    if ($New_VPN_And_RDP_PW_Same -eq $false) {
+    if ($VPN_And_RDP_PW_Same -eq $true) {
         $VPNPassword = Get-StoredCredential -Target $RDP_Server_IP -AsCredentialObject
         # $VPNPassword = [Runtime.InteropServices.Marshal]::PtrToStringAuto([Runtime.InteropServices.Marshal]::SecureStringToBSTR($VPNPassword.Password))
         $VPNPassword = $VPNPassword.Password
@@ -111,9 +104,17 @@ if ([string]::IsNullOrEmpty($VPN_User) -or [string]::IsNullOrEmpty($VPNPassword)
 }
 
 # Koble til VPN
-Write-Host "Connecting to VPN"
-rasdial.exe "$VPN_Name" $VPN_User $VPNPassword "/phonebook:$PhoneBookLocation"
-# Write-Host $VPN_Name.ConnectionStatus
+Write-Host "Connecting to VPN with stored credentials"
+rasdial.exe "$VPN_Name" "$VPN_User" $VPNPassword "/phonebook:$PhoneBookLocation"
+
+
+
+if (-Not (Test-Connection -ComputerName $RDP_Server_IP -Count 1 -Quiet)){
+[System.Windows.MessageBox]::Show(" Kunne ikke koble til VPN. `nDette betyr enten feil i instillinger, eller ingen lagret passord. `n I neste vindu velger du 'Koble til' deretter fyller du ut innloggings informasjonen.")
+rasphone -FilePath $PhoneBookLocation
+$RasPid = (Get-Process rasphone).Id
+Wait-Process -Id $RasPid
+}
 
 
 #Kobler til RPD