Commit Graph

26068 Commits (735ccda4db3f4c17b2f29da751b4c753dcbef4e5)

Author SHA1 Message Date
James Lee afe36ab6ad
Merge branch 'staging/electro-release' into feature/MSP-9707/smb-bruteforce-refactor
Conflicts:
	lib/metasploit/framework/login_scanner/smb.rb
2014-07-09 12:50:24 -05:00
David Maloney 5b66f07f59
migration changes on schema.rb 2014-07-09 12:22:09 -05:00
David Maloney 59c90bba22
version lock rspec
rspec 3 will cause problems for us right now
2014-07-09 12:21:41 -05:00
David Maloney 7325cfec64
add default realm values
for the scanners that take a realm
we know what the default realm to try is
so the Scanner should hold that info
2014-07-09 11:19:25 -05:00
David Maloney bc18ca5762
add REALM_KEY to each LoginScanner
each LoginScanner should now know
what kind of REALM it takes
2014-07-09 10:53:37 -05:00
David Maloney e5abfea36a
require new metasploit-credential and -model
get the new Realm Key constants after the
move to -model
2014-07-09 10:43:57 -05:00
David Maloney 487cf325d5
Merge branch 'staging/electro-release' into feature/MSP-10660/realm_adjustments 2014-07-09 10:35:34 -05:00
jvazquez-r7 42823fe15e Test download_exec with linux meterpreter 2014-07-09 09:41:10 -05:00
jvazquez-r7 f4c6505351 Test mount_cifs_creds on linux meterpreter 2014-07-09 09:20:30 -05:00
jvazquez-r7 14b218dce5 Make hashdump compatible with meterpreter 2014-07-09 08:48:20 -05:00
jvazquez-r7 73fdc06d1d Fix enum_xchat to work with meterpreter 2014-07-09 08:37:17 -05:00
Luke Imhoff 467c686701
Merge branch 'bug/MSP-10663/core-opts-needs-a-task-id' into staging/electro-release
MSP-10663
2014-07-08 19:45:11 -05:00
Luke Imhoff dd75c645c3
Update metasploit-credential
MSP-10663
2014-07-08 19:44:38 -05:00
Trevor Rosen a27c1d7dcc
Importing old export, making new models
MSP-9948
2014-07-08 19:14:26 -05:00
Trevor Rosen 574f4356e8
Update deps 2014-07-08 18:20:20 -05:00
jvazquez-r7 b47650580a Fix bugs 2014-07-08 16:51:39 -05:00
jvazquez-r7 a364172978 Add meterpreter as session type 2014-07-08 16:25:50 -05:00
jvazquez-r7 c19deddfb1 Delete debug messages 2014-07-08 16:24:45 -05:00
jvazquez-r7 c25c5f6806 Make linux gather post modules compatible with meterpreter 2014-07-08 16:23:57 -05:00
Michael Messner f89f47c4d0 dlink_dspw215_info_cgi_rop 2014-07-08 22:29:57 +02:00
Michael Messner 6fbd6bb4a0 stager 2014-07-08 22:17:02 +02:00
Michael Messner ac727dae89 dlink_dsp_w215_hnap_exploit 2014-07-08 22:13:13 +02:00
Michael Messner 579ce0a858 cleanup 2014-07-08 21:58:15 +02:00
Michael Messner 51001f9cb3 Merge branch 'master' of git://github.com/rapid7/metasploit-framework into dlink_upnp_msearch_command_injection 2014-07-08 21:39:53 +02:00
Michael Messner 84d6d56e15 cleanup, deprecated 2014-07-08 21:36:07 +02:00
Michael Messner 10bcef0c33 cleanup, deprecated 2014-07-08 21:34:28 +02:00
dmaloney-r7 b65989ff0c Merge pull request #100 from rapid7/bug/MSP-10661/glob-rb-files
Use glob instead of entries
2014-07-08 14:29:24 -05:00
Trevor Rosen 79054fae20
Remove credentials exportation from XML
MSP-9948
2014-07-08 12:03:32 -05:00
Lance Sanchez 9d3caf9c2f
Merge branch 'feature/MSP-10658/to_credential' into staging/electro-release 2014-07-08 11:17:17 -05:00
Lance Sanchez 6e11a4f789 changing the private_type
chainging trys to show these may all come back nil.

MSP-10658
2014-07-08 11:07:39 -05:00
Lance Sanchez e6f13f6607 reformatting the hash
MSP-10658
2014-07-08 11:07:25 -05:00
William Vu 4eeab66ebe
Land #3497, comma-separated get_cookies 2014-07-08 11:00:40 -05:00
James Lee 567435f508
Use glob instead of entries
Fixes the case where a non-ruby file exists in the login_scanner/
directory
2014-07-08 11:00:33 -05:00
Trevor Rosen 8436adb5f8
Make XML export work with new backend
MSP-9948

* XML data looks ok in spot check
2014-07-08 09:40:15 -05:00
David Maloney 38419dae83
fix to_credential on core
the Metasploit::Credential::Core to_credential
method now seats private_type and realm_key correctly
2014-07-07 18:05:04 -05:00
Lance Sanchez d178b1f788
Merge branch 'bug/MSP-10654/compatibility' into staging/electro-release 2014-07-07 17:13:16 -05:00
Lance Sanchez d7450dcbdf
updating dependencies
metasploit-credential to pre.electro.pre.release
metasploit-data-models to 0.18.0

MSP-10654
2014-07-07 17:02:22 -05:00
David Maloney aeda74f394
Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-07-07 16:41:23 -05:00
dmaloney-r7 80bee35b70 Merge pull request #97 from rapid7/feature/MSP-10656/unify-ssh-scanners
Feature/msp 10656/unify ssh scanners
2014-07-07 16:37:41 -05:00
David Maloney 2c13ff4038
Merge branch 'staging/electro-release' into feature/MSP-10656/unify-ssh-scanners 2014-07-07 16:32:39 -05:00
dmaloney-r7 db8b0c907b Merge pull request #94 from rapid7/feature/MSP-10648/login-scanner-creation
Feature/msp 10648/login scanner creation
2014-07-07 16:04:09 -05:00
Trevor Rosen 1d7de8fef9
Mid-work commit
MSP-9848
2014-07-07 15:44:29 -05:00
dmaloney-r7 c4c7ff519f Merge pull request #96 from rapid7/feature/MSP-10657/add-private-type
Add private_type and realm_key accessors to Framework::Credential
2014-07-07 15:43:18 -05:00
David Maloney b52c13228c
make private_type validation conditional
there are times when this won't be filled in
but the credential is still valid
2014-07-07 15:40:52 -05:00
Luke Imhoff 271fae07cf
Update to compatible dependencies
MSP-10654
2014-07-07 14:41:03 -05:00
dmaloney-r7 eda7e7297e Merge pull request #95 from rapid7/feature/MSP-10649/remove-successes
Remove successes and failures
2014-07-07 13:58:40 -05:00
cdoughty-r7 e5b5439e47 Merge pull request #3500 from todb-r7/fixup-release
Release fixup: Description/whitespace changes (minor)
2014-07-07 13:56:07 -05:00
James Lee 4d4b8078f8
Unify SSH specs as well 2014-07-07 13:41:08 -05:00
James Lee 2a9ac0a007
Axe SSHKey in favor of a unified SSH 2014-07-07 13:35:17 -05:00
James Lee 71cbbc5388
Merge branch 'feature/MSP-10648/login-scanner-creation' into feature/MSP-10656/unify-ssh-scanners 2014-07-07 13:19:34 -05:00