Land rapid7#3170, Array#sample for Rex::Text

Author: wvu

lib/rex/text.rb

@@ -1386,12 +1386,12 @@ def self.compress(str)
   # Randomize the whitespace in a string
   #
   def self.randomize_space(str)
+    set = ["\x09", "\x20", "\x0d", "\x0a"]
     str.gsub(/\s+/) { |s|
       len = rand(50)+2
-      set = "\x09\x20\x0d\x0a"
       buf = ''
       while (buf.length < len)
-        buf << set[rand(set.length),1]
+        buf << set.sample
       end
 
       buf
@@ -1582,37 +1582,37 @@ def self.rand_hostname
     (rand(5) + 1).times {
       host.push(Rex::Text.rand_text_alphanumeric(rand(10) + 1))
     }
-    host.push(TLDs[rand(TLDs.size)])
+    host.push(TLDs.sample)
     host.join('.').downcase
   end
 
   # Generate a state
   def self.rand_state()
-    States[rand(States.size)]
+    States.sample
   end
 
   # Generate a surname
   def self.rand_surname
-    Surnames[rand(Surnames.size)]
+    Surnames.sample
   end
 
   # Generate a name
   def self.rand_name
     if rand(10) % 2 == 0
-      Names_Male[rand(Names_Male.size)]
+      Names_Male.sample
     else
-      Names_Female[rand(Names_Female.size)]
+      Names_Female.sample
     end
   end
 
   # Generate a male name
   def self.rand_name_male
-    Names_Male[rand(Names_Male.size)]
+    Names_Male.sample
   end
 
   # Generate a female name
   def self.rand_name_female
-    Names_Female[rand(Names_Female.size)]
+    Names_Female.sample
   end
 
   # Generate a random mail address

spec/lib/rex/text_spec.rb

@@ -114,6 +114,19 @@
       end
     end
 
+    context ".randomize_space" do
+      let (:sample_text) { "The quick brown sploit jumped over the lazy A/V" }
+      let (:spaced_text) { described_class.randomize_space(sample_text) }
+      it "should return a string with at least one new space characater" do
+        spaced_text.should match /\x09\x0d\x0a/
+      end
+
+      it "should not otherwise be mangled" do
+        normalized_text = spaced_text.gsub(/[\x20\x09\x0d\x0a]+/m, " ")
+        normalized_text.should eq(sample_text)
+      end
+    end
+
   end
 end