Joshua Smith
32faa0bc62
Land 3796, specs for Rex::Encoder::Alpha2 encoders
2014-10-17 13:15:00 -05:00
Trevor Rosen
22f5347660
Merge branch 'landing/4042' into upstream-master
...
Land #4042
the commit.
2014-10-17 12:51:50 -05:00
William Vu
dbfe398e35
Land #4037 , Drupageddon exploit
2014-10-17 12:39:59 -05:00
William Vu
a514e3ea16
Fix bad indent (should be spaces)
...
msftidy is happy now.
2014-10-17 12:39:25 -05:00
William Vu
f2328e679f
Land #4034 , POODLE scanner
2014-10-17 12:36:48 -05:00
William Vu
367ea5d3db
Add disclosure date
2014-10-17 12:35:28 -05:00
Tod Beardsley
ccdaf2b576
Fix the banner
...
Turns out these will be broken in outstanding PRs for a while. At least
they won't be merge conflicts.
2014-10-17 12:23:23 -05:00
Luke Imhoff
200d64040d
Fully-qualify Msf::ServiceState
...
MSP-11152
Replace unqualified `ServiceState` with `Msf::ServiceState`.
2014-10-17 11:58:11 -05:00
Tod Beardsley
ad501b25e4
Filename move to be less redundant
2014-10-17 11:25:14 -05:00
Luke Imhoff
9f32cbd476
Use :: to force top-level constant resolution
...
MSP-11152
When `Msf::DBManager::Import::MetasploitFramework` is included in
`Msf::DBManager::Import`, it's child namespace of
`Msf::DBManager::Import::MetasploitFramework::Zip becomes resolvable as
`Zip` in `Msf::DBManager::Import` methods, so need to use `::Zip` to
cause `Zip` to be resolved from rubyzip gem.
2014-10-17 10:15:59 -05:00
Luke Imhoff
13923a8ca5
Fully-qualify Msf::DBImportError
...
MSP-11152
Constant was unqualified in some of the reorganized Msf::DBManager code
because that code was take advantage of the old nested lexical scope
that included `Msf`.
2014-10-17 09:29:01 -05:00
William Vu
e242bf914f
Land #4031 , fixes for pureftpd_bash_env_exec
2014-10-16 19:55:09 -05:00
Brandon Perry
353d2f79cc
tweak pw generation
2014-10-16 12:06:19 -07:00
Brandon Perry
5f8c0cb4f3
Merge branch 'drupal' of https://github.com/FireFart/metasploit-framework into drupageddon
2014-10-16 11:53:54 -07:00
Christian Mehlmauer
c8dd08f605
password hashing
2014-10-17 15:52:47 +02:00
Brandon Perry
23b7b8e400
fix for version 7.0-7.31
2014-10-16 11:53:48 -07:00
Brandon Perry
9bab77ece6
add urls
2014-10-16 10:36:37 -07:00
Brandon Perry
b031ce4df3
Create drupal_drupageddon.rb
2014-10-16 16:42:47 -05:00
Brandon Perry
5c4ac48db7
update the drupal module a bit with error checking
2014-10-16 10:32:39 -07:00
Trevor Rosen
c503e8a3d8
Merge branch 'landing/4026' into upstream-master
...
Land #4026
* db.rb (DBManager) now in multiple files
* Cucumber coverage for DB-related msfconsole commands
2014-10-16 11:52:57 -05:00
Tod Beardsley
8cf10be779
Don't assume SSLv3 is set (kill FP+s)
2014-10-16 10:43:58 -05:00
Tod Beardsley
0b67efd51e
Add a POODLE scanner and general SSL version scan
2014-10-16 10:27:37 -05:00
Trevor Rosen
b02dc7a44f
Merge branch 'landing/3971' into HEAD
...
Land #3791 - specs for code reorg
2014-10-16 10:26:51 -05:00
Spencer McIntyre
09069f75c2
Fix #4019 , fix NameError peer and disconnect in check
2014-10-16 08:32:20 -04:00
Samuel Huckins
50a2f4c2a7
Adding missing lock changes from #4030
2014-10-15 20:39:13 -05:00
Samuel Huckins
87d8fc187e
Lands #4030 , latest meterpreter bins
2014-10-15 20:35:26 -05:00
Tod Beardsley
4f32cc8c01
Bump to meterpreter_bins 0.0.10
2014-10-15 19:36:48 -05:00
Tod Beardsley
8afe4ab5e0
Update Gemspec for meterpreter 0.0.8
2014-10-15 19:00:19 -05:00
Tod Beardsley
d5a0b81680
Land #4024 , auto-negotiate SSL versions
...
Thanks @hmoore-r7!
2014-10-15 16:04:38 -05:00
HD Moore
5a350b2bf3
Merge pull request #6 from todb-r7/pr4024-auto-negotiate-ssl
...
Add 'Auto' to tcp.rb as well.
2014-10-15 16:03:52 -05:00
Tod Beardsley
62be638258
Add 'Auto' to tcp.rb as well.
2014-10-15 16:01:42 -05:00
Joshua Smith
8ec0aa0a75
Land 4006, msfcli support for show actions
2014-10-15 14:43:27 -05:00
Tod Beardsley
b866983bc2
Land #4025 , auto-negotiate meterpreter SSL
2014-10-15 14:25:44 -05:00
Luke Imhoff
9456506e3d
Merge branch 'master' into feature/MSP-11124/msf-dbmanager-reorg
...
MSP-11124
2014-10-15 14:08:55 -05:00
Luke Imhoff
3bce8e418d
unserialize_object -> Msf::DBManager::Import::MetasploitFramework shared examples
...
MSP-11124
2014-10-15 14:03:55 -05:00
Luke Imhoff
1f7ad1cac9
unserialize_object -> Msf::DBManager::Import::MetasploitFramework
...
MSP-11124
2014-10-15 14:03:18 -05:00
Luke Imhoff
1aca55bc2a
nils_for_nulls -> Msf::DBManager::Import::MetasploitFramework shared examples
...
MSP-11124
2014-10-15 14:00:42 -05:00
Luke Imhoff
bed98fe43b
nils_for_nulls -> Msf::DBManager::Import::MetasploitFramework
...
MSP-11124
2014-10-15 13:59:03 -05:00
HD Moore
fcd9b4b293
Allow non-SSLv3 Meterpreters (auto-negotiate)
2014-10-15 13:57:51 -05:00
Luke Imhoff
27c5cf8887
Move helpers to Msf::DBManager::Import::Libpcap shared examples
...
MSP-11124
2014-10-15 13:57:27 -05:00
Luke Imhoff
ac30990177
Move libpcap helpers to Libpcap module
...
MSP-11124
2014-10-15 13:55:24 -05:00
Luke Imhoff
5d59224520
Extract Msf::DBManager::Import::Report shared examples
...
MSP-11124
2014-10-15 13:53:09 -05:00
Luke Imhoff
7aed88f11b
Extract Msf::DBManager::Import::Report
...
MSP-11124
2014-10-15 13:51:57 -05:00
HD Moore
cb3a4afac5
Typo: request -> requested in message
2014-10-15 13:48:22 -05:00
Luke Imhoff
505ca5fcc0
Extract Msf::DBManager::Import::Wapiti shared examples
...
MSP-11124
2014-10-15 13:47:22 -05:00
Luke Imhoff
e5e051c905
Extract Msf::DBManager::Import::Wapiti
...
MSP-11124
2014-10-15 13:42:54 -05:00
Luke Imhoff
6e0c7f0aaf
Extract Msf::DBManager::Import::Spiceworks shared examples
...
MSP-11124
2014-10-15 13:40:03 -05:00
Luke Imhoff
e65a386d3d
Extract Msf::DBManager::Import::Spiceworks
...
MSP-11124
2014-10-15 13:37:35 -05:00
HD Moore
7516512650
Raise an ArgumentError vs RuntimeError for backwards compatibility
2014-10-15 13:30:38 -05:00
HD Moore
a762d871bf
Autonegotiate SSL/TLS versions when not explicit
2014-10-15 13:26:40 -05:00
