infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,036 Commits
7 Branches
556 Tags
419 MiB
Commit Graph

26036 Commits (d7a0c1f3e809aaf0f1a97b4018911050c13957e4)

Author SHA1 Message Date
Luke Imhoff d7a0c1f3e8
Optionally require 'active_record/railtie` in Rakefile 
MSP-10905

Require in Rakefile so that db tasks are defined.  Make it optionally so
that `rake` doesn't error out when metasploit-framework installed with
`bundle install --without db`.
 2014-07-30 10:10:20 -05:00
Luke Imhoff ceb8a0f5c2
Extract option require pattern to helper Module 
MSP-10905

`Metasplot::Framework::Require.optionally` can be used to optionally
require a library and then issue a warning if the require fails or run a
block when it succeeds.
 2014-07-30 10:07:53 -05:00
Luke Imhoff 1a6d4843c7
Merge branch 'staging/electro-release' into bug/MSP-10905/msfconsole-database 
MSP-10905
 2014-07-29 15:52:11 -05:00
Luke Imhoff a77ca325ea
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-07-29 15:51:48 -05:00
Luke Imhoff ba4891bca0
Restore Rails.groups arguments 
MSP-10905

They don't cause a problem.
 2014-07-29 15:50:52 -05:00
Luke Imhoff f5ff22eba4
msfconsole with bundle install --without db 
MSP-10905
 2014-07-29 14:46:44 -05:00
Luke Imhoff 38da44c26b
Fix arity difference between rails and msfconsole options 
MSP-10905
 2014-07-29 14:32:42 -05:00
Luke Imhoff 04541ac724
Parse msfconsole options before initializing Rails 
MSP-10905
 2014-07-29 14:07:14 -05:00
Luke Imhoff 8e7dd1b658
Add missing require 
MSP-10905
 2014-07-29 14:06:27 -05:00
Luke Imhoff 9a5085cbba
Prevent circular dependency 
MSP-10905

Use Metasploit::Framework::Version directly instead of
Msf::Framework to prevent circular dependency when starting msfconsole.
 2014-07-29 14:04:15 -05:00
Luke Imhoff 24a5a155f4
Require gems 
MSP-10905
 2014-07-29 14:02:56 -05:00
jvennix-r7 0876302fba Merge pull request #3580 from dmaloney-r7/bug/MSP-10869/credential-parent 
Credential Parent References
 2014-07-29 14:00:59 -05:00
Luke Imhoff 539817fddb
Add metasploit-model as a direct dependency 
MSP-10905

Metasploit::Model constants need to be accessible without the db group
installed.
 2014-07-29 13:55:56 -05:00
David Maloney 78a3263cfe
have Credentials remember their aprents 
a Credential object can be created from several
other types of objects. Keep a reference to the originating
'parent' so we can find our way back
 2014-07-29 11:20:52 -05:00
Luke Imhoff 533d0be2fb
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release 2014-07-28 12:12:45 -05:00
David Maloney 7a49f218d4
update .yardopts 2014-07-24 13:59:04 -05:00
James Lee 5286b7cc22
Land #3566, ducktype better 2014-07-24 11:19:40 -05:00
darkbushido 064d624322
changing Credential == operator 
it should no longer raise no method errors when comparing a credential to
an object that doesnt respond to public, private, or realm
 2014-07-23 16:17:09 -05:00
Samuel Huckins 6c1a3f4992 Merge pull request #3555 from jlee-r7/bug/MSP-10817/jtr-typo 
Now able to complete without error.

MSP-10817 #land
 2014-07-23 15:55:42 -05:00
James Lee eee72a86ba
Fix the case when john cracks only half of LM 2014-07-23 15:25:32 -05:00
Samuel Huckins ffd7d28bc6 Merge pull request #3559 from dmaloney-r7/feature/MSP-10230/snmp_login 
MSP-10230 #land
 2014-07-23 13:59:37 -05:00
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
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
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