3a623862e3
Merge branch 'master' into staging/rails-upgrade
2016-04-15 10:55:43 -05:00
d3e5dffe26
whitespace
2016-04-13 22:20:42 -05:00
6ce7055130
Land #6737 , Added reverse shell JCL payload for z/OS
2016-04-13 22:19:15 -05:00
09873f2f9c
Land #6717 , Add new cmd mainframe payload (generic_jcl) for z/OS
2016-04-13 22:10:23 -05:00
6c5886afba
Resolve #6736 , Add rspec for login_scanner/redis lib
...
Resolve #6736
2016-04-08 11:41:08 -05:00
8f3f2f74b4
Move shared example from pro into framework
...
MS-1361
2016-04-07 13:09:52 -05:00
f5415c8058
Move pro concern logic into framework
...
MS-1361
2016-04-07 10:59:40 -05:00
22d08fdf39
Revert #6748 , premature Gemfile* changes
2016-04-06 14:52:22 -05:00
8de58e4b80
Merge branch 'master' into staging/rails-upgrade
2016-04-04 09:30:01 -05:00
f7dd326b16
Land #6455 , Fix dns labels/names size limits for lib/net/dns/names/names
2016-04-01 21:57:09 -05:00
6a4d7e3b58
Revshell cmd JCL payload for z/OS
...
Added a JCL-based reverse shell. Uses the same source code as the
shellcode version does. Source code is in
external/source/shellcode/mainframe/shell_reverse_tcp.s
2016-03-31 20:42:42 -05:00
46d4b533f3
Add rspec for lib/net/dns/names/names.rb
2016-03-31 11:29:30 -05:00
bc48ebd43b
Use patch_finder for msu_finder
2016-03-29 23:21:01 -05:00
1bcd3fac25
Land #6724 , Import workspace IP validation from Mdm
...
MS-902
2016-03-29 18:31:47 -05:00
3b0170e87d
Import workspace IP validation from Mdm
...
This allows us to actually test the validations, since the code calls
out to Rex::Socket::RangeWalker.
MS-902
2016-03-29 17:56:22 -05:00
a6518b5273
Add generic JCL cmd payload for z/OS (mainframe)
...
This payload does nothing but return successfully. It can be used to
test exploits and as a basis for other JCL cmd payloads.
2016-03-28 21:01:39 -05:00
c4735bd72a
Fix rspec pull_request_finder_spec.rb
2016-03-24 20:56:46 -05:00
57984706b8
Resolve merge conflict with Gemfile
2016-03-24 18:13:31 -05:00
1375600780
Land #6644 , datastore validation on assignment
2016-03-17 11:16:12 -05:00
32fe9ae55d
Remove dead version check in db_manager.rb
...
The check appears to have been orphaned in the db_manager refactor, but
I can't track down the exact commit.
2016-03-16 15:24:55 -05:00
903807d039
update spec for pre-check
2016-03-15 14:21:01 -05:00
dabe5c8465
Land #6655 , use MetasploitModule as module class name
2016-03-13 13:48:31 -05:00
88697a5d3f
Merge branch 'master' into staging/rails-upgrade
2016-03-08 15:22:04 -06:00
860159fa00
Update rspec
2016-03-08 11:37:25 -06:00
58b8c35146
Escape HTML for KB and update rspec
2016-03-08 10:10:10 -06:00
3123175ac7
use MetasploitModule as a class name
2016-03-08 14:02:44 +01:00
659af68b16
Land #6388 , update msftidy check for new preferred Metasploit module base class
2016-03-06 17:12:20 -06:00
cc436fe438
update to new preferred base class for modules
2016-03-06 17:11:51 -06:00
a2c3b05416
Land #6405 , prefer default module base class of simply 'Metasploit'
2016-03-06 17:10:55 -06:00
e1db3ef369
Land #6388 , Update msftidy to error when module super class is incorrect
2016-03-06 16:53:11 -06:00
0fc4ebf4ab
Land #6618 , Improve Content-Length behavior in Rex HTTP
2016-03-06 16:38:44 -06:00
8faae94338
Land #6592 , make linux/x86/shell_reverse_tcp's shell path configurable and remove shell_reverse_tcp2
2016-03-06 15:33:53 -06:00
c2f7360a9a
replace deprecated 'ignore' with 'transient'
2016-02-29 14:57:09 -06:00
bff4b4d5fc
Fix #6609 and #6587 - Change Content-Length behavior in Rex HTTP
...
This patches changes two things:
1. If a module has a custom Content-Length, it will respect that
instead of forcing its own.
2. If a request does not have anything in the body, the
Content-Length header will not be set.
Fix #6609
Fix #6587
2016-02-29 10:50:21 -06:00
814d53aee0
Add rspec for Msf::Util::DocumentGenerator::PullrequestFinder
2016-02-24 15:13:04 -06:00
753e0f7693
Add rspec for Msf::Util::DocumentGenerator::DocumentNormalizer
2016-02-23 15:34:34 -06:00
39f1113bca
Remove unused spec.
2016-02-18 22:20:13 -06:00
44eb2d6a80
Merge branch 'upstream/master' into default-xor
2016-02-11 14:30:18 +10:00
2386cb1344
Land #6527 , add support for importing Burp suite vuln exports
2016-02-10 13:19:21 -06:00
942eec5fee
Update rspec
2016-02-07 12:37:08 -06:00
4dcbd7c1ae
Add a nokogiri xml stream parser for Burp issue xml and rename original burp parser to burp session parser so both are supported.
2016-02-04 10:30:56 -06:00
53d4e31844
Allow OptPath to valid symbolic paths that need expansion
2016-02-03 14:12:03 -08:00
c0ed57db43
Land #6267 , the rest of the rspec3 updates
2016-01-29 11:36:58 -06:00
d35d0993c1
should -> expect
2016-01-29 11:36:38 -06:00
ac822943b1
Land #6267 , update to rspec3
2016-01-29 11:33:30 -06:00
8c94d3c1bd
adjust namespec for rspec3
2016-01-29 11:32:22 -06:00
b6bc862c1b
Land #6267 , fix Rex::Parser::Ini#each_group
2016-01-29 11:19:40 -06:00
6187354392
Land #6226 , Add Wordpress XML-RPC system.multicall Credential BF
2016-01-23 00:12:46 -06:00
781ff4bb7d
Rspec is deprecated. Use RSpec instead.
2016-01-22 20:39:40 -06:00
6bbfc5a869
Fix rspec
2016-01-22 20:27:45 -06:00
0f9cf812b7
Bring wordpress_xmlrpc_login back, make wordpress_multicall as new
2016-01-22 18:54:20 -06:00
e6147d60e2
fix rspecs
2016-01-22 23:43:13 +01:00
f92f59a4c8
remove corresponding spec files
2016-01-22 23:38:44 +01:00
216986f7af
Do API documentation, rspec, and other small changes
2016-01-21 17:22:14 -06:00
478cd2ed5c
check database.yml path
2016-01-21 20:32:32 +01:00
ac0b489a90
Revert bad merge and include expect calls
2016-01-21 10:28:38 +10:00
f68b2b56fa
use hardcoded path
2016-01-19 23:51:28 +01:00
aaa1174ca5
fix rspec errors without database
2016-01-19 20:28:58 +01:00
18fe9bd96f
Merge branch 'upstream/master' into default-xor
2016-01-13 10:05:59 +10:00
7f9b804060
Land #6410 , remove JtR binaries, update for independent framework releases
2016-01-06 14:16:49 -06:00
388bfec46c
Land #6415 , update rspec3 conventions
2016-01-06 12:14:15 -06:00
92503c0ff6
Remove extra check_setup call
2016-01-06 11:01:35 -06:00
480913cb32
Add rspec
2016-01-06 01:41:13 -06:00
06a75e1339
re-enable deprecation errors
...
had to disable this to let transpec do
dynamic analysis. re-enabling now to throw
an error on any deprecation warning
2015-12-31 16:57:17 -06:00
c6656e4031
example_group and hook_scope conversions
...
not strictly required, these conversions keep us
up to date with latest rspec conventions and best practices
which will prevent use from having to convert them when they become
deprecated later
2015-12-31 16:56:13 -06:00
0a8cc8e01c
basic transpec conversions
...
no options apssed, first run of transpec
not much to report
2015-12-31 16:43:26 -06:00
8090bbc750
Changes to support framework as a gem
2015-12-30 11:00:45 -06:00
46a3c839b4
Refactor existing tests that had been duplicating get_std*
2015-12-24 11:03:11 -08:00
be84ed13a2
Update msftidy spec to be more easily added to
2015-12-24 10:55:13 -08:00
f029cd0c9a
Add common helpers for capturing stdout/stderr
2015-12-24 10:54:51 -08:00
5ac4e9aa6b
Correct payload fixture
2015-12-23 12:55:01 -08:00
83f0c2fa05
Add beginnings of rspec coverage for msftidy
2015-12-23 12:53:12 -08:00
6eda702b25
Land #6292 , add reverse_tcp command shell for Z/OS (MVS)
2015-12-23 14:11:37 -06:00
7d8ecf2341
Add Joomla mixin
2015-12-18 21:14:04 -06:00
eccf61bec5
ensure that the metasploit database environment variable is unset
2015-12-14 14:29:25 -06:00
6551df6446
update bitlocker for rspec3
2015-12-10 21:52:15 -06:00
fb578e9063
use explicit exceptions for raise_error
2015-12-10 21:47:22 -06:00
f59446851f
update namespace
2015-12-10 21:47:22 -06:00
99931aff44
Call stance only if module implements stance
2015-12-10 21:47:22 -06:00
b29459747b
stub out private meterpreter accessor method net
2015-12-10 21:47:22 -06:00
2a6db4092d
fix stub on Database specs
2015-12-10 21:47:22 -06:00
a96445b302
switch out expect with a proper mock by allow
2015-12-10 21:47:22 -06:00
d0d09097d5
stub out name on foo_inst in the option_container_spec
2015-12-10 21:47:22 -06:00
9a59671330
switch expect to allow on runas_spec cases
2015-12-10 21:47:22 -06:00
e8440f9798
remove deprecated syntax from text_spec
2015-12-10 21:47:22 -06:00
5056321d34
replace before block expecations with allow statements
...
comment out some before statements that seem to be causing a problem
2015-12-10 21:47:22 -06:00
1a36bcb525
Replace expect with allow the directory_spec
2015-12-10 21:47:22 -06:00
cd0d774db6
replace deprecated unsub, and replace expecations with allows
...
in base_spec
2015-12-10 21:47:22 -06:00
c5d77c3476
change stubs from expect to allow on directory_spec
2015-12-10 21:47:22 -06:00
5b568f2e4b
added missing expectation wrapper
2015-12-10 21:47:22 -06:00
1521fd0a95
remove unnecessary message chain call
2015-12-10 21:47:22 -06:00
b84bd0327d
fix MSSQL test stubs
2015-12-10 21:47:22 -06:00
5c733a3b6d
fix stub on module loader test
2015-12-10 21:47:22 -06:00
71ce9b377a
change module manager stub from expect to allow
2015-12-10 21:47:22 -06:00
69bb683d0a
fix typo in runas spec and change some more expects to allow
2015-12-10 21:47:22 -06:00
2fc0c0b326
switch expect stubs
...
in ui_driver shared context to allows
2015-12-10 21:47:22 -06:00
93d4be2301
replace stubbing expects with allow statements
2015-12-10 21:47:22 -06:00
bf9da1440e
change module_manager to allow from expect
2015-12-10 21:47:22 -06:00
605756a500
and receive needed to be and_return
2015-12-10 21:47:22 -06:00
aca4c6a986
Change include_context on jmx specs
2015-12-10 21:47:22 -06:00
d5d177b782
Use Msf::StringIO on query_spec
2015-12-10 21:47:22 -06:00
2dbb610d99
Use Msf::StringIO on find_spec
2015-12-10 21:47:22 -06:00
5600119fca
Use Msf::StringIO on trans2_spec
2015-12-10 21:47:22 -06:00
07ab7bac9c
Use Msf::StringIO on query_path_information_spec
2015-12-10 21:47:22 -06:00
21ea110aef
Use Msf::StringIO on query_file_information_spec
2015-12-10 21:47:22 -06:00
6405c8102d
Use Msf::StringIO on find_first2_spec
2015-12-10 21:47:22 -06:00
eeca2f4b8a
Use Msf::StringIO on session_setup_and_spec
2015-12-10 21:47:22 -06:00
692a3cb24c
Use Msf::StringIO on read_andx_spec
2015-12-10 21:47:22 -06:00
87a189d990
Use Msf::StringIO on nt_create_andx_spec
2015-12-10 21:47:22 -06:00
7933fa5356
Use Msf::StringIO on negotaite_spec
2015-12-10 21:47:22 -06:00
60de01432c
Use Msf::StringIO in close_spec
2015-12-10 21:47:22 -06:00
085598f6d2
Use lets
2015-12-10 21:47:22 -06:00
2beb42a734
Use msf_data attribute
2015-12-10 21:47:22 -06:00
b61a7f43ef
Use Msf::StringIO context on registry_spec
2015-12-10 21:47:22 -06:00
bc80bf7fdb
use Msf::StringIO on client_spec
2015-12-10 21:47:22 -06:00
046a73b3b3
Use set_msf_data on connection_spec
2015-12-10 21:47:22 -06:00
3d0fcdf84d
Add set_msf_data
2015-12-10 21:47:22 -06:00
2041149d54
Use Msf::StringIO in connection_spec
2015-12-10 21:47:22 -06:00
4872628ff5
Try to make it generic
2015-12-10 21:47:22 -06:00
236c28b6fb
Add shared context
2015-12-10 21:47:22 -06:00
11ea7ee5b9
update mocks for smb specs
2015-12-10 21:47:22 -06:00
c3e2615a23
Implement stub methods instead using allow which verifies
...
MSP-13484
2015-12-10 21:47:22 -06:00
bb7c463c44
Remove operators after .to with matchers
...
MSP-13484
2015-12-10 21:47:22 -06:00
76d1f6ba0a
Fix Rex::Psot::Meterpreter::PacketParser spec
...
MSP-13484
Use allow instead of expect because call count isn't important.
2015-12-10 21:47:22 -06:00
04ea44e76b
eq {} -> eq({})
...
So that the `{}` isn't interpreted as a block to `eq`.
2015-12-10 21:47:22 -06:00
f31e578780
Add missing RSpec. before describe
2015-12-10 21:47:22 -06:00
bde4f8bbe7
Fix allows in Exploit::Remote::Java::Rmi::Client::Jmx::Server spec
...
MSP-13484
2015-12-10 21:47:22 -06:00
e3f2db8f09
Fix allows in Exploit::Remote::Java::Rmi::Client::Jmx::Connection
...
MSP-13484
2015-12-10 21:47:22 -06:00
c754dca48b
fix allows in Exploit::Remote::JAva::Rmi::Client spec
...
MSP-13484
2015-12-10 21:47:22 -06:00
61e1dc2363
Fix allows in FirefoxAddonGenerator spec
...
MSP-13484
2015-12-10 21:47:22 -06:00
2d8d876eaa
Fix allow errors in BrowserAutopwn2 specs
...
MSP-13484
2015-12-10 21:47:22 -06:00
00ad6afd4f
Fix typo shoftname -> shortname
...
MSP-13484
2015-12-10 21:47:22 -06:00
164f24ef8a
Fix stubbing on class instead of instance
...
MSP-13484
2015-12-10 21:47:22 -06:00
fbddd4cc47
Fix IO stubbing
...
MSP-13484
2015-12-10 21:47:22 -06:00
db42c9f760
Fix service double stubbing
...
MSP-13484
2015-12-10 21:47:22 -06:00
c46b97cef9
=~ <Array> -> match_array
...
MSP-13484
2015-12-10 21:47:22 -06:00
99eaa8efb3
Change some expects back to allows to match old stubs
...
MSP-13484
2015-12-10 21:47:22 -06:00
f48f8c1540
Use `be` before operators
...
MSP-13484
2015-12-10 21:47:22 -06:00
4f23b83fa3
.should\n -> expect().to
...
MSP-13484
2015-12-10 21:47:22 -06:00
53f5c019f9
Fix doubles
...
MSP-13484
2015-12-10 21:47:22 -06:00
3d64c52c9a
it { should_not -> it { is_expected.not_to
...
MSP-13484
2015-12-10 21:47:22 -06:00
6f71810010
it { should -> it { is_expected.to
...
MSP-13484
2015-12-10 21:47:22 -06:00
ba88de84ec
Fix mocking errors
...
MSP-13484
2015-12-10 21:47:22 -06:00
910b630d96
it { should == -> it { is_expected.to eq
...
MSP-13484
2015-12-10 21:47:22 -06:00
a8f766ffbd
Fix unimplemented method allows
...
MSP-13484
2015-12-10 21:47:22 -06:00
05585acb89
.should_not -> expect().not_to
...
MSP-13484
2015-12-10 21:47:22 -06:00
64a870aac0
Fix not implemented error by using double
...
MSP-13484
2015-12-10 21:47:22 -06:00
337be4355d
Fix Msf::DBManager spec upgrade problems
...
MSP-13484
2015-12-10 21:47:22 -06:00
d1f64363b1
.any_instance -> *_any_isntance_of()
...
MSP-13484
2015-12-10 21:47:22 -06:00
d7d484a862
Use double to properly expect unimplemented methods
...
MSP-13484
2015-12-10 21:47:22 -06:00
cd57ed289f
Fix mistaken substitution
...
MSP-13484
2015-12-10 21:47:22 -06:00
0eb68ef16c
.should_not_receive -> expect().not_to receive
...
MSP-13484
2015-12-10 21:47:22 -06:00
4cec58d78c
.stub_chain -> expect().to receive_message_chain
...
MSP-13484
2015-12-10 21:47:22 -06:00
4870909afc
.should -> expect().to
...
MSP-13484
2015-12-10 21:47:22 -06:00
2534b18f4c
.stub -> expect().to receive
...
MSP-13484
2015-12-10 21:47:22 -06:00
03c649bb91
should_receive -> expect().to receive
...
MSP-13484
2015-12-10 21:47:22 -06:00
6f29e9a4cf
.should == -> expect().to eq
...
MSP-13484
2015-12-10 21:47:22 -06:00
3fff6cabce
should_not == -> expect().not_to eq
...
MSP-13484
2015-12-10 21:47:22 -06:00
fc9ca84da5
shared_context -> RSpec.shared_context
...
MSP-13484
shared_context must be qualified as global patching is disabled in
spec_helper.
2015-12-10 21:47:22 -06:00
2b02b9e081
shared_examples -> RSpec.shared_examples
...
MSP-13484
2015-12-10 21:47:22 -06:00
d6bf0fd781
decribe -> RSpec.describe
...
MSP-13484
Disabled expose_dsl_globally in spec_helper, so need to qualify
top-level describe.
2015-12-10 21:47:22 -06:00
ed1e984b6a
Update spec_helper with all rspec 3 features
...
MSP-13484
Copied from metasploit-cache.
2015-12-10 21:47:22 -06:00
39da306b1d
Land #6057 , @danilbaz's module for dumping Bitlocker master key (FVEK)
2015-12-08 18:16:39 -08:00
080ec26afb
Land #4489 , Update SMB admin modules to use Scanner & fixes
2015-12-08 14:49:26 -06:00
f2a33cb1ad
The word "should" is not needed.
2015-12-08 11:18:36 -06:00
c747ffc05a
Implement support for TLV packet XORing, and RECV removal
2015-12-08 16:37:10 +10:00
6483eca00a
Update payloads_spec for pymet stageless reverse http
2015-11-30 11:28:36 -05:00
9bcbd12407
Updated spec for mainframe rev shell
2015-11-26 21:34:27 -06:00
f37adf9ff8
Add incomplete spec for Rex::Parser::Ini
2015-11-20 15:18:14 -08:00
c2483faec8
Add Bitlcoker spec file
2015-11-20 19:28:08 +01:00
4a707b33a2
Add rspec coverage for cowsay. Achievement unlocked
2015-11-13 10:26:47 -08:00
15eb135295
Resolve merge conflicts
2015-11-09 18:15:40 -08:00
a71d7ae2ae
Land #6089 , @jvazquez-r7 Fix HTTP mixins namespaces
2015-11-05 16:56:41 -06:00
9c347fbaae
Land #6195 , remove ff buildid from os.js
2015-11-05 15:01:15 -06:00
00d09744fb
Land #6118 , @wchen-r7's new methods for Rex HTTP response
2015-11-03 10:42:42 -06:00
be23da1c1f
Merge branch 'upstream-master' into land-6120-python-stageless
2015-10-30 17:26:26 -05:00
d53be873dc
Updating master to metasploit/master
2015-10-26 09:24:24 -05:00
f6b9f38326
This method is not needed because Nokogiri does that already
2015-10-23 19:38:17 -05:00
810665847b
Add stageless python meterpreter to the payloads spec
2015-10-22 08:40:50 -04:00
12cdd786a6
Add more Nokogiri and RKelly support for Rex::Proto::Http::Response
...
These new methods allow the module writer to being able to parse
HTML/XML/JSON responses properly without using regex first.
2015-10-21 16:26:31 -05:00
28ca34c40a
Fix conflicts
2015-10-16 15:38:59 -05:00
773b523d27
Fix namespaces in specs
2015-10-15 11:54:36 -05:00
1c4686eff0
Move specs folder
2015-10-15 11:50:10 -05:00
8057b3edae
Fix specs to pass again
2015-10-15 09:40:39 -05:00
fa9a33cae8
Move specs to the correct folder
2015-10-15 09:19:43 -05:00
30d2a3f2a9
Land #5999 , teach PSH web delivery to use a proxy
2015-10-14 11:05:45 -05:00
cd2e9d4232
Move Msf::Java to the normal Msf::Exploit::Remote namespace
2015-10-09 13:24:34 -07:00
5e9faad4dc
Revert "Merge branch using Rex sockets as IO"
...
This reverts commit c48246c91c3cd9dc4fde
2015-10-09 14:09:12 -05:00
3aa7b513d5
Delete safe_get_once
2015-10-09 13:34:38 -05:00
3cd9dc4fde
Fix JMX Server specs
2015-10-09 12:17:44 -05:00
62272e64ed
Fix RMI Registry specs
2015-10-09 12:16:59 -05:00
12d2594095
Add StringIO stub to Msf::Java::Rmi::Client::Jmx::Connection
2015-10-09 12:00:35 -05:00
3d1ec54f02
Stub has_read_data?
2015-10-09 11:36:24 -05:00
6549f48d4e
Added new class MainframeShell for mainframe(z/os)
...
This class is built upon and overrides certain methods in the generic
CommandShell class. Primarily it is here to control when and if bytes
sent to/from mainframe (z/os) targets get encoded/decoded from cp1047
(ebcdic<->ascii). This would be the default shell for upcoming
mainframe based payloads.
2015-10-08 17:11:31 -05:00
f57f0991ab
Update rspec
2015-10-06 15:42:31 -05:00
bc46b41bbe
Change tools structure
2015-10-05 22:34:47 -05:00
5a7ac8c29a
Land #6030 , @wchen-r7's Microsoft Patch Finder
2015-10-02 13:33:27 -05:00
33ea5fdd12
Use named subjects
2015-10-02 13:32:32 -05:00
5862a66221
Pass specs again
2015-10-02 11:50:41 -05:00
69f3d88ea6
Ensure uniq on #find_msb_numbers
2015-10-02 11:38:36 -05:00
David Maloney
Brent Cook
wchen-r7
Fernando Arias
William Vu
Bigendian Smalls
Adam Cammack
James Lee
Christian Mehlmauer
Gregory Mikeska
joev
OJ
Brian Patterson
Jon Hart
Chris Doughty
jvazquez-r7
Luke Imhoff
Spencer McIntyre
BAZIN-HSC
dmohanty-r7
Louis Sato
HD Moore