rex-powershell 0.1.96 → 0.1.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533b355fdb313b3ea465af07001b7f0e660cbe9692a5fe61347fb0c259970c00
-  data.tar.gz: 7c21738e84b817fad4ca0b4498cd9e47d5a73933063d7b5b56766d3b95daafcc
+  metadata.gz: 8ee9b7efcf1354be8d350fff79d6201a00190226945ec746e8f0310a31c1ffeb
+  data.tar.gz: 5715250b6743b6a1c48d9c0270155a7e841892ff8bbe1aa21fe30957f9f91e0c
 SHA512:
-  metadata.gz: 2d9088c3d6160de7008882c2a335f8449c09628f42eeb3140e5a33aca0609c95bd2a628b142c878940059e2e01350ab817769069c02ba838c6ebe9483833de8d
-  data.tar.gz: 7498366f191e68ff7413413677521b28f8add5f8b5d65edb9049c776a8c568708b32abca9ed2efdd8a05e9b7a44430fb022f37daa608dcf4ef2a31ffb2d6dda5
+  metadata.gz: 9cf1ad34f336ab4a62b3982de8710578b68252de0cef6ed7b97d1e9b03e1320e543683c06a4d74f99424af3e7d988eee2cba290a5b015a372d10724791c9b5aa
+  data.tar.gz: 9b9e1ad0895957fa90eebb78891efeef90f16d3ecd9135b8ab19bc0342d05cb83a5c9e69bacc574110d5fbec415b6fda6f8e76a111c761689192e58c24f6dcca

data/.github/workflows/verify.yml

@@ -10,24 +10,29 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 40
 
     strategy:
       fail-fast: true
       matrix:
         ruby:
-          - 2.6
           - 2.7
           - 3.0
           - 3.1
+        os:
+          - ubuntu-20.04
+          - ubuntu-latest
+        exclude:
+          - { os: ubuntu-latest, ruby: 2.7 }
+          - { os: ubuntu-latest, ruby: 3.0 }
         test_cmd:
           - bundle exec rspec
 
     env:
       RAILS_ENV: test
 
-    name: Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
+    name: ${{ matrix.os }} - Ruby ${{ matrix.ruby }} - ${{ matrix.test_cmd }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

data/lib/rex/powershell/psh_methods.rb

@@ -172,6 +172,19 @@ module Powershell
       %Q^[Net.ServicePointManager]::SecurityProtocol=[Net.SecurityProtocolType]::Tls12;^
     end
 
+    # Use the default system web proxy and credentials
+    #
+    # @return [String] Powershell code to use the default system web proxy and credentials
+    def self.proxy_aware
+      var = Rex::Text.rand_text_alpha(1)
+      cmd = "$#{var}=new-object net.webclient;"
+      cmd << "if([System.Net.WebProxy]::GetDefaultProxy().address -ne $null){"
+      cmd << "$#{var}.proxy=[Net.WebRequest]::GetSystemWebProxy();"
+      cmd << "$#{var}.Proxy.Credentials=[Net.CredentialCache]::DefaultCredentials;"
+      cmd << "};"
+      cmd
+    end
+
     #
     # Use the default system web proxy and credentials to download a URL
     # as a string and execute the contents as PowerShell
@@ -181,14 +194,7 @@ module Powershell
     #
     # @return [String] PowerShell code to download a URL
     def self.proxy_aware_download_and_exec_string(urls, iex = true)
-      var = Rex::Text.rand_text_alpha(1)
-      cmd = "$#{var}=new-object net.webclient;"
-      cmd << "if([System.Net.WebProxy]::GetDefaultProxy().address -ne $null){"
-      cmd << "$#{var}.proxy=[Net.WebRequest]::GetSystemWebProxy();"
-      cmd << "$#{var}.Proxy.Credentials=[Net.CredentialCache]::DefaultCredentials;"
-      cmd << "};"
-      cmd << download_and_exec_string(urls, iex)
-      cmd
+      "#{self.proxy_aware}#{download_and_exec_string(urls, iex)}"
     end
 
     def self.uglify_ps(script)

data/lib/rex/powershell/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Powershell
-    VERSION = "0.1.96"
+    VERSION = "0.1.98"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-powershell
 version: !ruby/object:Gem::Version
-  version: 0.1.96
+  version: 0.1.98
 platform: ruby
 authors:
 - Metasploit Hackers
@@ -93,7 +93,7 @@ cert_chain:
   EknWpNgVhohbot1lfVAMmIhdtOVaRVcQQixWPwprDj/ydB8ryDMDosIMcw+fkoXU
   9GJsSaSRRYQ9UUkVL27b64okU8D48m8=
   -----END CERTIFICATE-----
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -219,8 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rex Powershell Utilities