From 8b10cbe3fd3de268564eeb6886f6b79f02ad0bdd Mon Sep 17 00:00:00 2001 From: dmohanty-r7 Date: Tue, 22 Sep 2015 10:50:23 -0500 Subject: [PATCH] Query for vulns without specifying service when service is nil MSP-13284 --- lib/msf/core/db_manager/vuln.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/msf/core/db_manager/vuln.rb b/lib/msf/core/db_manager/vuln.rb index 0aabdba686..169ad78361 100644 --- a/lib/msf/core/db_manager/vuln.rb +++ b/lib/msf/core/db_manager/vuln.rb @@ -47,7 +47,10 @@ module Msf::DBManager::Vuln def find_vuln_by_refs(refs, host, service=nil) ref_ids = refs.find_all { |ref| ref.name.starts_with? 'CVE-'} relation = host.vulns.includes(:refs) - relation.where(service_id: service.try(:id), refs: { id: ref_ids}).first || relation.where(refs: { id: ref_ids}).first + if !service.try(:id).nil? + return relation.where(service_id: service.try(:id), refs: { id: ref_ids}).first + end + return relation.where(refs: { id: ref_ids}).first end def get_vuln(wspace, host, service, name, data='')