Commit Graph

25202 Commits (897b0b1ee5cfad1c110facc548d8dcabf09ca5fc)

Author SHA1 Message Date
David Maloney 90b52814b1
fix some spec issues for recent changes 2014-06-06 11:52:49 -05:00
jvennix-r7 f660f557e5 Merge pull request #38 from rapid7/feature/msp-9738/winscp
Feature/msp 9738/winscp
2014-06-06 11:43:50 -05:00
Samuel Huckins 984b77a4a6 Merge pull request #43 from rapid7/feature/MSP-9721/tomcat_deploy
Specs aside from known POP3 fail passing, functional steps passing.

MSP-9721 #land
MSP-9722 #land
2014-06-06 11:11:08 -05:00
jvennix-r7 4bc543715d Merge pull request #40 from rapid7/feature/MSP-9748/postgres_hashdump
Feature/msp 9748/postgres hashdump
2014-06-06 10:51:19 -05:00
David Maloney da09a2725b
we need the service data in the login!
ooopsie #2
2014-06-06 10:51:12 -05:00
Brandon Turner acced15d11
Merge branch 'release' 2014-06-06 10:17:00 -05:00
Brandon Turner 82464bd6aa
Update version spec 2014-06-06 10:16:44 -05:00
Brandon Turner bacf82acb1
Merge branch 'release' into 'master' 2014-06-06 09:59:00 -05:00
Brandon Turner 21be4f21a6
Bump version to 4.9.3 2014-06-06 09:52:01 -05:00
Brandon Turner d9a5002bd3
Merge branch 'release'
Updates meterpreter bins and closes #3425 and #3423.
2014-06-05 17:33:11 -05:00
Brandon Turner 17ccc132a4
Land #3425 from todb-r7:release-meterpreter-bins 2014-06-05 17:32:34 -05:00
Tod Beardsley 97a70e49c8
Roll back the jar/py changes 2014-06-05 17:31:02 -05:00
Tod Beardsley 737f06f600
Add Meterpreter bins for release branch.
This contains the same bins as #3423, but it is targeted at the release
branch for rapid7/metasploit-framework.
2014-06-05 17:17:32 -05:00
Lance Sanchez b6f049d41e
Merge branch 'feature/MSP-9653/use-metasploit-concern-in-pro' into staging/electro-release 2014-06-05 16:32:47 -05:00
Lance Sanchez eead9f097a
updating creds to v0.3.0
MSP-9653
2014-06-05 16:31:17 -05:00
Luke Imhoff f2a56c041b
Merge branch 'staging/electro-release' into feature/MSP-9653/use-metasploit-concern-in-pro
MSP-9653

Conflicts:
	Gemfile
	Gemfile.lock
2014-06-05 16:22:02 -05:00
David Maloney c61b47063d
vnc add missing exception catch
linux throws a different exception than osx
when the vnc client fails to connect
this caused issues with the specs running. this now
catches that additional exception
2014-06-05 15:32:08 -05:00
jvennix-r7 2522f1f332 Merge pull request #39 from rapid7/feature/MSP-9751/mysql_hashdump
Feature/msp 9751/mysql hashdump
2014-06-05 14:39:48 -05:00
Lance Sanchez d10867ea9e
updating the gemfile
metasploit-concern v0.1.0 has been released
metasploit-credential is now on the v0.2.0-electro-release tag

MSP-9653
2014-06-05 14:26:40 -05:00
David Maloney a84980fa9d
login creation was missing! 2014-06-05 13:56:08 -05:00
Samuel Huckins 9d4ba8c981 Merge pull request #41 from rapid7/feature/MSP-9731/filezilla
Specs other than POP3 specs fixed on staging passing, functional passing

MSP-9731 #land
2014-06-05 13:19:10 -05:00
Luke Imhoff 5ae5448005
Join killed threads to ensure cleanup
MSP-9653
2014-06-05 12:40:24 -05:00
Samuel Huckins 75e4e81b7a Merge pull request #37 from rapid7/feature/MSP-9750/MSSQL_hashdump
Specs and functional tests passing. 

MSP-9750 #land
2014-06-05 12:20:40 -05:00
James Lee 33a9f8c43f
Add spec for userpass_file 2014-06-05 11:54:59 -05:00
James Lee 45c26343a1
Add spec for pass_file 2014-06-05 11:51:11 -05:00
James Lee b1136752be
Add Credential#== to facilitate specs 2014-06-05 11:37:48 -05:00
Samuel Huckins af20e8f56e Merge pull request #44 from rapid7/bug/fixing-failing-specs-in-pop3
All specs passing. Much celebrations. Such happy. Wow.
2014-06-05 11:33:40 -05:00
Lance Sanchez 262deac155
Fixing the failing specs
for some reason on my box sock.closed? isnt being called. stubbing it out

Kernel.select is being called and cant cast a mock object to an IO object
ok to fix this I'm stubbing select on the scanner object then the call wont
get passed onto the Kernel module
2014-06-05 11:21:34 -05:00
William Vu 00511b2aeb
Land #3421, new @trosen-r7 in .mailmap 2014-06-05 10:59:47 -05:00
Tod Beardsley 8747273b01
Add @trosen-r7's alias for commits
Just so quick counts of contributors is slightly more accurate and
@trosen-r7 doesn't accidentally get double counted.
2014-06-05 10:40:38 -05:00
James Lee 8b6e188ba8
Add support for realm in CredentialCollection
MSP-9988
2014-06-04 17:03:52 -05:00
David Maloney 62866374b8
refactor tomcat_mgr_deploy 2014-06-04 16:22:22 -05:00
David Maloney f22447f91e
refactor tomcat_mgr_upload 2014-06-04 16:07:57 -05:00
David Maloney ef8f237050
refactor filezilla_server
you know the score
2014-06-04 15:43:15 -05:00
James Lee b1ff6b95b5
Better docs 2014-06-04 14:44:53 -05:00
David Maloney 4960503a59
fix jtr_format
use raw-md5 as that sort of works
2014-06-04 14:10:28 -05:00
James Lee 41644970bf
Add a CredentialCollection
Also moves Metasploit::Framework::LoginScanner::Credential to
Metasploit::Framework::Credential
2014-06-04 13:01:09 -05:00
David Maloney 30c35907bf
refactor psotgres_hashdump
refactor psotgres_hashdump to now save
hashes as Metasploit::Credential objects
2014-06-04 12:21:49 -05:00
David Maloney d1f7f93e4b
refactor mysql_hashdump
mysql_hashdump now uses Metasploit::Credential to
save hashes.
2014-06-04 11:59:47 -05:00
David Maloney 201e6e9866
Merge branch 'feature/MSP-9750/MSSQL_hashdump' into feature/MSP-9751/mysql_hashdump 2014-06-04 11:58:58 -05:00
David Maloney 28bf29980e
Merge branch 'master' into staging/electro-release 2014-06-04 10:21:08 -05:00
Meatballs c032b8ce8e
Compat 2014-06-04 02:27:06 +01:00
James Lee f2e1732878
Resolve hostnames before trying to save 2014-06-03 15:19:30 -05:00
David Maloney d3949b3d6c
refactor mssql_hashdump
refactor mssql_hashdump to use Metasploit:Credential
2014-06-03 15:02:59 -05:00
Trevor Rosen 0272593923 Merge pull request #32 from rapid7/feature/MSP-9736/vnc-post
refactor vnc post module

MSP-9736 #land
2014-06-03 13:53:42 -05:00
Trevor Rosen ad15e6fe17 Merge pull request #35 from rapid7/feature/MSP-9678/pop3-login-scanner
Feature/msp 9678/pop3 login scanner

MSP-9678 #land
2014-06-03 12:11:17 -05:00
James Lee 8abed15c77
Switch to Credential::* things 2014-06-03 11:48:08 -05:00
William Vu 6c7fd3642a
Land #3411, Python 3.[34] Meterpreter support 2014-06-03 11:34:22 -05:00
Meatballs 0e3549ebc4
mc brute tidy 2014-06-03 17:27:46 +01:00
Lance Sanchez edc9f94d41
fixing issues raised in code review
MSP-9678
2014-06-03 11:15:26 -05:00