update monkey utils module

Author: silverhack

core/modules/monkeyutils/monkeyutils.psd1

@@ -103,7 +103,8 @@ FunctionsToExport = @(
     'Test-IsValidUrl',
     'Update-MonkeyAsset',
     'Get-HashFromString',
-    'Test-IsPsObject'
+    'Test-IsPsObject',
+    'Get-MonkeyLatestReleaseFromGitHub'
 )
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.

core/modules/monkeyutils/public/ConvertTo-SecureScriptBlock.ps1

@@ -55,8 +55,9 @@ Function ConvertTo-SecureScriptBlock{
             $allowEnvVars= $false
             # Any variable will be allowed
             $allowedVariables = [string[]] @('*')
-            #Remove Property references
-            $sbTest = $InputObject.Replace('.','')
+            #Remove Property references inside parentheses
+            #$sbTest = $InputObject.Replace('.','')
+            $sbTest = $InputObject -replace '(?<=\([^()]*)\.(?=[^()]*\))', ''
             ForEach($allow in $allowed){
                 If([regex]::isMatch($sbTest.ToLower(),("-{0}" -f $allow.ToLower()))){
                     $sbTest = $sbTest -ireplace [regex]::Escape(("-{0}" -f $allow.ToLower())), "-eq"
@@ -65,7 +66,9 @@ Function ConvertTo-SecureScriptBlock{
             $double_quotes ='".*?"'
             $single_quotes ='''.*?'''
             #Replace Where if any
-            $sbTest = $sbTest.Replace('Where', ' -and ').Replace('{','').Replace('}','')
+            $sbTest = $sbTest -replace '(?i)\.?Where', " -and "
+            #Replace bracket
+            $sbTest = $sbTest.Replace('{','').Replace('}','')
             #Replace @ and |
             $sbTest = $sbTest.Replace('@', '').Replace('|','')
             #Remove string with double quotes
@@ -82,6 +85,10 @@ Function ConvertTo-SecureScriptBlock{
                     $sbTest = $sbTest -replace [regex]::Escape($match.Value), 0
                 }
             }
+            #Replace Count
+            $sbTest = $sbTest -replace '(?i)\.?Count', ''
+            #Replace final dots
+            $sbTest = $sbTest -replace '\.', ''
             #Create an scriptblock that will not be executed
             $ScriptBlock = [scriptblock]::Create($sbTest)
             try{

core/modules/monkeyutils/public/Get-MonkeyLatestReleaseFromGitHub.ps1

@@ -0,0 +1,69 @@
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+Function Get-MonkeyLatestReleaseFromGitHub{
+    <#
+        .SYNOPSIS
+        Get the latest published full release for the repository
+
+        .DESCRIPTION
+        Get the latest published full release for the repository
+
+        .INPUTS
+
+        .OUTPUTS
+
+        .EXAMPLE
+
+        .NOTES
+	        Author		: Juan Garrido
+            Twitter		: @tr1ana
+            File Name	: Get-MonkeyLatestReleaseFromGitHub
+            Version     : 1.0
+
+        .LINK
+            https://github.com/silverhack/monkey365
+    #>
+    [cmdletbinding()]
+    [OutputType([System.String])]
+    Param (
+        [parameter(Mandatory=$true, ValueFromPipeline = $True, HelpMessage="GitHub repository")]
+        [String]$Url
+    )
+    Process{
+        #Set null
+        $repoUrl = $ghUser = $repository = $null
+        $URI = [System.Uri]::new($Url);
+        If($URI.Segments.Count -gt 2 -and $URI.Host.ToLower() -eq 'github.com'){
+            $ghUser = $URI.Segments[1].ToLower().TrimEnd('/')
+            $repository = $URI.Segments[2].ToLower().TrimEnd('/')
+            If($null -ne $ghUser -and $null -ne $repository){
+                $repoUrl = ('https://api.github.com/repos/{0}/{1}/releases/latest' -f $ghUser,$repository);
+            }
+        }
+        If($null -ne $repoUrl){
+            Try{
+                $rawContent = Invoke-WebRequest -Uri $repoUrl -UseBasicParsing
+                If($rawContent.StatusCode -eq [System.Net.HttpStatusCode]::OK){
+                    $content = $rawContent.Content | ConvertFrom-Json
+                    Write-Verbose ("Found {0}" -f $content.html_url)
+                    $content.tag_name.TrimStart('v')
+                }
+            }
+            Catch{
+                Write-Warning $_.Exception.Message
+            }
+        }
+    }
+}

core/modules/monkeyutils/public/Update-PsObject.ps1

@@ -93,12 +93,13 @@ Function Update-PsObject{
                     }
                   }
                   # Output: If the value is an array, output it as a single object
-                  if ($null -ne $obj -and @($obj).Count -gt 1) {
+                  If ($obj -is [System.Collections.IEnumerable] -and $obj -isnot [string]){
                     , $obj
                   }
                   else {
                     $obj
                   }
+                  
               } -Force -ErrorAction SilentlyContinue
           }
       }