Issue#138

modules/AdminToolbox.FortiWizard/Changelog.md

@@ -131,4 +131,5 @@
 * **2.17.23** CI Maintenance Release
 * **2.17.24** CI Maintenance Release
 * **2.17.25** CI Maintenance Release
-* **2.17.26** CI Maintenance Release
+* **2.17.26** CI Maintenance Release
+* **2.18.00** Modify New-AddressObject to accept an array. Issue [#138](https://github.com/TheTaylorLee/AdminToolbox/issues/138)

modules/AdminToolbox.FortiWizard/Private/New-AddressObjectTunnel.ps1

@@ -0,0 +1,86 @@
+#Required by functions
+#New-P2PTunnel
+#New-P2PTunnelNAT
+#New-DialUPTunnelDynamic
+#New-DialUPTunnelStatic
+
+<#
+    .Description
+    Create a New Address Object
+
+    .Parameter AddressName
+    Specify a Unique name for the Address Object
+
+    .Parameter CIDR
+    Specify a CIDR address. ex: 192.168.0.0/24
+
+    .Example
+    $Params = @{
+        AddressName   = "ComanyLan_192.168.0.1/26"
+        CIDR          = "192.168.0.1/26"
+    }
+    New-AddressObjectTunnel @params
+
+    .Example
+    New-SSHSession -computername 192.168.0.1
+    $Params = @{
+        AddressName   = "ComanyLan_192.168.0.1/26"
+        CIDR          = "192.168.0.1/26"
+    }
+    $command = New-AddressObjectTunnel @params
+    $result = Invoke-SSHCommand -Command $command -SessionId 0
+    $result.output
+
+    This example generates an SSH session and invokes the output of this function against that session.
+
+    .Example
+    New-SSHSession -computername 192.168.0.1
+    New-SSHSession -computername 192.168.1.1
+    $Params = @{
+        AddressName   = "ComanyLan_192.168.0.1/26"
+        CIDR          = "192.168.0.1/26"
+    }
+    $command = New-AddressObjectTunnel @params
+    $sessions = Get-SSHSession
+    foreach ($session in $sessions) {
+        Write-Output "Invoking Command against $session.host"
+        $result = Invoke-SSHCommand -Command $command -SessionId $session.sessionID
+        $result.output
+    }
+
+    This example generates multiple SSH sessions and invokes the output of this function against all active sessions.
+
+
+    .Link
+    https://github.com/TheTaylorLee/AdminToolbox/tree/master/docs
+#>
+
+Function New-AddressObjectTunnel {
+
+    [CmdletBinding()]
+    Param (
+        [Parameter(Mandatory = $true)]$AddressName,
+        [Parameter(Mandatory = $true)]
+        [ValidateScript( {
+                if ($_ -match '^[0-9]{1,3}[.]{1}[0-9]{1,3}[.]{1}[0-9]{1,3}[.]{1}[0-9]{1,3}[/]{1}[0-9]{1,2}$') {
+                    $true
+                }
+                else {
+                    throw "$_ is an invalid pattern. You must provide a proper CIDR format. ex: 192.168.0.0/24"
+                }
+            })]
+        $CIDR
+    )
+
+    $calc = Invoke-PSipcalc $cidr
+    $IPAddress = ($calc).IP
+    $SubnetMask = ($calc).SubnetMask
+
+    Write-Output "
+config firewall address
+    edit ""$AddressName""
+        set subnet $IPAddress $SubnetMask
+        set allow-routing enable
+    next
+end"
+}

modules/AdminToolbox.FortiWizard/Public/New-AddressObject.ps1

@@ -1,30 +1,26 @@
-#Required by functions
-#New-P2PTunnel
-#New-P2PTunnelNAT
-#New-DialUPTunnelDynamic
-#New-DialUPTunnelStatic
-
 <#
     .Description
-    Create a New Address Object
+    Create New Address Objects
 
     .Parameter AddressName
-    Specify a Unique name for the Address Object
+    Specify a prefix for the Address Object/s. This will prefix the CIDR address as a name for the addresses.
 
     .Parameter CIDR
-    Specify a CIDR address. ex: 192.168.0.0/24
+    Specify a CIDR address or addresses. ex: 192.168.0.0/24 or 192.168.0.0/24, 10.10.10.5/32
 
     .Example
     $Params = @{
-        AddressName   = "ComanyLan_192.168.0.1/26"
-        CIDR          = "192.168.0.1/26"
+        AddressName   = "ComanyLan"
+        CIDR          = "192.168.0.1/26", "10.10.0.0/24"
     }
     New-AddressObject @params
 
+    Create Multiple Address Objects.
+
     .Example
     New-SSHSession -computername 192.168.0.1
     $Params = @{
-        AddressName   = "ComanyLan_192.168.0.1/26"
+        AddressName   = "ComanyLan"
         CIDR          = "192.168.0.1/26"
     }
     $command = New-AddressObject @params
@@ -37,7 +33,7 @@
     New-SSHSession -computername 192.168.0.1
     New-SSHSession -computername 192.168.1.1
     $Params = @{
-        AddressName   = "ComanyLan_192.168.0.1/26"
+        AddressName   = "ComanyLan"
         CIDR          = "192.168.0.1/26"
     }
     $command = New-AddressObject @params
@@ -69,18 +65,22 @@ Function New-AddressObject {
                     throw "$_ is an invalid pattern. You must provide a proper CIDR format. ex: 192.168.0.0/24"
                 }
             })]
+        [String[]]
         $CIDR
     )
 
-    $calc = Invoke-PSipcalc $cidr
+    foreach ($sub in $Cidr) {
+    $calc = Invoke-PSipcalc $sub
     $IPAddress = ($calc).IP
     $SubnetMask = ($calc).SubnetMask
+    $name = $AddressName + "_" + $sub
 
     Write-Output "
 config firewall address
-    edit ""$AddressName""
+    edit ""$name""
         set subnet $IPAddress $SubnetMask
         set allow-routing enable
     next
 end"
+    }
 }

modules/AdminToolbox.FortiWizard/Public/New-DialUPTunnelBehindNAT.ps1

@@ -221,7 +221,7 @@ Function New-DialUPTunnelBehindNAT {
         }
 
         $ConfLocalAddressObjects = Foreach ($AddressObject in $script:LocalAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Remote Address Objects
@@ -234,7 +234,7 @@ Function New-DialUPTunnelBehindNAT {
         }
 
         $ConfRemoteAddressObjects = Foreach ($AddressObject in $script:RemoteAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Local Address Group

modules/AdminToolbox.FortiWizard/Public/New-DialUPTunnelRemoteNAT.ps1

@@ -212,7 +212,7 @@ Function New-DialUPTunnelRemoteNAT {
         }
 
         $ConfLocalAddressObjects = Foreach ($AddressObject in $script:LocalAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Remote Address Objects
@@ -225,7 +225,7 @@ Function New-DialUPTunnelRemoteNAT {
         }
 
         $ConfRemoteAddressObjects = Foreach ($AddressObject in $script:RemoteAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Local Address Group

modules/AdminToolbox.FortiWizard/Public/New-P2PTunnel.ps1

@@ -219,7 +219,7 @@ Function New-P2PTunnel {
         }
 
         $ConfLocalAddressObjects = Foreach ($AddressObject in $script:LocalAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Remote Address Objects
@@ -232,7 +232,7 @@ Function New-P2PTunnel {
         }
 
         $ConfRemoteAddressObjects = Foreach ($AddressObject in $script:RemoteAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Local Address Group

modules/AdminToolbox.FortiWizard/Public/New-P2PTunnelNAT.ps1

@@ -265,7 +265,7 @@ Function New-P2PTunnelNAT {
         }
 
         $ConfLocalAddressObjects = Foreach ($AddressObject in $script:LocalAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Remote Address Objects
@@ -278,7 +278,7 @@ Function New-P2PTunnelNAT {
         }
 
         $ConfRemoteAddressObjects = Foreach ($AddressObject in $script:RemoteAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create NAT Address Objects
@@ -291,7 +291,7 @@ Function New-P2PTunnelNAT {
         }
 
         $ConfNATAddressObjects = Foreach ($AddressObject in $script:NATAddressObjects) {
-            New-AddressObject -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
+            New-AddressObjectTunnel -AddressName $AddressObject.Name -CIDR $AddressObject.CIDR
         }
 
         #Create Local Address Group