Commit Graph

489 Commits (92dec1ecf896ad1145ee0c88047f87e286285e79)

Author SHA1 Message Date
bwatters-r7 08ec8e1ef9
Land #10553, add x86/xor_dynamic and x64/xor_dynamic encoders
Merge branch 'land-10553' into upstream-master
2018-10-30 09:56:15 -05:00
William Vu 1737935dc0 Convert reverse_relative_name to a class method
It'll be easier to use this way if someone uses it externally.
2018-10-10 13:21:18 -05:00
William Vu 46e7b8ac98 Namespace modules using full name instead of hex 2018-10-01 18:32:23 -05:00
Matthew Kienow ab443831a9
Add RSpec for Msf::RPC::JSON::Dispatcher 2018-09-24 17:27:06 -04:00
phra 8404cbea3c
test: chooses x86/call4_dword_xor => x86/xor_dynamic #2 2018-09-04 00:22:05 +02:00
phra 82d25a0fcd
test: improve test message 2018-09-03 23:08:01 +02:00
phra 360b09c244
test: use meterpreter_bind_tcp instead of meterpreter_reverse_tcp 2018-09-03 23:05:45 +02:00
phra e2ba0ac9b9
Revert "test: chooses x86/call4_dword_xor => x86/xor_dynamic"
This reverts commit 7516be4147.
2018-09-03 22:52:55 +02:00
phra 7516be4147
test: chooses x86/call4_dword_xor => x86/xor_dynamic 2018-09-01 03:34:50 +02:00
phra 16f2cd6910
test: add x86/xor_dynamic badchars test 2018-09-01 03:17:18 +02:00
William Vu 74b74b89d1 Fix spec for modules not defining check
It's no longer necessary, and we handle this and return the right thing.
2018-07-18 17:39:38 -05:00
bwatters-r7 7e34f27004
Land #9246, Support RHOSTS for exploit modules 2018-05-16 14:40:25 -05:00
christopher lee 516b61ebaa Merged master 2018-04-26 16:02:56 -05:00
christopher lee 195b405d69 First pass at all test working, added travis ci build 2018-04-26 15:12:53 -05:00
Jeffrey Martin 2487314821
Land #9869, Add support for shellcode encryption for msfvenom 2018-04-25 15:51:05 -05:00
Wei Chen ee9f49fa39 Fix a typo 2018-04-12 14:45:54 -05:00
Wei Chen 4e55724f3f Fix a typo and rspec for payload generator 2018-04-12 14:10:26 -05:00
Brent Cook df6de5b1c3 remove self-evident rspec 2018-04-07 13:00:19 -05:00
Brent Cook b134a33877 Merge branch 'master' into land-9740 2018-03-27 11:59:55 -05:00
Christian Mehlmauer 7d873ea7ab
replace factory_girls with factory_bot fixes #9736 2018-03-21 23:21:37 +01:00
Brent Cook 3f9b124752 update spec 2018-03-12 15:46:03 -05:00
christopher lee d5978803eb Fix all failing rspec for goliath 2018-01-19 15:16:19 -06:00
Jeffrey Martin cd755b05d5
update powershell specs for rex-powershell 0.1.77 2017-10-26 15:03:10 -05:00
Jeffrey Martin 386e14828a
Land #8728, Psexec via PSH related fixes 2017-10-24 15:55:18 -05:00
Jeffrey Martin b83787c24c
make powershell spec more specific in expectations 2017-10-09 20:02:32 -05:00
Brent Cook 47dc3772a7 add OptFloat datastore option 2017-08-08 19:06:51 -05:00
darkbushido 2f507cf52b removing some test code 2017-05-04 12:57:50 -05:00
darkbushido fbf1db590e Adding a tests
trying to find the first interface with a non local v4 ip address.
2017-05-04 12:57:50 -05:00
darkbushido a6afd0b9bf adding in a new option type
this will grab the first ipv4 address on a given iface
2017-05-04 12:55:46 -05:00
Brent Cook 99047fa8a1 be stricter in what we accept for payload uri
datastore needs to contain something to produce a valid URI
2017-01-22 10:20:04 -06:00
Brent Cook f69b4a330e handle Ruby 2.4 Fixnum/Bignum -> Integer deprecations 2017-01-22 10:20:03 -06:00
David Maloney 9b9d3127a8
cleanup leaked constants
use constant cleaner
7824
2017-01-12 15:49:24 -06:00
David Maloney 4029dbd5ca
try not to forget fixing the spec... 2017-01-10 14:33:18 -06:00
David Maloney 2108913e77
target_host method had a name collision
this method appears to have been accidentaly overriding another
method causing sessions to never finish being established
2017-01-06 12:44:37 -06:00
David Maloney 3d2957dff1 tying it all together
insert our autotarget routine into
the main target selection process

MS-2325
2017-01-03 14:38:50 -06:00
David Maloney 44830dfc54 prefer authour's target over ours
if the module authour added an automatic target
we skip our routine, to let the module's own automatic targeting
take over as it likely be better

MS-2325
2017-01-03 14:38:50 -06:00
David Maloney 1afc57da40 determine most precise filter
drop back to our most precise level of filtering

MS-2325
2017-01-03 14:38:50 -06:00
David Maloney 201b65e43d remaining os filtering
now can filter by os name and service pack
need to do final logic to turn that into an actual
target selection

MS-2325
2017-01-03 14:38:50 -06:00
David Maloney 05ac2ee6ed convert first stage to os_family
added the new os-family column to Host
so now we use that as our first stage filter
for targets

MS-2325
2017-01-03 14:38:49 -06:00
David Maloney 95d5c7a778 filtering by os_name
targets now filtered by OS name, but a little
more processing may be needed on this part because
it looks like what you'd expect in os_flavor gets jammed
into name instead

MS-2325
2017-01-03 14:38:49 -06:00
David Maloney f107408389 target_host specs
add specs for finding the 'target host' ie.
the mdm::Host object related to the RHOST value
to see what we know about our target

MS-2325
2017-01-03 14:38:49 -06:00
David Maloney 4060e63b89 add tests for auto target addition
tests to make sure we add auto targets only
in the appropriate conditions

MS-2325
2017-01-03 14:38:49 -06:00
David Maloney 84d5e42e4f start gearing up for testing
start getting auto-targeting test framework in place
so we can have unit tests for this behaviour

MS-2325
2017-01-03 14:38:45 -06:00
Brent Cook f313389be4 Merge remote-tracking branch 'upstream/master' into land-7507-uuid-arch 2016-11-20 19:08:56 -06:00
Tod Beardsley 1deacad2be
Add a print_bad alias for print_error
Came up on Twitter, where Justin may have been trolling a little:

https://twitter.com/jstnkndy/status/798671298302017536

We have a `print_good` method, but not a `print_bad`, which seems a
little weird for Ruby -- opposite methods should be intuitive as Justin
is implying.

Anyway, I went with alias_method, thanks to the compelling argument at

https://github.com/bbatsov/ruby-style-guide#alias-method

...since Metasploit is all about the singleton, and didn't want to risk
some unexpected scoping thing.

Also dang, we define the `print_` methods like fifty billion times!
Really should fix that some day.
2016-11-15 19:20:42 -06:00
OJ abe46024de
Fix tests after arch refactor 2016-11-05 05:15:57 +10:00
OJ e4edbb16fe
Fix encoded_payload_spec 2016-10-29 15:29:23 +10:00
Jon Hart 12508f7140
Fix DRDoS mixin to handle empty responses 2016-10-24 14:21:28 -07:00
David Maloney 6b77f509ba
fixes bad file refs for cmdstagers
when moving to the rex-exploitation gem some of the
file references were missed, partially due to silly differences
between how each file was referenced

Fixes #7466
2016-10-21 12:31:18 -05:00
darkbushido 5a1cd24350 finishing converting the last of this to credentials 2016-07-29 09:58:17 -05:00