Changeset 5505

Timestamp:

05/17/08 00:29:32 (5 months ago)

Author:

egypt

Message:

"set foo" prints the value of foo if it exists

Files:

• framework3/trunk/lib/msf/core/payload/php.rb (added)
• framework3/trunk/lib/msf/ui/console/command_dispatcher/core.rb (modified) (1 diff)
• framework3/trunk/lib/rex/exploitation/obfuscatejs.rb (modified) (4 diffs)
• framework3/trunk/lib/rex/text.rb (modified) (1 diff)
• framework3/trunk/modules/payloads/singles/cmd/windows/generic.rb (added)
• framework3/trunk/modules/payloads/singles/php/bind_tcp.rb (added)

framework3/trunk/lib/msf/ui/console/command_dispatcher/core.rb

@@ -802 +802 @@
-                                        datastore) + "\n")
-                        return true
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                end
-

framework3/trunk/lib/rex/exploitation/obfuscatejs.rb

@@ -6 +6 @@
-#
-class ObfuscateJS
+        STRINGS_SINGLE_QUOTES = 0
+        STRINGS_DOUBLE_QUOTES = 1
-
-        #
@@ -40 +42 @@
-        #
-        def sym(name)
-
+
+
+
+
+
-        end
-
@@ -52 +58 @@
-                # Globally replace symbols
-                replace_symbols(opts['Symbols']) if opts['Symbols']
+
+                if (opts['Strings'])
+                        obfuscate_strings(opts['Strings'])
+                        # since there shouldn't be spaces in strings after the call to
+                        # obfuscate_strings, we can safely randomize the spaces as well
+                        @js = Rex::Text.compress(@js)
+                        @js = Rex::Text.randomize_space(@js)
+                end
+
-
-                @js
@@ -99 +114 @@
-        end
-
+        def obfuscate_strings(type=STRINGS_SINGLE_QUOTES)
+                if type == STRINGS_SINGLE_QUOTES
+                        regex = /'.*?[^\\]'/
+                else 
+                        regex = /".*?[^\\]"/ 
+                end
+                return @js.gsub!(regex) { |str|
+                        str = str[1,str.length-2]
-
+                        case (rand(3))
+                        when 0
+                                buf = '"' + Rex::Text.to_hex(str) + '"'
+                        when 1
+                                buf = "unescape(\"" + Rex::Text.to_hex(str, "%") + "\")"
+                        else 
+                                buf = "String.fromCharCode("
+                                str.each_byte { |c|
+                                        if (0 == rand(2))
+                                                buf << "%i,"%(c)
+                                        else
+                                                buf << "0x%0.2x,"%(c)
+                                        end
+                                }
+                                buf = buf[0,buf.length-1] + ")"
+                        end
+                        buf
+                }
+        end
-end
-

framework3/trunk/lib/rex/text.rb

@@ -176 +176 @@
-                return buff     
-        end
+        def self.from_unescape(data, endian=ENDIAN_LITTLE)
+                buf = 
+                        if (data =~ /%u/)
+                                data.split("%u").collect { |b| 
+                                        next if b == ""
+                                        if (endian == ENDIAN_LITTLE)
+                                                "#{(b[2,2].to_i 16).chr}#{(b[0,2].to_i 16).chr}" 
+                                        else
+                                                "#{(b[0,2].to_i 16).chr}#{(b[2,2].to_i 16).chr}" 
+                                        end
+                                }.join('')
+                        else
+                                data.split("%").collect { |b|
+                                        next if b == ""
+                                        "#{(b.to_i 16).chr}"
+                                }.join('')
+                        end
+                return buf
+        end
-
-        #