Commit Graph

25125 Commits

Author SHA1 Message Date
dmaloney-r7 85bee6ea12 Update ftp_login.rb 2014-06-11 17:29:23 -05:00
David Maloney 83a2dc250d make ftp guest attempts optional 2014-06-11 16:37:59 -05:00
David Maloney 1164cf5363 refactor ftp_login
uses new cred goodness
2014-06-11 16:21:55 -05:00
David Maloney 6269a9141b Merge branch 'staging/electro-release' into feature/MSP-9695/ftp_login 2014-06-11 14:38:49 -05:00
dmaloney-r7 9affc753c0 Merge pull request #66 from rapid7/feature/cred-collection-prepend
Add ability to prepend creds to a collection
2014-06-11 14:34:54 -05:00
James Lee 3a8f6236ad Add ability to prepend creds to a collection 2014-06-11 14:30:45 -05:00
Trevor Rosen 8d06cb7679 Creds version bump 2014-06-11 14:09:31 -05:00
Trevor Rosen 6c0d668f0a Merge pull request #55 from rapid7/feature/MSP-9701/msssql_login
Feature/msp 9701/msssql login

MSP-9701 #land
2014-06-11 13:48:59 -05:00
Samuel Huckins 84aa0d42ed Merge pull request #57 from rapid7/bug/MSP-10004/rubyzip
Trevor added a 0.4.1 tag right before this PR landed, making this unmergable. Pulled in staging/electro-release, specs passing.
2014-06-11 13:48:03 -05:00
Samuel Huckins 1903542683 Merge branch 'staging/electro-release' into bug/MSP-10004/rubyzip
Conflicts:
	Gemfile
	Gemfile.lock
2014-06-11 13:42:26 -05:00
Trevor Rosen 5440e3e150 Merge pull request #52 from rapid7/feature/MSP-9702/mysql_login
refactor mysql_login

MSP-9702 #land
2014-06-11 13:41:48 -05:00
Trevor Rosen e8752f9c56 Point to correct creds version 2014-06-11 13:38:35 -05:00
Trevor Rosen ad80ada86b Merge pull request #51 from rapid7/feature/MSP-9711/vnc_login
refactor vnc_login
2014-06-11 13:35:26 -05:00
Trevor Rosen 651871bd7a Resolve upstream conflict 2014-06-11 13:34:45 -05:00
Trevor Rosen a92660376c Update credentials tag 2014-06-11 13:29:09 -05:00
Samuel Huckins b26a8fa76d Updating with latest MC tag
MSP-10004
2014-06-11 11:36:49 -05:00
David Maloney 943a4285e4 update schema.rb 2014-06-11 10:57:13 -05:00
David Maloney 9593422f9c Merge branch 'master' into staging/electro-release 2014-06-11 10:23:56 -05:00
Tod Beardsley 4b8961a464 Land #3428, deprecation warns for payloads 2014-06-11 09:57:07 -05:00
Meatballs1 165a65fdb4 Merge pull request #49 from todb-r7/fix-pr3428-deprecated
Avoid double-printing with setup and init_ui
2014-06-11 09:28:06 +01:00
Samuel Huckins 8e34b0b4bd Updated metasploit-credential tag
MSP-10004
2014-06-10 19:51:50 -05:00
Trevor Rosen 73c3409133 Prayer
Merge branch 'staging/electro-release' into feature/MSP-9711/vnc_login
2014-06-10 16:01:24 -05:00
David Maloney 693c4aae66 make sure we capture realms
need to account for the possability of
realms in mssql_login
2014-06-10 14:41:45 -05:00
Luke Imhoff b05e7fb9ac Fix require
MSP-10004

Change 'zip/zip' to 'zip' to match >= 1.0.0 rubyzip API.
2014-06-10 13:58:07 -05:00
Tod Beardsley b379dc014a Avoid double-printing with setup and init_ui 2014-06-10 13:57:25 -05:00
Luke Imhoff c79e51ea1d Update db/schema.rb
MSP-10004
2014-06-10 13:46:12 -05:00
Luke Imhoff 4d923a4809 Update to Rubyzip 1.X API
MSP-10004

`require 'zip'` instead of `'zip/zip'` and rename all classes to remove
redundant Zip prefix inside the Zip namespace.
2014-06-10 13:41:42 -05:00
Luke Imhoff f37ce795a1 Remove lib/zip
MSP-10004
2014-06-10 13:39:05 -05:00
Tod Beardsley 44540e6d00 Land #3437, CSS Injection MITM scanner 2014-06-10 13:36:35 -05:00
jvazquez-r7 4aa1fee398 Land #3326, @FireFart's Heartbleed - server response parsing 2014-06-10 13:27:28 -05:00
Luke Imhoff b92e95ee7f Add rubyzip 1.1.X
MSP-10004
2014-06-10 13:23:40 -05:00
dmaloney-r7 9826a57429 Update coreftp.rb 2014-06-10 13:01:19 -05:00
David Maloney 0c89d6cdce refactor mssql_login
now uses all the Metasploit::Credential goodness
2014-06-10 11:49:08 -05:00
David Maloney 15ceb1e826 put calls in right place it helps 2014-06-10 11:17:19 -05:00
David Maloney 63ec83ea90 missing public
missing the public in the invalidate_login call
now fixed
2014-06-10 11:12:17 -05:00
David Maloney e9d9806408 invalidate_login
added invalidate_login call
also made to_s on credential drop the @
if there is no realm present
2014-06-10 11:07:15 -05:00
David Maloney dc590008a7 add invalidate_login call
add the new invalidate login call to make sure
we update the status on failed logins appropriately
2014-06-10 10:58:27 -05:00
jvennix-r7 92414d3688 Merge pull request #53 from rapid7/bug/MSP-9994/framework-db-driver
Set `framework.db.driver` when connection already established.
2014-06-10 10:49:00 -05:00
jvazquez-r7 9aa2978589 Land jvazquez-r7/metasploit-framework#14, @todb-r7's fixes 2014-06-10 10:42:34 -05:00
Tod Beardsley 521284253f Be more clear about the vuln and impact 2014-06-10 10:29:23 -05:00
jvazquez-r7 2c8a99143b Land #3426, @Meatballs1's Python v2.3.3 Compatible Command Shell payloads 2014-06-10 09:55:58 -05:00
jvazquez-r7 3ec15b6512 Land #3431, @bcoles's new targets for efs_easychatserver_username 2014-06-10 09:52:16 -05:00
jvazquez-r7 a554b25855 Use EXITFUNC 2014-06-10 09:51:06 -05:00
Trevor Rosen 2c8c4f238c Merge pull request #49 from rapid7/feature/MSP-9746/ssh_creds
refactor ssh_creds post module

MSP-9746 #land
2014-06-10 09:32:11 -05:00
Trevor Rosen dcca5802e4 Merge pull request #48 from rapid7/feature/MSP-9745/linux_hashdump
refactor linux hashdump post module

MSP-9745 #land
2014-06-10 09:23:31 -05:00
jvazquez-r7 9b55f5143a Add module for CVE-2014-0224 2014-06-09 17:38:11 -05:00
Meatballs dc69afebb1 License and Require 2014-06-09 21:41:38 +01:00
Luke Imhoff 2cbbaad6b4 Set drivers and driver when connection already established
MSP-9994

3 database commands in msfconsole check for framework.db.driver to be
set, so driver must be set when the connection is already established by
the Rails initialization.
2014-06-09 14:26:59 -05:00
Luke Imhoff 1ee35ec68a Handle unconnected config in connection_established?
MSP-9994

Rescue `ActiveRecord::ConnectionNotEstablished` in
`Msf::DBManager#connection_established?` in addition to
`PG::ConnectionBad` to handle when the connection has been removed.
2014-06-09 14:26:45 -05:00
Luke Imhoff c7a43ecced Update Gemfile.lock
MSP-9994
2014-06-09 14:24:44 -05:00