Merge branch 'develop'

Author: silverhack

Invoke-Monkey365.ps1

@@ -459,6 +459,48 @@ Function Invoke-Monkey365{
             }
             return
         }
+        #Check if list collectors
+        If($PSBoundParameters.ContainsKey('ListRule') -and $PSBoundParameters['ListRule'].IsPresent){
+            #Get command Metadata
+            $MetaData = New-Object -TypeName "System.Management.Automation.CommandMetaData" (Get-Command -Name "Get-Rule")
+            $newPsboundParams = [ordered]@{}
+            if($null -ne $MetaData){
+                $param = $MetaData.Parameters.Keys
+                foreach($p in $param.GetEnumerator()){
+                    if($PSBoundParameters.ContainsKey($p)){
+                        $newPsboundParams.Add($p,$PSBoundParameters[$p])
+                    }
+                }
+                #Add verbose, debug
+                $newPsboundParams.Add('Verbose',$O365Object.verbose)
+                $newPsboundParams.Add('Debug',$O365Object.debug)
+                $newPsboundParams.Add('InformationAction',$O365Object.InformationAction)
+                #Add pretty print
+                [void]$newPsboundParams.Add('Pretty',$true);
+                #Add RulesPath
+                If($newPsboundParams.Contains('RulesPath')){
+                    $newPsboundParams.RulesPath = $O365Object.rulesPath;
+                }
+                Else{
+                    [void]$newPsboundParams.Add('RulesPath',$O365Object.rulesPath);
+                }
+                #Remove RuleSet if null
+                If($newPsboundParams.Contains('RuleSet') -and $null -eq $newPsboundParams['RuleSet']){
+                    [void]$newPsboundParams.Remove('RuleSet');
+                }
+                #Remove instance if EntraID is selected
+                If($newPsboundParams.Contains('Instance') -and $newPsboundParams['Instance'] -eq 'EntraID'){
+                    [void]$newPsboundParams.Remove('Instance');
+                }
+                #Remove Instance if null
+                If($newPsboundParams.Contains('Instance') -and $null -eq $newPsboundParams['Instance']){
+                    [void]$newPsboundParams.Remove('Instance');
+                }
+                #Execute command
+                Get-Rule @newPsboundParams
+            }
+            return
+        }
         #Check for mandatory params
         Test-MandatoryParameter
         #Import MSAL module
@@ -536,4 +578,4 @@ Function Invoke-Monkey365{
             [System.GC]::GetTotalMemory($true) | out-null
         }
     }
-}
+}

README.md

@@ -65,14 +65,14 @@ The following example will retrieve data and metadata from Azure AD and SharePoi
 
 
 ``` powershell
-$param = @{
+$options = @{
     Instance = 'Microsoft365';
-    Analysis = 'SharePointOnline';
+    Collect = 'ExchangeOnline';
     PromptBehavior = 'SelectAccount';
     IncludeEntraID = $true;
-    ExportTo = 'PRINT';
+    ExportTo = 'CSV';
 }
-$assets = Invoke-Monkey365 @param
+Invoke-Monkey365 @options
 ```
 
 # Regulatory compliance checks
@@ -93,9 +93,7 @@ By default, the HTML report shows you the CIS (Center for Internet Security) Ben
 
 The following standards are supported by Monkey365:
 
-* CIS Microsoft Azure Foundations Benchmark v2.0.0
 * CIS Microsoft Azure Foundations Benchmark v3.0.0
-* CIS Microsoft 365 Foundations Benchmark v2.0.0
 * CIS Microsoft 365 Foundations Benchmark v3.0.0
 
 More standards will be added in next releases (NIST, HIPAA, GDPR, PCI-DSS, etc..) as they are available.

build.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -77,4 +77,4 @@ $param = @{
 }
 Write-information @param
 #Start process
-Start-Process docker -ArgumentList $buildArgs -NoNewWindow -Wait
+Start-Process docker -ArgumentList $buildArgs -NoNewWindow -Wait

collectors/azure/APIM/Get-MonkeyAZAPIM.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -130,3 +130,4 @@ function Get-MonkeyAZAPIM {
 
 
 
+

collectors/azure/alerts/securityalerts/Get-MonkeyAzSecurityAlert.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -137,3 +137,4 @@ function Get-MonkeyAzSecurityAlert {
 
 
 
+

collectors/azure/appservices/Get-MonkeyAzAppServiceInfo.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -136,3 +136,4 @@ function Get-MonkeyAzAppServiceInfo {
 
 
 
+

collectors/azure/botchannels/Get-MonkeyAzBotChannel.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -138,3 +138,4 @@ function Get-MonkeyAzBotChannel {
 
 
 
+

collectors/azure/classicvm/virtualmachines/Get-MonkeyAzClassicDisk.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -131,3 +131,4 @@ function Get-MonkeyAzClassicDisk {
 
 
 
+

collectors/azure/classicvm/virtualmachines/Get-MonkeyAzClassicVM.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -170,3 +170,4 @@ function Get-MonkeyAzClassicVM {
 
 
 
+

collectors/azure/cognitive/Get-MonkeyAzCognitiveService.ps1

@@ -1,4 +1,4 @@
-# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
+# Monkey365 - the PowerShell Cloud Security Tool for Azure and Microsoft 365 (copyright 2022) by Juan Garrido
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -146,3 +146,4 @@ function Get-MonkeyAzCognitiveService {
 
 
 
+