9de8297848
Use [] for References
2014-07-30 10:28:00 -05:00
313fd6ffab
Land #3582 , @FireFart's rubocop cleanup for wp_property_upload_exec
2014-07-30 10:24:58 -05:00
58fbb0b421
Use [] for References
2014-07-30 10:24:14 -05:00
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
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
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
8766faa14e
Merge pull request #4 from jvennix-r7/anwar-android-bins
...
Rebuilt Android bins, remove store_loot calls
2014-07-30 13:07:53 +02:00
ed6594ddb8
Change filename to calllog_dump.
2014-07-30 00:16:23 -07:00
ece3b5583a
Revert to file-based solution.
2014-07-30 00:13:44 -07:00
c52b72830a
Merge branch 'android_ext2' of github.com:AnwarMohamed/metasploit-framework into anwar-android-bins
2014-07-29 23:58:42 -07:00
be18dddac7
Merge branch 'staging/electro-release' of github.com:shuckins-r7/metasploit-framework into staging/electro-release
2014-07-29 20:50:05 -05:00
318418a90b
Lands #3589 , adds rhost:rport to vmware fingerprint
2014-07-29 18:50:53 -05:00
1fe459eb42
Add info to know where the info comes from
2014-07-29 18:47:40 -05:00
adf03e28ce
Fix SpaceBeforeModifierKeyword Rubocop warning
...
This also deals with some errant tabs where internal spaces should be,
as well as one syntax error which was preventing an old meterpreter
script from ever working correctly.
Some day, we need to get rid of those Meterpeter scripts. Srsly.
2014-07-29 17:10:54 -05:00
1e47383118
Add .rubocop_todo.yml
2014-07-29 16:54:19 -05:00
4871492ec1
Tidy up .rubocopy.yml
...
This alphabetizes the configuration for rubocop.yml and preps for a
rubocop auto-config so we're not constantly hit with warnings.
2014-07-29 16:48:49 -05:00
1a6d4843c7
Merge branch 'staging/electro-release' into bug/MSP-10905/msfconsole-database
...
MSP-10905
2014-07-29 15:52:11 -05:00
a77ca325ea
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-29 15:51:48 -05:00
ba4891bca0
Restore Rails.groups arguments
...
MSP-10905
They don't cause a problem.
2014-07-29 15:50:52 -05:00
8fda4ee239
Fix fd leak and blind IO#gets in pwdump import
...
MSP-10715
2014-07-29 15:15:47 -05:00
f5ff22eba4
msfconsole with bundle install --without db
...
MSP-10905
2014-07-29 14:46:44 -05:00
38da44c26b
Fix arity difference between rails and msfconsole options
...
MSP-10905
2014-07-29 14:32:42 -05:00
04541ac724
Parse msfconsole options before initializing Rails
...
MSP-10905
2014-07-29 14:07:14 -05:00
8e7dd1b658
Add missing require
...
MSP-10905
2014-07-29 14:06:27 -05:00
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
24a5a155f4
Require gems
...
MSP-10905
2014-07-29 14:02:56 -05:00
75057b5df3
Fixed variable
2014-07-29 21:02:15 +02:00
0876302fba
Merge pull request #3580 from dmaloney-r7/bug/MSP-10869/credential-parent
...
Credential Parent References
2014-07-29 14:00:59 -05:00
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
cc3285fa57
Updated checkcode
2014-07-29 20:53:54 +02:00
61ab88b2c5
Updated wp_asset_manager_upload_exec module
2014-07-29 20:53:18 +02:00
e438c140ab
Updated wp_property_upload_exec module
2014-07-29 20:34:34 +02:00
3d2a62bc29
Updated W3 Total Cache Hash extract module
2014-07-29 19:49:48 +02:00
1ee32b3b98
Bump metasploit-model so we can use Realm::Key map
2014-07-29 12:19:03 -05:00
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
c2be3d6875
fixing autoload bug
2014-07-29 17:51:56 +02:00
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
b02dbcc2e7
remove extra whitespace
2014-07-29 16:23:27 +02:00
7512e04894
fixing autoload
2014-07-29 16:21:31 +02:00
820ea7e50b
Land #3577 , @FireFart's update for wordpress foxypress module
2014-07-29 09:10:07 -05:00
6bbb2124a7
bug fixing
2014-07-29 15:49:14 +02:00
d6c7eb8850
Fixed a typo introduced in commit 9e92448
2014-07-29 09:04:12 +02:00
27444e61ef
Merge branch 'android_ext2' of github.com:AnwarMohamed/metasploit-framework into anwar-android-bins
2014-07-28 21:30:04 -07:00
2efeb850ee
Added spec to lib/msf/http/jboss
2014-07-29 02:04:57 +02:00
9e9244830a
Added spec for lib/msf/http/jboss
...
Also renamed get_undeploy_bsh and get_undeploy_stager to
gen_undeploy_bsh and gen_undeploy_stager to be consistent
with the other functions
2014-07-29 01:57:04 +02:00
0208420a67
Land #3565 , GNOME Commander post module
2014-07-28 17:28:36 -05:00
f4bd44d9c6
Fix outstanding issues
2014-07-28 17:28:15 -05:00
a904ed8507
Update gnome_commander_creds.rb
2014-07-28 22:49:13 +02:00
b121bf6d6c
Update gnome_commander_creds.rb
2014-07-28 22:46:50 +02:00
621e85a32d
Correct version
2014-07-28 22:45:04 +02:00
jvazquez-r7
Luke Imhoff
Trevor Rosen
Anwar Mohamed
Joe Vennix
Samuel Huckins
HD Moore
Tod Beardsley
Trevor Rosen
Christian Mehlmauer
James Lee
David Maloney
AnwarMohamed
us3r777
William Vu
David Bloom