From 34e732eabd9e8a7dd8dbe094e3e11a4d4e1bb69f Mon Sep 17 00:00:00 2001 From: Joe Vennix Date: Tue, 16 Jul 2013 10:14:41 -0500 Subject: [PATCH 1/2] Kill stray character in whitespace gutter. --- lib/rex/parser/nokogiri_doc_mixin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rex/parser/nokogiri_doc_mixin.rb b/lib/rex/parser/nokogiri_doc_mixin.rb index ef3e23fb56..090dd5b9fc 100644 --- a/lib/rex/parser/nokogiri_doc_mixin.rb +++ b/lib/rex/parser/nokogiri_doc_mixin.rb @@ -221,7 +221,7 @@ module Parser return unless @report_type_ok unless @state[:current_tag].empty? missing_ends = @state[:current_tag].keys.map {|x| "'#{x}'"}.join(", ") - l msg = "Warning, the provided file is incomplete, and there may be missing\n" + msg = "Warning, the provided file is incomplete, and there may be missing\n" msg << "data. The following tags were not closed: #{missing_ends}." db.emit(:warning,msg,&block) if block end From 73fd14a5000afc53c79086336da1224d8953548f Mon Sep 17 00:00:00 2001 From: jvazquez-r7 Date: Tue, 16 Jul 2013 15:59:52 -0500 Subject: [PATCH 2/2] Fix [SeeRM #8239] NoMethodError undefined method --- modules/exploits/multi/http/phpldapadmin_query_engine.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/exploits/multi/http/phpldapadmin_query_engine.rb b/modules/exploits/multi/http/phpldapadmin_query_engine.rb index 6052a86061..100ff391de 100644 --- a/modules/exploits/multi/http/phpldapadmin_query_engine.rb +++ b/modules/exploits/multi/http/phpldapadmin_query_engine.rb @@ -114,7 +114,7 @@ class Metasploit3 < Msf::Exploit::Remote data = "cmd=query_engine&query=none&search=1&orderby=#{php_code}\r\n\r\n" session = get_session - uri normalize_uri(datastore['URI']) + uri = normalize_uri(datastore['URI']) uri << '/' if uri[-1,1] != '/' uri << 'cmd.php'