Changeset 5105

Timestamp:

09/13/07 11:15:56 (1 year ago)

Author:

hdm

Message:

Support pattern_create() lengths larger than the maximum set size

Files:

• framework3/tags/framework-3.0/lib/rex/text.rb (modified) (6 diffs)

framework3/tags/framework-3.0/lib/rex/text.rb

@@ -210 +210 @@
-        # 
-        def self.to_unicode(str='', type = 'utf-16le', mode = '', size = '')
+                return '' if not str
-                case type 
-                when 'utf-16le'
@@ -329 +330 @@
-                        }
-                        return string
+                when 'uhwtfms-half' # suggested name from HD :P
+                        load_codepage()
+                        string = ''
+                        # overloading mode as codepage
+                        if mode == ''
+                                mode = 1252 # ANSI - Latan 1, default for US installs of MS products
+                        else
+                raise TypeError, "Invalid codepage #{mode}, only 1252 supported for uhwtfms_half"
+                        end
+                        str.each_byte {|byte|
+                if ((byte >= 33 && byte <= 63) || (byte >= 96 && byte <= 126))
+                    string += "\xFF" + [byte ^ 32].pack('C')
+                elsif (byte >= 64 && byte <= 95)
+                    string += "\xFF" + [byte ^ 96].pack('C')
+                else
+                    char = [byte].pack('C')
+                                        possible = $codepage_map_cache[mode]['data'][char]
+                                        if possible.nil?
+                                                raise TypeError, "codepage #{mode} does not provide an encoding for 0x#{char.unpack('H*')[0]}"
+                                        end
+                                        string += possible[ rand(possible.length) ]
+                end
+                        }
+                        return string
-                else 
-                        raise TypeError, 'invalid utf type'
@@ -372 +397 @@
-                        end
-                        return res              
+        when 'u-half'
+            return str.gsub(all) { |s| Rex::Text.to_hex(Rex::Text.to_unicode(s, 'uhwtfms-half'), '%u', 2) }
-        else
-            raise TypeError, 'invalid mode'
@@ -428 +455 @@
-                        
-                        chunk.unpack("C*").each do |c|
-9
+f
-                                        buf << c.chr
-                                else
@@ -631 +658 @@
-        end
-
+        # Generate random bytes of numeric data
+        def self.rand_text_numeric(len, bad='')
+                foo = ('0' .. '9').to_a
+                rand_base(len, bad, *foo )
+        end
+        
-        # Generate random bytes of english-like data
-        def self.rand_text_english(len, bad='')
@@ -658 +691 @@
-                        end
-                end
-
+
+
+
+
+
+
-                buf[0,length]
-        end