Merge branch 'master' of https://github.com/rapid7/metasploit-framework

Author: dougsko

data/gui/msfgui.jar

@@ -15,7 +15,7 @@
         </DimensionLayout>
         <DimensionLayout dim="1">
           <Group type="103" groupAlignment="0" attributes="0">
-              <Component id="tabbedPane" alignment="1" pref="530" max="32767" attributes="0"/>
+              <Component id="tabbedPane" alignment="1" pref="534" max="32767" attributes="0"/>
           </Group>
         </DimensionLayout>
       </Layout>
@@ -308,7 +308,7 @@
                     <Property name="name" type="java.lang.String" value="credsTable" noResource="true"/>
                   </Properties>
                   <AuxValues>
-                    <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new MsfTable(rpcConn, new String [] {&quot;Host&quot;, &quot;Time&quot;, &quot;Port&quot;, &quot;Proto&quot;, &quot;Sname&quot;, &quot;Type&quot;, &quot;User&quot;, &quot;Pass&quot;, &quot;Active&quot;&#xa;            }, &quot;creds&quot;, new String[]{&quot;host&quot;, &quot;time&quot;, &quot;port&quot;, &quot;proto&quot;, &quot;sname&quot;, &quot;type&quot;, &quot;user&quot;, &quot;pass&quot;, &quot;active&quot;})"/>
+                    <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new MsfTable(rpcConn, new String [] {&quot;Host&quot;, &quot;Updated&quot;, &quot;Port&quot;, &quot;Proto&quot;, &quot;Sname&quot;, &quot;Type&quot;, &quot;User&quot;, &quot;Pass&quot;, &quot;Active&quot;&#xa;            }, &quot;creds&quot;, new String[]{&quot;host&quot;, &quot;updated_at&quot;, &quot;port&quot;, &quot;proto&quot;, &quot;sname&quot;, &quot;type&quot;, &quot;user&quot;, &quot;pass&quot;, &quot;active&quot;})"/>
                   </AuxValues>
                 </Component>
               </SubComponents>

external/source/gui/msfguijava/src/msfgui/MainFrame.form

@@ -527,8 +527,8 @@ private void initComponents() {
         lootsTable = new MsfTable(rpcConn,new String [] {"Host", "Service", "Ltype", "Ctype", "Data", "Created", "Updated", "Name", "Info"
         }, "loots", new String[]{"host", "service", "ltype", "ctype", "data", "created_at", "updated_at", "name", "info"});
         credsPane = new javax.swing.JScrollPane();
-        credsTable = new MsfTable(rpcConn, new String [] {"Host", "Time", "Port", "Proto", "Sname", "Type", "User", "Pass", "Active"
-        }, "creds", new String[]{"host", "time", "port", "proto", "sname", "type", "user", "pass", "active"});
+        credsTable = new MsfTable(rpcConn, new String [] {"Host", "Updated", "Port", "Proto", "Sname", "Type", "User", "Pass", "Active"
+        }, "creds", new String[]{"host", "updated_at", "port", "proto", "sname", "type", "user", "pass", "active"});
         menuBar = new javax.swing.JMenuBar();
         javax.swing.JMenu fileMenu = new javax.swing.JMenu();
         connectRpcMenuItem = new javax.swing.JMenuItem();
@@ -710,7 +710,7 @@ public void keyReleased(java.awt.event.KeyEvent evt) {
         );
         mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 530, Short.MAX_VALUE)
+            .addComponent(tabbedPane, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 534, Short.MAX_VALUE)
         );
 
         menuBar.setName("menuBar"); // NOI18N

external/source/gui/msfguijava/src/msfgui/MainFrame.java

@@ -156,7 +156,7 @@ def calculate_confidence( vuln )
 	end
 
 	def log_fingerprint( opts = {} )
-		mode  = details[:category].to_sym
+		mode  = name
 		vhash = [target.to_url, opts[:fingerprint], mode, opts[:location]].
 			map { |x| x.to_s }.join( '|' ).hash
 
@@ -187,12 +187,12 @@ def log_fingerprint( opts = {} )
 
 		report_web_vuln( info )
 
-		print_good "	FOUND(#{mode.to_s.upcase}) URL(#{location})"
+		print_good "	FOUND(#{mode.to_s}) URL(#{location})"
 		print_good "		 PROOF(#{opts[:fingerprint]})"
 	end
 
 	def log_resource( opts = {} )
-		mode  = details[:category].to_sym
+		mode  = name
 		vhash = [target.to_url, mode, opts[:location]].
 			map { |x| x.to_s }.join( '|' ).hash
 
@@ -221,12 +221,12 @@ def log_resource( opts = {} )
 
 		report_web_vuln( info )
 
-		print_good "	VULNERABLE(#{mode.to_s.upcase}) URL(#{target.to_url})"
+		print_good "	VULNERABLE(#{mode.to_s}) URL(#{target.to_url})"
 		print_good "		 PROOF(#{opts[:location]})"
 	end
 
 	def process_vulnerability( element, proof, opts = {} )
-		mode  = details[:category].to_sym
+		mode  = name
 		vhash = [target.to_url, mode, element.altered].
 			map{ |x| x.to_s }.join( '|' ).hash
 
@@ -281,7 +281,7 @@ def process_vulnerability( element, proof, opts = {} )
 
 		report_web_vuln( info )
 
-		print_good "	VULNERABLE(#{mode.to_s.upcase}) URL(#{target.to_url})" +
+		print_good "	VULNERABLE(#{mode.to_s}) URL(#{target.to_url})" +
 						" PARAMETER(#{element.altered}) VALUES(#{element.params})"
 		print_good "		 PROOF(#{proof})"
 	end

lib/msf/core/auxiliary/web.rb

@@ -118,7 +118,7 @@ def to_hash
 	end
 
 	def self.from_model( form )
-		e = new( :action => "#{form.path}?#{form.query}", :input => inputs[0][1] )
+		e = new( :action => "#{form.path}?#{form.query}", :input => form.inputs[0][1] )
 		e.model = form
 		e
 	end

lib/msf/core/auxiliary/web/path.rb

@@ -1,5 +1,5 @@
 # -*- coding: binary -*-
-
+#
 require 'rexml/document'
 require 'rex/parser/nmap_xml'
 require 'msf/core/db_export'
@@ -975,8 +975,15 @@ def cmd_notes(*args)
 		end
 
 		def cmd_loot_help
-			print_line "Usage: loot [-h] [addr1 addr2 ...] [-t <type1,type2>]"
+			print_line "Usage: loot <options>"
+			print_line " Info: loot [-h] [addr1 addr2 ...] [-t <type1,type2>]"
+			print_line "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] [-t [type]"
+			print_line "  Del: loot -d [addr1 addr2 ...]"
 			print_line
+			print_line "  -a,--add          Add loot to the list of addresses, instead of listing"
+			print_line "  -d,--delete       Delete *all* loot matching host and type"
+			print_line "  -f,--file         File with contents of the loot to add"
+			print_line "  -i,--info         Info of the loot to add"
 			print_line "  -t <type1,type2>  Search for a list of types"
 			print_line "  -h,--help         Show this help information"
 			print_line "  -S,--search       Search string to filter by"
@@ -991,31 +998,52 @@ def cmd_loot(*args)
 			types = nil
 			delete_count = 0
 			search_term = nil
+			file = nil
+			name = nil
+			info = nil
 
 			while (arg = args.shift)
 				case arg
-				when '-d','--delete'
-					mode = :delete
-				when '-t'
-					typelist = args.shift
-					if(!typelist)
-						print_status("Invalid type list")
+					when '-a','--add'
+						mode = :add
+					when '-d','--delete'
+						mode = :delete
+					when '-f','--file'
+						filename = args.shift
+						if(!filename)
+							print_error("Can't make loot with no filename")
+							return
+						end
+						if (!File.exists?(filename) or !File.readable?(filename))
+							print_error("Can't read file")
+							return
+						end
+					when '-i','--info'
+						info = args.shift
+						if(!info)
+							print_error("Can't make loot with no info")
 						return
 					end
-					types = typelist.strip().split(",")
-				when '-S', '--search'
-					search_term = /#{args.shift}/nmi
-				when '-h','--help'
-					cmd_loot_help
-					return
-				else
-					# Anything that wasn't an option is a host to search for
-					unless (arg_host_range(arg, host_ranges))
+					when '-t'
+						typelist = args.shift
+						if(!typelist)
+							print_error("Invalid type list")
+							return
+						end
+						types = typelist.strip().split(",")
+					when '-S', '--search'
+						search_term = /#{args.shift}/nmi
+					when '-h','--help'
+						cmd_loot_help
+						return
+					else
+						# Anything that wasn't an option is a host to search for
+						unless (arg_host_range(arg, host_ranges))
 						return
 					end
 				end
-
 			end
+
 			tbl = Rex::Ui::Text::Table.new({
 					'Header'  => "Loot",
 					'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info', 'path' ],
@@ -1024,6 +1052,32 @@ def cmd_loot(*args)
 			# Sentinal value meaning all
 			host_ranges.push(nil) if host_ranges.empty?
 
+		if mode == :add
+			if info.nil?
+				print_error("Info required")
+				return
+			end
+			if filename.nil?
+				print_error("Loot file required")
+				return
+			end
+			if types.nil? or types.size != 1
+				print_error("Exactly one loot type is required")
+				return
+			end
+			type = types.first
+			name = File.basename(filename)
+			host_ranges.each do |range|
+				range.each do |host|
+					file = File.open(filename, "rb")
+					contents = file.read
+					lootfile = framework.db.find_or_create_loot(:type => type, :host => host,:info => info, :data => contents,:path => filename,:name => name)
+					print_status "Added loot #{host}"
+				end
+			end
+			return
+		end
+
 			each_host_range_chunk(host_ranges) do |host_search|
 				framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
 					host.loots.each do |loot|