Use BruteSocket in a bunch of brute scripts

scripts/ajp-brute.nse

@@ -52,7 +52,7 @@ Driver = {
   end,
 
   connect = function(self)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   disconnect = function(self)

scripts/cassandra-brute.nse

@@ -37,7 +37,7 @@ portrule = shortport.port_or_service({9160}, {"cassandra"})
 Driver = {
 
   new = function(self, host, port, options)
-    local o = { host = host, port = port, socket = nmap.new_socket() }
+    local o = { host = host, port = port, socket = brute.new_socket() }
     setmetatable(o, self)
     self.__index = self
     return o

scripts/cics-user-brute.nse

@@ -58,7 +58,7 @@ Driver = {
     o.host = host
     o.port = port
     o.options = options
-    o.tn3270 = tn3270.Telnet:new()
+    o.tn3270 = tn3270.Telnet:new(brute.new_socket())
     return o
   end,
   connect = function( self )

scripts/cvs-brute.nse

@@ -51,7 +51,7 @@ Driver =
   end,
 
   connect = function( self )
-    self.helper:connect()
+    self.helper:connect(brute.new_socket())
     return true
   end,
 

scripts/deluge-rpc-brute.nse

@@ -92,7 +92,7 @@ Driver = {
 
   connect = function(self)
     local status, err
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(
       ((self.host.times and self.host.times.timeout) or 8) * 1000)
 

scripts/dpap-brute.nse

@@ -45,7 +45,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(5000)
     return self.socket:connect(self.host, self.port, "tcp")
   end,

scripts/informix-brute.nse

@@ -59,7 +59,7 @@ Driver =
     local status, data
     self.helper = informix.Helper:new( self.host, self.port, "on_nmap_dummy" )
 
-    status, data = self.helper:Connect()
+    status, data = self.helper:Connect(brute.new_socket())
     if ( not(status) ) then
       return status, data
     end

scripts/ipmi-brute.nse

@@ -39,7 +39,7 @@ Driver = {
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(
       ((self.host.times and self.host.times.timeout) or 8) * 1000)
     self.socket:connect(self.host, self.port, "udp")

scripts/iscsi-brute.nse

@@ -44,7 +44,7 @@ Driver = {
 
   connect = function( self )
     self.helper = iscsi.Helper:new( self.host, self.port )
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function( self, username, password )

scripts/membase-brute.nse

@@ -46,7 +46,7 @@ Driver = {
 
   connect = function(self)
     self.helper = membase.Helper:new(self.host, self.port)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function(self, username, password)

scripts/metasploit-xmlrpc-brute.nse

@@ -44,7 +44,7 @@ Driver =
   end,
 
   connect = function ( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     if ( not(self.socket:connect(self.host, self.port, self.opts)) ) then
       return false
     end

scripts/mikrotik-routeros-brute.nse

@@ -48,7 +48,7 @@ Driver =
   end,
 
   connect = function( self )
-    self.s = nmap.new_socket("tcp")
+    self.s = brute.new_socket()
     self.s:set_timeout(self.options['timeout'])
     return self.s:connect(self.host, self.port, "tcp")
   end,

scripts/mmouse-brute.nse

@@ -49,7 +49,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(arg_timeout)
     return self.socket:connect(self.host, self.port)
   end,

scripts/mongodb-brute.nse

@@ -38,7 +38,7 @@ portrule = shortport.port_or_service({27017}, {"mongodb"})
 Driver = {
 
   new = function(self, host, port, options)
-    local o = { host = host, port = port, sock = nmap.new_socket() }
+    local o = { host = host, port = port, sock = brute.new_socket() }
     setmetatable(o, self)
     self.__index = self
     return o

scripts/mysql-brute.nse

@@ -53,7 +53,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     local status, err = self.socket:connect(self.host, self.port)
     self.socket:set_timeout(arg_timeout)
     if(not(status)) then

scripts/nessus-brute.nse

@@ -48,7 +48,7 @@ Driver =
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     if ( not(self.socket:connect(self.host, self.port, "ssl")) ) then
       return false
     end

scripts/nessus-xmlrpc-brute.nse

@@ -48,7 +48,7 @@ local function authenticate(host, port, username, password)
   }
 
   local data = table.concat(headers, "\r\n") .. "\r\n\r\n" .. post_data
-  local socket = nmap.new_socket()
+  local socket = brute.new_socket()
   socket:set_timeout(arg_timeout)
 
   local status, err = socket:connect(host, port)

scripts/nping-brute.nse

@@ -126,7 +126,7 @@ Driver =
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     return self.socket:connect(self.host, self.port)
   end,
 

scripts/omp2-brute.nse

@@ -34,7 +34,7 @@ Driver = {
     self.__index = self
     o.host = host
     o.port = port
-    o.session = omp2.Session:new()
+    o.session = omp2.Session:new(brute.new_socket())
     return o
   end,
 

scripts/openvas-otp-brute.nse

@@ -43,7 +43,7 @@ Driver =
   end,
 
   connect = function ( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     if ( not(self.socket:connect(self.host, self.port, "ssl")) ) then
       return false
     end

scripts/oracle-brute.nse

@@ -98,7 +98,7 @@ Driver =
     self.helper = ConnectionPool[coroutine.running()]
     if ( self.helper ) then return true end
 
-    self.helper = tns.Helper:new( self.host, self.port, self.sid )
+    self.helper = tns.Helper:new( self.host, self.port, self.sid, brute.new_socket() )
 
     -- This loop is intended for handling failed connections
     -- A connection may fail for a number of different reasons.

scripts/pcanywhere-brute.nse

@@ -70,7 +70,7 @@ Driver = {
   end,
 
   connect = function( self )
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     local response
     local err
     local status = false

scripts/pop3-brute.nse

@@ -46,7 +46,7 @@ Driver = {
   -- @return false, brute.Error object on failure
   connect = function(self)
 
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     local opts = {timeout=10000, recv_before=true}
     local best_opt, line, _
     self.socket, _, best_opt, line = comm.tryssl(self.host, self.port, "" , opts)

scripts/redis-brute.nse

@@ -43,7 +43,7 @@ Driver = {
 
   connect = function( self )
     self.helper = redis.Helper:new(self.host, self.port)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function( self, username, password )

scripts/rexec-brute.nse

@@ -62,7 +62,7 @@ Driver = {
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     self.socket:set_timeout(self.timeout)
     local status, err = self.socket:connect(self.host, self.port)
     if ( not(status) ) then

scripts/rlogin-brute.nse

@@ -56,7 +56,7 @@ Driver = {
 
     local status
 
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     -- apparently wee need a source port below 1024
     -- this approach is not very elegant as it causes address already in
     -- use errors when the same src port is hit in a short time frame.

scripts/rpcap-brute.nse

@@ -33,7 +33,7 @@ portrule = shortport.port_or_service(2002, "rpcap", "tcp")
 Driver = {
 
   new = function(self, host, port)
-    local o = { helper = rpcap.Helper:new(host, port) }
+    local o = { helper = rpcap.Helper:new(host, port, brute.new_socket()) }
     setmetatable(o, self)
     self.__index = self
     return o

scripts/rsync-brute.nse

@@ -44,7 +44,7 @@ Driver = {
 
   connect = function(self)
     self.helper = rsync.Helper:new(self.host, self.port, self.options)
-    return self.helper:connect()
+    return self.helper:connect(brute.new_socket())
   end,
 
   login = function(self, username, password)

scripts/socks-brute.nse

@@ -40,7 +40,7 @@ Driver = {
 
   connect = function ( self )
     self.helper = socks.Helper:new(self.host, self.port, { timeout = 10000 })
-    return self.helper:connect()
+    return self.helper:connect(nil, brute.new_socket())
   end,
 
   login = function( self, username, password )

scripts/svn-brute.nse

@@ -67,7 +67,7 @@ svn =
     local repo_url = ( "svn://%s/%s" ):format(self.host.ip, self.repo)
     local status, msg
 
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
 
     local result
     status, result = self.socket:connect(self.host, self.port)

scripts/telnet-brute.nse

@@ -145,7 +145,7 @@ local Connection = { methods = {} }
 -- @param port Telnet port
 -- @return Connection object or nil (if the operation failed)
 Connection.new = function (host, port, proto)
-  local soc = nmap.new_socket(proto)
+  local soc = brute.new_socket(proto)
   if not soc then return nil end
   return setmetatable({
                         socket = soc,

scripts/tso-brute.nse

@@ -73,7 +73,7 @@ Driver = {
     o.host = host
     o.port = port
     o.options = options
-    o.tn3270 = tn3270.Telnet:new()
+    o.tn3270 = tn3270.Telnet:new(brute.new_socket())
     return o
   end,
   connect = function( self )

scripts/vmauthd-brute.nse

@@ -41,7 +41,7 @@ Driver = {
   end,
 
   connect = function(self)
-    self.socket = nmap.new_socket()
+    self.socket = brute.new_socket()
     return self.socket:connect(self.host, self.port)
   end,
 

scripts/xmpp-brute.nse

@@ -64,7 +64,7 @@ Driver =
     self.helper = ConnectionPool[coroutine.running()]
     if ( not(self.helper) ) then
       self.helper = xmpp.Helper:new( self.host, self.port, self.options )
-      local status, err = self.helper:connect()
+      local status, err = self.helper:connect(brute.new_socket())
       if ( not(status) ) then return false, err end
       ConnectionPool[coroutine.running()] = self.helper
     end