393a71cf46
Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
...
Conflicts:
Gemfile.lock
2015-09-29 15:00:22 -05:00
54f9a3b25a
Land #6013 , add mainframe as a platform and architecture
2015-09-29 13:28:23 -05:00
49bb3f2e3f
Complete tests for capture_sendto
2015-09-28 13:27:58 -07:00
aa8c4e2792
Added rspec tests for zarch and ebcdic(cp1047)
...
Basic tests for zarch (64bit BE) and ebcdic<->ascii conversion required
to communicate with mainframes.
2015-09-28 13:31:30 -05:00
e1c3d3e277
Stub unit tests for capture_sendto. Unsure if these will be possible
2015-09-27 15:51:40 -07:00
66c9222968
Make web_delivery proxy aware
2015-09-23 20:45:51 +01:00
fb051edc2e
Changed the rspec
2015-09-18 12:48:30 -05:00
c7f15ca940
Rework how match results get created
...
MSP-13119
* Create match result when we create vuln attempt
2015-09-14 12:18:47 -05:00
eaf51a2113
Land #5722 , @vallejocc's busybox work
2015-09-04 13:36:44 -05:00
05e1a69fe5
Add specs for prepend
2015-09-04 11:14:53 -05:00
3d428ef33d
Fix spec like I shoulda done before landing #5736
2015-09-03 14:23:30 -05:00
7665747d1c
Land #5736 , certutil cmdstager
...
Ferreal this time.
2015-09-03 14:21:21 -05:00
82b27c9038
Revert "Land #5736 , certutil cmdstager"
...
This reverts commit 93eb42dfa3
2015-09-03 14:18:28 -05:00
956c8e550d
Fix spec like I shoulda done before landing #5736
2015-09-03 13:53:21 -05:00
93eb42dfa3
Land #5736 , certutil cmdstager
2015-09-03 13:13:24 -05:00
70b5336356
Merge branch 'upstream-master' into land-5890-android-post-api
2015-09-03 09:51:35 -05:00
9f9bbce034
Land #5840 , add LLMNR & mDNS modules
2015-09-02 18:30:29 -05:00
8e1a0e039e
Add spec
2015-09-01 22:04:35 +01:00
779ece3096
Correct workspace unit tests
2015-08-28 12:19:42 -07:00
06712817cf
Fix specs
2015-08-28 14:06:04 -05:00
54243d411e
Change spec file name
2015-08-28 13:28:34 -05:00
52a11cc383
Use correct calls to cmd_workspace
2015-08-28 11:03:47 -07:00
fc7a93ac30
Fix syntax and style
2015-08-28 10:51:57 -07:00
aaa8b2c907
Add rspec coverage for the rest of workspace while here
2015-08-28 10:47:51 -07:00
3f7c8e03e2
Update workspace command to support deleting all workspaces
2015-08-28 10:23:41 -07:00
ad3e37fda2
Fix rspec
2015-08-26 02:38:13 -05:00
3f994e964d
Change method name and update rspec
2015-08-25 23:23:26 -05:00
3412f31f85
Add Android POST API
2015-08-24 18:37:25 -05:00
b37efd29b0
Modified module busybox_pingnet.rb to avoid sending an ash script but executing each ping command separately. Added some fixes. Modified spec file for busybox.rb.
2015-08-23 12:17:17 +02:00
83ca4e984f
Land #5772 , @wchen-r7's fixes #5753 , support Origin for the creds command
2015-08-21 16:07:45 -05:00
0a7ac2d758
Delete another debug puts
2015-08-17 15:28:48 -05:00
09c888bc49
Fix minor things
2015-08-17 15:27:26 -05:00
c52da9f50d
Add regression spec for #5856
2015-08-17 14:32:20 -05:00
3a7cea51b4
Merge master and fix Net::DNS::RR merge conflicts
2015-08-13 08:53:25 -07:00
25dde141d6
fix rspec
2015-07-24 15:24:18 -05:00
844b47e8ce
Additional changes
2015-07-18 14:10:46 +07:00
0929b54cd3
Update spec for notes help menu
2015-07-16 00:43:08 -05:00
886ca47dfb
Land #5650 , @wchen-r7's browser autopwn 2
2015-07-15 10:21:44 -05:00
4f8f640189
Rename autopwnv2 to just autopwn2
2015-07-14 17:38:51 -05:00
2276e355aa
Fix a typo
2015-07-14 10:51:15 -05:00
88a00b1ed8
We don't use MessagePack anymore
2015-07-12 14:45:46 -05:00
a7424c93a0
Update BES rspec
2015-07-12 01:26:43 -05:00
eabf561a1f
Fix some BES rspec
2015-07-11 22:16:10 -05:00
5a858d68a5
Add rspec for browser_profile_manager
2015-07-11 21:11:31 -05:00
b2d723e4a3
Rspec
2015-07-11 19:13:20 -05:00
b1208e1337
Pending rspec
2015-07-11 00:16:48 -05:00
8349a274ea
use and include git hash of Framework as part of the version
...
Because we do not always update the version number, multiple releases have
shown version string, which is not useful for helping debug issues, or for
knowing what features are enabled.
This adds the git hash or reads from a file a copy of the git hash (useful for
doing packaged builds without git) so that it is clear the origin of a
particular metasploit-framework version.
2015-07-10 18:03:37 -05:00
c8c3e1a258
Fix rspec
2015-07-10 13:42:25 -05:00
fdb715c9dd
Merge branch 'upstream-master' into bapv2
2015-07-07 13:45:39 -05:00
6d30dfd93e
Remove the parts that are not broken for BES spec
2015-07-06 23:28:52 -05:00
a9eeae56cb
Remove the broken parts in browser_autopwnv2_spec
2015-07-06 22:24:32 -05:00
653c4808b2
update framework version spec
2015-07-06 10:42:48 -05:00
b9a8308138
Replace BAP profiles with a framework-instance hash
2015-07-02 12:53:24 -05:00
9bd920b169
Merge branch 'upstream-master' into bapv2
2015-06-27 12:19:55 -05:00
88e58cbdc5
Better performance
2015-06-27 12:19:07 -05:00
bf7e0695d0
Land #5570 , @todb-r7 Removes references to Iconv gem, since it's deprecated
2015-06-19 17:19:03 -05:00
bd097e3264
Land #5497 , Refactor LoginScanner::SNMP to be fast and less buggy
2015-06-19 14:57:36 -05:00
66fecb2832
Add some specs around changed methods
...
See #4525
2015-06-19 13:23:07 -05:00
5fa864b097
done with rspec
2015-06-17 16:23:39 -05:00
b1f68556f9
More testcases
2015-06-17 02:52:59 -05:00
089579e354
This is how much rspec I have so far for browser_autopwnv2_spec.rb
2015-06-16 23:04:12 -05:00
ed69e5f902
Redo BES rspec
2015-06-09 23:45:41 -05:00
6eb25743e3
Merge branch 'upstream-master' into bapv2
2015-06-09 10:10:00 -05:00
1fe2361e12
Add rspec for BrowserProfileManager
2015-06-09 02:23:27 -05:00
101c5a29ed
Add x86 specs
2015-06-08 16:47:26 -05:00
34d83f3881
Add specs for Rex AlphaMixed mods
2015-06-08 16:01:29 -05:00
3fb0a5f23e
Add specs for Rex AlphaUpper mods
2015-06-08 15:53:11 -05:00
6b05302059
Fixes #5459 , refactors LoginScanner::SNMP
2015-06-06 00:50:55 -05:00
c003602993
Remove report_store_local from the spec
2015-06-04 18:54:15 -05:00
018833a326
Fix rspec
2015-05-13 20:48:52 -05:00
9549d572cc
Land #5280 , update to Ruby on Rails 4.0
...
This upgrades a number of other gems as a side-effect.
2015-05-12 16:48:49 -05:00
5b2627c027
switch
2015-05-06 16:15:21 -05:00
5573c6c7e8
remove hardcoded defaults from spec
...
ensure that we test for there being defaults in the underlying scanner
2015-05-06 15:57:14 -05:00
013781fb9c
Land #5292 , WordPress custom file version check
2015-05-05 11:21:18 -05:00
18791ce933
Clean up code
2015-05-05 11:19:40 -05:00
26e7fe15f9
Merge branch 'upstream' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2015-05-05 11:00:38 -05:00
05e4af8162
Land #5214 , initial meterpreter session recovery support
2015-05-04 16:25:27 -05:00
e6ea5511ca
update linux and windows meterpreters to use metasploit-payloads
2015-05-04 09:44:36 -05:00
55967172be
allow custom regex
2015-05-02 21:06:15 +02:00
9678479abb
check version from custom file
2015-05-02 18:34:10 +02:00
c6806b4e5f
Land #5102 , @wchen-r7's ManageEngine Desktop Central Login Utility
2015-05-01 15:20:21 -05:00
b037560c90
Do minor style fixes
2015-05-01 15:01:13 -05:00
9f0b2d4f0f
One expectation for every example
2015-05-01 14:57:48 -05:00
d880f50b98
Normalize
2015-05-01 14:54:42 -05:00
213d34ce61
Delete unnecessary let
2015-05-01 14:54:12 -05:00
8163c3cdda
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
plugins/nessus.rb
2015-04-28 15:33:46 -05:00
59d6ad5a6d
Restore specs
2015-04-27 17:00:19 -05:00
c3f18aa899
Complete the #4989 revert
2015-04-27 16:26:34 -05:00
27f6adcd81
Land #5110 , teach Http::Response to extract hidden form inputs
2015-04-24 13:30:57 -05:00
b6df023c99
Land #4989 , @hmoore-r7's change to file: handling
...
Datastore options with file: are handled at set time
2015-04-21 23:21:22 -05:00
8f5d222e53
Land #5156 - module ranking properly handles nil
2015-04-21 14:40:01 -05:00
57df5c4f4f
Solve conflics
2015-04-20 23:38:34 -05:00
831e65261d
Add lengths specs
2015-04-20 17:37:41 -05:00
c7129e063c
Land #5069 , breaking up with old options
2015-04-20 16:23:44 -05:00
d7fc9294f0
Add require
2015-04-20 15:54:41 -05:00
2a3ed890d2
Add specs for Msf::Opt
2015-04-20 15:54:40 -05:00
3a5af3939d
Split all the option classes into their own files
2015-04-20 15:54:40 -05:00
79ca0a56f9
Land #4171 , Steam protocol support
2015-04-20 15:35:06 -05:00
3493d25ff9
Move all this to Rex
2015-04-16 21:07:23 -05:00
9bf897a829
Land #4744 , refactor powershell for msfvenom psh-cmd
2015-04-16 15:44:57 -05:00
42ff0decc7
Land #4722 , timing options for snmp_login
2015-04-16 02:25:29 -05:00
16234feeed
Red rank_modules ranks unloadable as Manual
...
MSP-12557
2015-04-15 16:09:19 -05:00
87d1770bac
Green rank_modules with loaded without Rank is NormalRanking
...
MSP-12557
2015-04-15 15:51:42 -05:00
bae581046b
Green module_ranks with loaded with Rank
...
MSP-12557
2015-04-15 15:49:19 -05:00
65a40a994b
Green rank_modules use NormalRanking without Rank in loaded modules
...
MSP-12557
2015-04-15 15:45:21 -05:00
d57cf8f09f
Green rank_modules with Rank
...
MSP-12557
Test that modules that need to be loaded are ranked using Rank after
loading.
2015-04-15 15:41:16 -05:00
e82fb5f836
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
lib/msf/ui/console/command_dispatcher/db.rb
metasploit-framework-db.gemspec
metasploit-framework.gemspec
2015-04-15 14:04:35 -05:00
7a14618481
Red Msf::ModuleSet#rank_modules with create -> nil
...
MSP-12557
Msf::ModuleSet#rank_modules does not handle Msf::ModuleSet#create
returning `nil`.
2015-04-15 11:59:34 -05:00
9f15824e2a
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
2015-04-10 15:35:27 -05:00
284ef5bbbb
Land #5112 , Nessus REST Login Module
2015-04-10 13:32:53 -05:00
90d525088c
Green rspec
2015-04-10 11:36:23 -05:00
7e6461aea0
Travis error correction
2015-04-10 15:48:48 +05:00
8c0d5d66d0
Add spec file
2015-04-10 15:32:03 +05:00
88031c9a87
Update spec
2015-04-09 16:25:04 -05:00
3fc25a00d8
Make sure we are only grabbing hidden inputs
2015-04-09 01:09:00 -05:00
717120b8c5
Add #get_hidden_inputs for Metasploit::Framework::LoginScanner::HTTP
2015-04-09 00:34:09 -05:00
e03f2df691
Land #5002 , RMI/JMX improvements
2015-04-08 15:23:29 -05:00
f51eaef765
Add rspec
2015-04-08 02:33:27 -05:00
5e2d6c27c3
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
db/schema.rb
lib/msf/core/db_manager/session.rb
metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
9145b6d717
Fix specs for uri_checksum
2015-04-05 22:56:59 -05:00
261ef51813
Add Rex::Java::Serialization exceptions
2015-04-05 18:43:03 -05:00
ebf77cd02d
Merge remote-tracking branch 'upstream/master' into msfvenom_psh_squash
...
Conflicts:
lib/msf/util/exe.rb
2015-04-05 00:24:48 +01:00
e3bbb7c297
Solve conflicts
2015-04-03 14:57:49 -05:00
6455862484
Merge branch 'staging/rails-4.0' of github.com:rapid7/metasploit-framework into staging/rails-4.0
...
Conflicts:
Gemfile.lock
metasploit-framework.gemspec
2015-04-03 13:56:38 -05:00
d02a4cc197
Land #5066 : EncodedPayload#generate specs
2015-04-03 20:59:00 +10:00
a1b4cf375f
Add some minimal specs for #generate
2015-04-03 00:11:41 -05:00
fd043d4842
Fix up build and missing uri_checksum stuff
...
Somehow this made it into a merge when it shouldn't have. This fix moves
the URI checksum module to where it needs to be and updates all the
references where required. This will result in a class with the dynamic
transport branch, but I can fix that after.
2015-04-03 13:42:25 +10:00
f4977bf606
Land #5006 @jlee-r7 adds meterpreter specs
2015-04-01 11:05:47 -05:00
dfaf1b3a8f
Stub monitor_sock so we don't leak threads
2015-03-30 22:03:39 -05:00
2ab4584079
Merge remote-tracking branch 'upstream/master' into staging/single-vuln-push
2015-03-30 13:50:52 -05:00
a1c755161a
Add spec coverage for appender, fix injector
2015-03-29 11:52:06 -05:00
9eca3a0ab5
Impersonation spec
2015-03-29 00:52:27 +00:00
10029eedb9
Add command specs
2015-03-29 00:05:44 +00:00
f7e3abf760
sqlcmd specs and fixes
2015-03-28 23:23:00 +00:00
3b651aecdc
Specs for sqlserver check and fixes
2015-03-28 22:59:00 +00:00
9cfafdd8b8
Land #4649 , improve post/windows/manage/run_as and as an exploit
2015-03-27 17:31:30 -05:00
2815462375
Update Mdm to staging hash
2015-03-27 15:16:33 -05:00
d84c48cb7d
Use newer hash syntax
2015-03-25 13:39:34 -05:00
72a0909e9b
Land #4992 , @wchen-r7's support for multiple ActiveX controls on BrowserExploitServerMerge
2015-03-25 13:30:36 -05:00
95d70e7211
Remove respond_to check for protected method
...
Fails on Ruby 2.x, and doesn't really gain us anything anyway.
2015-03-25 12:50:46 -05:00
8f0c434faa
Add specs for the new method
2015-03-25 12:34:10 -05:00
0540e25db2
Calculate the java/rmi/registry/RegistryImpl_Stub hash dinamically
2015-03-25 11:29:07 -05:00
6e3e696262
Use symantec_web_gateway as an example of using send_request
2015-03-25 10:55:46 -05:00
111e3fcb88
Add rspec for #send_request
2015-03-25 01:45:03 -05:00
a5c39db6c3
Use mocks like a boss...
2015-03-24 19:30:59 -05:00
0b671d5210
Add specs for Msf::Java::Rmi::Client::Jmx::Connection
2015-03-24 19:15:25 -05:00
356e8c727c
Add specs for Msf::Java::Rmi::Client::Jmx::Server
2015-03-24 18:56:58 -05:00
464a6df5e0
Add specs for Msf::Java::Rmi::Client::Registry
2015-03-24 18:42:35 -05:00
0fe98bc023
Delete old JMX mixin specs
2015-03-24 17:30:37 -05:00
e20398a70a
Add specs for Msf::Java::Rmi::Client::Jmx::Server::Parser
2015-03-24 17:30:06 -05:00
0a352fc7d4
Finish specs for Msf::Java::Rmi::Client::Jmx::Connection::Builder
2015-03-24 17:06:05 -05:00
115c4e5a06
Add first specs for Msf::Java::Rmi::Client::Jmx::Connection::Builder
2015-03-24 16:37:05 -05:00
82d545850e
Add specs for Msf::Java::Rmi::Client::Jmx::Server::Builder
2015-03-24 16:04:18 -05:00
87cac6fd55
Complete specs for Msf::Java::Rmi::Util
2015-03-24 15:41:32 -05:00
48026da35f
Fix RMI specs
2015-03-24 15:14:36 -05:00
0a07bb4d17
Add a couple of specs for Rex::Proto::Rmi::Model::ReturnValue
2015-03-24 15:08:59 -05:00
7bf00f8f47
Land #4789 , @rastating WPLMS wordpress module
2015-03-24 20:46:38 +01:00
3c4da5c3ff
Update BES rspec
2015-03-24 00:10:18 -05:00
c7da9d6f79
Move file: prefix checks out of option class specs (would need to go into console test specs at some point)
2015-03-23 15:09:22 -05:00
79068c8ec2
Delete JMX discovery stream
2015-03-23 10:21:37 -05:00
01caf161f8
Fix syntax error in db_spec.rb
2015-03-23 01:35:26 -05:00
2e75d14d56
Update rspec
2015-03-23 00:53:55 -05:00
1226b3656f
Land #4945 , @wchen-r7's login scanner for Symantec web gateway
2015-03-20 14:44:05 -05:00
e257e742e0
Fix require
2015-03-20 14:26:55 -05:00
62871255b0
Match class and file names
2015-03-20 14:25:20 -05:00
eb73da2f39
Clean specs
2015-03-20 14:19:02 -05:00
b19f766728
Land #4942 , Gitlab Login Scanner
2015-03-20 13:02:12 -05:00
da51d2be67
Really add specs for Msf::Java::Rmi::Client::Registry::Parser
2015-03-19 19:07:42 -05:00
6eecbc3de1
Add specs for Msf::Java::Rmi::Client::Registry::Builder
2015-03-19 18:24:31 -05:00
6c84081552
Update db_spec.rb
2015-03-19 18:12:37 -05:00
ec90594f7e
Add support for Rex::Java::Serialization::ProxyClassDesc
2015-03-19 15:41:24 -05:00
a5d589ef55
Railgun calls should return a hash
2015-03-19 00:05:02 +00:00
975ddc9092
Add some spec mockery
2015-03-18 23:43:46 +00:00
8113ed2e1f
Move specs
2015-03-18 09:29:37 -05:00
0968f14ac1
Add specs for CallData
2015-03-17 20:53:02 -05:00
6315e07312
Add specs for UniqueIdentifier
2015-03-17 20:38:43 -05:00
4bc4936083
Add specs for ReturnValue
2015-03-17 17:30:53 -05:00
87b777e923
Refactor moving code to rex
2015-03-17 17:15:32 -05:00
78ec4c91e8
Completed rspec
2015-03-17 16:15:12 -05:00
f29a3f69e9
Merge branch 'master' into staging/rails-4.0
...
Conflicts:
Gemfile.lock
metasploit-framework-db.gemspec
2015-03-17 15:47:48 -05:00
ee276434a4
Update swg spec, looking good so far
2015-03-17 15:15:32 -05:00
d5b77d053b
Update for rspec
2015-03-17 12:14:58 -05:00
503fb602f9
Get rspec going
2015-03-17 12:01:46 -05:00
2d8782d711
Fix RMI specs
2015-03-17 11:48:38 -05:00
ebe7ad07b0
Add specs, plus modify java_rmi_server modules
2015-03-17 11:26:27 -05:00
2c6b904c02
Correct spec too
2015-03-17 11:36:36 +00:00
f4a1e981ab
Add gitlab login scanner
2015-03-17 11:19:23 +00:00
fa2fbc387c
Land #4922 , REG_MULTI_SZ for type2str
2015-03-13 01:07:27 -05:00
966848127a
Refactor x86 Windows reverse_http and reverse_https stagers
2015-03-10 12:48:30 -05:00
838746b021
Add user_data_is_match? method
2015-03-09 15:35:53 -05:00
cd5699dc39
Sort cases and add specs
2015-03-08 23:27:32 -05:00
38f8fe382c
Update specs
2015-03-05 12:24:41 -06:00
1c064f6b46
Land #3074 , @0x41414141 SMB Share mixin
2015-03-04 10:16:04 -06:00
a57aefb721
Add specs for QUERY information level
2015-03-03 15:24:13 -06:00
96c0f1847b
Fix examples descriptions
2015-03-03 14:48:18 -06:00
7f7b17c04e
Really add specs
2015-03-03 14:14:03 -06:00
df7c07bfd1
Really add the specs
2015-03-03 13:19:50 -06:00
a2a24c56d6
Add specs for QueryFileInformation
2015-03-03 13:04:30 -06:00
1322cb0d3f
Clean find_first2 specs
2015-03-03 12:46:25 -06:00
8328c5c5e9
Add specs for SMB_FIND_FILE_BOTH_DIRECTORY_INFO requests
2015-03-03 12:43:41 -06:00
Fernando Arias
Brent Cook
Jon Hart
bigendian smalls
Meatballs
Mo Sadek
jvazquez-r7
James Lee
HD Moore
wchen-r7
jvicente
xistence
Tod Beardsley
William Vu
darkbushido
Christian Mehlmauer
Matt Buck
Trevor Rosen
Luke Imhoff
root
OJ