David Maloney
b1d1e4fc04
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
2014-07-23 12:08:56 -05:00
David Maloney
b7d15d0b08
simple fix to mysql loginscanner
...
typo caused connection_timeout default to not get set
2014-07-23 12:07:57 -05:00
James Lee
4f19a1defa
Add an origin type and actually honor realm
...
Also adds better help text
2014-07-22 19:52:10 -05:00
David Maloney
1f007bf3c9
start adding new rpc calls
...
Signed-off-by: David Maloney <DMaloney@rapid7.com>
2014-07-22 15:46:27 -05:00
Trevor Rosen
a338b4a11c
Merge branch 'feature/MSP-10029/core-search' into staging/electro-release
...
Support search
2014-07-22 14:50:38 -05:00
David Maloney
e54f5e8ee7
working snmp_login module
2014-07-22 12:44:21 -05:00
David Maloney
c553fcac73
start refacotirng snmp_login
2014-07-22 11:46:22 -05:00
David Maloney
0eb4fc0ed1
community string collection
...
add community string collection to handle snmp loginscanner
credentials
2014-07-22 11:44:31 -05:00
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
James Lee
2013e28608
WIP: First stab at creds add-* subcommands
2014-07-22 02:05:55 -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
James Lee
addecb6311
Fix running shipped bins by using a config file
...
This should get everything working again.
MSP-10817
2014-07-21 18:26:50 -05:00
James Lee
917d2c718b
Use All4 instead of LanMan
...
... Which was the original behavior. A full incremental LanMan can take
many hours instead of the few seconds this module was intended to run.
2014-07-21 18:24:35 -05:00
James Lee
a2a75ffb03
Fix typo and full path issue
...
Previously, the JtR library was prepending the path to data/john/ for
shipped bins; without it, modules weren't finding the executables.
2014-07-21 17:58:27 -05:00
Joe Vennix
9db951cadc
Add sane defaults for HTTP method and path.
2014-07-21 14:57:28 -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