Changeset 6150

Timestamp:

01/13/09 21:46:10 (6 months ago)

Author:

hdm

Message:

Fix up the dialup code

Location:

framework3/trunk

Files:

• lib/msf/core/handler/find_tty.rb (modified) (2 diffs)
• lib/msf/core/payload/generic.rb (modified) (1 diff)
• modules/exploits/test/dialup.rb (modified) (3 diffs)

framework3/trunk/lib/msf/core/handler/find_tty.rb

@@ -15 +15 @@
         #
         # Returns the string representation of the handler type, in this case
-        # 'find_tag'.
+        # 'none', which is kind of a lie, but we don't have a better way to
+        # handle this yet
         #
         def self.handler_type
-                return "find_shell"
+                return "none"
         end
 
         #
         # Returns the connection oriented general handler type, in this case
-        # 'find'.
+        # 'none'
         #
         def self.general_handler_type
-                "find"
+                "none"
         end
 
@@ -40 +41 @@
 
         def _check_shell(sock)
+                # Verify that the modem is online
                 if(sock.respond_to?('commandstate'))
                         return (sock.commandstate ? false : true)

framework3/trunk/lib/msf/core/payload/generic.rb

@@ -19 +19 @@
         def initialize(info = {})
                 super(merge_info(info,
-                        'Arch'     => ARCH_ALL,
+                        'Arch'     => ARCH_ALL - [ARCH_TTY],
                         'Platform' => ''))
 

framework3/trunk/modules/exploits/test/dialup.rb

@@ -26 +26 @@
                                         'I)ruid',
                                 ],
-                        'Arch'          => ARCH_CMD,
+                        'Arch'          => ARCH_TTY,
                         'Platform'      => ['unix'],
                         'License'       => MSF_LICENSE,
@@ -33 +33 @@
                'Space'    => 1000,
                'BadChars' => '',
-                                        'DisableNops' => true,
+                           'DisableNops' => true,
             },
-                        'PayloadCompat' =>
-                                {
-                                        'PayloadType' => 'cmd_tty',
-                                },
          'Targets'        =>
             [
@@ -49 +45 @@
 
         def exploit
-                # Connect to the system via dialup
-                modem = connect_dialup
-                if ! modem
-                        print_error("Unable to connect.")
-                        return
-                end
-
-                # Log in 
-
-                # Handoff to the shell handler
-                modem.display = false
-                handler(modem.sock)
-
-                disconnect_dialup(modem)
+                connect_dialup
+                handler
+                disconnect_dialup
         end