librex 0.0.48 → 0.0.49

data/README.markdown

@@ -3,7 +3,7 @@
 A non-official re-packaging of the Rex library as a gem for easy of usage of the Metasploit REX framework in a non Metasploit application. I received permission from HDM to create this package.
 
 Currently based on:
-SVN Revision: 13637
+SVN Revision: 13642
 
 # Credits
 The Metasploit development team <http://www.metasploit.com>

data/lib/rex/proto/dhcp/server.rb

@@ -1,4 +1,4 @@
-# $Id: server.rb 13629 2011-08-24 21:28:31Z scriptjunkie $
+# $Id: server.rb 13639 2011-08-25 22:48:33Z scriptjunkie $
 
 require 'rex/socket'
 require 'rex/proto/dhcp'
@@ -96,6 +96,9 @@ class Server
 		self.pxereboottime = 2000
 	end
 
+	def report(&block)
+		self.reporter = block
+	end
 
 	# Start the DHCP server
 	def start
@@ -151,7 +154,7 @@ class Server
 	attr_accessor :sock, :thread, :myfilename, :ipstring, :served, :serveOnce
 	attr_accessor :current_ip, :start_ip, :end_ip, :broadcasta, :netmaskn
 	attr_accessor :servePXE, :pxeconfigfile, :pxealtconfigfile, :pxepathprefix, :pxereboottime, :serveOnlyPXE
-	attr_accessor :give_hostname, :served_hostname, :served_over
+	attr_accessor :give_hostname, :served_hostname, :served_over, :reporter
 
 protected
 
@@ -293,10 +296,15 @@ protected
 		pkt << dhcpoption(OpDns, self.dnsserv)
 		if self.servePXE  # PXE options
 			pkt << dhcpoption(OpPXEMagic, PXEMagic)
+			# We already got this one, serve localboot file
 			if self.serveOnce == true and self.served.has_key?(buf[28..43]) and
 					self.served[buf[28..43]][1] and pxeclient == true
 				pkt << dhcpoption(OpPXEConfigFile, self.pxealtconfigfile)
 			else
+				# We are handing out an IP and our PXE attack
+				if(self.reporter)
+					self.reporter.call(buf[28..43],self.ipstring)
+				end
 				pkt << dhcpoption(OpPXEConfigFile, self.pxeconfigfile)
 			end
 			pkt << dhcpoption(OpPXEPathPrefix, self.pxepathprefix)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librex
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
   prerelease: 
 platform: ruby
 authors:
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-08-26 00:00:00.000000000Z
 dependencies: []
 description: Rex provides a variety of classes useful for security testing and exploit
-  development. Based on SVN Revision 13637
+  development. Based on SVN Revision 13642
 email:
 - hdm@metasploit.com
 - jacob.hammack@hammackj.com