From 0019a0059b543191fd7b910717c504317e8212d5 Mon Sep 17 00:00:00 2001 From: adfoster-r7 Date: Wed, 11 Dec 2024 18:23:15 +0000 Subject: [PATCH] Improve acceptance test namespace --- spec/acceptance/command_shell_spec.rb | 8 ++++---- spec/acceptance/meterpreter_spec.rb | 10 +++++----- spec/support/acceptance/command_shell/cmd.rb | 4 ++-- spec/support/acceptance/command_shell/powershell.rb | 4 ++-- .../acceptance/command_shell/{linux.rb => unix.rb} | 4 ++-- .../acceptance/{session => meterpreter}/java.rb | 4 ++-- .../acceptance/{session => meterpreter}/mettle.rb | 4 ++-- .../support/acceptance/{session => meterpreter}/php.rb | 4 ++-- .../acceptance/{session => meterpreter}/python.rb | 4 ++-- .../{session => meterpreter}/windows_meterpreter.rb | 4 ++-- 10 files changed, 25 insertions(+), 25 deletions(-) rename spec/support/acceptance/command_shell/{linux.rb => unix.rb} (98%) rename spec/support/acceptance/{session => meterpreter}/java.rb (99%) rename spec/support/acceptance/{session => meterpreter}/mettle.rb (99%) rename spec/support/acceptance/{session => meterpreter}/php.rb (99%) rename spec/support/acceptance/{session => meterpreter}/python.rb (99%) rename spec/support/acceptance/{session => meterpreter}/windows_meterpreter.rb (99%) diff --git a/spec/acceptance/command_shell_spec.rb b/spec/acceptance/command_shell_spec.rb index 63c0a985f9d0e..b3121c2ca4875 100644 --- a/spec/acceptance/command_shell_spec.rb +++ b/spec/acceptance/command_shell_spec.rb @@ -4,12 +4,12 @@ RSpec.describe 'CommandShell' do include_context 'wait_for_expect' - # Tests to ensure that CMD/Powershell/Linux is consistent across all implementations/operation systems + # Tests to ensure that CMD/Powershell/unix is consistent across all implementations/operation systems COMMAND_SHELL_PAYLOADS = Acceptance::Session.with_session_name_merged( { - powershell: Acceptance::Session::POWERSHELL, - cmd: Acceptance::Session::CMD, - linux: Acceptance::Session::LINUX + powershell: Acceptance::Session::CommandShell::PowerShell::TESTS, + cmd: Acceptance::Session::CommandShell::PowerShell::TESTS, + unix: Acceptance::Session::CommandShell::Unix::TESTS, } ) diff --git a/spec/acceptance/meterpreter_spec.rb b/spec/acceptance/meterpreter_spec.rb index 3bca9b2d91288..df51c62caf5ac 100644 --- a/spec/acceptance/meterpreter_spec.rb +++ b/spec/acceptance/meterpreter_spec.rb @@ -7,11 +7,11 @@ # Tests to ensure that Meterpreter is consistent across all implementations/operation systems METERPRETER_PAYLOADS = Acceptance::Session.with_session_name_merged( { - python: Acceptance::Session::PYTHON_METERPRETER, - php: Acceptance::Session::PHP_METERPRETER, - java: Acceptance::Session::JAVA_METERPRETER, - mettle: Acceptance::Session::METTLE_METERPRETER, - windows_meterpreter: Acceptance::Session::WINDOWS_METERPRETER + python: Acceptance::Session::Meterpreter::Python::TESTS, + php: Acceptance::Session::Meterpreter::Php::TESTS, + java: Acceptance::Session::Meterpreter::Java::TESTS, + mettle: Acceptance::Session::Meterpreter::Mettle::TESTS, + windows_meterpreter: Acceptance::Session::Meterpreter::WindowsMeterpreter::TESTS } ) diff --git a/spec/support/acceptance/command_shell/cmd.rb b/spec/support/acceptance/command_shell/cmd.rb index 8f9fca7f68cff..7cbf4fd0408e5 100644 --- a/spec/support/acceptance/command_shell/cmd.rb +++ b/spec/support/acceptance/command_shell/cmd.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - CMD = { +module Acceptance::Session::CommandShell::Cmd + TESTS = { payloads: [ { name: 'windows/x64/shell_reverse_tcp', diff --git a/spec/support/acceptance/command_shell/powershell.rb b/spec/support/acceptance/command_shell/powershell.rb index f941057eccd43..33dadad8690a2 100644 --- a/spec/support/acceptance/command_shell/powershell.rb +++ b/spec/support/acceptance/command_shell/powershell.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - POWERSHELL = { +module Acceptance::Session::CommandShell::PowerShell + TESTS = { payloads: [ { name: 'cmd/windows/powershell_reverse_tcp', diff --git a/spec/support/acceptance/command_shell/linux.rb b/spec/support/acceptance/command_shell/unix.rb similarity index 98% rename from spec/support/acceptance/command_shell/linux.rb rename to spec/support/acceptance/command_shell/unix.rb index 3eb40744ec55a..377d4934a7e93 100644 --- a/spec/support/acceptance/command_shell/linux.rb +++ b/spec/support/acceptance/command_shell/unix.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - LINUX = { +module Acceptance::Session::CommandShell::Unix + TESTS = { payloads: [ { name: "cmd/unix/reverse_bash", diff --git a/spec/support/acceptance/session/java.rb b/spec/support/acceptance/meterpreter/java.rb similarity index 99% rename from spec/support/acceptance/session/java.rb rename to spec/support/acceptance/meterpreter/java.rb index 029ce6e672f06..e5dfe41c9977c 100644 --- a/spec/support/acceptance/session/java.rb +++ b/spec/support/acceptance/meterpreter/java.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - JAVA_METERPRETER = { +module Acceptance::Session::Meterpreter::Java + TESTS = { payloads: [ { name: "java/meterpreter/reverse_tcp", diff --git a/spec/support/acceptance/session/mettle.rb b/spec/support/acceptance/meterpreter/mettle.rb similarity index 99% rename from spec/support/acceptance/session/mettle.rb rename to spec/support/acceptance/meterpreter/mettle.rb index 182a0d3706100..e077185123319 100644 --- a/spec/support/acceptance/session/mettle.rb +++ b/spec/support/acceptance/meterpreter/mettle.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - METTLE_METERPRETER = { +module Acceptance::Session::Meterpreter::Mettle + TESTS = { payloads: [ { name: "linux/x64/meterpreter/reverse_tcp", diff --git a/spec/support/acceptance/session/php.rb b/spec/support/acceptance/meterpreter/php.rb similarity index 99% rename from spec/support/acceptance/session/php.rb rename to spec/support/acceptance/meterpreter/php.rb index 0cc3fb666858a..49d9be271370d 100644 --- a/spec/support/acceptance/session/php.rb +++ b/spec/support/acceptance/meterpreter/php.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - PHP_METERPRETER = { +module Acceptance::Session::Meterpreter::Php + TESTS = { payloads: [ { name: "php/meterpreter_reverse_tcp", diff --git a/spec/support/acceptance/session/python.rb b/spec/support/acceptance/meterpreter/python.rb similarity index 99% rename from spec/support/acceptance/session/python.rb rename to spec/support/acceptance/meterpreter/python.rb index eb2870c0eb7c1..d87ac5b4be144 100644 --- a/spec/support/acceptance/session/python.rb +++ b/spec/support/acceptance/meterpreter/python.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - PYTHON_METERPRETER = { +module Acceptance::Session::Meterpreter::Python + TESTS = { payloads: [ { name: "python/meterpreter_reverse_tcp", diff --git a/spec/support/acceptance/session/windows_meterpreter.rb b/spec/support/acceptance/meterpreter/windows_meterpreter.rb similarity index 99% rename from spec/support/acceptance/session/windows_meterpreter.rb rename to spec/support/acceptance/meterpreter/windows_meterpreter.rb index 7784ab66d2fa4..374a83d963a0a 100644 --- a/spec/support/acceptance/session/windows_meterpreter.rb +++ b/spec/support/acceptance/meterpreter/windows_meterpreter.rb @@ -1,5 +1,5 @@ -module Acceptance::Session - WINDOWS_METERPRETER = { +module Acceptance::Session::Meterpreter::WindowsMeterpreter + TESTS = { payloads: [ { name: "windows/meterpreter/reverse_tcp",