Update windows acceptance tests

This commit is contained in:
adfoster-r7
2024-06-13 15:30:31 +01:00
parent f8eba7c1d9
commit 30c9ea2064
6 changed files with 5 additions and 10 deletions
+3 -3
View File
@@ -135,10 +135,10 @@ jobs:
# pcaprub skipped until new version released: https://github.com/pcaprub/pcaprub/issues/70
- name: Remove pcaprub dependency
shell: pwsh
if: runner.os == 'Windows':
if: runner.os == 'Windows'
run: |
Set-Content -Path "Gemfile.lock" -Value (Get-Content -Path "Gemfile.lock" | Select-String -Pattern 'pcaprub' -NotMatch)
Set-Content -Path "metasploit-framework.gemspec" -Value (Get-Content -Path "metasploit-framework.gemspec" | Select-String -Pattern 'pcaprub' -NotMatch)
Set-Content -Path "Gemfile.lock" -Value (Get-Content -Path "Gemfile.lock" | Select-String -Pattern 'pcaprub' -NotMatch | Select-String -Pattern 'packetfu' -NotMatch)
Set-Content -Path "metasploit-framework.gemspec" -Value (Get-Content -Path "metasploit-framework.gemspec" | Select-String -Pattern 'pcaprub' -NotMatch | Select-String -Pattern 'packetfu' -NotMatch)
- name: Setup Ruby
env:
-1
View File
@@ -11,7 +11,6 @@ require 'json'
require 'msgpack'
require 'metasploit/credential'
require 'nokogiri'
require 'packetfu'
# railties has not autorequire defined
# rkelly-remix is a fork of rkelly, so it's autorequire is 'rkelly' and not 'rkelly-remix'
require 'rkelly'
-2
View File
@@ -10,8 +10,6 @@ require 'uri'
# Gems
#
require 'packetfu'
module Msf::DBManager::Import
autoload :Acunetix, 'msf/core/db_manager/import/acunetix'
autoload :Amap, 'msf/core/db_manager/import/amap'
+1 -2
View File
@@ -50,9 +50,8 @@ module Msf
], Msf::Exploit::Capture
)
require 'packetfu'
begin
require 'packetfu'
require 'pcaprub'
@pcaprub_loaded = true
rescue ::LoadError => e
+1
View File
@@ -339,6 +339,7 @@ autoload :Faker, 'faker'
autoload :BinData, 'bindata'
autoload :RubySMB, 'ruby_smb'
autoload :MetasploitPayloads, 'metasploit-payloads'
autoload :PacketFu, 'packetfu'
require 'rexml/document'
# Load IO#expect moneypatch
@@ -3,8 +3,6 @@
# Current source: https://github.com/rapid7/metasploit-framework
##
require 'packetfu'
class MetasploitModule < Msf::Auxiliary
def initialize
super(