librex 0.0.68 → 0.0.70

data/lib/rex/mime/message.rb

@@ -3,143 +3,146 @@ module Rex
 module MIME
 class Message
 
-	require 'rex/mime/header'
-	require 'rex/mime/part'
-	require 'rex/text'
-
-	attr_accessor :header, :parts, :bound, :content
-
-	def initialize(data=nil)
-		self.header = Rex::MIME::Header.new
-		self.parts  = []
-		self.bound  = "_Part_#{rand(1024)}_#{rand(0xffffffff)}_#{rand(0xffffffff)}"
-		self.content = ''
-		if data
-			head,body = data.split(/\r?\n\r?\n/, 2)
-
-			self.header.parse(head)
-			ctype = self.header.find('Content-Type')
-
-			if ctype and ctype[1] and ctype[1] =~ /multipart\/mixed;\s*boundary=([^\s]+)/
-				self.bound = $1
-
-				chunks = body.to_s.split(/--#{self.bound}(--)?\r?\n/)
-				self.content = chunks.shift.to_s.gsub(/\s+$/, '')
-				self.content << "\r\n" if not self.content.empty?
-
-				chunks.each do |chunk|
-					break if chunk == "--"
-					head,body = chunk.split(/\r?\n\r?\n/, 2)
-					part = Rex::MIME::Part.new
-					part.header.parse(head)
-					part.content = body.gsub(/\s+$/, '')
-					self.parts << part
-				end
-			else
-				self.content = body.to_s.gsub(/\s+$/, '') + "\r\n"
-			end
-		end
-	end
-
-	def to
-		(self.header.find('To') || [nil, nil])[1]
-	end
-
-	def to=(val)
-		self.header.set("To", val)
-	end
-
-	def from=(val)
-		self.header.set("From", val)
-	end
-
-	def from
-		(self.header.find('From') || [nil, nil])[1]
-	end
-
-	def subject=(val)
-		self.header.set("Subject", val)
-	end
-
-	def subject
-		(self.header.find('Subject') || [nil, nil])[1]
-	end
-
-	def mime_defaults
-		self.header.set("MIME-Version", "1.0")
-		self.header.set("Content-Type", "multipart/mixed; boundary=\"#{self.bound}\"")
-		self.header.set("Subject", '') # placeholder
-		self.header.set("Date", Time.now.strftime("%a,%e %b %Y %H:%M:%S %z"))
-		self.header.set("Message-ID",
-			"<"+
-			Rex::Text.rand_text_alphanumeric(rand(20)+40)+
-			"@"+
-			Rex::Text.rand_text_alpha(rand(20)+3)+
-			">"
-		)
-		self.header.set("From", '')    # placeholder
-		self.header.set("To", '')      # placeholder
-	end
-
-
-	def add_part(data='', content_type='text/plain', transfer_encoding="8bit", content_disposition=nil)
-		part = Rex::MIME::Part.new
-
-		if (content_disposition)
-			part.header.set("Content-Disposition", content_disposition)
-		end
-
-		if (content_type)
-			part.header.set("Content-Type", content_type)
-		end
-
-		if (transfer_encoding)
-			part.header.set("Content-Transfer-Encoding", transfer_encoding)
-		end
-
-		part.content = data
-		self.parts << part
-		part
-	end
-
-	def add_part_attachment(data, name)
-		self.add_part(
-			Rex::Text.encode_base64(data, "\r\n"),
-			"application/octet-stream; name=\"#{name}\"",
-			"base64",
-			"attachment; filename=\"#{name}\""
-		)
-	end
-
-
-	def add_part_inline_attachment(data, name)
-		self.add_part(
-			Rex::Text.encode_base64(data, "\r\n"),
-			"application/octet-stream; name=\"#{name}\"",
-			"base64",
-			"inline; filename=\"#{name}\""
-		)
-	end
-
-	def to_s
-		msg = self.header.to_s + "\r\n"
-
-		if self.content and not self.content.empty?
-			msg << self.content + "\r\n"
-		end
-
-		self.parts.each do |part|
-			msg << "--" + self.bound + "\r\n"
-			msg << part.to_s + "\r\n"
-		end
-
-		if self.parts.length > 0
-			msg << "--" + self.bound + "--\r\n"
-		end
-
-		# Force CRLF for SMTP compatibility
-		msg.gsub("\r", '').gsub("\n", "\r\n")
-	end
+  require 'rex/mime/header'
+  require 'rex/mime/part'
+  require 'rex/mime/encoding'
+  require 'rex/text'
+
+  include Rex::MIME::Encoding
+
+  attr_accessor :header, :parts, :bound, :content
+
+
+  def initialize(data=nil)
+    self.header = Rex::MIME::Header.new
+    self.parts  = []
+    self.bound  = "_Part_#{rand(1024)}_#{rand(0xffffffff)}_#{rand(0xffffffff)}"
+    self.content = ''
+    if data
+      head,body = data.split(/\r?\n\r?\n/, 2)
+
+      self.header.parse(head)
+      ctype = self.header.find('Content-Type')
+
+      if ctype and ctype[1] and ctype[1] =~ /multipart\/mixed;\s*boundary=([^\s]+)/
+        self.bound = $1
+
+        chunks = body.to_s.split(/--#{self.bound}(--)?\r?\n/)
+        self.content = chunks.shift.to_s.gsub(/\s+$/, '')
+        self.content << "\r\n" if not self.content.empty?
+
+        chunks.each do |chunk|
+          break if chunk == "--"
+          head,body = chunk.split(/\r?\n\r?\n/, 2)
+          part = Rex::MIME::Part.new
+          part.header.parse(head)
+          part.content = body.gsub(/\s+$/, '')
+          self.parts << part
+        end
+      else
+        self.content = body.to_s.gsub(/\s+$/, '') + "\r\n"
+      end
+    end
+  end
+
+  def to
+    (self.header.find('To') || [nil, nil])[1]
+  end
+
+  def to=(val)
+    self.header.set("To", val)
+  end
+
+  def from=(val)
+    self.header.set("From", val)
+  end
+
+  def from
+    (self.header.find('From') || [nil, nil])[1]
+  end
+
+  def subject=(val)
+    self.header.set("Subject", val)
+  end
+
+  def subject
+    (self.header.find('Subject') || [nil, nil])[1]
+  end
+
+  def mime_defaults
+    self.header.set("MIME-Version", "1.0")
+    self.header.set("Content-Type", "multipart/mixed; boundary=\"#{self.bound}\"")
+    self.header.set("Subject", '') # placeholder
+    self.header.set("Date", Time.now.strftime("%a,%e %b %Y %H:%M:%S %z"))
+    self.header.set("Message-ID",
+      "<"+
+      Rex::Text.rand_text_alphanumeric(rand(20)+40)+
+      "@"+
+      Rex::Text.rand_text_alpha(rand(20)+3)+
+      ">"
+    )
+    self.header.set("From", '')    # placeholder
+    self.header.set("To", '')      # placeholder
+  end
+
+
+  def add_part(data='', content_type='text/plain', transfer_encoding="8bit", content_disposition=nil)
+    part = Rex::MIME::Part.new
+
+    if (content_disposition)
+      part.header.set("Content-Disposition", content_disposition)
+    end
+
+    if (content_type)
+      part.header.set("Content-Type", content_type)
+    end
+
+    if (transfer_encoding)
+      part.header.set("Content-Transfer-Encoding", transfer_encoding)
+    end
+
+    part.content = data
+    self.parts << part
+    part
+  end
+
+  def add_part_attachment(data, name)
+    self.add_part(
+      Rex::Text.encode_base64(data, "\r\n"),
+      "application/octet-stream; name=\"#{name}\"",
+      "base64",
+      "attachment; filename=\"#{name}\""
+    )
+  end
+
+
+  def add_part_inline_attachment(data, name)
+    self.add_part(
+      Rex::Text.encode_base64(data, "\r\n"),
+      "application/octet-stream; name=\"#{name}\"",
+      "base64",
+      "inline; filename=\"#{name}\""
+    )
+  end
+
+  def to_s
+    msg = force_crlf(self.header.to_s + "\r\n")
+
+    unless self.content.blank?
+      msg << force_crlf(self.content + "\r\n")
+    end
+
+    self.parts.each do |part|
+      msg << force_crlf("--" + self.bound + "\r\n")
+      msg << part.to_s
+    end
+
+    if self.parts.length > 0
+      msg << force_crlf("--" + self.bound + "--\r\n")
+    end
+
+    msg
+  end
 
 end
 end

data/lib/rex/mime/part.rb

@@ -3,18 +3,47 @@ module Rex
 module MIME
 class Part
 
-	require 'rex/mime/header'
-	
-	attr_accessor :header, :content
-
-	def initialize
-		self.header = Rex::MIME::Header.new
-		self.content = ''
-	end
-
-	def to_s
-		self.header.to_s + "\r\n" + self.content + "\r\n"
-	end
+  require 'rex/mime/header'
+  require 'rex/mime/encoding'
+
+  include Rex::MIME::Encoding
+
+  attr_accessor :header, :content
+
+  def initialize
+    self.header = Rex::MIME::Header.new
+    self.content = ''
+  end
+
+  def to_s
+    self.header.to_s + "\r\n" + content_encoded + "\r\n"
+  end
+
+  # Returns the part content with any necessary encoding or transformation
+  # applied.
+  #
+  # @return [String] Content with encoding or transformations applied.
+  def content_encoded
+    binary_content? ? content : force_crlf(content)
+  end
+
+  # Answers if the part content is binary.
+  #
+  # @return [Boolean] true if the part content is binary, false otherwise.
+  def binary_content?
+    transfer_encoding && transfer_encoding == 'binary'
+  end
+
+  # Returns the Content-Transfer-Encoding of the part.
+  #
+  # @return [nil] if the part hasn't Content-Transfer-Encoding.
+  # @return [String] The Content-Transfer-Encoding or the part.
+  def transfer_encoding
+    h = header.find('Content-Transfer-Encoding')
+    return nil if h.nil?
+
+    h[1]
+  end
 
 end
 end

data/lib/rex/nop/opty2.rb

@@ -13,96 +13,96 @@ module Nop
 ###
 class Opty2
 
-	Table = Rex::Nop::Opty2Tables::StateTable
-
-	def initialize(badchars = '', save_registers = nil)
-		self.badchars       = badchars
-		self.save_registers = (save_registers || []) | [ 'esp', 'ebp']
-	end
-
-	#
-	# Generates the Opty2 multi-byte NOP sled.
-	#
-	def generate_sled(length)
-		return '' if (length <= 0)
-
-		# Initialize the sled buffer, the previous state, and the current stream
-		# length.
-		sled = ''
-		prev = 256
-		slen = 0
-
-		# Initialize the byte count array
-		counts = []
-
-		256.times { |idx| counts[idx] = 0 }
-
-		# Initialize the bad register mask
-		mask = 0
-
-		save_registers.each { |reg|
-			mask |= 1 << (Rex::Arch::X86.reg_number(reg))
-		}
-		mask = mask << 16
-
-		# Initialize the bad byte lookup table
-		bad_bytes = []
-		(badchars || '').each_byte { |byte|
-			bad_bytes[byte] = 1
-		}
-
-		# Build the sled
-		while (length > 0)
-			low  = -1
-			lows = []
-
-			Table[prev].each { |nt|
-				nt.each { |e|
-					# Skip it if it's masked off or too large
-					next if ((e & mask) != 0)
-					next if (((e >> 8) & 0xff) > slen)
-					
-					byte = e & 0xff
-
-					# Skip it if it's a bad byte
-					next if (bad_bytes[byte] == 1)
-
-					# Use it if it's a better value
-					if ((low == -1) or (low > counts[byte]))
-						low  = counts[byte]
-						lows = [byte]
-					# Otherwise, if it's just as good..
-					elsif (low == counts[byte])
-						lows << byte
-					end
-				}
-			}
-
-			# If we didn't find at least one byte possibility, then we're stuck.
-			# Abort.
-			if (low == -1)
-				raise RuntimeError, "Failed to find a valid byte."
-			end
-
-			# Pick a random character for the possiblities
-			prev = lows[rand(lows.length)]
-
-			# Increment its used count
-			counts[prev] += 1
-
-			# Prepend the byte to the sled
-			sled = prev.chr + sled
-
-			# Increment the sled length
-			slen   += 1
-			length -= 1
-		end
-
-		# Return the sled
-		sled
-	end
-
-	attr_accessor :badchars, :save_registers # :nodoc:
+  Table = Rex::Nop::Opty2Tables::StateTable
+
+  def initialize(badchars = '', save_registers = nil)
+    self.badchars       = badchars
+    self.save_registers = (save_registers || []) | [ 'esp', 'ebp']
+  end
+
+  #
+  # Generates the Opty2 multi-byte NOP sled.
+  #
+  def generate_sled(length)
+    return '' if (length <= 0)
+
+    # Initialize the sled buffer, the previous state, and the current stream
+    # length.
+    sled = ''
+    prev = 256
+    slen = 0
+
+    # Initialize the byte count array
+    counts = []
+
+    256.times { |idx| counts[idx] = 0 }
+
+    # Initialize the bad register mask
+    mask = 0
+
+    save_registers.each { |reg|
+      mask |= 1 << (Rex::Arch::X86.reg_number(reg))
+    }
+    mask = mask << 16
+
+    # Initialize the bad byte lookup table
+    bad_bytes = []
+    (badchars || '').each_byte { |byte|
+      bad_bytes[byte] = 1
+    }
+
+    # Build the sled
+    while (length > 0)
+      low  = -1
+      lows = []
+
+      Table[prev].each { |nt|
+        nt.each { |e|
+          # Skip it if it's masked off or too large
+          next if ((e & mask) != 0)
+          next if (((e >> 8) & 0xff) > slen)
+
+          byte = e & 0xff
+
+          # Skip it if it's a bad byte
+          next if (bad_bytes[byte] == 1)
+
+          # Use it if it's a better value
+          if ((low == -1) or (low > counts[byte]))
+            low  = counts[byte]
+            lows = [byte]
+          # Otherwise, if it's just as good..
+          elsif (low == counts[byte])
+            lows << byte
+          end
+        }
+      }
+
+      # If we didn't find at least one byte possibility, then we're stuck.
+      # Abort.
+      if (low == -1)
+        raise RuntimeError, "Failed to find a valid byte."
+      end
+
+      # Pick a random character for the possiblities
+      prev = lows[rand(lows.length)]
+
+      # Increment its used count
+      counts[prev] += 1
+
+      # Prepend the byte to the sled
+      sled = prev.chr + sled
+
+      # Increment the sled length
+      slen   += 1
+      length -= 1
+    end
+
+    # Return the sled
+    sled
+  end
+
+  attr_accessor :badchars, :save_registers # :nodoc:
 end
 
 end