Switch RuntimeError -> EncodingError

Author: HD Moore

modules/encoders/cmd/echo.rb

@@ -34,12 +34,12 @@ def encode_block(state, buf)
     end
 
     if state.badchars.include?("-")
-      raise RuntimeError
+      raise EncodingError
     else
       # Without an escape character we can't escape anything, so echo
       # won't work.
       if state.badchars.include?("\\")
-        raise RuntimeError
+        raise EncodingError
       else
         buf = encode_block_bash_echo(state,buf)
       end
@@ -68,7 +68,7 @@ def encode_block_bash_echo(state, buf)
       if state.badchars.include?("`")
         # Last ditch effort, dollar paren
         if state.badchars.include?("$") or state.badchars.include?("(")
-          raise RuntimeError
+          raise EncodingError
         else
           buf = "$(/bin/echo -ne #{hex})"
         end

modules/encoders/cmd/generic_sh.rb

@@ -68,7 +68,7 @@ def encode_block_perl(state, buf)
     state.badchars.unpack('C*') { |c| qot.delete(c.chr) }
 
     # Throw an error if we ran out of quotes
-    raise RuntimeError if qot.length == 0
+    raise EncodingError if qot.length == 0
 
     sep = qot[0].chr
 
@@ -83,7 +83,7 @@ def encode_block_perl(state, buf)
       if (state.badchars.match(/\(|\)/))
 
         # No paranthesis...
-        raise RuntimeError
+        raise EncodingError
       end
 
       cmd << "system\\(pack\\(qq#{sep}H\\*#{sep},qq#{sep}#{hex}#{sep}\\)\\)"
@@ -92,7 +92,7 @@ def encode_block_perl(state, buf)
       if (state.badchars.match(/\(|\)/))
         if (state.badchars.include?(" "))
           # No spaces allowed, no paranthesis, give up...
-          raise RuntimeError
+          raise EncodingError
         end
 
         cmd << "'system pack qq#{sep}H*#{sep},qq#{sep}#{hex}#{sep}'"
@@ -124,7 +124,7 @@ def encode_block_bash_echo(state, buf)
       if (state.badchars.include?("`"))
         # Last ditch effort, dollar paren
         if (state.badchars.include?("$") or state.badchars.include?("("))
-          raise RuntimeError
+          raise EncodingError
         else
           buf = "$(/bin/echo -ne #{hex})"
         end

modules/encoders/cmd/perl.rb

@@ -35,7 +35,7 @@ def encode_block(state, buf)
     end
 
     if state.badchars.include?("-")
-      raise RuntimeError
+      raise EncodingError
     else
       buf = encode_block_perl(state,buf)
     end
@@ -55,7 +55,7 @@ def encode_block_perl(state, buf)
     # Convert spaces to IFS...
     if state.badchars.include?(" ")
       if state.badchars.match(/[${IFS}]/n)
-        raise RuntimeError
+        raise EncodingError
       end
       cmd.gsub!(/\s/, '${IFS}')
     end
@@ -118,7 +118,7 @@ def perl_qq(state, qot, hex)
     state.badchars.unpack('C*') { |c| qot.delete(c.chr) }
 
     # Throw an error if we ran out of quotes
-    raise RuntimeError if qot.length == 0
+    raise EncodingError if qot.length == 0
 
     sep = qot[0].chr
     # Use an explicit length for the H specifier instead of just "H*"

modules/encoders/cmd/printf_php_mq.rb

@@ -50,7 +50,7 @@ def encode_block(state, buf)
       (state.badchars.include?("|")) or
       # We must have at least ONE of these two..
       (state.badchars.include?("x") and state.badchars.include?("0"))
-      raise RuntimeError
+      raise EncodingError
     end
 
     # Now we build a string of the original payload with bad characters

modules/encoders/x86/add_sub.rb

@@ -99,7 +99,7 @@ def decoder_stub(state)
     @inst = {}
     @set = add_or_sub(@avchars)
     if @set == 0 then
-      raise RuntimeError, "Bad character list includes essential characters."
+      raise EncodingError, "Bad character list includes essential characters."
       exit
     elsif @set == 1 then #add
       @inst["opcode"] = 0x05
@@ -112,7 +112,7 @@ def decoder_stub(state)
     @inst["push_esp"] = 0x54
     @inst["pop_esp"] = 0x5c
     if state.buf.size%4 != 0 then
-      raise RuntimeError, "Shellcode size must be divisible by 4, try nop padding."
+      raise EncodingError, "Shellcode size must be divisible by 4, try nop padding."
       exit
     end
     #init

modules/encoders/x86/alpha_mixed.rb

@@ -44,7 +44,7 @@ def decoder_stub(state)
       else
         res = Rex::Arch::X86.geteip_fpu(state.badchars)
         if (not res)
-          raise RuntimeError, "Unable to generate geteip code"
+          raise EncodingError, "Unable to generate geteip code"
         end
       buf, reg, off = res
       end

modules/encoders/x86/alpha_upper.rb

@@ -47,7 +47,7 @@ def decoder_stub(state)
       else
         res = Rex::Arch::X86.geteip_fpu(state.badchars)
         if (not res)
-          raise RuntimeError, "Unable to generate geteip code"
+          raise EncodingError, "Unable to generate geteip code"
         end
       buf, reg, off = res
       end

modules/encoders/x86/opt_sub.rb

@@ -161,11 +161,11 @@ def decoder_stub(state)
 
     # determine if we have any invalid characters that we rely on.
     unless all_bytes_valid
-      raise RuntimeError, "Bad character set contains characters that are required for this encoder to function."
+      raise EncodingError, "Bad character set contains characters that are required for this encoder to function."
     end
 
     unless @asm['PUSH'][@base_reg]
-      raise RuntimeError, "Invalid base register"
+      raise EncodingError, "Invalid base register"
     end
 
     # get the offset from the specified base register, or default to zero if not specifed
@@ -176,7 +176,7 @@ def decoder_stub(state)
 
     # if we can't then we bomb, because we know we need to clear out EAX at least once
     unless @clear1
-      raise RuntimeError, "Unable to find AND-able chars resulting 0 in the valid character set."
+      raise EncodingError, "Unable to find AND-able chars resulting 0 in the valid character set."
     end
 
     protect_payload = (datastore['OverwriteProtect'] || "").downcase == "true"
@@ -288,7 +288,7 @@ def encode_payload(buf, reg_offset, protect_payload)
     # Write out a stubbed placeholder for the offset instruction based on
     # the base register, we'll update this later on when we know how big our payload is.
     encoded, _ = sub_3(0, 0)
-    raise RuntimeError, "Couldn't offset base register." if encoded.nil?
+    raise EncodingError, "Couldn't offset base register." if encoded.nil?
     data << create_sub(encoded)
 
     # finally push the value of EAX back into ESP
@@ -312,7 +312,7 @@ def encode_payload(buf, reg_offset, protect_payload)
       end
 
       # if we're still nil here, then we have an issue
-      raise RuntimeError, "Couldn't encode payload" if encoded.nil?
+      raise EncodingError, "Couldn't encode payload" if encoded.nil?
 
       data << create_sub(encoded)
     end
@@ -324,7 +324,7 @@ def encode_payload(buf, reg_offset, protect_payload)
     encoded, _ = sub_3(total_offset, 0)
 
     # if we're still nil here, then we have an issue
-    raise RuntimeError, "Couldn't encode protection" if encoded.nil?
+    raise EncodingError, "Couldn't encode protection" if encoded.nil?
     patch = create_sub(encoded)
 
     # patch in the correct offset back at the start of our payload

modules/encoders/x86/shikata_ga_nai.rb

@@ -281,7 +281,7 @@ def generate_shikata_block(state, length, cutoff)
     begin
       # Generate a permutation saving the ECX, ESP, and user defined registers
       loop_inst.generate(block_generator_register_blacklist, nil, state.badchars)
-    rescue RuntimeError => e
+    rescue EncodingError => e
       raise EncodingError
     end
   end

modules/encoders/x86/unicode_mixed.rb

@@ -37,7 +37,7 @@ def decoder_stub(state)
     reg    = datastore['BufferRegister']
     offset = datastore['BufferOffset'].to_i || 0
     if (not reg)
-      raise RuntimeError, "Need BufferRegister"
+      raise EncodingError, "Need BufferRegister"
     end
     Rex::Encoder::Alpha2::UnicodeMixed::gen_decoder(reg, offset)
   end