Commit Graph

15128 Commits (3df9dfcea259a9aed7addc0a497bdfd16c80e3c6)

Author SHA1 Message Date
James Lee 3df9dfcea2 Disable CI testing on 1.8.7 for now
To stop the flood of everything-is-broken emails
2012-11-07 20:53:55 -06:00
James Lee dee89bdfa0 Merge branch 'rapid7' into feature/travis-ci.org
Conflicts:
	README.md
2012-11-07 19:43:32 -06:00
James Lee 8a4fb07a0c Merge branch 'bug/read-module-content-errno-enoent' into rapid7
Really [Closes #1025]
2012-11-07 19:25:39 -06:00
James Lee aaa5a3c0bb Add "Call stack:" to the log when a module load fails 2012-11-07 12:48:55 -06:00
David Maloney 04a80e0648 Fixes to the WMI setup 2012-11-07 11:26:48 -06:00
David Maloney 208e706307 Module title fixes 2012-11-07 10:33:14 -06:00
Tod Beardsley 81ed0bbcce Avoiding 1.8.7 variable assignment incompat.
Reported on twitter:

http://twitter.com/SoapyWetDish/status/266155915256938496
2012-11-07 10:10:13 -06:00
Tod Beardsley 0ed3614576 Merge pull request #1036 from rapid7/feature/codeclimate.com
Add codeclimate button to README
2012-11-07 07:39:46 -08:00
Luke Imhoff baffd09ce1 Fix alignment of button and header 2012-11-07 08:51:00 -06:00
Luke Imhoff 5dceda279a Fix alignment of button and header 2012-11-07 08:48:48 -06:00
Luke Imhoff 4392d163a1 Add codeclimate button to README
Add the codeclimate button so users can quickly jump to the code quality
metrics.  This keeps metasploit-framework inline with other open source
ruby projects like https://github.com/rspec/rspec-rails that also uses
the codeclimate button.
2012-11-07 08:36:57 -06:00
Luke Imhoff 726cf8bb94 travis-ci.org integration
Add the .travis.yml so that travis-ci.org knows which rubies (1.8.7 and
1.9.3 to run rake against.  Add the build status button to the README.md
so that people can see if the specs are passing from the main
rapid7/metasploit-framework page on github just like other open source
projects.
2012-11-07 08:29:44 -06:00
Luke Imhoff 3ad00f7c63 Merge branch 'master' into bug/read-module-content-errno-enoent 2012-11-06 17:39:55 -06:00
Luke Imhoff 16407f91c8 Rescue Errno::ENOENT from File.open in read_module_content
[Fixes #38426061, #38097411]

Msf::Modules::Loader::Directory#read_module_content may calculate a non-existent
module_path that gets passed to File.open causing an Errno::ENOENT exception
to be raised when using the module cache with a module that has been
moved to a new path (as is the case that originally found this bug) or
deleted.  Now, the exception is rescued and read_module_content returns
an empty string (''), which load_module detects with
module_content.empty? and returns earlier without attempting to module
eval the (empty) content.

As having Msf::Modules::Loader::Directory#read_module_content rescue the
exception, meant there was another place that needed to log and error
and store an error in Msf::ModuleManager#module_load_error_by_path, I
refactored the error reporting to call
Msf::Modules::Loader::Base#load_error, which handles writing to the log
and setting the Hash, so the error reporting is consistent across the
loaders.

The exception hierarchy was also refactored so that
namespace_module.metasploit_class now has an error raising counter-part:
namespace_module.metasploit_class! that can be used with
Msf::Modules::Loader::Base#load_error as it requires an exception, and
not just a string so the exception class, message, and backtrace can be
logged.
2012-11-06 17:38:38 -06:00
Luke Imhoff 236db52d3d Add simplecov for code coverage
Conflicts:
	Gemfile.lock
2012-11-06 16:30:41 -06:00
Tod Beardsley b973927ab2 Msftidy on digi_addp_reboot and pgpass_creds 2012-11-05 16:19:38 -06:00
jvazquez-r7 9166d12179 Merge branch 'WinRM_piecemeal' of https://github.com/dmaloney-r7/metasploit-framework into dmaloney-r7-WinRM_piecemeal 2012-11-05 23:08:59 +01:00
Tod Beardsley 70d53b4e2d Merge remote branch 'jvazquez-r7/emc_networker_format_string' 2012-11-05 16:03:56 -06:00
jvazquez-r7 77b1e9e648 added comment about ropdb 2012-11-05 23:02:23 +01:00
Tod Beardsley e385aad9e5 Merge remote branch 'jvazquez-r7/emc_networker_format_string' 2012-11-05 16:02:18 -06:00
Tod Beardsley 23cc2bd1a1 Merge remote branch 'origin/master' 2012-11-05 15:56:21 -06:00
Tod Beardsley 6a4d398b5d Merge remote branch 'origin/feature/addp-modules' 2012-11-05 15:55:30 -06:00
jvazquez-r7 0f5f5f966b Merge branch 'master' into feature/realport-modules 2012-11-05 22:52:38 +01:00
David Maloney 9d5ab5a66f Stupid typing error 2012-11-05 15:41:47 -06:00
James Lee ac6f984fbf Merge @todb-r7's msfupdate for git stuff
[Closes #1014]
2012-11-05 15:10:04 -06:00
Tod Beardsley da9963d3d9 Be verbose about stashes 2012-11-05 14:52:14 -06:00
Tod Beardsley 8ebaee4b7c Don't just trash local changes 2012-11-05 14:37:32 -06:00
David Maloney 314026ed0e Some error checking and fixups 2012-11-05 13:29:57 -06:00
Tod Beardsley d3cb9c141d No longer TODO on the deprecation duh 2012-11-05 12:32:36 -06:00
Tod Beardsley c8fd6ded0c Slightly better margins for deprecation 2012-11-05 12:15:11 -06:00
Tod Beardsley 628f676b21 Fill in the deprecation warning 2012-11-05 12:13:10 -06:00
Tod Beardsley 0d7de4b575 Allow for naming a git remote/branch 2012-11-05 11:56:05 -06:00
Tod Beardsley df53409b2d Make msfbase_dir an instance variable 2012-11-05 11:48:09 -06:00
Tod Beardsley 0f40fabfcd Oops on is_svn 2012-11-05 11:46:50 -06:00
Tod Beardsley b7eca59934 Allow for switching between git and svn
Depending on the kind of checkout, msfupdate should be smart about this.
This was first proposed by @corelanc0d3r I believe, but rejected because
it didn't seem to solve any immediate problem. Now, it does, as we are
ditching SVN Real Soon Now for performance reasons.

This change is minimal functionality and doesn't handle switching over
from one to the other.
2012-11-05 11:44:53 -06:00
David Maloney 7c141e11c4 Hopefully final touches
Some smftidy cleanup, and added a method to check that the payload is
the correct arch when using the powershell method
2012-11-05 10:06:57 -06:00
James Lee 85dd212456 Merge branch 'bug/wrong-file_changed-argument' into rapid7
[Closes #965]
2012-11-05 09:54:30 -06:00
jvazquez-r7 04668c7d61 fix response codes check to avoid second tries to fail 2012-11-05 09:26:26 +01:00
HD Moore 3d7e0b7b3d Fix bad indent that snuck into the comments 2012-11-04 22:50:47 -06:00
HD Moore dccfb63bd6 Cleanup based on PR #1008 feedback 2012-11-04 22:47:56 -06:00
HD Moore 36f82fba09 Remove unused version fields from template 2012-11-04 22:38:31 -06:00
HD Moore ae9b462b99 Fix baud rate (see PR #1008) 2012-11-04 22:38:16 -06:00
David Maloney 25a6e983a1 Remove the older modules 2012-11-04 14:48:34 -06:00
David Maloney fca8208171 Some minor code cleanup 2012-11-04 14:45:15 -06:00
David Maloney f69ccc779f Unified smarter module 2012-11-04 13:14:02 -06:00
David Maloney c30ada5eac Adds temp vbs mod and tweaked decoder stub 2012-11-04 12:49:15 -06:00
HD Moore 963fdd6430 Initial commit for Digi RealPort modules 2012-11-03 17:44:53 -05:00
jvazquez-r7 88c99161b4 added universal target 2012-11-03 18:52:07 +01:00
jvazquez-r7 9576d26299 Merge branch 'bitweaver_traversal' of https://github.com/wchen-r7/metasploit-framework into wchen-r7-bitweaver_traversal 2012-11-03 18:25:46 +01:00
jvazquez-r7 b8eea1007f Added module for CVE-2012-2288 EMC Networker Format String 2012-11-03 18:17:12 +01:00