Commit Graph

26005 Commits (14fa49cdeb82025aef84296546ff792711ab3c03)

Author SHA1 Message Date
Luke Imhoff 14fa49cdeb
Update spec to handle Mdm::Service#proto sequence
MSP-10029

Mdm::Service factories were changed in metasploit_data_models 0.19.0 to
use a sequence that cycles between 'tcp' and 'udp'.  To make the spec
clearer, just hard-code the protos under test instead of relying on
default behavior.
2014-07-22 09:47:35 -05:00
Luke Imhoff f3eb708dd1
Update metasploit_data_models and metasploit-credential for tag search
MSP-10029

Use metasploit_data_models that supports searching Mdm::Tag and a
compatible metasploit-credential.  Needed so
Metasploit::Credential::Core#tags can be searched in Pro.
2014-07-22 09:07:18 -05:00
Luke Imhoff f8af435df6
Fix version restrictions on metasploit-credential
MSP-10029

The '<' version should have been '0.8' and not '0.7.10' because '0.8' is
the next incompatible version number.
2014-07-21 19:44:20 -05:00
Luke Imhoff 1a10b21e7f
Use metasploit-credential with association search
MSP-10029
2014-07-21 13:39:17 -05:00
Luke Imhoff a4e5c36de5
Update to metasploit-credential to use gem.
MSP-10808
2014-07-21 12:57:20 -05:00
Samuel Huckins ed1ed5d5a4 Merge pull request #117 from rapid7/feature/MSP-9943/db-import-creds
Deprecation warning exorcised, specs passing, export/import accuracy confirmed.

MSP-9943 #land
2014-07-18 11:56:59 -05:00
James Lee 2eea95e120
Silence warnings about I18n defaults 2014-07-18 11:49:49 -05:00
James Lee 175d857611
Fix empty message and don't lie in yardoc 2014-07-18 11:36:31 -05:00
James Lee 2dab69d67c
Use constant instead of hardcoded filename 2014-07-17 16:04:25 -05:00
James Lee 7d1cd22aca
Quick and dirty import of cred zip 2014-07-17 15:59:16 -05:00
Kyle Gray 08cd2690f9
Merge branch 'bug/MSP-10724/fix-import-failure' into staging/electro-release MSP-10724 #land 2014-07-17 13:37:13 -05:00
Samuel Huckins fd2a12da43 Merge pull request #115 from rapid7/bug/MSP-10730/finish-login-status-move
Specs passing, no hits on Metasploit::Credential::Login::Status across all projects aside from coverage docs (3).

MSP-10730 #land
2014-07-17 10:55:46 -05:00
Trevor Rosen e789d5350b
No idea why this didn't fail before
MSP-10724
2014-07-17 10:15:22 -05:00
Trevor Rosen bebf11c969
Resolves some Login::Status migration issues
MSP-10730
2014-07-16 21:52:08 -05:00
Brandon Turner ff017f83f7 Merge pull request #105 from rapid7/bug/MSP-10684-electro-installers
MSP-10684 Allow declaring root via env var in gemspecs
2014-07-16 16:51:46 -05:00
Lance Sanchez 9addfcede7
Merge branch 'bug/MSP-10728/invalidate-login' into staging/electro-release 2014-07-16 16:20:40 -05:00
Lance Sanchez 7e338aa828
updating Gemfile.lock
MSP-10728
2014-07-16 16:19:59 -05:00
David Maloney 0d3abf26e8
use latest metasploit-credential 2014-07-16 15:38:50 -05:00
cdoughty-r7 1ad04eb2d9 Merge pull request #111 from rapid7/bug/MSP-10714-gem-version
Fix gem version to support rubygems < 2.1
2014-07-16 13:23:33 -05:00
David Maloney 8b9aa75c68 Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework-private into staging/electro-release 2014-07-16 12:54:37 -05:00
David Maloney 5534599cfc
fix for jtr warnings
remmove include for Jtr mixin in deprecated jtr_unshadow module

remove deprecated postgres_crack module
2014-07-16 12:52:29 -05:00
Samuel Huckins fc0c299db8 Merge pull request #113 from rapid7/bug/MSP-10721/gemspec-meterpreter-bins
Specs passing after bundle install, console starts up.
2014-07-16 12:36:50 -05:00
Brandon Turner e637237574
Use the Rubygems 2.2 version convention
Substitute version dashes with ".pre.".

MSP-10714
2014-07-16 11:13:14 -05:00
Lance Sanchez 1e2df81397
Attempting to fix a gemfile mergeconflict
MSP-10721
2014-07-16 10:22:27 -05:00
David Maloney 098054e902
gemfile.lock 2014-07-16 09:45:59 -05:00
David Maloney 52a29856b3
Merge branch 'master' into staging/electro-release
Conflicts:
	Gemfile
	Gemfile.lock
2014-07-16 09:38:44 -05:00
dmaloney-r7 c288e6625b Merge pull request #112 from rapid7/bug/MSP-10718/metasploit-credential-constant-refactor
Fix bugs due to Metasploit::Model::Login::Status refactor
2014-07-16 09:23:31 -05:00
Matt Buck eff2defdde
Fix bug due to Metasploit::Model::Login::Status refactor
MSP-10718
2014-07-16 04:14:45 -05:00
Trevor Rosen 2f460f32c3
Fix Gemfile deps 2014-07-15 21:52:57 -05:00
Trevor Rosen 17c3e61322 Merge pull request #110 from rapid7/feature/MSP-10711/login-status
Feature/msp 10711/login status

MSP-10711
2014-07-15 21:47:37 -05:00
Brandon Turner 252c359f2a
Update Gemfile.lock with new framework version 2014-07-15 19:25:36 -05:00
Brandon Turner 044fdb8c55
Fix gem version to support rubygems < 2.1
MSP-10714
2014-07-15 19:02:39 -05:00
sinn3r f8e47a5c61
Land #3524 - WPTouch fileupload exploit 2014-07-15 16:29:59 -05:00
David Maloney ea57ad0126
fix connection error on base
missed a reference to connection_error on the
loginscanner base. this would prevent us from
bailing out early if we have too many connection errors
2014-07-15 16:21:13 -05:00
Spencer McIntyre e58100fe85
Land #3419, multi script delivery module by @jakxx 2014-07-15 17:07:51 -04:00
Spencer McIntyre 1a8d73fca8 Minor whitespace and grammar changes 2014-07-15 17:00:28 -04:00
David Maloney 7c0633f0a7
gemfile fix 2014-07-15 15:38:02 -05:00
David Maloney 674447c891
final cleanup steps 2014-07-15 15:31:51 -05:00
David Maloney 7ac6640cfd
Merge branch 'staging/electro-release' into feature/MSP-10711/login-status
Conflicts:
	Gemfile
	Gemfile.lock
	modules/auxiliary/scanner/smb/smb_login.rb
2014-07-15 15:12:33 -05:00
dmaloney-r7 4d3bfcf9d0 Merge pull request #109 from rapid7/bug/MSP-10713/smb-error-code
Move error_name to InvalidPacket and check for nil
2014-07-15 15:10:37 -05:00
James Lee 51a9a763c0
Move error_name to InvalidPacket and check for nil
MSP-10713
2014-07-15 15:02:53 -05:00
David Maloney 34635ab968
module login status cleanup
cleanup several bruteforce module to
use the loginstatus constants for result status
2014-07-15 14:55:41 -05:00
David Maloney 9857bac6b1
add NO_AUTH_REQUIRED 2014-07-15 14:38:41 -05:00
Samuel Huckins a4ff2fdd50 Merge pull request #108 from rapid7/feature/MSP-9948/update-db-import
Specs and functional now passing with latest update.

MSP-9948 #land
2014-07-15 13:36:43 -05:00
Trevor Rosen 6a1149c1ed
Add missing origin
MSP-9948
2014-07-15 13:27:08 -05:00
David Maloney 939e585658
refactor all loginscanners
loginscanners now use LoginStatus constants
for the result statuses
2014-07-15 13:17:56 -05:00
David Maloney 846679bef9
change Result status
result bojects now use Login::status constants
for their status
2014-07-15 11:39:38 -05:00
sinn3r 57b1023592
Land #3522 - Multi Gather Dbvis Connections Settings 2014-07-15 11:34:02 -05:00
sinn3r 1d6f088eab Pass msftidy 2014-07-15 11:31:37 -05:00
Tod Beardsley 1cac801158
Land #3527 from @wchen-r7, doc update 2014-07-15 10:50:36 -05:00