infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,589 Commits
7 Branches
556 Tags
421 MiB
Commit Graph

37589 Commits (242ea8d9cd194ccf9333efb453cf0e5a8f2199ca)

Author SHA1 Message Date
Brent Cook 242ea8d9cd Merge branch 'master' into land-6691- 2016-03-24 22:19:57 -05:00
Brendan Watters 18604c3d44
Land #6705, Rectify MSF_CFGROOT_CONFIG comment 2016-03-24 18:21:05 -05:00
Brendan Watters 6b4b523521
Land #6699, Update mailmap for Steven Seeley 2016-03-23 17:48:17 -05:00
Till Maas 7f002128ad Rectify MSF_CFGROOT_CONFIG comment 
Also remove reference to feature request that does not seem to be
available anymore.
 2016-03-23 22:23:30 +01:00
dmohanty-r7 6a462d5f60
Land #6703, Make ms09_065_eot_integer passive 2016-03-23 13:39:41 -05:00
Adam Cammack 8fb55eeb6b
Land #6700, add aux module to gather browser info 2016-03-23 13:19:27 -05:00
Louis Sato 0c19d89655
add more space for deprecation message 2016-03-23 11:39:42 -05:00
Louis Sato b0cdfe9ee1
Land #6704, move android stock browser iframe 2016-03-23 11:38:34 -05:00
wchen-r7 8c5c0086e6 Change cve_2012_6301 module path & make passive 
This addresses two things:

1. The module is in the wrong directory. dos/http is for http
   servers, not browsers.
2. PassiveActions should not be a 2D array.
 2016-03-23 11:10:23 -05:00
wchen-r7 53860bef1f Make ms09_065_eot_integer passive 
MS-932
 2016-03-23 10:50:24 -05:00
Metasploit e7b0c60e5c
Bump version of framework to 4.11.18 2016-03-23 07:55:29 -07:00
Brent Cook 4906327bc2
Land #6702, fix datastore option 'stickiness', fix OptPort validation 2016-03-22 23:26:19 -05:00
Adam Cammack 866c4718b0
Fix OptPort validation 
Allow a port value of 0 and don't reject empty values if the option is
not required.
 2016-03-22 23:01:18 -05:00
Adam Cammack ec3a0a108d
Change OptPort to inherit from OptInt 
Fixes the normalize and validate methods.
 2016-03-22 19:25:51 -05:00
Adam Cammack 22df7c0071
Fix datastore to validate options w/o a default 
Options without a default were not pulled into the `@options` hash and
therefore were not used to validate options on assignment.

I am not entirely sure how this fix works, since it would seem that
non-override options would not get pulled in if an option was first set
in the global datastore. However, a previous value does not get
overridden and new values are validated. Anything further is merely
speculation on my part.
 2016-03-22 19:12:53 -05:00
Adam Cammack 5c163960ed
Fix datastore to not freeze options on the default 2016-03-22 19:07:58 -05:00
wchen-r7 8bf039a69e ignore_items! should not be used in a loop 
because it's not necessary.
 2016-03-22 15:56:38 -05:00
wchen-r7 8836393cb1 Add aux module to gather browser information. 2016-03-22 13:56:12 -05:00
wchen-r7 71109038e7 Update mailmap for Steven Seeley 2016-03-22 12:45:28 -05:00
William Vu 0c7cf2924c
Land #6686, Android dump_* -o fixes 2016-03-21 12:21:47 -05:00
Adam Cammack b2dea83a8b
Land #6688, Fix typo 
s/thorugh/through/ in exploits/multi/http/phpmyadmin_3522_backdoor
 2016-03-21 10:42:36 -05:00
OJ 80e0bbeb68 Add the interactive shell prompt with sessions 2016-03-21 15:44:20 +10:00
h00die ebc7316442 Spelling Fix 
Fixed Thorugh to Through
 2016-03-19 13:58:13 -04:00
h00die 488f93d213 Merge remote-tracking branch 'refs/remotes/rapid7/master' 2016-03-19 13:40:40 -04:00
Metasploit 6e12e74e02
Bump version of framework to 4.11.17 2016-03-18 14:12:18 -07:00
Adam Cammack 67b9d053ec
Land #6679, remove unreachable sanity checks 2016-03-18 11:25:51 -05:00
Adam Cammack 570221379e
Land #6533, move ie_unsafe_scripting to BES 2016-03-18 11:22:44 -05:00
Brent Cook 9219efa512 remove unreachable ruby 1.x check 2016-03-18 11:16:44 -05:00
James Lee d54bbdf9a3
Land #6566, filezilla xml file locations 2016-03-17 16:27:24 -05:00
James Lee 115a033036
Fix parsing the Last Server xml 2016-03-17 16:27:02 -05:00
wchen-r7 31279291c2 Resolve merge conflict for ie_unsafe_scripting.rb 2016-03-17 14:42:36 -05:00
wchen-r7 b1b68294bb Update class name 2016-03-17 14:41:23 -05:00
wchen-r7 7b2d717280 Change ranking to manual and restore BAP2 count to 21 
Since the exploit requires the target to be configured manually,
it feel more appropriate to be ManualRanking.
 2016-03-17 14:39:28 -05:00
James Lee 1375600780
Land #6644, datastore validation on assignment 2016-03-17 11:16:12 -05:00
Brent Cook df2d0f7826 Indicate that output options take parameters 2016-03-17 11:13:34 -05:00
Brent Cook 1790f039c3
Land #6684, remove obsolete warn_about_rubies 2016-03-17 08:26:57 -05:00
Brent Cook e9f87d2883
Land #6685, ensure platform variable is set for non-osx 2016-03-17 08:25:42 -05:00
William Vu 59a55dec5b
Land #6676, new Postgres fingerprints 2016-03-16 16:32:10 -05:00
James Lee 9e7a330ac8
OptInt -> OptPort 2016-03-16 15:47:29 -05:00
Adam Cammack 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
James Lee 79c36c4f53
RPORT should be an OptPort 2016-03-16 14:13:19 -05:00
James Lee af642379e6
Fix some OptInts 2016-03-16 14:13:18 -05:00
James Lee c21bad78e8
Fix some more String defaults 2016-03-16 14:13:18 -05:00
James Lee a878926f31
Remove unused datastore option 2016-03-16 14:13:17 -05:00
Brent Cook fbe1cce7ab
Land #6683, fix msftidy warning about MetasploitModule 2016-03-16 13:21:13 -05:00
Spencer McIntyre 631e24c02b Update the msftidy warning for module class names 2016-03-16 13:31:24 -04:00
Spencer McIntyre 4e3a188f75
Land #6401, EasyCafe server file retrieval module 2016-03-16 13:24:54 -04:00
Spencer McIntyre 9ac4ec4bfc Update the class name to MetasploitModule 2016-03-16 13:22:06 -04:00
Spencer McIntyre 53f1338ad0 Update module to remove references to print peer 2016-03-16 13:10:39 -04:00
William Vu adb275520b
Land #6680, old SVN code deletion 2016-03-16 10:15:06 -05:00