Commit Graph

204 Commits

Author SHA1 Message Date
William Vu c642057fa0 Clean up module 2015-10-13 12:03:41 -05:00
Fernando Arias 393a71cf46 Merge branch 'master' of github.com:rapid7/metasploit-framework into bug/MSP-13119/rework-match-result-creation
Conflicts:
	Gemfile.lock
2015-09-29 15:00:22 -05:00
Fernando Arias 52e3405192 Passing report_exploit_success specs
MSP-13119
2015-09-23 11:12:02 -05:00
Fernando Arias dc84b3b1ba Passing report_exploit_failure specs
MSP-13119
2015-09-23 10:54:13 -05:00
dmohanty-r7 8b10cbe3fd Query for vulns without specifying service when service is nil
MSP-13284
2015-09-22 10:50:23 -05:00
Fernando Arias 9230b04674 Update match result creation logic
MSP-13119

* Look up match on match set for the run
* If no match exists in the match set for the vuln, attempt to create a match for the vuln
2015-09-22 00:24:38 -05:00
Fernando Arias d3a73149a2 Add specs around match result creation in exploit attempt
MSP-13119
2015-09-18 12:04:45 -05:00
Fernando Arias 5cf3ac23e2 Fix no method defined error when run_id is not passed down
* run_id is an optional param so we handle when it isn't set on user data

MSP-13119
2015-09-16 15:32:48 -05:00
HD Moore b7572d5494 Handle both serialized & unserialized cases on import 2015-09-16 08:11:15 -07:00
Fernando Arias 382e01d680 Add comments and use run scope on match
MSP-13119
2015-09-15 15:09:26 -05:00
Fernando Arias eb479318b1 Use existing run for match result or create a new one if it doesnt exist
MSP-13119
2015-09-15 14:34:44 -05:00
Fernando Arias c7f15ca940 Rework how match results get created
MSP-13119

* Create match result when we create vuln attempt
2015-09-14 12:18:47 -05:00
Fernando Arias 0bb03db786 Rework vuln lookup logic to account for vuln with no service (nexpose import vuln with -1 port)
MSP-13234
2015-09-09 13:21:05 -05:00
Fernando Arias ed1065b297 Create MatchResult with status Failure on session failure
MSP-13104
2015-08-24 12:56:32 -05:00
Dev Mohanty 68a802b980 Merge pull request #5834 from gmikeska-r7/bug/MSP-13064/SVV-validations-not-created
Bug/msp 13064/svv validations not created
2015-08-19 12:47:59 -05:00
jvazquez-r7 0aa958dac0 Allow unserialization on hosts v5 2015-08-17 13:47:52 -05:00
Greg Mikeska 790356bac8 add infer_vuln_from_session to other valid case
MSP-13065
2015-08-12 15:45:37 -05:00
Greg Mikeska 01b3ae2dd8 Revert "added infer_vuln_from_session to other valid case"
This reverts commit 53e747ce2e.
2015-08-12 15:43:16 -05:00
Greg Mikeska 53e747ce2e added infer_vuln_from_session to other valid case
MSP-13064
2015-08-12 15:35:03 -05:00
Trevor Rosen d53067b0b7 Fix ctype handling for body-less pages
#5515
2015-06-22 14:17:29 -05:00
g0tmi1k 6dcc9b7dab More inconsistencies 2015-06-12 21:59:15 +01:00
Christian Catalan 046003acb4 Increase REXML expansion text limit
MSP-9532

* Increase to reasonable size to handle larger xml file expansion on import
* Prevents the 'RuntimeError entity expansion has grown too large' error that prevents import
2015-05-19 12:47:19 -05:00
darkbushido 0b608e139a Merge branch 'upstream' into staging/rails-4.0 2015-05-01 11:26:24 -05:00
David Maloney 18874fe384 fixes Issue #5272 on report_vuln
use includes instead of joins so that refs on
the vuln are not marked as readonly
2015-04-30 15:21:56 -05:00
Matt Buck 912f41292a Drop some unused code 2015-04-30 11:25:57 -05:00
Matt Buck 8163c3cdda Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	plugins/nessus.rb
2015-04-28 15:33:46 -05:00
Matt Buck 6a4d63ca4f Drop explicit IPAddr to String coercion
MSP-12611
2015-04-27 10:48:13 -05:00
William Vu 74ad81c90c Consolidate tunnel check into name check 2015-04-20 21:18:12 -05:00
William Vu 741149058c Report unknown service names for consistency 2015-04-20 17:22:19 -05:00
William Vu d894502148 Update legacy Nmap XML parser 2015-04-20 17:15:35 -05:00
Matt Buck e82fb5f836 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	lib/msf/ui/console/command_dispatcher/db.rb
	metasploit-framework-db.gemspec
	metasploit-framework.gemspec
2015-04-15 14:04:35 -05:00
root 51dd88114b Fix grammer in comments 2015-04-13 13:21:41 +05:00
Matt Buck 9f15824e2a Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
2015-04-10 15:35:27 -05:00
James Lee 83cf1ad8ce Instantiate to get name if we don't have cache yet
Fixes #5086
2015-04-06 18:59:38 -05:00
Christian Catalan 75343ef30c Remove unneccesary match_set in MatchResult.create
MSP-12516

* Fixes UknownAttribute error for match_set in Rails 4
2015-04-06 16:36:37 -05:00
Matt Buck 5e2d6c27c3 Merge branch 'master' into staging/rails-4.0
Conflicts:
	Gemfile.lock
	db/schema.rb
	lib/msf/core/db_manager/session.rb
	metasploit-framework-db.gemspec
2015-04-06 11:27:00 -05:00
Tod Beardsley 72b9647b31 Land #5057, CVE fixups 2015-04-03 16:36:11 -05:00
William Vu 8140b0ee6c Update Qualys importers for the new CVE format 2015-04-01 17:50:18 -05:00
James Lee 8c1a597a25 Make a Session record before using it
How about that.
2015-04-01 13:12:28 -05:00
James Lee 2fc22132e0 Link the new constant as default in documentation 2015-03-31 16:48:02 -05:00
James Lee 44dd45e48d Use a const instead of hardcoding "tcp" everywhere 2015-03-31 16:15:04 -05:00
James Lee 76bfaa6ce9 Fix dumb inverted logic. Thanks, rspec! 2015-03-31 14:28:07 -05:00
James Lee 8b8ec5990a Ask the database how long the column should be
Instead of hardcoding a number
2015-03-31 14:12:22 -05:00
James Lee a8ef465b46 Use the variables we worked so hard to create 2015-03-31 13:34:27 -05:00
James Lee 3695d4b0c7 Don't modify argument in place 2015-03-31 13:32:28 -05:00
James Lee adcf88761d Save ref names for easier debugging 2015-03-31 13:07:09 -05:00
James Lee 176cdcb836 Use sym-to-proc instead of reimplementing it 2015-03-31 11:21:53 -05:00
James Lee a1a7faa77a Don't modify argument in place 2015-03-31 10:41:24 -05:00
James Lee 7e559f7b13 Don't modify argument in place 2015-03-31 10:16:14 -05:00
James Lee 971120ce98 Use create! instead of new ... save! 2015-03-31 10:15:23 -05:00