Commit Graph

15160 Commits (e057467329e98ff334820916e924d601af3371f8)

Author SHA1 Message Date
Meatballs1 e057467329 Initial attempt 2012-11-18 21:24:49 +00:00
Tod Beardsley 54c83d98fd Merge remote branch 'jlee-r7/travis-notifications' 2012-11-09 15:10:03 -06:00
James Lee b8e3bfe1da Add IRC notifications and allow 1.8.7 to fail
This should tell travis to run the tests against 1.8.7 but not to
consider the whole build broken if it fails (which it currently does)
2012-11-09 15:02:09 -06:00
Tod Beardsley 1b9d45e106 Test for subdom_list existence first
Otherwise, you get

````
[11/09/2012 14:50:38] [e(0)] core: Error running against host
173.236.237.136: can't convert nil into String
````

Other than that, looks good.

[Fixes #851]
2012-11-09 15:01:36 -06:00
Tod Beardsley 171ebe13cd Whitespace fix for vhost_scanner 2012-11-09 14:48:46 -06:00
Tod Beardsley b1c35fdb24 Merge remote branch 'sempervictus/http_vhost_scanner_from_file' 2012-11-09 14:46:54 -06:00
Tod Beardsley 9a94fef8d0 Merge branch 'llmnr-spoof' 2012-11-09 14:36:04 -06:00
Tod Beardsley a6fd0fee1c Fix up notification to not spam or hide
Instead of hiding the success notification in vprint, it should print,
but not every time. This fix thottles the notification to ten seconds
per host.

[Fixes #731]
2012-11-09 14:31:28 -06:00
Tod Beardsley 6cd5b79b60 Getting rid of Id and Revision 2012-11-09 13:30:14 -06:00
Chris John Riley 08d56e31e1 recreated in new branch
removed space at EOL
2012-11-08 22:38:21 +01:00
jvazquez-r7 b75c622813 Merge branch 'master' into feature/udp-scanner-mixin 2012-11-08 20:15:25 +01:00
Tod Beardsley c196cac398 Merge remote branch 'jlee-r7/bug/rm7037-hash-iteration'
Hopefully I have the commit message hook right now.

[Fixes #39207979]
2012-11-08 10:29:12 -06:00
James Lee 57bb23ce3d Fix 1.9ism that breaks specs on 1.8 2012-11-08 09:55:29 -06:00
HD Moore 5ad2749cee Rework ADDP modules to use the new mixin 2012-11-08 06:40:32 -06:00
HD Moore 0e8a3f0ea6 Merge branch 'master' into feature/udp-scanner-mixin 2012-11-08 06:09:22 -06:00
HD Moore e008120c11 Bug fixes to the SSDP discovery module 2012-11-08 06:08:49 -06:00
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 5670d2266b Merge branch 'rapid7' into bug/rm7037-hash-iteration 2012-11-07 19:45:08 -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 2ebe2fa08e Merge branch 'rapid7' into bug/rm7037-hash-iteration 2012-11-07 19:27:11 -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 26a145e527 Always overwrite the old module even when ambiguous 2012-11-07 18:51:12 -06:00
James Lee 3a572625f5 return inside a block returns from outer method
So no need to check its return value.
2012-11-07 17:43:22 -06:00
James Lee ce60a1ea73 Merge branch 'bug/read-module-content-errno-enoent' into rapid7
[Closes #1025]
2012-11-07 12:53:43 -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
HD Moore aa8549fb6b Correct use of rport. 2012-11-05 15:57:59 -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