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
Meatballs
e05904c3f3
Land #3597 , script/web_delivery powershell fixes
2014-07-31 23:00:31 +01:00
Meatballs
bff8a734ae
Fix and be Architecture Agnostic
2014-07-31 22:58:43 +01:00
James Lee
62240537db
Refactor sso to use Credential::Creation
2014-07-31 16:06:23 -05:00
Spencer McIntyre
5a25120660
Apply rubocop changes to multi/script/web_delivery
2014-07-31 16:16:23 -04:00
Spencer McIntyre
8af4c496c9
Add a missing include and require statement for psh
2014-07-31 16:08:25 -04: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
Samuel Huckins
735687e6a1
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
2014-07-31 12:31:27 -05:00
Luke Imhoff
38c6e2d3e0
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-31 10:16:00 -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
Luke Imhoff
73ed9f89f0
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-31 08:31:37 -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
James Lee
1c35ec4271
Land #3585 , fix fd leak in pwdump import
...
Conflicts:
db/schema.rb
2014-07-30 15:17:27 -05:00
James Lee
23b04c8ece
Fix post/test/* modules' loadpath
...
Allows loading when pwd is not framework's install root
2014-07-30 14:21:42 -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
Samuel Huckins
1e7ef15923
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
2014-07-30 13:13:08 -05:00
Matt Buck
f7aa324c35
Update metasploit-model and metasploit_data_models deps
2014-07-30 13:10:09 -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
Samuel Huckins
8a3df99b01
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
2014-07-30 12:36:03 -05:00
Luke Imhoff
14341c68a3
Merge remote-tracking branch 'upstream/staging/electro-release' into staging/electro-release
2014-07-30 12:24:10 -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
James Lee
ef59d88f64
Fix spec failure due to workspace mismatch
...
Also fixes intermittent failure from FactoryGirl picking a heinous
Origin type.
2014-07-30 11:26:35 -05:00
Luke Imhoff
e4f665fe72
Require 'active_record/railtie' for specs
...
MSP-10905
2014-07-30 11:10:02 -05:00
jvazquez-r7
4ed085d0d2
Land #3581 , @FireFart's update for W3 Total Cache Hash extract module
2014-07-30 10:45:11 -05:00
jvazquez-r7
674c3ca260
Use [] for references
2014-07-30 10:44:42 -05:00
Tod Beardsley
7bf9d25221
Also remove the offenses from the todo
2014-07-30 10:30:58 -05:00
jvazquez-r7
a79eec84ac
Land #3584 , @FireFart's update for wp_asset_manager_upload_exec
2014-07-30 10:28:51 -05:00
Tod Beardsley
49e48566da
Ignore PercentLiteralDelimiters and WordArray
...
Per a discussion in IRC, these rules in particular don't
appear to be valuable for Metasploit at this stage.
2014-07-30 10:28:12 -05:00
jvazquez-r7
9de8297848
Use [] for References
2014-07-30 10:28:00 -05:00
jvazquez-r7
313fd6ffab
Land #3582 , @FireFart's rubocop cleanup for wp_property_upload_exec
2014-07-30 10:24:58 -05:00
jvazquez-r7
58fbb0b421
Use [] for References
2014-07-30 10:24:14 -05:00
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
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
Anwar Mohamed
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
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
Joe Vennix
c52b72830a
Merge branch 'android_ext2' of github.com:AnwarMohamed/metasploit-framework into anwar-android-bins
2014-07-29 23:58:42 -07:00
Samuel Huckins
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
HD Moore
318418a90b
Lands #3589 , adds rhost:rport to vmware fingerprint
2014-07-29 18:50:53 -05:00
jvazquez-r7
1fe459eb42
Add info to know where the info comes from
2014-07-29 18:47:40 -05:00
Tod Beardsley
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