Changeset 6089

Timestamp:

01/07/09 21:04:26 (6 months ago)

Author:

kris

Message:

Adding host-based access control to msfd

Location:

framework3/trunk

Files:

• msfd (modified) (3 diffs)
• plugins/msfd.rb (modified) (3 diffs)

framework3/trunk/msfd

@@ -20 +20 @@
         "-s" => [ false, "Use SSL"                                              ],
         "-f" => [ false, "Run the daemon in the foreground"                     ],
+        "-A" => [ true,  "Specify list of hosts allowed to connect"             ],
+        "-D" => [ true,  "Specify list of hosts not allowed to connect"         ],
         "-h" => [ false, "Help banner"                                          ])
 
@@ -36 +38 @@
                 when "-s"
                         opts['SSL'] = true
+                when "-A"
+                        begin
+                                opts['HostsAllowed'] = val.split(',').map { |a|
+                                        Rex::Socket.resolv_nbo(a)
+                                }
+                        rescue
+                                $stderr.puts "Bad argument for -A: #{$!}"
+                                exit
+                        end
+                when "-D"
+                        begin
+                                opts['HostsDenied'] = val.split(',').map { |a|
+                                        Rex::Socket.resolv_nbo(a)
+                                }
+                        rescue
+                                $stderr.puts "Bad argument for -D: #{$!}"
+                                exit
+                        end
                 when "-h"
                         print(
@@ -57 +77 @@
 
 # Run the plugin instance in the foreground.
-$framework.plugins.load('msfd', opts).run
+$framework.plugins.load('msfd', opts).run(opts)

framework3/trunk/plugins/msfd.rb

@@ -50 +50 @@
         #       ``run'' method.
         #
+        # HostsAllowed
+        #
+        #       List of hosts (in NBO) allowed to use msfd
+        #
+        # HostsDenied
+        #
+        #       List of hosts (in NBO) not allowed to use msfd
+        #
         def initialize(framework, opts)
                 super
@@ -63 +71 @@
                 if (opts['RunInForeground'] != true)
                         Thread.new {
-                                run
+                                run(opts)
                         }
                 end
@@ -86 +94 @@
         # threads to handle the console interface for each client.
         #
-        def run
+        def run(opts={})
                 begin
                         client = server.accept
+
+                        addr = Rex::Socket.resolv_nbo(client.getpeername[1])
+
+                        if opts['HostsAllowed'] and
+                           not opts['HostsAllowed'].find { |x| x == addr }
+                                client.close
+                                next
+                        end
+
+                        if opts['HostsDenied'] and
+                           opts['HostsDenied'].find { |x| x == addr }
+                                client.close
+                                next
+                        end
 
                         # Spawn a thread for the client connection