don't set the language if we don't have one

git-svn-id: file:///home/svn/framework3/trunk@8709 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2010-03-04 07:38:52 +00:00
parent 4f08e6fd25
commit 602395ead0
1 changed files with 3 additions and 3 deletions

View File

@ -391,7 +391,7 @@ module Exploit::Remote::HttpServer
# #
# Store the results of server-side User-Agent fingerprinting in the DB. # Store the results of server-side User-Agent fingerprinting in the DB.
# #
# Returns an array containing host and client information. # Returns a Hash containing host and client information.
# #
def report_user_agent(address, request) def report_user_agent(address, request)
ua = request['User-Agent'].downcase ua = request['User-Agent'].downcase
@ -472,9 +472,9 @@ module Exploit::Remote::HttpServer
:host => address, :host => address,
:os_name => os_name, :os_name => os_name,
:os_flavor => os_flavor, :os_flavor => os_flavor,
:os_lang => os_lang || 'en',
:arch => arch :arch => arch
} }
host[:os_lang] = os_lang if os_lang
report_host(host) report_host(host)
client = { client = {
:host => address, :host => address,
@ -488,7 +488,7 @@ module Exploit::Remote::HttpServer
:type => 'http_request', :type => 'http_request',
:data => "#{address}: #{request.method} #{request.resource} #{os_name} #{ua_name} #{ua_ver}" :data => "#{address}: #{request.method} #{request.resource} #{os_name} #{ua_name} #{ua_ver}"
) )
return [host, client] return host.merge(client)
end end
# #