David Maloney
dbde046f44
use to_h instead of to_hash
...
apparently ruby 2 adds this as a standard method so
we should stay compliant
2014-08-01 09:45:51 -05:00
David Maloney
0e65792f43
Merge branch 'staging/electro-release' into feature/loginscanner-report-dry
2014-08-01 09:41:30 -05:00
Meatballs
4ef3de84f3
get some more test cases
2014-08-01 14:34:17 +01:00
Brandon Turner
0ad2a7c89b
Bump version to 4.10.0
2014-07-31 23:43:46 -05:00
David Maloney
374c6532fa
add to_hash to Credential
...
begining of the chain to DRYing up
credential reporting in the loginscanner
2014-07-31 18:10:48 -05:00
Meatballs
902cf4bc1e
Fix var name
2014-07-31 23:16:53 +01:00
Meatballs
90c0f587bf
Fix for newer powershell
2014-07-31 23:11:51 +01:00
Meatballs
15c1ab64cd
Quick rubocop
2014-07-31 23:11:00 +01:00
Meatballs
d336c56b99
Merge remote-tracking branch 'upstream/master' into land_2551
2014-07-31 23:06:37 +01:00
darkbushido
ad6eed01a2
.to_credential now assigns a parent
...
Metasploit::Credential::Core#to_credential will set the parent to the original core objext
Metasploit::Framework::Credential#to_credential also sets the parent to itself.
2014-07-31 14:52:27 -05:00
Luke Imhoff
7cc5af589f
Only require config/application.rb when Rails.application not set
...
MSP-10964
Allows other Rails::Applications to use the commands.
2014-07-31 13:32:22 -05:00
Luke Imhoff
f9ab7f7a88
Only error out if Rails.env differs from options.environment
...
MSP-10964
2014-07-31 13:28:21 -05:00
Luke Imhoff
aa2e26f8f2
Allow RAILS_ENV to override default environment of 'production'
...
MSP-10964
2014-07-31 13:24:23 -05:00
William Vu
0546282441
Land #3590 , #3574 reversion
2014-07-31 09:59:04 -05:00
James Lee
6a72572237
Wrap comments at 80
2014-07-31 09:41:08 -05:00
James Lee
735ccda4db
Add an example for add-ssh-key
2014-07-31 09:40:36 -05:00
Meatballs
53b66f3b4a
Land #2075 , Powershell Improvements
2014-07-31 00:49:39 +01:00
James Lee
77d99b7374
Land #3586 , fix msfconsole when running without db
...
Conflicts:
Gemfile.lock
metasploit-framework.gemspec
2014-07-30 17:24:21 -05:00
Tod Beardsley
3320a1ef77
Revert PR #3574
...
This reverts commit 96945442ff
.
With this PR, the following now appears in framework.log:
````
[07/30/2014 14:01:37] [e(0)] core: Error updating module details for
auxiliary/fuzzers/http/http_form_field: NoMethodError undefined method
`name' for []:Array
````
2014-07-30 14:06:46 -05:00
Trevor Rosen
3e915e5059
Merge branch 'staging/electro-release' into bug/MSP-10715/import-security-issues
...
Update deps
Conflicts:
Gemfile
Gemfile.lock
2014-07-30 12:49:15 -05:00
Trevor Rosen
ea72a7e5c3
Merge pull request #3583 from jlee-r7/feature/MSP-9932/creds-add-subcommands
...
Add `creds` subcommands
MSP-9932 #land
2014-07-30 12:01:36 -05:00
James Lee
85b00eede6
Add #present? checks
2014-07-30 11:52:59 -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
Trevor Rosen
d863ff907e
Merge pull request #3576 from dmaloney-r7/feature/MSP-9641/cred-rpc-calls
...
Feature/msp 9641/cred roc calls
MSP-9641 #land
2014-07-30 09:40:38 -05:00
Joe Vennix
ed6594ddb8
Change filename to calllog_dump.
2014-07-30 00:16:23 -07:00
Joe Vennix
ece3b5583a
Revert to file-based solution.
2014-07-30 00:13:44 -07: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
ba4891bca0
Restore Rails.groups arguments
...
MSP-10905
They don't cause a problem.
2014-07-29 15:50:52 -05:00
Trevor Rosen
8fda4ee239
Fix fd leak and blind IO#gets in pwdump import
...
MSP-10715
2014-07-29 15:15:47 -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
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
AnwarMohamed
c2be3d6875
fixing autoload bug
2014-07-29 17:51:56 +02:00
James Lee
ef7f5fe967
Make metasploit-model a direct dep
...
Needed for all the scanners that use Metasploit::Model::Realm::Key
constants.
2014-07-29 10:30:46 -05:00
AnwarMohamed
b02dbcc2e7
remove extra whitespace
2014-07-29 16:23:27 +02:00
AnwarMohamed
7512e04894
fixing autoload
2014-07-29 16:21:31 +02:00
Christian Mehlmauer
d334797116
Updated foxpress module
2014-07-28 22:23:22 +02:00
David Maloney
3870b59873
remove rpg_get_auth_info
...
this is an rpc call that calls a method that
does not even exist...
WAT?!
2014-07-28 15:13:03 -05:00
David Maloney
c9d231b48b
remove old rpc methods
...
added rpc methods to create new creds
removing the old methods for
the obsolete cred models
2014-07-28 14:52:53 -05:00
David Maloney
e29b2aed9b
add credential rpc calls
2014-07-28 14:49:35 -05:00
James Lee
49d0fc37c2
Add support for different realm_key
2014-07-28 14:39:24 -05:00
William Vu
ba7d8efb07
Land #3574 , has_actions.rb cleanup
2014-07-28 12:59:33 -05:00
David Maloney
1e32574768
Merge branch 'staging/electro-release' into feature/MSP-9641/cred-rpc-calls
2014-07-28 11:10:59 -05:00
jvazquez-r7
79fe342688
Land #3558 , @FireFart's improvements to wordpress mixin
2014-07-28 09:52:20 -05:00
jvazquez-r7
2d5fd5e0d5
Use constant for WORDPRESS_VERSION_PATTERN
2014-07-28 09:22:50 -05:00
James Lee
c65db18090
Add rudimentary specs and fix some help wording
2014-07-28 09:19:09 -05:00
jvazquez-r7
b061d24b84
Favor & over and
2014-07-28 09:05:53 -05:00
AnwarMohamed
283046b25d
fixing auto load on new session
2014-07-28 10:49:50 +02:00
AnwarMohamed
9f0bf67521
fixing minor bugs
2014-07-28 07:49:46 +02:00
Joshua Smith
96945442ff
removes unnec. retruns & uses of 'not' - has_actions.rb
2014-07-27 18:20:12 -05:00
James Lee
a35e7371bb
Add simple tabbing for creds command
2014-07-27 14:08:38 -05:00
James Lee
b8bb4c7bc0
Add add-ssh-key to help output, fix some warnings
2014-07-27 13:46:38 -05:00
James Lee
a38a627b94
Merge branch 'staging/electro-release' into feature/MSP-9932/creds-add-subcommands
2014-07-27 13:38:33 -05:00
sinn3r
faee2c7026
Land #3492 - sqlmap plugin for sqlmap API
2014-07-25 16:30:30 -05:00
Tod Beardsley
3e304536ea
Land #3554 , Typo3 mixin specs
2014-07-25 16:06:40 -05:00
James Lee
a0a2fddee8
Land #3562 , yardoc cleanup
2014-07-24 17:25:12 -05:00
James Lee
bc836f3606
Add a little easter egg in the NTLM hash
2014-07-24 16:37:24 -05:00
James Lee
b8b3509c96
Re-add the ability to delete creds
2014-07-24 15:44:52 -05:00
James Lee
18ce342e2a
Refactor a bit for readability
2014-07-24 15:42:36 -05:00
James Lee
1470f3de30
Fix padding when a cell value is nil
2014-07-24 14:00:09 -05:00
James Lee
8a279d202c
Whitespace
2014-07-24 13:56:57 -05:00
James Lee
1a4e59e547
Add add-ssh-key subcommand
2014-07-23 17:09:02 -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
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
Christian Mehlmauer
57839e0f4b
Fix some yardoc issues
2014-07-22 23:26:50 +02: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
Christian Mehlmauer
c1a0f707ef
typos
2014-07-22 22:29:01 +02:00
Christian Mehlmauer
073a8c5233
redirection returns an URI
2014-07-22 19:55:26 +02:00
Christian Mehlmauer
a6479a77d6
Implented feedback from @jhart-r7
2014-07-22 19:49:58 +02: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
Christian Mehlmauer
baff003ecc
extracted check version to module
...
also added some wordpress specs and applied
rubocop
2014-07-22 17:02:35 +02:00
James Lee
2013e28608
WIP: First stab at creds add-* subcommands
2014-07-22 02:05:55 -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
Brandon Perry
d62b24744c
Moar " -> '
2014-07-21 18:04:36 -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
jvazquez-r7
47d9a30af0
Add specs for Typo3 mixin
2014-07-21 17:39:07 -05:00
Joe Vennix
9db951cadc
Add sane defaults for HTTP method and path.
2014-07-21 14:57:28 -05:00
sinn3r
6048f21875
Land #3552 - Correct DbVisualizer title name
2014-07-21 13:07:33 -05:00
Tod Beardsley
a62ee99d1d
Actually require NetAPI
2014-07-21 12:48:34 -05:00
Tod Beardsley
ffafd4c01f
Add NTP fuzzer from @jhart-r7
...
Looks good to me!
2014-07-21 12:38:12 -05:00
HD Moore
b3c7fff32a
Land #3551 , fix inconsistent pack/unpack usage
2014-07-20 17:11:49 -05:00
HD Moore
eea0b24aec
Land #3550 , fix railgun use of pack/unpack Q
2014-07-20 17:09:53 -05:00
Meatballs
3daf78777b
Use native unpack for PDWORDs
2014-07-20 22:57:19 +01:00
Meatballs
4fecae084b
Q (native) to Q< (le)
2014-07-20 22:38:30 +01:00
Meatballs
5f0533677e
Cheat/Rubycop all the things
2014-07-20 21:07:59 +01:00
Meatballs
474ee81807
Merge remote-tracking branch 'upstream/master' into pr2075
2014-07-20 21:01:54 +01:00
Meatballs
b28343842f
Address @jhart-r7's comments
2014-07-20 21:00:34 +01:00
scriptjunkie
8fe508207c
Merge Meatballs' gpp_again pull into new branch
2014-07-19 11:10:14 -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
175d857611
Fix empty message and don't lie in yardoc
2014-07-18 11:36:31 -05:00