more cleanup

TehMuffinMoo · Jul 16, 2024 · 1a8a7f5 · 1a8a7f5
1 parent d10c655
commit 1a8a7f5
Show file tree

Hide file tree

Showing 21 changed files with 107 additions and 112 deletions.
diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneCloud/Get-B1DNSEvent.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneCloud/Get-B1DNSEvent.ps1
@@ -42,9 +42,6 @@ function Get-B1DNSEvent {
     .PARAMETER PolicyAction
         Used to filter the DNS Events by Policy Action
 
-    .PARAMETER EndpointGroup
-        Used to filter the DNS Events by Endpoint Group
-
     .PARAMETER AppName
         Used to filter the DNS Events by App Name
 
@@ -95,7 +92,6 @@ function Get-B1DNSEvent {
       [String[]]$ThreatIndicator,
       [ValidateSet("Log","Block","Default","Redirect")]
       [String[]]$PolicyAction,
-      [String[]]$EndpointGroup,
       [String[]]$AppName,
       [String[]]$DNSView,
       [datetime]$Start = $(Get-Date).AddDays(-1),
@@ -122,6 +118,9 @@ function Get-B1DNSEvent {
     if ($IP) {
       $Filters += "qip=$IP"
     }
+    if ($Response) {
+      $Filters += "rdata=$Response"
+    }
     if ($Network) {
       $Filters += "network=$Network"
     }
@@ -146,6 +145,9 @@ function Get-B1DNSEvent {
     if ($FeedName) {
       $Filters += "feed_name=$FeedName"
     }
+    if ($FeedType) {
+      $Filters += "feed_type=$FeedType"
+    }
     if ($AppCategory) {
       $Filters += "app_category=$AppCategory"
     }

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneCloud/Set-B1Location.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneCloud/Set-B1Location.ps1
@@ -117,6 +117,9 @@ function Set-B1Location {
             }
         }
 
+        if ($NewName) {
+            $Object.name = $($NewName)
+        }
         if ($Description) {
             $Object.description = $($Description)
         }

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Get-B1DTCHealthCheck.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Get-B1DTCHealthCheck.ps1
@@ -112,6 +112,14 @@
     } else {
         $QueryURI = 'health_check_all'
     }
+    if ($Status) {
+        if ($Status -eq 'Enabled') {
+            $StatusVal = $False
+        } else {
+            $StatusVal = $True
+        }
+        $Filters.Add("disabled==$StatusVal") | Out-Null
+    }
     if ($Port) {
         $Filters.Add("port==$Port") | Out-Null
     }

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Get-B1ZoneChild.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Get-B1ZoneChild.ps1
@@ -128,6 +128,9 @@
         if ($OrderByTag) {
             $QueryFilters.Add("_torder_by=$OrderByTag") | Out-Null
         }
+        if ($tfilter) {
+            $QueryFilters.Add("_tfilter=$tfilter") | Out-Null
+        }
         if ($QueryFilters) {
             $QueryString = ConvertTo-QueryString $QueryFilters
         }

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/New-B1DelegatedZone.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/New-B1DelegatedZone.ps1
@@ -61,6 +61,7 @@
 
         $splat = @{
 	        "fqdn" = $FQDN
+            "comment" = $Description
 	        "disabled" = $false
 	        "delegation_servers" = $ExternalHosts
 	        "view" = $ViewUUID

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/New-B1ForwardZone.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/New-B1ForwardZone.ps1
@@ -69,6 +69,7 @@
 
         $splat = @{
 	        "fqdn" = $FQDN
+            "comment" = $Description
 	        "disabled" = $false
             "forward_only" = if ($ForwardOnly) {$true} else {$false}
 	        "external_forwarders" = $ExternalHosts

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Remove-B1AddressReservation.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Remove-B1AddressReservation.ps1
@@ -9,9 +9,6 @@
     .PARAMETER Address
         The IP address of the reservation to remove
 
-    .PARAMETER Space
-        The IPAM space the reservation is contained in
-
     .PARAMETER id
         The id of the Address Reservation to remove. Accepts pipeline input.
 
@@ -28,7 +25,6 @@
       [Parameter(ParameterSetName="Default",Mandatory=$true)]
       [String]$Address,
       [Parameter(ParameterSetName="Default",Mandatory=$true)]
-      [String]$Space,
       [Parameter(
         ValueFromPipelineByPropertyName = $true,
         ParameterSetName="With ID",

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Set-B1AuthoritativeZone.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Set-B1AuthoritativeZone.ps1
@@ -25,7 +25,7 @@
         The description for the zone to be updated to
 
     .PARAMETER State
-        Set whether the Forward Zone is enabled or disabled.
+        Set whether the Authoritative Zone is enabled or disabled.
 
     .PARAMETER NotifyExternalSecondaries
         Toggle whether to notify external secondary DNS Servers for this zone.
@@ -55,7 +55,7 @@
       [System.Object]$AddAuthNSGs,
       [System.Object]$RemoveAuthNSGs,
       [Parameter(ParameterSetName="Default",Mandatory=$true)]
-      [System.Object]$View,
+      [String]$View,
       [String]$Description,
       [ValidateSet("Enabled","Disabled")]
       [String]$State,
@@ -89,7 +89,7 @@
                 return $null
             }
         } else {
-            $Object = Get-B1ForwardZone -FQDN $FQDN -Strict
+            $Object = Get-B1AuthoritativeZone -FQDN $FQDN -View $View -Strict
             if (!($Object)) {
                 Write-Error "Unable to find Authoritative Zone: $($FQDN)"
                 return $null

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Set-B1DTCHealthCheck.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneDDI/Set-B1DTCHealthCheck.ps1
@@ -175,6 +175,12 @@
         if ($RetryDown) {
             $NewObj.retry_down = $RetryDown
         }
+        if ($State) {
+            $NewObj.disabled = $(if ($State -eq 'Enabled') { $false } else { $true })
+        }
+        if ($Tags) {
+            $NewObj.tags = $Tags
+        }
 
         if ($Port) {
             if ($ObjectType -in @('tcp','http')) {

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Disable-B1Lookalike.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Disable-B1Lookalike.ps1
@@ -39,7 +39,7 @@
         $JSONData = @{
             "hide" = $MutedDomains
         } | ConvertTo-Json
-        $Results = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atclad/v1/lookalikes" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+        $null = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atclad/v1/lookalikes" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
 
         foreach ($MutedDomain in $MutedDomains) {
             if (Get-B1Lookalikes -LookalikeDomain $($MutedDomain) -Muted true) {

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Disable-B1LookalikeTargetCandidate.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Disable-B1LookalikeTargetCandidate.ps1
@@ -47,7 +47,7 @@
             "select" = @()
             "unselect" = $DisabledDomains
         } | ConvertTo-Json
-        $Results = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atcfw/v1/lookalike_target_candidates" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+        $null = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atcfw/v1/lookalike_target_candidates" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
 
         $Candidates = Get-B1LookalikeTargetCandidates | Select-Object -ExpandProperty items_described
         foreach ($DisabledDomain in $DisabledDomains) {

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Enable-B1Lookalike.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Enable-B1Lookalike.ps1
@@ -39,7 +39,7 @@
         $JSONData = @{
             "expose" = $UnmutedDomains
         } | ConvertTo-Json
-        $Results = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atclad/v1/lookalikes" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+        $null = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atclad/v1/lookalikes" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
 
         foreach ($UnmutedDomain in $UnmutedDomains) {
             if (Get-B1Lookalikes -LookalikeDomain $($UnmutedDomain) -Muted false) {

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Enable-B1LookalikeTargetCandidate.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Enable-B1LookalikeTargetCandidate.ps1
@@ -47,7 +47,7 @@
             "select" = $EnabledDomains
             "unselect" = @()
         } | ConvertTo-Json
-        $Results = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atcfw/v1/lookalike_target_candidates" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+        $null = Invoke-CSP -Method PATCH -Uri "$(Get-B1CSPUrl)/api/atcfw/v1/lookalike_target_candidates" -Data $($JSONData) -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
 
         $Candidates = Get-B1LookalikeTargetCandidates | Select-Object -ExpandProperty items_described
         foreach ($EnabledDomain in $EnabledDomains) {

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Get-B1BypassCode.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Get-B1BypassCode.ps1
@@ -88,6 +88,9 @@
         $Fields += "access_key"
         $QueryFilters.Add("_fields=$($Fields -join ",")") | Out-Null
     }
+    if ($OrderBy) {
+        $QueryFilters += "_order_by=$($OrderBy)"
+    }
     if ($QueryFilters) {
         $QueryString = ConvertTo-QueryString $QueryFilters
     }

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Get-B1SOCInsight.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Get-B1SOCInsight.ps1
@@ -78,7 +78,11 @@
         $QueryFilter = ConvertTo-QueryString $QueryFilters
       }
       Write-DebugMsg -Filters $QueryFilters
-      $Results = Invoke-CSP -Uri "$(Get-B1CspUrl)/api/v1/insights$QueryFilter" -Method GET | Select-Object -ExpandProperty insightList -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+      if ($insightId) {
+        $Results = Invoke-CSP -Uri "$(Get-B1CspUrl)/api/v1/insights/$($insightId)$($QueryFilter)" -Method GET | Select-Object -ExpandProperty insight -ErrorAction SilentlyContinue -WarningAction SilentlyContinue        
+      } else {
+        $Results = Invoke-CSP -Uri "$(Get-B1CspUrl)/api/v1/insights$QueryFilter" -Method GET | Select-Object -ExpandProperty insightList -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
+      }
 
       if ($Results) {
         return $Results

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Get-B1ThreatIntel.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Get-B1ThreatIntel.ps1
@@ -124,11 +124,6 @@ function Get-B1ThreatIntel {
         [Switch]$Unique
     )
 
-    $Start = $Start.ToUniversalTime()
-    $End = $End.ToUniversalTime()
-    $StartTime = $Start.ToString("yyyy-MM-ddTHH:mm:ss.000")
-    $EndTime = $End.ToString("yyyy-MM-ddTHH:mm:ss.000")
-
     if ($ThreatActors) {
         $Filters = @(
             @{
@@ -144,7 +139,7 @@ function Get-B1ThreatIntel {
                 )
             }
         )
-		$Results = Invoke-B1CubeJS -Cube PortunusAggIPSummary -Measures count -Dimensions threat_indicator,actor_id -TimeDimension timestamp -Start $Start -End $End -Limit $TopCount -Grouped -Filters $Filters -OrderBy timestampMax -Order 'desc'
+		$Results = Invoke-B1CubeJS -Cube PortunusAggIPSummary -Measures count -Dimensions threat_indicator,actor_id -TimeDimension timestamp -Start $Start -End $End -Limit $Limit -Grouped -Filters $Filters -OrderBy timestampMax -Order 'desc'
         $ThreatActorData = @()
         $UniqueResults = $Results | Select-Object 'actor_id' -Unique
         ForEach ($UniqueResult in $UniqueResults) {

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Set-B1InternalDomainList.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Set-B1InternalDomainList.ps1
@@ -70,6 +70,9 @@
             if ($Domains) {
                 $Object.internal_domains = $Domains
             }
+            if ($Description) {
+                $Object.description = $Description
+            }
             if ($Tags) {
                 $Object.tags = $Tags
             }

diff --git a/Modules/ibPS/Functions/BloxOne/BloxOneTD/Submit-B1TideData.ps1 b/Modules/ibPS/Functions/BloxOne/BloxOneTD/Submit-B1TideData.ps1
@@ -168,15 +168,18 @@ function Submit-B1TideData {
 
         $Feed = @{
             "feed" = @{
-            "profile" = "$($Profile)"
-            "record_type" = "$($RecordType)"
-            "record" = @(@{
-                "$($RecordType)" = "$($RecordValue)"
-                "detected" = "$($DetectedTime)"
-            })
+                "profile" = "$($Profile)"
+                "record_type" = "$($RecordType)"
+                "record" = @(@{
+                    "$($RecordType)" = "$($RecordValue)"
+                    "detected" = "$($DetectedTime)"
+                })
             }
         }
-
+
+        if ($external_id) {
+            $Feed.feed.external_id = $external_id
+        }
         if ($ThreatClass) {
             $Feed.feed.record[0].class = "$($ThreatClass)"
         }

diff --git a/Modules/ibPS/Functions/Misc/Misc.ps1 b/Modules/ibPS/Functions/Misc/Misc.ps1
@@ -710,8 +710,7 @@ function Build-TopologyChildren {
       [System.Object[]]$Object,
       [Switch]$IncludeAddresses,
       [Switch]$IncludeRanges,
-      [Switch]$IncludeSubnets,
-      [Int]$Progress = 0
+      [Switch]$IncludeSubnets
   )
   process {
       $ParentObjectsToCheck = @("ipam/address_block")

diff --git a/Modules/ibPS/Functions/Misc/Resolve-DoHQuery.ps1 b/Modules/ibPS/Functions/Misc/Resolve-DoHQuery.ps1
@@ -20,9 +20,6 @@ function Resolve-DoHQuery {
     .PARAMETER Section
         Optionally specify one or more sections to return (Answer/Authority/Additional)
 
-    .PARAMETER DNSSEC
-        Optionally validate DNSSEC
-
     .PARAMETER SourceIP
         Specify the Source IP to spoof using EDNS OPT 65523. This only works when using BloxOne Threat Defense.
 
@@ -121,8 +118,6 @@ function Resolve-DoHQuery {
         [String]$DoHServer = $(if ($ENV:IBPSDoH) { $ENV:IBPSDoH }),
         [ValidateSet('Answer','Authority','Additional')]
         [String[]]$Section,
-        [Parameter(DontShow)]
-        [Switch]$DNSSEC,
         [String]$SourceIP,
         [String]$SourceMAC,
         [String]$SourceView,