Merge branch 'release/0.1.6'

Connect-VPN.ps1

@@ -14,7 +14,9 @@ function Connect-AnyConnect() # {{{
     [Parameter(Position=3, ParameterSetName='Plain', Mandatory=$true)]
     [string] $Password,
     [Parameter(Position=4, Mandatory=$false)]
-    [switch] $AcceptNotice    
+    [switch] $AcceptNotice,
+    [Parameter(Position=5, Mandatory=$false)]
+    [int] $Timeout = 60
   )
   if ($PSCmdlet.ParameterSetName -eq 'Credential')
   {
@@ -42,7 +44,7 @@ function Connect-AnyConnect() # {{{
 
   # First Stop any VPN cli and ui
   # There must be only one "client" running when connecting
-  Get-Process | Where ProcessName -match 'vpn(ui|cli)' | ForEach {
+  Get-Process | Where-Object ProcessName -match 'vpn(ui|cli)' | ForEach-Object {
     if (! $_.HasExited)
     {
       Write-Verbose "Stopping process $($_.Name) (pid: $($_.Id))"
@@ -88,9 +90,9 @@ function Connect-AnyConnect() # {{{
     $vpncli.StandardInput.WriteLine("y")
   }
 
+  $timer = [Diagnostics.Stopwatch]::StartNew()
   Write-Verbose "Reading its output stream"
-  $found = $false
-  for ($output = $vpncli.StandardOutput.ReadLine(); $output -ne $null; $output = $vpncli.StandardOutput.ReadLine())
+  for ($output = $vpncli.StandardOutput.ReadLine(); $null -ne $output -and $timer.Elapsed.TotalSeconds -lt $Timeout; $output = $vpncli.StandardOutput.ReadLine())
   {
     Write-Debug $output
     if ($output -eq '  >> Login failed.')
@@ -111,6 +113,12 @@ function Connect-AnyConnect() # {{{
       }
     }
   }
+  $timer.Stop()
+  if ($timer.Elapsed.TotalSeconds -ge $Timeout)
+  {
+    Write-Error "Timeout ($Timeout seconds) while connecting to $ComputerName"
+    return [PSCustomObject] @{}
+  }
   Start-Process -FilePath (Get-Anyconnect -gui)
 
   return [PSCustomObject] @{
@@ -150,6 +158,10 @@ function Connect-AnyConnect() # {{{
 .PARAMETER AcceptNotice
   Accept notice from the server, like a banner message.
 
+.PARAMETER Timeout
+  Maximum time in seconds to wait for the connection to be established.
+  Default is 60 seconds.
+
 .INPUTS
   The ComputerName can be piped in.
 
@@ -193,7 +205,9 @@ function Connect-VPN # {{{
     [Parameter(Position=4, ParameterSetName='Plain', Mandatory=$true)]
     [string] $Password,
     [Parameter(Position=5, Mandatory=$false)]
-    [switch] $AcceptNotice
+    [switch] $AcceptNotice,
+    [Parameter(Position=6, Mandatory=$false)]
+    [int] $Timeout = 60
   )
   DynamicParam
   {

Install.ps1

@@ -5,7 +5,7 @@ Param(
 )
 
 $ModuleName    = 'Posh-VPN'
-$ModuleVersion = '0.1.5'
+$ModuleVersion = '0.1.6'
 $GithubRoot    = "https://raw.githubusercontent.com/gildas/posh-vpn/$ModuleVersion"
 
 if ([string]::IsNullOrEmpty($Path))

Posh-VPN.psd1

@@ -12,7 +12,7 @@
 RootModule = 'Posh-VPN.psm1'
 
 # Version number of this module.
-ModuleVersion = '0.1.5'
+ModuleVersion = '0.1.6'
 
 # ID used to uniquely identify this module
 GUID = 'c762b59e-61f1-4411-9c5b-3709a00199c1'

README.md

@@ -12,7 +12,7 @@ Install-Module Posh-VPN
 Copy the following line and paste it in a Powershell:
 
 ```posh
-Start-BitsTransfer http://tinyurl.com/posh-vpn-0-1-5 $env:TEMP ; & $env:TEMP\Install.ps1
+Start-BitsTransfer https://raw.githubusercontent.com/gildas/posh-vpn/0.1.6/Install.ps1 $env:TEMP ; & $env:TEMP\Install.ps1
 ```
 
 To install the latest development version, use one of the followings:
@@ -65,6 +65,11 @@ PS> $creds = Get-Credential ACME\gildas
 PS> $vpn = Connect-VPN -Provider AnyConnect -ComputerName vpn.acme.com -Credential $creds
 ```
 
+You can also specify a custom timeout. Upon reaching the timeout the `Connect-VPN` Cmdlet will display an error:
+```posh
+PS> $vpn = Connect-VPN -Provider AnyConnect -ComputerName vpn.acme.com -Credential $creds -Timeout 60
+```
+
 In both cases, you can use the TAB completion for the ComputerName. The values come from the available profiles/servers/connections for the given provider.
 
 To get the status of a VPN session:

VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6