Change Core Edition check

fvanroie · May 26, 2018 · 7a0e2e2 · 7a0e2e2
1 parent 297c08c
commit 7a0e2e2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/PS_OPNsense.psm1 b/PS_OPNsense.psm1
@@ -23,7 +23,7 @@
 
 
 ##### Module Variables
-$IsPSCoreEdition = ($PSVersionTable.PSEdition -eq 'Core')
+#$IsPSCoreEdition = ($PSVersionTable.PSEdition -eq 'Core')
 $minversion = [System.Version]'18.1.7'
 
 $debug = $true  
@@ -79,8 +79,8 @@ Try {
     $OPNsenseOpenApi = Import-OpenApiData $FullPath
 
     # Load objectmap of api calls
-    $FullPath = ("{0}/{1}" -f $PSScriptRoot, 'Data/items.json')
-    $OPNsenseItemMap = Get-Content $FullPath | ConvertFrom-Json
+    #$FullPath = ("{0}/{1}" -f $PSScriptRoot, 'Data/items.json')
+    #$OPNsenseItemMap = Get-Content $FullPath | ConvertFrom-Json
 
     # Load servicemap of api calls
     $FullPath = ("{0}/{1}" -f $PSScriptRoot, 'Data/services.json')
@@ -90,9 +90,6 @@ Try {
     $FullPath = ("{0}/{1}" -f $PSScriptRoot, 'Data/settings.json')
     $OPNsenseSettingMap = Get-Content $FullPath | ConvertFrom-Json
 
-    $OPNsenseSettingsModule = Get-NoteProperty $OPNsenseSettingMap
-    $OPNsenseItemModule = Get-NoteProperty $OPNsenseItemMap
-
 } Catch {
     Throw ("Unable to load the API maps :`nError : {0}" -f $_)
 }

diff --git a/Private/Invoke-OPNsenseApiRestCommand.ps1 b/Private/Invoke-OPNsenseApiRestCommand.ps1
@@ -45,7 +45,7 @@ Function Invoke-OPNsenseApiRestCommand {
     $Headers = @{}
 
     # Check PowerShell Edition
-    if ($IsPSCoreEdition) {
+    if ($PSVersionTable.PSEdition -eq 'Core') {
         # PS Core knows the Basic Authentication and handles SkipCertificateCheck
         $ParamSplat.Add("Authentication", "Basic") | Out-Null
     } else {
@@ -120,7 +120,7 @@ Function Invoke-OPNsenseApiRestCommand {
         Write-Error ("An error Occured while contacting the OPNsense server: {0}" -f $_.Exception.Message)
     } Finally {
         # Always restore the built-in .NET certificate policy on Windows PS Desktop only
-        if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+        if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
             Set-CertificatePolicy $CertPolicy -Verbose:$VerbosePreference
         }
     }

diff --git a/Public/Legacy/Backup-OPNsenseConfig.ps1 b/Public/Legacy/Backup-OPNsenseConfig.ps1
@@ -48,13 +48,13 @@ Function Backup-OPNsenseConfig {
         $encrypt = $false
     }
 
-    if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+    if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
         $CertPolicy = Get-CertificatePolicy -Verbose:$VerbosePreference
         Disable-CertificateValidation -Verbose:$VerbosePreference
     }
 
     Try {
-        if ($IsPSCoreEdition) {
+        if ($PSVersionTable.PSEdition -eq 'Core') {
             $webpage = Invoke-WebRequest -Uri $Uri -SessionVariable cookieJar -SkipCertificateCheck:$SkipCertificateCheck
         } else {
             $webpage = Invoke-WebRequest -Uri $Uri -SessionVariable cookieJar
@@ -67,7 +67,7 @@ Function Backup-OPNsenseConfig {
             passwordfld = $Credential.GetNetworkCredential().Password;
             login = 1
         }
-        if ($IsPSCoreEdition) {
+        if ($PSVersionTable.PSEdition -eq 'Core') {
             $webpage = Invoke-WebRequest -Uri "$Uri/index.php" -WebSession $cookieJar -Method POST -Body $form -SkipCertificateCheck:$SkipCertificateCheck
         } else {
             $webpage = Invoke-WebRequest -Uri "$Uri/index.php" -WebSession $cookieJar -Method POST -Body $form
@@ -78,7 +78,7 @@ Function Backup-OPNsenseConfig {
             Throw 'Unable to login to the OPNsense server'
         }
 
-        if ($IsPSCoreEdition) {
+        if ($PSVersionTable.PSEdition -eq 'Core') {
             $webpage = Invoke-WebRequest -Uri "$Uri/diag_backup.php" -WebSession $cookieJar -Method POST -Body $form -SkipCertificateCheck:$SkipCertificateCheck
         } else {
             $webpage = Invoke-WebRequest -Uri "$Uri/diag_backup.php" -WebSession $cookieJar -Method POST -Body $form
@@ -93,7 +93,7 @@ Function Backup-OPNsenseConfig {
             encrypt_passconf = if ($encrypt) { $Password.GetNetworkCredential().Password } else { '' };
             download = "Download configuration"
         }
-        if ($IsPSCoreEdition) {
+        if ($PSVersionTable.PSEdition -eq 'Core') {
             $backupxml = Invoke-WebRequest "$Uri/diag_backup.php" -WebSession $cookieJar -Method POST -Body $form -SkipCertificateCheck:$SkipCertificateCheck
         } else {
             $backupxml = Invoke-WebRequest "$Uri/diag_backup.php" -WebSession $cookieJar -Method POST -Body $form
@@ -105,7 +105,7 @@ Function Backup-OPNsenseConfig {
     }
     # Always restore the built-in .NET certificate policy
     Finally {
-        if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+        if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
             Set-CertificatePolicy $CertPolicy -Verbose:$VerbosePreference
         }
     }

diff --git a/Public/Legacy/Reset-OPNsenseConfig.ps1 b/Public/Legacy/Reset-OPNsenseConfig.ps1
@@ -69,7 +69,7 @@ Function Reset-OPNsenseConfig {
         Return
     }
 
-    if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+    if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
         $CertPolicy = Get-CertificatePolicy -Verbose:$VerbosePreference
         Disable-CertificateValidation -Verbose:$VerbosePreference
     }
@@ -116,7 +116,7 @@ Function Reset-OPNsenseConfig {
     }
     # Always restore the built-in .NET certificate policy
     Finally {
-        if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+        if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
             Set-CertificatePolicy $CertPolicy -Verbose:$VerbosePreference
         }
     }

diff --git a/Public/Legacy/Restore-OPNsenseConfig.ps1 b/Public/Legacy/Restore-OPNsenseConfig.ps1
@@ -95,7 +95,7 @@ Content-Disposition: form-data; name="{1}"
         Return
     }
 
-    if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+    if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
         $CertPolicy = Get-CertificatePolicy -Verbose:$VerbosePreference
         Disable-CertificateValidation -Verbose:$VerbosePreference
     }
@@ -142,7 +142,7 @@ Content-Disposition: form-data; name="{1}"
     }
     # Always restore the built-in .NET certificate policy
     Finally {
-        if (-Not $IsPSCoreEdition -And [bool]::Parse($SkipCertificateCheck)) {
+        if ($PSVersionTable.PSEdition -ne 'Core' -And [bool]::Parse($SkipCertificateCheck)) {
             Set-CertificatePolicy $CertPolicy -Verbose:$VerbosePreference
         }
     }